chore: add job name and fix kafka bug (#68)

apecloud · Dec 8, 2023 · 95ba910 · 95ba910
1 parent 2128ede
commit 95ba910
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 59 deletions.
diff --git a/addons/apecloud-mysql/dashboards/mysql.json b/addons/apecloud-mysql/dashboards/mysql.json
@@ -4910,8 +4910,8 @@
       {
         "current": {
           "selected": true,
-          "text": "kubeblocks-service",
-          "value": "kubeblocks-service"
+          "text": "oteld-app-metricse",
+          "value": "oteld-app-metrics"
         },
         "hide": 0,
         "includeAll": false,
@@ -4921,16 +4921,11 @@
         "options": [
           {
             "selected": true,
-            "text": "kubeblocks-service",
-            "value": "kubeblocks-service"
-          },
-          {
-            "selected": false,
-            "text": "agamotto",
-            "value": "agamotto"
+            "text": "oteld-app-metrics",
+            "value": "oteld-app-metrics"
           }
         ],
-        "query": "kubeblocks-service,agamotto",
+        "query": "oteld-app-metrics",
         "queryValue": "",
         "skipUrlSync": false,
         "type": "custom"

diff --git a/addons/kafka/dashboards/kafka.json b/addons/kafka/dashboards/kafka.json
@@ -26,7 +26,6 @@
   "fiscalYearStartMonth": 0,
   "gnetId": 12931,
   "graphTooltip": 0,
-  "id": 9,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -687,8 +686,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -786,8 +784,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -885,8 +882,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -984,8 +980,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -1097,8 +1092,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -1598,15 +1592,15 @@
           "type": "prometheus",
           "uid": "prometheus"
         },
-        "definition": "label_values(kafka_brokers, namespace)",
+        "definition": "label_values(kafka_server_kafkaserver_total_brokerstate_value, namespace)",
         "hide": 0,
         "includeAll": false,
         "label": "Namespace",
         "multi": false,
         "name": "namespace",
         "options": [],
         "query": {
-          "query": "label_values(kafka_brokers, namespace)",
+          "query": "label_values(kafka_server_kafkaserver_total_brokerstate_value, namespace)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 1,
@@ -1621,22 +1615,22 @@
       {
         "current": {
           "selected": false,
-          "text": "kafka-cluster",
-          "value": "kafka-cluster"
+          "text": "kafka",
+          "value": "kafka"
         },
         "datasource": {
           "type": "prometheus",
           "uid": "prometheus"
         },
-        "definition": "label_values(kafka_brokers, app_kubernetes_io_instance)",
+        "definition": "label_values(kafka_server_kafkaserver_total_brokerstate_value, app_kubernetes_io_instance)",
         "hide": 0,
         "includeAll": false,
         "label": "Cluster",
         "multi": false,
         "name": "cluster",
         "options": [],
         "query": {
-          "query": "label_values(kafka_brokers, app_kubernetes_io_instance)",
+          "query": "label_values(kafka_server_kafkaserver_total_brokerstate_value, app_kubernetes_io_instance)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 1,
@@ -1671,7 +1665,7 @@
         "options": [],
         "query": {
           "query": "label_values(kafka_topic_partition_current_offset{instance='$instance',topic!='__consumer_offsets',topic!='--kafka'}, topic)",
-          "refId": "Prometheus-topic-Variable-Query"
+          "refId": "StandardVariableQuery"
         },
         "refresh": 1,
         "regex": "",
@@ -1748,6 +1742,6 @@
   "timezone": "browser",
   "title": "Kafka",
   "uid": "kafka",
-  "version": 5,
+  "version": 1,
   "weekStart": ""
 }
diff --git a/addons/mysql/dashboards/mysql.json b/addons/mysql/dashboards/mysql.json
@@ -4910,8 +4910,8 @@
       {
         "current": {
           "selected": true,
-          "text": "kubeblocks-service",
-          "value": "kubeblocks-service"
+          "text": "oteld-app-metrics",
+          "value": "oteld-app-metrics"
         },
         "hide": 0,
         "includeAll": false,
@@ -4921,16 +4921,11 @@
         "options": [
           {
             "selected": true,
-            "text": "kubeblocks-service",
-            "value": "kubeblocks-service"
-          },
-          {
-            "selected": false,
-            "text": "agamotto",
-            "value": "agamotto"
+            "text": "oteld-app-metrics",
+            "value": "oteld-app-metrics"
           }
         ],
-        "query": "kubeblocks-service,agamotto",
+        "query": "oteld-app-metrics",
         "queryValue": "",
         "skipUrlSync": false,
         "type": "custom"

diff --git a/addons/postgresql/dashboards/postgresql.json b/addons/postgresql/dashboards/postgresql.json
@@ -8157,8 +8157,8 @@
       {
         "current": {
           "selected": true,
-          "text": "kubeblocks-service",
-          "value": "kubeblocks-service"
+          "text": "oteld-app-metrics",
+          "value": "oteld-app-metrics"
         },
         "hide": 0,
         "includeAll": false,
@@ -8168,16 +8168,11 @@
         "options": [
           {
             "selected": true,
-            "text": "kubeblocks-service",
-            "value": "kubeblocks-service"
-          },
-          {
-            "selected": false,
-            "text": "agamotto",
-            "value": "agamotto"
+            "text": "oteld-app-metrics",
+            "value": "oteld-app-metrics"
           }
         ],
-        "query": "kubeblocks-service,agamotto",
+        "query": "oteld-app-metrics",
         "queryValue": "",
         "skipUrlSync": false,
         "type": "custom"

diff --git a/addons/redis/dashboards/redis.json b/addons/redis/dashboards/redis.json
@@ -4813,8 +4813,8 @@
       {
         "current": {
           "selected": false,
-          "text": "kubeblocks-service",
-          "value": "kubeblocks-service"
+          "text": "oteld-app-metrics",
+          "value": "oteld-app-metrics"
         },
         "hide": 0,
         "includeAll": false,
@@ -4824,16 +4824,11 @@
         "options": [
           {
             "selected": true,
-            "text": "kubeblocks-service",
-            "value": "kubeblocks-service"
-          },
-          {
-            "selected": false,
-            "text": "agamotto",
-            "value": "agamotto"
+            "text": "oteld-app-metrics",
+            "value": "oteld-app-metrics"
           }
         ],
-        "query": "kubeblocks-service,agamotto",
+        "query": "oteld-app-metrics",
         "queryValue": "",
         "skipUrlSync": false,
         "type": "custom"