Sync UI (#12089)

apache · Apr 11, 2024 · 5a90121 · 5a90121
1 parent 8699ffd
commit 5a90121
Show file tree

Hide file tree

Showing 18 changed files with 50 additions and 48 deletions.
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
@@ -122,6 +122,8 @@
 * Add Airflow menu i18n.
 * Add Support for dragging in the trace panel.
 * Add workflow icon.
+* Metrics support multiple labels.
+* Support the `SINGLE_VALUE` for table widgets.
 
 #### Documentation
 

diff --git a/...rver/server-starter/src/main/resources/ui-initialized-templates/browser/browser-page.json b/...rver/server-starter/src/main/resources/ui-initialized-templates/browser/browser-page.json
@@ -35,7 +35,7 @@
                     "showYAxis": true
                   },
                   "expressions": [
-                    "relabels(browser_app_page_fmp_percentile{p='0,1,2,3,4'},p='50,75,90,95,99',p='P50,P75,P90,P95,P99')"
+                    "relabels(browser_app_page_fmp_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
                   ],
                   "metricMode": "Expression",
                   "typesOfMQE": [
@@ -91,7 +91,7 @@
                     "showYAxis": true
                   },
                   "expressions": [
-                    "relabels(browser_app_page_first_pack_percentile{p='0,1,2,3,4'},p='50,75,90,95,99',p='P50,P75,P90,P95,P99')"
+                    "relabels(browser_app_page_first_pack_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
                   ],
                   "metricMode": "Expression",
                   "typesOfMQE": [
@@ -147,7 +147,7 @@
                     "showYAxis": true
                   },
                   "expressions": [
-                    "relabels(browser_app_page_fpt_percentile{p='0,1,2,3,4'},p='50,75,90,95,99',p='P50,P75,P90,P95,P99')"
+                    "relabels(browser_app_page_fpt_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
                   ],
                   "metricMode": "Expression",
                   "typesOfMQE": [
@@ -203,7 +203,7 @@
                     "showYAxis": true
                   },
                   "expressions": [
-                    "relabels(browser_app_page_dom_ready_percentile{p='0,1,2,3,4'},p='50,75,90,95,99',p='P50,P75,P90,P95,P99')"
+                    "relabels(browser_app_page_dom_ready_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
                   ],
                   "metricMode": "Expression",
                   "typesOfMQE": [
@@ -259,7 +259,7 @@
                     "showYAxis": true
                   },
                   "expressions": [
-                    "relabels(browser_app_page_ttl_percentile{p='0,1,2,3,4'},p='50,75,90,95,99',p='P50,P75,P90,P95,P99')"
+                    "relabels(browser_app_page_ttl_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
                   ],
                   "metricMode": "Expression",
                   "typesOfMQE": [
@@ -315,7 +315,7 @@
                     "showYAxis": true
                   },
                   "expressions": [
-                    "relabels(browser_app_page_load_page_percentile{p='0,1,2,3,4'},p='50,75,90,95,99',p='P50,P75,P90,P95,P99')"
+                    "relabels(browser_app_page_load_page_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
                   ],
                   "metricMode": "Expression",
                   "typesOfMQE": [

diff --git a/...tarter/src/main/resources/ui-initialized-templates/general/general-endpoint-relation.json b/...tarter/src/main/resources/ui-initialized-templates/general/general-endpoint-relation.json
@@ -40,7 +40,7 @@
           },
           "metricMode": "Expression",
           "expressions": [
-            "relabels(endpoint_relation_percentile{p='0,1,2,3,4'},p='50,75,90,95,99',p='P50,P75,P90,P95,P99')"
+            "relabels(endpoint_relation_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
           ],
           "typesOfMQE": [
             "TIME_SERIES_VALUES"

diff --git a/.../server-starter/src/main/resources/ui-initialized-templates/general/general-endpoint.json b/.../server-starter/src/main/resources/ui-initialized-templates/general/general-endpoint.json
@@ -57,7 +57,7 @@
                   },
                   "metricMode": "Expression",
                   "expressions": [
-                    "relabels(endpoint_percentile{p='0,1,2,3,4'},p='50,75,90,95,99',p='P50,P75,P90,P95,P99')"
+                    "relabels(endpoint_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
                   ],
                   "typesOfMQE": [
                     "TIME_SERIES_VALUES"

diff --git a/...r/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json b/...r/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json
@@ -255,7 +255,7 @@
                   },
                   "metricMode": "Expression",
                   "expressions": [
-                    "relabels(service_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',p='P50,P75,P90,P95,P99')"
+                    "relabels(service_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
                   ],
                   "typesOfMQE": [
                     "TIME_SERIES_VALUES"

diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s/k8s-cluster.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s/k8s-cluster.json
@@ -154,11 +154,11 @@
                     "tableHeaderCol2": ""
                   },
                   "expressions": [
-                    "k8s_cluster_pod_status_waiting"
+                    "latest(k8s_cluster_pod_status_waiting)"
                   ],
                   "metricMode": "Expression",
                   "typesOfMQE": [
-                    "TIME_SERIES_VALUES"
+                    "SINGLE_VALUE"
                   ]
                 },
                 {
@@ -178,11 +178,11 @@
                     "tableHeaderCol2": ""
                   },
                   "expressions": [
-                    "k8s_cluster_service_pod_status"
+                    "latest(k8s_cluster_service_pod_status)"
                   ],
                   "metricMode": "Expression",
                   "typesOfMQE": [
-                    "TIME_SERIES_VALUES"
+                    "SINGLE_VALUE"
                   ]
                 },
                 {
@@ -202,11 +202,11 @@
                     "tableHeaderCol2": ""
                   },
                   "expressions": [
-                    "k8s_cluster_pod_status_not_running"
+                    "latest(k8s_cluster_pod_status_not_running)"
                   ],
                   "metricMode": "Expression",
                   "typesOfMQE": [
-                    "TIME_SERIES_VALUES"
+                    "SINGLE_VALUE"
                   ]
                 },
                 {
@@ -226,11 +226,11 @@
                     "tableHeaderCol2": ""
                   },
                   "expressions": [
-                    "k8s_cluster_node_status"
+                    "latest(k8s_cluster_node_status)"
                   ],
                   "metricMode": "Expression",
                   "typesOfMQE": [
-                    "TIME_SERIES_VALUES"
+                    "SINGLE_VALUE"
                   ]
                 },
                 {
@@ -250,11 +250,11 @@
                     "tableHeaderCol2": "Replicas"
                   },
                   "expressions": [
-                    "k8s_cluster_deployment_spec_replicas"
+                    "latest(k8s_cluster_deployment_spec_replicas)"
                   ],
                   "metricMode": "Expression",
                   "typesOfMQE": [
-                    "TIME_SERIES_VALUES"
+                    "SINGLE_VALUE"
                   ]
                 },
                 {
@@ -274,11 +274,11 @@
                     "tableHeaderCol2": ""
                   },
                   "expressions": [
-                    "k8s_cluster_deployment_status"
+                    "latest(k8s_cluster_deployment_status)"
                   ],
                   "metricMode": "Expression",
                   "typesOfMQE": [
-                    "TIME_SERIES_VALUES"
+                    "SINGLE_VALUE"
                   ]
                 },
                 {

diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s/k8s-node.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s/k8s-node.json
@@ -83,11 +83,11 @@
             "tableHeaderCol2": ""
           },
           "expressions": [
-            "k8s_node_node_status"
+            "latest(k8s_node_node_status)"
           ],
           "metricMode": "Expression",
           "typesOfMQE": [
-            "TIME_SERIES_VALUES"
+            "SINGLE_VALUE"
           ]
         },
         {

diff --git a/...-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-service.json b/...-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-service.json
@@ -118,10 +118,10 @@
                   "type": "Widget",
                   "metricMode": "Expression",
                   "typesOfMQE": [
-                    "TIME_SERIES_VALUES"
+                    "SINGLE_VALUE"
                   ],
                   "expressions": [
-                    "k8s_service_pod_status"
+                    "latest(k8s_service_pod_status)"
                   ],
                   "widget": {
                     "title": "Service Pod Status"
@@ -194,10 +194,10 @@
                   "type": "Widget",
                   "metricMode": "Expression",
                   "typesOfMQE": [
-                    "TIME_SERIES_VALUES"
+                    "SINGLE_VALUE"
                   ],
                   "expressions": [
-                    "k8s_service_pod_status_waiting"
+                    "latest(k8s_service_pod_status_waiting)"
                   ],
                   "widget": {
                     "title": "Pod Waiting"
@@ -218,10 +218,10 @@
                   "type": "Widget",
                   "metricMode": "Expression",
                   "typesOfMQE": [
-                    "TIME_SERIES_VALUES"
+                    "SINGLE_VALUE"
                   ],
                   "expressions": [
-                    "k8s_service_pod_status_restarts_total"
+                    "latest(k8s_service_pod_status_restarts_total)"
                   ],
                   "widget": {
                     "title": "Pod Restarts"
@@ -2122,4 +2122,4 @@
       ]
     }
   }
-]
+]
diff --git a/...server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-endpoint.json b/...server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-endpoint.json
@@ -52,7 +52,7 @@
                   ],
                   "metricMode": "Expression",
                   "expressions": [
-                    "relabels(endpoint_percentile{p='0,1,2,3,4'},p='50,75,90,95,99',p='P50,P75,P90,P95,P99')"
+                    "relabels(endpoint_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
                   ],
                   "typesOfMQE": [
                     "TIME_SERIES_VALUES"

diff --git a/...rver-starter/src/main/resources/ui-initialized-templates/mesh/mesh-instance-relation.json b/...rver-starter/src/main/resources/ui-initialized-templates/mesh/mesh-instance-relation.json
@@ -62,7 +62,7 @@
           ],
           "metricMode": "Expression",
           "expressions": [
-            "relabels(service_instance_relation_client_percentile{p='0,1,2,3,4'},p='50,75,90,95,99',p='P50,P75,P90,P95,P99')"
+            "relabels(service_instance_relation_client_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
           ],
           "typesOfMQE": [
             "TIME_SERIES_VALUES"
@@ -277,7 +277,7 @@
           ],
           "metricMode": "Expression",
           "expressions": [
-            "relabels(service_instance_relation_server_percentile{p='0,1,2,3,4'},p='50,75,90,95,99',p='P50,P75,P90,P95,P99')"
+            "relabels(service_instance_relation_server_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
           ],
           "typesOfMQE": [
             "TIME_SERIES_VALUES"

diff --git a/...erver-starter/src/main/resources/ui-initialized-templates/mesh/mesh-service-relation.json b/...erver-starter/src/main/resources/ui-initialized-templates/mesh/mesh-service-relation.json
@@ -76,7 +76,7 @@
                   ],
                   "metricMode": "Expression",
                   "expressions": [
-                    "relabels(service_relation_server_percentile{p='0,1,2,3,4'},p='50,75,90,95,99',p='P50,P75,P90,P95,P99')"
+                    "relabels(service_relation_server_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
                   ],
                   "typesOfMQE": [
                     "TIME_SERIES_VALUES"
@@ -222,7 +222,7 @@
                   ],
                   "metricMode": "Expression",
                   "expressions": [
-                    "relabels(service_relation_client_percentile{p='0,1,2,3,4'},p='50,75,90,95,99',p='P50,P75,P90,P95,P99')"
+                    "relabels(service_relation_client_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
                   ],
                   "typesOfMQE": [
                     "TIME_SERIES_VALUES"

diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-service.json
@@ -211,7 +211,7 @@
                   ],
                   "metricMode": "Expression",
                   "expressions": [
-                    "relabels(service_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',p='P50,P75,P90,P95,P99')"
+                    "relabels(service_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
                   ],
                   "typesOfMQE": [
                     "TIME_SERIES_VALUES"

diff --git a/.../server-starter/src/main/resources/ui-initialized-templates/so11y_oap/so11y-instance.json b/.../server-starter/src/main/resources/ui-initialized-templates/so11y_oap/so11y-instance.json
@@ -193,7 +193,7 @@
                   },
                   "metricMode": "Expression",
                   "expressions": [
-                    "relabels(meter_oap_instance_persistence_prepare_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',p='P50,P75,P90,P95,P99')"
+                    "relabels(meter_oap_instance_persistence_prepare_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
                   ],
                   "typesOfMQE": [
                     "TIME_SERIES_VALUES"
@@ -219,7 +219,7 @@
                   },
                   "metricMode": "Expression",
                   "expressions": [
-                    "relabels(meter_oap_instance_persistence_execute_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',p='P50,P75,P90,P95,P99')"
+                    "relabels(meter_oap_instance_persistence_execute_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
                   ],
                   "typesOfMQE": [
                     "TIME_SERIES_VALUES"
@@ -430,7 +430,7 @@
                   },
                   "metricMode": "Expression",
                   "expressions": [
-                    "relabels(meter_oap_instance_trace_latency_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',p='P50,P75,P90,P95,P99')"
+                    "relabels(meter_oap_instance_trace_latency_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
                   ],
                   "typesOfMQE": [
                     "TIME_SERIES_VALUES"
@@ -488,7 +488,7 @@
                   },
                   "metricMode": "Expression",
                   "expressions": [
-                    "relabels(meter_oap_instance_mesh_latency_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',p='P50,P75,P90,P95,P99')"
+                    "relabels(meter_oap_instance_mesh_latency_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
                   ],
                   "typesOfMQE": [
                     "TIME_SERIES_VALUES"
@@ -546,7 +546,7 @@
                   },
                   "metricMode": "Expression",
                   "expressions": [
-                    "relabels(meter_oap_instance_k8s_als_latency_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',p='P50,P75,P90,P95,P99')"
+                    "relabels(meter_oap_instance_k8s_als_latency_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
                   ],
                   "typesOfMQE": [
                     "TIME_SERIES_VALUES"

diff --git a/...rter/src/main/resources/ui-initialized-templates/virtual_cache/virtual-cache-service.json b/...rter/src/main/resources/ui-initialized-templates/virtual_cache/virtual-cache-service.json
@@ -165,7 +165,7 @@
             "showYAxis": true
           },
           "expressions": [
-            "relabels(cache_access_percentile{p='0,1,2,3,4'},p='50,75,90,95,99',p='P50,P75,P90,P95,P99')"
+            "relabels(cache_access_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
           ],
           "metricMode": "Expression",
           "typesOfMQE": [
@@ -455,7 +455,7 @@
             "showYAxis": true
           },
           "expressions": [
-            "relabels(cache_read_percentile{p='0,1,2,3,4'},p='50,75,90,95,99',p='P50,P75,P90,P95,P99')"
+            "relabels(cache_read_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
           ],
           "metricMode": "Expression",
           "typesOfMQE": [
@@ -548,7 +548,7 @@
             "showYAxis": true
           },
           "expressions": [
-            "relabels(cache_write_percentile{p='0,1,2,3,4'},p='50,75,90,95,99',p='P50,P75,P90,P95,P99')"
+            "relabels(cache_write_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
           ],
           "metricMode": "Expression",
           "typesOfMQE": [

diff --git a/...rc/main/resources/ui-initialized-templates/virtual_database/virtual-database-service.json b/...rc/main/resources/ui-initialized-templates/virtual_database/virtual-database-service.json
@@ -142,7 +142,7 @@
           ],
           "metricMode": "Expression",
           "expressions": [
-            "relabels(database_access_percentile{p='0,1,2,3,4'},p='50,75,90,95,99',p='P50,P75,P90,P95,P99')"
+            "relabels(database_access_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
           ],
           "typesOfMQE": [
             "TIME_SERIES_VALUES"

diff --git a/...r-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-endpoint.json b/...r-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-endpoint.json
@@ -128,7 +128,7 @@
             "showYAxis": true
           },
           "expressions": [
-            "relabels(mq_endpoint_consume_percentile{p='0,1,2,3,4'},p='50,75,90,95,99',p='P50,P75,P90,P95,P99')"
+            "relabels(mq_endpoint_consume_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
           ],
           "metricMode": "Expression",
           "typesOfMQE": [

diff --git a/...er-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-service.json b/...er-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-service.json
@@ -128,7 +128,7 @@
             "showYAxis": true
           },
           "expressions": [
-            "relabels(mq_service_consume_percentile{p='0,1,2,3,4'},p='50,75,90,95,99',p='P50,P75,P90,P95,P99')"
+            "relabels(mq_service_consume_percentile{p='50,75,90,95,99'},p='50,75,90,95,99',percentile='50,75,90,95,99')"
           ],
           "metricMode": "Expression",
           "typesOfMQE": [

diff --git a/skywalking-ui b/skywalking-ui