This is an automated email from the ASF dual-hosted git repository.

wankai pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git


The following commit(s) were added to refs/heads/main by this push:
     new 0ab2df7  update grafana dashboard config (#168)
0ab2df7 is described below

commit 0ab2df7e0ebc3b7beb104ca4124375fc97483e2e
Author: Wan Kai <wankai...@foxmail.com>
AuthorDate: Thu Apr 11 16:11:41 2024 +0800

    update grafana dashboard config (#168)
---
 Makefile.in                                        |  4 +-
 .../config/grafana/dashboards/general-service.json | 86 ++++++++++-----------
 .../config/grafana/dashboards/service-mesh.json    | 90 +++++++++++-----------
 .../grafana/dashboards/virtual-database.json       | 12 +--
 4 files changed, 96 insertions(+), 96 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index f6f8bf5..9ecfb18 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,10 +29,10 @@ ES_IMAGE ?= 
docker.elastic.co/elasticsearch/elasticsearch-oss
 ES_IMAGE_TAG ?= 7.10.2
 
 SW_OAP_IMAGE ?= ghcr.io/apache/skywalking/oap
-SW_OAP_IMAGE_TAG ?= 8dd842189d4cf4df817dfb437ded5673023c3451
+SW_OAP_IMAGE_TAG ?= f97fd4f6e429e9326893ad57d8aeb9de914653ec
 
 SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui
-SW_UI_IMAGE_TAG ?= 8dd842189d4cf4df817dfb437ded5673023c3451
+SW_UI_IMAGE_TAG ?= f97fd4f6e429e9326893ad57d8aeb9de914653ec
 
 SW_CLI_IMAGE ?= 
ghcr.io/apache/skywalking-cli/skywalking-cli:0883266bfaa36612927b69e35781b64ea181758d
 SW_EVENT_EXPORTER_IMAGE ?= 
ghcr.io/apache/skywalking-kubernetes-event-exporter/skywalking-kubernetes-event-exporter:8a012a3f968cb139f817189afb9b3748841bba22
diff --git a/deploy/platform/config/grafana/dashboards/general-service.json 
b/deploy/platform/config/grafana/dashboards/general-service.json
index 0ed3dfa..af82deb 100644
--- a/deploy/platform/config/grafana/dashboards/general-service.json
+++ b/deploy/platform/config/grafana/dashboards/general-service.json
@@ -140,7 +140,7 @@
           },
           "editorMode": "code",
           "expr": "service_apdex{service='$service', layer='$layer'} / 10000",
-          "legendFormat": "__auto",
+          "legendFormat": "apdex",
           "range": true,
           "refId": "A"
         }
@@ -206,7 +206,7 @@
           },
           "editorMode": "code",
           "expr": "service_sla{service='$service', layer='$layer'} / 100",
-          "legendFormat": "__auto",
+          "legendFormat": "sla",
           "range": true,
           "refId": "A"
         }
@@ -272,7 +272,7 @@
           },
           "editorMode": "code",
           "expr": "service_cpm{service='$service', layer='$layer'}",
-          "legendFormat": "__auto",
+          "legendFormat": "cpm",
           "range": true,
           "refId": "A"
         }
@@ -367,7 +367,7 @@
           "editorMode": "code",
           "expr": "service_resp_time{service='$service', layer='$layer'}",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "resp_time",
           "range": true,
           "refId": "A"
         }
@@ -462,7 +462,7 @@
           "editorMode": "code",
           "expr": "service_apdex{service='$service', layer='$layer'} / 10000",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "apdex",
           "range": true,
           "refId": "A"
         }
@@ -555,9 +555,9 @@
             "uid": "${DS_SW_Prometheus}"
           },
           "editorMode": "code",
-          "expr": "service_percentile{service='$service', layer='$layer', 
labels='0,1,2,3,4', relabels='P50,P75,P90,P95,P99'}",
+          "expr": "service_percentile{service='$service', layer='$layer', 
p='50,75,90,95,99'}",
           "format": "time_series",
-          "legendFormat": "{{label}}",
+          "legendFormat": "{{p}}",
           "range": true,
           "refId": "A"
         }
@@ -653,7 +653,7 @@
           "editorMode": "code",
           "expr": "service_cpm{service='$service', layer='$layer'}",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "cpm",
           "range": true,
           "refId": "A"
         }
@@ -750,7 +750,7 @@
           "editorMode": "code",
           "expr": "service_sla{service='$service', layer='$layer'} / 100",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "sla",
           "range": true,
           "refId": "A"
         }
@@ -846,7 +846,7 @@
           "editorMode": "code",
           "expr": "service_mq_consume_count{service='$service', 
layer='$layer'}",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "count",
           "range": true,
           "refId": "A"
         }
@@ -942,7 +942,7 @@
           "editorMode": "code",
           "expr": "service_mq_consume_latency{service='$service', 
layer='$layer'}",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "latency",
           "range": true,
           "refId": "A"
         }
@@ -1461,7 +1461,7 @@
               "editorMode": "code",
               "expr": "service_instance_cpm{service='$service', 
service_instance='$service_instance', layer='$layer'}",
               "format": "time_series",
-              "legendFormat": "__auto",
+              "legendFormat": "cpm",
               "range": true,
               "refId": "A"
             }
@@ -1557,7 +1557,7 @@
               "editorMode": "code",
               "expr": "service_instance_sla{service='$service', 
service_instance='$service_instance', layer='$layer'} / 100",
               "format": "time_series",
-              "legendFormat": "__auto",
+              "legendFormat": "sla",
               "range": true,
               "refId": "A"
             }
@@ -1652,7 +1652,7 @@
               "editorMode": "code",
               "expr": "service_instance_resp_time{service='$service', 
service_instance='$service_instance', layer='$layer'}",
               "format": "time_series",
-              "legendFormat": "__auto",
+              "legendFormat": "resp_time",
               "range": true,
               "refId": "A"
             }
@@ -1747,7 +1747,7 @@
               "editorMode": "code",
               "expr": "meter_datasource{service='$service', 
service_instance='$service_instance', layer='$layer'} / 100",
               "format": "time_series",
-              "legendFormat": "__auto",
+              "legendFormat": "datasource",
               "range": true,
               "refId": "A"
             }
@@ -1853,7 +1853,7 @@
               "editorMode": "code",
               "expr": "meter_thread_pool{service='$service', 
service_instance='$service_instance', layer='$layer'}",
               "format": "time_series",
-              "legendFormat": "__auto",
+              "legendFormat": "thread_pool",
               "range": true,
               "refId": "A"
             }
@@ -1966,7 +1966,7 @@
           "editorMode": "code",
           "expr": "instance_jvm_cpu{service='$service', 
service_instance='$service_instance',layer='$layer'}",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "jvm_cpu",
           "range": true,
           "refId": "A"
         }
@@ -2062,7 +2062,7 @@
           "editorMode": "code",
           "expr": "instance_jvm_memory_noheap_max{service='$service', 
service_instance='$service_instance', layer='$layer'}",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "jvm_memory_noheap_max",
           "range": true,
           "refId": "A"
         },
@@ -2074,7 +2074,7 @@
           "editorMode": "code",
           "expr": "instance_jvm_memory_noheap{service='$service', 
service_instance='$service_instance', layer='$layer'}",
           "hide": false,
-          "legendFormat": "__auto",
+          "legendFormat": "jvm_memory_noheap",
           "range": true,
           "refId": "B"
         },
@@ -2086,7 +2086,7 @@
           "editorMode": "code",
           "expr": "instance_jvm_memory_heap{service='$service', 
service_instance='$service_instance', layer='$layer'}",
           "hide": false,
-          "legendFormat": "__auto",
+          "legendFormat": "jvm_memory_heap",
           "range": true,
           "refId": "C"
         },
@@ -2098,7 +2098,7 @@
           "editorMode": "code",
           "expr": "instance_jvm_memory_heap_max{service='$service', 
service_instance='$service_instance', layer='$layer'}",
           "hide": false,
-          "legendFormat": "__auto",
+          "legendFormat": "jvm_memory_heap_max",
           "range": true,
           "refId": "D"
         }
@@ -2194,7 +2194,7 @@
           "editorMode": "code",
           "expr": "instance_jvm_young_gc_time{service='$service', 
service_instance='$service_instance', layer='$layer'}",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "jvm_young_gc_time",
           "range": true,
           "refId": "A"
         },
@@ -2206,7 +2206,7 @@
           "editorMode": "code",
           "expr": "instance_jvm_old_gc_time{service='$service', 
service_instance='$service_instance', layer='$layer'}",
           "hide": false,
-          "legendFormat": "__auto",
+          "legendFormat": "jvm_old_gc_time",
           "range": true,
           "refId": "B"
         },
@@ -2218,7 +2218,7 @@
           "editorMode": "code",
           "expr": "instance_jvm_normal_gc_time{service='$service', 
service_instance='$service_instance', layer='$layer'}",
           "hide": false,
-          "legendFormat": "__auto",
+          "legendFormat": "jvm_normal_gc_time",
           "range": true,
           "refId": "C"
         }
@@ -2314,7 +2314,7 @@
           "editorMode": "code",
           "expr": "instance_jvm_young_gc_count{service='$service', 
service_instance='$service_instance', layer='$layer'}",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "jvm_young_gc_count",
           "range": true,
           "refId": "A"
         },
@@ -2326,7 +2326,7 @@
           "editorMode": "code",
           "expr": "instance_jvm_old_gc_count{service='$service', 
service_instance='$service_instance', layer='$layer'}",
           "hide": false,
-          "legendFormat": "__auto",
+          "legendFormat": "jvm_old_gc_count",
           "range": true,
           "refId": "B"
         },
@@ -2338,7 +2338,7 @@
           "editorMode": "code",
           "expr": "instance_jvm_normal_gc_count{service='$service', 
service_instance='$service_instance', layer='$layer'}",
           "hide": false,
-          "legendFormat": "__auto",
+          "legendFormat": "_jvm_normal_gc_count",
           "range": true,
           "refId": "C"
         }
@@ -2435,7 +2435,7 @@
           "editorMode": "code",
           "expr": "instance_jvm_thread_live_count{service='$service', 
service_instance='$service_instance', layer='$layer'}",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "jvm_thread_live_count",
           "range": true,
           "refId": "A"
         },
@@ -2447,7 +2447,7 @@
           "editorMode": "code",
           "expr": "instance_jvm_thread_daemon_count{service='$service', 
service_instance='$service_instance', layer='$layer'}",
           "hide": false,
-          "legendFormat": "__auto",
+          "legendFormat": "jvm_thread_daemon_count",
           "range": true,
           "refId": "B"
         },
@@ -2459,7 +2459,7 @@
           "editorMode": "code",
           "expr": "instance_jvm_thread_peak_count{service='$service', 
service_instance='$service_instance', layer='$layer'}",
           "hide": false,
-          "legendFormat": "__auto",
+          "legendFormat": "jvm_thread_peak_count",
           "range": true,
           "refId": "C"
         }
@@ -2555,7 +2555,7 @@
           "editorMode": "code",
           "expr": 
"instance_jvm_thread_timed_waiting_state_thread_count{service='$service', 
service_instance='$service_instance', layer='$layer'}",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "jvm_thread_timed_waiting_state_thread_count",
           "range": true,
           "refId": "A"
         },
@@ -2567,7 +2567,7 @@
           "editorMode": "code",
           "expr": 
"instance_jvm_thread_blocked_state_thread_count{service='$service', 
service_instance='$service_instance', layer='$layer'}",
           "hide": false,
-          "legendFormat": "__auto",
+          "legendFormat": "jvm_thread_blocked_state_thread_count",
           "range": true,
           "refId": "B"
         },
@@ -2579,7 +2579,7 @@
           "editorMode": "code",
           "expr": 
"instance_jvm_thread_waiting_state_thread_count{service='$service', 
service_instance='$service_instance', layer='$layer'}",
           "hide": false,
-          "legendFormat": "__auto",
+          "legendFormat": "jvm_thread_waiting_state_thread_count",
           "range": true,
           "refId": "C"
         },
@@ -2591,7 +2591,7 @@
           "editorMode": "code",
           "expr": 
"instance_jvm_thread_runnable_state_thread_count{service='$service', 
service_instance='$service_instance', layer='$layer'}",
           "hide": false,
-          "legendFormat": "__auto",
+          "legendFormat": "jvm_thread_runnable_state_thread_count",
           "range": true,
           "refId": "D"
         }
@@ -2691,7 +2691,7 @@
           "editorMode": "code",
           "expr": "instance_jvm_class_loaded_class_count{service='$service', 
service_instance='$service_instance', layer='$layer'}",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "jvm_class_loaded_class_count",
           "range": true,
           "refId": "A"
         },
@@ -2703,7 +2703,7 @@
           "editorMode": "code",
           "expr": 
"instance_jvm_class_total_loaded_class_count{service='$service', 
service_instance='$service_instance', layer='$layer'}",
           "hide": false,
-          "legendFormat": "__auto",
+          "legendFormat": "jvm_class_total_loaded_class_count",
           "range": true,
           "refId": "B"
         },
@@ -2715,7 +2715,7 @@
           "editorMode": "code",
           "expr": 
"instance_jvm_class_total_unloaded_class_count{service='$service', 
service_instance='$service_instance', layer='$layer'}",
           "hide": false,
-          "legendFormat": "__auto",
+          "legendFormat": "jvm_class_total_unloaded_class_count",
           "range": true,
           "refId": "C"
         }
@@ -2824,7 +2824,7 @@
           "editorMode": "code",
           "expr": "endpoint_cpm{service='$service', endpoint='$endpoint', 
layer='$layer'}",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "cpm",
           "range": true,
           "refId": "A"
         }
@@ -2921,7 +2921,7 @@
           "editorMode": "code",
           "expr": "endpoint_resp_time{endpoint='$endpoint', 
service='$service', layer='$layer'}",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "resp_time",
           "range": true,
           "refId": "A"
         }
@@ -3016,9 +3016,9 @@
             "uid": "${DS_SW_Prometheus}"
           },
           "editorMode": "code",
-          "expr": "endpoint_percentile{service='$service', 
endpoint=\"$endpoint\", layer='$layer', labels='0,1,2,3,4', 
relabels='P50,P75,P90,P95,P99'}",
+          "expr": "endpoint_percentile{service='$service', 
endpoint=\"$endpoint\", layer='$layer', p='50,75,90,95,99'}",
           "format": "time_series",
-          "legendFormat": "{{label}}",
+          "legendFormat": "{{p}}",
           "range": true,
           "refId": "A"
         }
@@ -3115,7 +3115,7 @@
           "editorMode": "code",
           "expr": "endpoint_sla{service='$service', endpoint='$endpoint', 
layer='$layer'} / 100",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "sla",
           "range": true,
           "refId": "A"
         }
@@ -3211,7 +3211,7 @@
           "editorMode": "code",
           "expr": "service_mq_consume_latency{service='$service', 
layer='$layer'}",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "latency",
           "range": true,
           "refId": "A"
         }
diff --git a/deploy/platform/config/grafana/dashboards/service-mesh.json 
b/deploy/platform/config/grafana/dashboards/service-mesh.json
index 7926382..0b53349 100644
--- a/deploy/platform/config/grafana/dashboards/service-mesh.json
+++ b/deploy/platform/config/grafana/dashboards/service-mesh.json
@@ -24,7 +24,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 2,
+  "id": 4,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -137,7 +137,7 @@
           },
           "editorMode": "code",
           "expr": "service_apdex{service='$service', layer='$layer'} / 10000",
-          "legendFormat": "__auto",
+          "legendFormat": "apdex",
           "range": true,
           "refId": "A"
         }
@@ -203,7 +203,7 @@
           },
           "editorMode": "code",
           "expr": "service_sla{service='$service', layer='$layer'} / 100",
-          "legendFormat": "__auto",
+          "legendFormat": "sla",
           "range": true,
           "refId": "A"
         }
@@ -269,7 +269,7 @@
           },
           "editorMode": "code",
           "expr": "service_cpm{service='$service', layer='$layer'}",
-          "legendFormat": "__auto",
+          "legendFormat": "cpm",
           "range": true,
           "refId": "A"
         }
@@ -364,7 +364,7 @@
           "editorMode": "code",
           "expr": "service_apdex{service='$service', layer='$layer'}",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "apdex",
           "range": true,
           "refId": "A"
         }
@@ -459,7 +459,7 @@
           "editorMode": "code",
           "expr": "service_resp_time{service='$service', layer='$layer'}",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "resp_time",
           "range": true,
           "refId": "A"
         }
@@ -552,9 +552,9 @@
             "uid": "${DS_SW_Prometheus}"
           },
           "editorMode": "code",
-          "expr": "service_percentile{service='$service', layer='$layer', 
labels='0,1,2,3,4', relabels='P50,P75,P90,P95,P99'}",
+          "expr": "service_percentile{service='$service', layer='$layer', 
p='50,75,90,95,99'}",
           "format": "time_series",
-          "legendFormat": "{{label}}",
+          "legendFormat": "{{p}}",
           "range": true,
           "refId": "A"
         }
@@ -651,7 +651,7 @@
           "editorMode": "code",
           "expr": "service_sla{service='$service', layer='$layer'} / 100",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "sla",
           "range": true,
           "refId": "A"
         }
@@ -747,7 +747,7 @@
           "editorMode": "code",
           "expr": "service_cpm{service='$service', layer='$layer'}",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "cpm",
           "range": true,
           "refId": "A"
         }
@@ -843,7 +843,7 @@
           "editorMode": "code",
           "expr": "service_throughput_received{service='$service', 
layer='$layer'}",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "received",
           "range": true,
           "refId": "A"
         },
@@ -855,7 +855,7 @@
           "editorMode": "code",
           "expr": "service_throughput_sent{service='$service', 
layer='$layer'}",
           "hide": false,
-          "legendFormat": "__auto",
+          "legendFormat": "sent",
           "range": true,
           "refId": "B"
         }
@@ -1353,7 +1353,7 @@
           "editorMode": "code",
           "expr": 
"service_sidecar_internal_req_latency_nanos{service='$service', 
layer='$layer'}",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "latency_nanos",
           "range": true,
           "refId": "A"
         }
@@ -1448,7 +1448,7 @@
           "editorMode": "code",
           "expr": 
"service_sidecar_internal_resp_latency_nanos{service='$service', 
layer='$layer'}",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "latency_nanos",
           "range": true,
           "refId": "A"
         }
@@ -1557,7 +1557,7 @@
           "editorMode": "code",
           "expr": "service_instance_cpm{service='$service', 
service_instance='$service_instance', layer='$layer'}",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "cpm",
           "range": true,
           "refId": "A"
         }
@@ -1653,7 +1653,7 @@
           "editorMode": "code",
           "expr": "service_instance_throughput_received{service='$service', 
service_instance='$service_instance', layer='$layer'}",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "received",
           "range": true,
           "refId": "A"
         },
@@ -1665,7 +1665,7 @@
           "editorMode": "code",
           "expr": "service_instance_throughput_sent{service='$service', 
service_instance='$service_instance', layer='$layer'}",
           "hide": false,
-          "legendFormat": "__auto",
+          "legendFormat": "sent",
           "range": true,
           "refId": "B"
         }
@@ -1762,7 +1762,7 @@
           "editorMode": "code",
           "expr": "service_instance_sla{service='$service', 
service_instance='$service_instance', layer='$layer'} / 100",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "sla",
           "range": true,
           "refId": "A"
         }
@@ -1858,7 +1858,7 @@
           "editorMode": "code",
           "expr": "service_instance_resp_time{service='$service', 
service_instance='$service_instance', layer='$layer'}",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "resp_time",
           "range": true,
           "refId": "A"
         }
@@ -1963,7 +1963,7 @@
               "editorMode": "code",
               "expr": "endpoint_cpm{service='$service', endpoint='$endpoint', 
layer='$layer'}",
               "format": "time_series",
-              "legendFormat": "__auto",
+              "legendFormat": "cpm",
               "range": true,
               "refId": "A"
             }
@@ -2059,7 +2059,7 @@
               "editorMode": "code",
               "expr": "endpoint_resp_time{endpoint='$endpoint', 
service='$service', layer='$layer'}",
               "format": "time_series",
-              "legendFormat": "__auto",
+              "legendFormat": "resp_time",
               "range": true,
               "refId": "A"
             }
@@ -2155,7 +2155,7 @@
               "editorMode": "code",
               "expr": "endpoint_sla{service='$service', endpoint='$endpoint', 
layer='$layer'} / 100",
               "format": "time_series",
-              "legendFormat": "__auto",
+              "legendFormat": "sla",
               "range": true,
               "refId": "A"
             }
@@ -2249,9 +2249,9 @@
                 "uid": "${DS_SW_Prometheus}"
               },
               "editorMode": "code",
-              "expr": "endpoint_percentile{service='$service', 
endpoint=\"$endpoint\", layer='$layer', labels='0,1,2,3,4', 
relabels='P50,P75,P90,P95,P99'}",
+              "expr": "endpoint_percentile{service='$service', 
endpoint=\"$endpoint\", layer='$layer', p='50,75,90,95,99'}",
               "format": "time_series",
-              "legendFormat": "{{label}}",
+              "legendFormat": "{{p}}",
               "range": true,
               "refId": "A"
             }
@@ -2345,7 +2345,7 @@
               "editorMode": "code",
               "expr": 
"endpoint_sidecar_internal_req_latency_nanos{service='$service', 
endpoint='$endpoint', layer='$layer'}",
               "format": "time_series",
-              "legendFormat": "__auto",
+              "legendFormat": "latency_nanos",
               "range": true,
               "refId": "A"
             }
@@ -2439,7 +2439,7 @@
               "editorMode": "code",
               "expr": 
"endpoint_sidecar_internal_resp_latency_nanos{service='$service', 
endpoint='$endpoint', layer='$layer'}",
               "format": "time_series",
-              "legendFormat": "__auto",
+              "legendFormat": "latency_nanos",
               "range": true,
               "refId": "A"
             }
@@ -2548,7 +2548,7 @@
               "editorMode": "code",
               "expr": "envoy_memory_allocated_max{service='$service', 
service_instance='$service_instance',layer='$layer'}",
               "format": "time_series",
-              "legendFormat": "__auto",
+              "legendFormat": "envoy_memory_allocated_max",
               "range": true,
               "refId": "A"
             },
@@ -2560,7 +2560,7 @@
               "editorMode": "code",
               "expr": "envoy_heap_memory_used{service='$service', 
service_instance='$service_instance',layer='$layer'}",
               "hide": false,
-              "legendFormat": "__auto",
+              "legendFormat": "envoy_heap_memory_used",
               "range": true,
               "refId": "B"
             },
@@ -2572,7 +2572,7 @@
               "editorMode": "code",
               "expr": "envoy_memory_allocated{service='$service', 
service_instance='$service_instance',layer='$layer'}",
               "hide": false,
-              "legendFormat": "__auto",
+              "legendFormat": "envoy_memory_allocated",
               "range": true,
               "refId": "C"
             },
@@ -2584,7 +2584,7 @@
               "editorMode": "code",
               "expr": "envoy_memory_physical_size{service='$service', 
service_instance='$service_instance',layer='$layer'}",
               "hide": false,
-              "legendFormat": "__auto",
+              "legendFormat": "envoy_memory_physical_size",
               "range": true,
               "refId": "D"
             },
@@ -2596,7 +2596,7 @@
               "editorMode": "code",
               "expr": "envoy_memory_physical_size_max{service='$service', 
service_instance='$service_instance',layer='$layer'}",
               "hide": false,
-              "legendFormat": "__auto",
+              "legendFormat": "envoy_memory_physical_size_max",
               "range": true,
               "refId": "E"
             },
@@ -2608,7 +2608,7 @@
               "editorMode": "code",
               "expr": "envoy_heap_memory_max_used{service='$service', 
service_instance='$service_instance',layer='$layer'}",
               "hide": false,
-              "legendFormat": "__auto",
+              "legendFormat": "envoy_heap_memory_max_used",
               "range": true,
               "refId": "F"
             }
@@ -2703,7 +2703,7 @@
               "editorMode": "code",
               "expr": "envoy_total_connections_used{service='$service', 
service_instance='$service_instance', layer='$layer'}",
               "format": "time_series",
-              "legendFormat": "__auto",
+              "legendFormat": "envoy_total_connections_used",
               "range": true,
               "refId": "A"
             },
@@ -2715,7 +2715,7 @@
               "editorMode": "code",
               "expr": "envoy_parent_connections_used{service='$service', 
service_instance='$service_instance', layer='$layer'}",
               "hide": false,
-              "legendFormat": "__auto",
+              "legendFormat": "envoy_parent_connections_used",
               "range": true,
               "refId": "B"
             }
@@ -2810,7 +2810,7 @@
               "editorMode": "code",
               "expr": "envoy_worker_threads_max{service='$service', 
service_instance='$service_instance', layer='$layer'}",
               "format": "time_series",
-              "legendFormat": "__auto",
+              "legendFormat": "envoy_worker_threads_max",
               "range": true,
               "refId": "A"
             },
@@ -2822,7 +2822,7 @@
               "editorMode": "code",
               "expr": "envoy_worker_threads{service='$service', 
service_instance='$service_instance', layer='$layer'}",
               "hide": false,
-              "legendFormat": "__auto",
+              "legendFormat": "envoy_worker_threads",
               "range": true,
               "refId": "B"
             }
@@ -2917,7 +2917,7 @@
               "editorMode": "code",
               "expr": "envoy_bug_failures{service='$service', 
service_instance='$service_instance', layer='$layer'}",
               "format": "time_series",
-              "legendFormat": "__auto",
+              "legendFormat": "failures",
               "range": true,
               "refId": "A"
             }
@@ -3012,7 +3012,7 @@
               "editorMode": "code",
               "expr": "envoy_cluster_membership_healthy{service='$service', 
service_instance='$service_instance', layer='$layer'}",
               "format": "time_series",
-              "legendFormat": "__auto",
+              "legendFormat": "{{cluster_name}}",
               "range": true,
               "refId": "A"
             }
@@ -3118,7 +3118,7 @@
               "editorMode": "code",
               "expr": "envoy_cluster_up_cx_active{service='$service', 
service_instance='$service_instance', layer='$layer'}",
               "format": "time_series",
-              "legendFormat": "__auto",
+              "legendFormat": "{{cluster_name}}",
               "range": true,
               "refId": "A"
             }
@@ -3224,7 +3224,7 @@
               "editorMode": "code",
               "expr": "envoy_cluster_up_cx_incr{service='$service', 
service_instance='$service_instance', layer='$layer'}",
               "format": "time_series",
-              "legendFormat": "__auto",
+              "legendFormat": "{{cluster_name}}",
               "range": true,
               "refId": "A"
             }
@@ -3330,7 +3330,7 @@
               "editorMode": "code",
               "expr": "envoy_cluster_up_rq_active{service='$service', 
service_instance='$service_instance', layer='$layer'}",
               "format": "time_series",
-              "legendFormat": "__auto",
+              "legendFormat": "{{cluster_name}}",
               "range": true,
               "refId": "A"
             }
@@ -3436,7 +3436,7 @@
               "editorMode": "code",
               "expr": "envoy_cluster_up_rq_incr{service='$service', 
service_instance='$service_instance', layer='$layer'}",
               "format": "time_series",
-              "legendFormat": "__auto",
+              "legendFormat": "{{cluster_name}}",
               "range": true,
               "refId": "A"
             }
@@ -3542,7 +3542,7 @@
               "editorMode": "code",
               "expr": "envoy_cluster_up_rq_pending_active{service='$service', 
service_instance='$service_instance', layer='$layer'}",
               "format": "time_series",
-              "legendFormat": "__auto",
+              "legendFormat": "{{cluster_name}}",
               "range": true,
               "refId": "A"
             }
@@ -3648,7 +3648,7 @@
               "editorMode": "code",
               "expr": 
"service_instance_sidecar_internal_req_latency_nanos{service='$service', 
service_instance='$service_instance', layer='$layer'}",
               "format": "time_series",
-              "legendFormat": "__auto",
+              "legendFormat": "latency_nanos",
               "range": true,
               "refId": "A"
             }
@@ -3744,7 +3744,7 @@
               "editorMode": "code",
               "expr": 
"service_instance_sidecar_internal_resp_latency_nanos{service='$service', 
service_instance='$service_instance', layer='$layer'}",
               "format": "time_series",
-              "legendFormat": "__auto",
+              "legendFormat": "latency_nanos",
               "range": true,
               "refId": "A"
             }
diff --git a/deploy/platform/config/grafana/dashboards/virtual-database.json 
b/deploy/platform/config/grafana/dashboards/virtual-database.json
index 9934982..ff6745a 100644
--- a/deploy/platform/config/grafana/dashboards/virtual-database.json
+++ b/deploy/platform/config/grafana/dashboards/virtual-database.json
@@ -115,7 +115,7 @@
           "editorMode": "code",
           "expr": "database_access_resp_time{service='$service', 
layer='$layer'}",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "resp_time",
           "range": true,
           "refId": "A"
         }
@@ -212,7 +212,7 @@
           "editorMode": "code",
           "expr": "database_access_sla{service='$service', layer='$layer'} / 
100",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "sla",
           "range": true,
           "refId": "A"
         }
@@ -308,7 +308,7 @@
           "editorMode": "code",
           "expr": "database_access_cpm{service='$service', layer='$layer'}",
           "format": "time_series",
-          "legendFormat": "__auto",
+          "legendFormat": "cpm",
           "range": true,
           "refId": "A"
         }
@@ -401,9 +401,9 @@
             "uid": "${DS_SW_Prometheus}"
           },
           "editorMode": "code",
-          "expr": "database_access_percentile{service='$service', 
layer='$layer', labels='0,1,2,3,4', relabels='P50,P75,P90,P95,P99'}",
+          "expr": "database_access_percentile{service='$service', 
layer='$layer', p='50,75,90,95,99'}",
           "format": "time_series",
-          "legendFormat": "{{label}}",
+          "legendFormat": "{{p}}",
           "range": true,
           "refId": "A"
         }
@@ -466,7 +466,7 @@
           },
           "editorMode": "code",
           "expr": "top_n_database_statement{parent_service='$service', 
layer='$layer', top_n='10', order='DES'}",
-          "legendFormat": "__auto",
+          "legendFormat": "statement",
           "range": true,
           "refId": "A"
         }

Reply via email to