Merge remote-tracking branch 'upstream/master'

yang1666204 · May 23, 2024 · a899319 · a899319
2 parents 6313f26 + 2521625
commit a899319
Show file tree

Hide file tree

Showing 18 changed files with 1,493 additions and 97 deletions.
diff --git a/charts/oceanbase-cluster/Chart.yaml b/charts/oceanbase-cluster/Chart.yaml
@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 4.2.1-sp.6-106000012024042515
+version: 4.3.1-sp.0-100000032024051615
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "4.2.1.6-106000012024042515"
+appVersion: 4.3.1.0-100000032024051615
diff --git a/docsite/static/index.yaml b/docsite/static/index.yaml
@@ -62,6 +62,16 @@ entries:
     - https://github.com/oceanbase/ob-operator/releases/download/ob-operator-2.0.0/ob-operator-2.0.0.tgz
     version: 2.0.0
   oceanbase-cluster:
+  - apiVersion: v2
+    appVersion: 4.3.1.0-100000032024051615
+    created: "2024-05-22T11:22:39.758486099Z"
+    description: A Helm chart for Kubernetes to deploy OceanBase cluster
+    digest: 441c578f4bd226e4b84948f8843faefb4ac441ef0cc2ee2fbdab3530e0ceac47
+    name: oceanbase-cluster
+    type: application
+    urls:
+    - https://github.com/oceanbase/ob-operator/releases/download/oceanbase-cluster-4.3.1-sp.0-100000032024051615/oceanbase-cluster-4.3.1-sp.0-100000032024051615.tgz
+    version: 4.3.1-sp.0-100000032024051615
   - apiVersion: v2
     appVersion: 4.3.0.1-100000242024032211
     created: "2024-04-16T06:22:47.179508074Z"
@@ -133,4 +143,4 @@ entries:
     urls:
     - https://github.com/oceanbase/ob-operator/releases/download/oceanbase-dashboard-0.1.0/oceanbase-dashboard-0.1.0.tgz
     version: 0.1.0
-generated: "2024-05-20T04:00:41.425046287Z"
+generated: "2024-05-22T11:22:39.758544248Z"
diff --git a/internal/dashboard/generated/swagger/docs.go b/internal/dashboard/generated/swagger/docs.go
@@ -2998,6 +2998,22 @@ const docTemplate = `{
                 ],
                 "summary": "Get OBProxy",
                 "operationId": "GetOBProxy",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "namespace of obproxy deployment",
+                        "name": "namespace",
+                        "in": "path",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "name of obproxy deployment",
+                        "name": "name",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
                 "responses": {
                     "200": {
                         "description": "OK",
@@ -3055,6 +3071,22 @@ const docTemplate = `{
                 ],
                 "summary": "Delete OBProxy",
                 "operationId": "DeleteOBProxy",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "namespace of obproxy deployment",
+                        "name": "namespace",
+                        "in": "path",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "name of obproxy deployment",
+                        "name": "name",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
                 "responses": {
                     "200": {
                         "description": "OK",
@@ -3121,6 +3153,20 @@ const docTemplate = `{
                         "schema": {
                             "$ref": "#/definitions/obproxy.PatchOBProxyParam"
                         }
+                    },
+                    {
+                        "type": "string",
+                        "description": "namespace of obproxy deployment",
+                        "name": "namespace",
+                        "in": "path",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "name of obproxy deployment",
+                        "name": "name",
+                        "in": "path",
+                        "required": true
                     }
                 ],
                 "responses": {

diff --git a/internal/dashboard/generated/swagger/swagger.json b/internal/dashboard/generated/swagger/swagger.json
@@ -2991,6 +2991,22 @@
                 ],
                 "summary": "Get OBProxy",
                 "operationId": "GetOBProxy",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "namespace of obproxy deployment",
+                        "name": "namespace",
+                        "in": "path",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "name of obproxy deployment",
+                        "name": "name",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
                 "responses": {
                     "200": {
                         "description": "OK",
@@ -3048,6 +3064,22 @@
                 ],
                 "summary": "Delete OBProxy",
                 "operationId": "DeleteOBProxy",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "namespace of obproxy deployment",
+                        "name": "namespace",
+                        "in": "path",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "name of obproxy deployment",
+                        "name": "name",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
                 "responses": {
                     "200": {
                         "description": "OK",
@@ -3114,6 +3146,20 @@
                         "schema": {
                             "$ref": "#/definitions/obproxy.PatchOBProxyParam"
                         }
+                    },
+                    {
+                        "type": "string",
+                        "description": "namespace of obproxy deployment",
+                        "name": "namespace",
+                        "in": "path",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "name of obproxy deployment",
+                        "name": "name",
+                        "in": "path",
+                        "required": true
                     }
                 ],
                 "responses": {

diff --git a/internal/dashboard/generated/swagger/swagger.yaml b/internal/dashboard/generated/swagger/swagger.yaml
@@ -4086,6 +4086,17 @@ paths:
       - application/json
       description: Delete OBProxy by namespace and name
       operationId: DeleteOBProxy
+      parameters:
+      - description: namespace of obproxy deployment
+        in: path
+        name: namespace
+        required: true
+        type: string
+      - description: name of obproxy deployment
+        in: path
+        name: name
+        required: true
+        type: string
       produces:
       - application/json
       responses:
@@ -4120,6 +4131,17 @@ paths:
       - application/json
       description: Get OBProxy by namespace and name
       operationId: GetOBProxy
+      parameters:
+      - description: namespace of obproxy deployment
+        in: path
+        name: namespace
+        required: true
+        type: string
+      - description: name of obproxy deployment
+        in: path
+        name: name
+        required: true
+        type: string
       produces:
       - application/json
       responses:
@@ -4161,6 +4183,16 @@ paths:
         required: true
         schema:
           $ref: '#/definitions/obproxy.PatchOBProxyParam'
+      - description: namespace of obproxy deployment
+        in: path
+        name: namespace
+        required: true
+        type: string
+      - description: name of obproxy deployment
+        in: path
+        name: name
+        required: true
+        type: string
       produces:
       - application/json
       responses:

diff --git a/internal/dashboard/handler/obproxy_handler.go b/internal/dashboard/handler/obproxy_handler.go
@@ -67,6 +67,8 @@ func CreateOBProxy(c *gin.Context) (*obproxy.OBProxy, error) {
 // @Tags OBProxy
 // @Accept application/json
 // @Produce application/json
+// @Param namespace path string true "namespace of obproxy deployment"
+// @Param name path string true "name of obproxy deployment"
 // @Success 200 object response.APIResponse{data=obproxy.OBProxy}
 // @Failure 400 object response.APIResponse
 // @Failure 401 object response.APIResponse
@@ -89,6 +91,8 @@ func GetOBProxy(c *gin.Context) (*obproxy.OBProxy, error) {
 // @Accept application/json
 // @Produce application/json
 // @Param body body obproxy.PatchOBProxyParam true "Request body for patching obproxy"
+// @Param namespace path string true "namespace of obproxy deployment"
+// @Param name path string true "name of obproxy deployment"
 // @Success 200 object response.APIResponse{data=obproxy.OBProxy}
 // @Failure 400 object response.APIResponse
 // @Failure 401 object response.APIResponse
@@ -115,6 +119,8 @@ func PatchOBProxy(c *gin.Context) (*obproxy.OBProxy, error) {
 // @Tags OBProxy
 // @Accept application/json
 // @Produce application/json
+// @Param namespace path string true "namespace of obproxy deployment"
+// @Param name path string true "name of obproxy deployment"
 // @Success 200 object response.APIResponse{data=obproxy.OBProxy}
 // @Failure 400 object response.APIResponse
 // @Failure 401 object response.APIResponse

diff --git a/ui/config/config.ts b/ui/config/config.ts
@@ -9,7 +9,6 @@ export default defineConfig({
   request: {},
   favicons: ['/logo.png'],
   title: 'OceanBase Dashboard',
-  mock: false,
   layout: false,
   locale: {
     default: 'zh-CN',

diff --git a/ui/mock/alertAPI.ts b/ui/mock/alertAPI.ts
@@ -129,4 +129,90 @@ export default {
     message: 'string',
     successful: true,
   },
+  'GET /api/v1/alarm/silence/silencers/string': {
+    data: {
+      comment: 'string',
+      createdBy: 'string',
+      endsAt: 1716282320833,
+      id: 'string',
+      instances: [
+        {
+          obcluster: 'string',
+          observer: 'string',
+          obtenant: 'string',
+          obzone: 'string',
+          type: 'obcluster',
+        },
+      ],
+      rules: ['string'],
+      matchers: [
+        {
+          isRegex: true,
+          name: 'string',
+          value: 'string',
+        },
+      ],
+      startsAt: 0,
+      status: {
+        state: 'active',
+      },
+      updatedAt: 0,
+    },
+    message: 'string',
+    successful: true,
+  },
+  'GET /api/v1/alarm/rule/rules/string': {
+    data: {
+      description: 'string',
+      duration: 0,
+      evaluationTime: 0,
+      health: 'unknown',
+      instanceType: 'obcluster',
+      keepFiringFor: 0,
+      labels: [
+        {
+          key: 'string',
+          value: 'string',
+        },
+      ],
+      lastError: 'string',
+      lastEvaluation: 0,
+      name: 'string',
+      query: 'string',
+      serverity: 'critical',
+      state: 'active',
+      summary: 'string',
+      type: 'builtin',
+    },
+    message: 'string',
+    successful: true,
+  },
+  'GET /api/v1/alarm/receiver/receivers/string': {
+    data: {
+      config: 'string',
+      name: 'string',
+      type: 'discord',
+    },
+    message: 'string',
+    successful: true,
+  },
+  'GET /api/v1/alarm/route/routes/string': {
+    data: {
+      aggregateLabels: ['string'],
+      groupInterval: 0,
+      groupWait: 0,
+      id: 'string',
+      matchers: [
+        {
+          isRegex: true,
+          name: 'string',
+          value: 'string',
+        },
+      ],
+      receiver: 'string',
+      repeatInterval: 0,
+    },
+    message: 'string',
+    successful: true,
+  },
 };