Fix es, mysql, rabbitmq dashboards typos and missing expressions. (ap…

…ache#12458)
renovamens · Jul 17, 2024 · bd86b26 · bd86b26
1 parent 9c5f4ab
commit bd86b26
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 9 deletions.
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
@@ -36,6 +36,7 @@
 * Support aggregation operators in PromQL query.
 * Update the kubernetes HTTP latency related metrics source unit from `ns` to `ms`.
 * Support BanyanDB internal stream query execution tracing.
+* Fix es, mysql, rabbitmq dashboards typos and missing expressions.
 
 #### UI
 

diff --git a/oap-server/server-starter/src/main/resources/otel-rules/postgresql/postgresql-service.yaml b/oap-server/server-starter/src/main/resources/otel-rules/postgresql/postgresql-service.yaml
@@ -62,7 +62,7 @@ metricsRules:
 
   ## cache and temporary file
   - name: cache_hit_rate
-    exp: (pg_stat_database_blks_hit*100 / (pg_stat_database_blks_read + pg_stat_database_blks_hit)).sum(['service_instance_id','host_name'])
+    exp: (pg_stat_database_blks_hit*100 / (pg_stat_database_blks_read + pg_stat_database_blks_hit)).avg(['service_instance_id','host_name'])
   - name: temporary_files_rate
     exp: pg_stat_database_temp_bytes.sum(['service_instance_id','host_name']).rate('PT1M')
 

diff --git a/...tarter/src/main/resources/ui-initialized-templates/elasticsearch/elasticsearch-index.json b/...tarter/src/main/resources/ui-initialized-templates/elasticsearch/elasticsearch-index.json
@@ -389,7 +389,10 @@
           },
           "widget": {
             "title": "Documents (Primary Shards)"
-          }
+          },
+          "expressions": [
+            "meter_elasticsearch_index_indices_docs_primary"
+          ]
         },
         {
           "x": 8,
@@ -408,7 +411,10 @@
           },
           "widget": {
             "title": "Documents Created Per Min (Primary Shards)"
-          }
+          },
+          "expressions": [
+            "meter_elasticsearch_index_indices_docs_primary_rate"
+          ]
         },
         {
           "x": 16,
@@ -584,7 +590,7 @@
             "title": "Deleted Documents Count (Primary Shard)"
           },
           "expressions": [
-            "latest(meter_elasticsearch_index_indices_docs_primary)"
+            "latest(meter_elasticsearch_index_indices_deleted_docs_primary)"
           ]
         },
         {
@@ -627,7 +633,10 @@
           },
           "widget": {
             "title": "Shards Documents"
-          }
+          },
+          "expressions": [
+            "meter_elasticsearch_index_indices_shards_docs"
+          ]
         }
       ],
       "layer": "ELASTICSEARCH",

diff --git a/...rver/server-starter/src/main/resources/ui-initialized-templates/mysql/mysql-instance.json b/...rver/server-starter/src/main/resources/ui-initialized-templates/mysql/mysql-instance.json
@@ -276,7 +276,7 @@
             }
           ],
           "expressions": [
-            "meter_mysql_slow_queries_rate"
+            "meter_mysql_instance_slow_queries_rate"
           ]
         },
         {

diff --git a/...er-starter/src/main/resources/ui-initialized-templates/postgresql/postgresql-service.json b/...er-starter/src/main/resources/ui-initialized-templates/postgresql/postgresql-service.json
@@ -284,7 +284,7 @@
                     "title": "Cache Hit Rate (%)"
                   },
                   "expressions": [
-                    "aggregate_labels(meter_pg_cache_hit_rate,sum)"
+                    "aggregate_labels(meter_pg_cache_hit_rate,avg)"
                   ],
                   "metricConfig": [
                     {

diff --git a/...er/server-starter/src/main/resources/ui-initialized-templates/rabbitmq/rabbitmq-node.json b/...er/server-starter/src/main/resources/ui-initialized-templates/rabbitmq/rabbitmq-node.json
@@ -97,7 +97,7 @@
             "showUnit": true
           },
           "widget": {
-            "title": "Collections"
+            "title": "Connections"
           },
           "expressions": [
             "latest(meter_rabbitmq_node_connections_total)"

diff --git a/...erver/server-starter/src/main/resources/ui-initialized-templates/redis/redis-service.json b/...erver/server-starter/src/main/resources/ui-initialized-templates/redis/redis-service.json
@@ -125,7 +125,7 @@
                     }
                   ],
                   "expressions": [
-                    "aggregate_labels(meter_redis_hit_rate,sum)"
+                    "aggregate_labels(meter_redis_hit_rate,avg)"
                   ]
                 },
                 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -276,7 +276,7 @@ @@
                 }
               ],
               "expressions": [
-                "meter_mysql_slow_queries_rate"
+                "meter_mysql_instance_slow_queries_rate"
               ]
             },
             {
@@ Expand Down @@