From 5a90121c82f54bb6c79f8ad7bb56ee40e67641a3 Mon Sep 17 00:00:00 2001 From: Wan Kai Date: Thu, 11 Apr 2024 10:19:59 +0800 Subject: [PATCH] Sync UI (#12089) --- docs/en/changes/changes.md | 2 ++ .../browser/browser-page.json | 12 +++++----- .../general/general-endpoint-relation.json | 2 +- .../general/general-endpoint.json | 2 +- .../general/general-service.json | 2 +- .../k8s/k8s-cluster.json | 24 +++++++++---------- .../k8s/k8s-node.json | 4 ++-- .../k8s_service/k8s-service-service.json | 14 +++++------ .../mesh/mesh-endpoint.json | 2 +- .../mesh/mesh-instance-relation.json | 4 ++-- .../mesh/mesh-service-relation.json | 4 ++-- .../mesh/mesh-service.json | 2 +- .../so11y_oap/so11y-instance.json | 10 ++++---- .../virtual_cache/virtual-cache-service.json | 6 ++--- .../virtual-database-service.json | 2 +- .../virtual_mq/virtual-mq-endpoint.json | 2 +- .../virtual_mq/virtual-mq-service.json | 2 +- skywalking-ui | 2 +- 18 files changed, 50 insertions(+), 48 deletions(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 1a1b0693d09c..e6d1d8a211b6 100644 --- 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/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-page.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-page.json index 2b7d32489330..b7232b499dff 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-page.json +++ b/oap-server/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/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-endpoint-relation.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-endpoint-relation.json index a69563de32a9..1a512ff95477 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-endpoint-relation.json +++ b/oap-server/server-starter/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/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-endpoint.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-endpoint.json index 0a7a7c4bf090..8039dba0b1b0 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-endpoint.json +++ b/oap-server/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/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json index 03a440bcdce9..0e6f91c93466 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json +++ b/oap-server/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 index 5505127928a9..451bd78689b5 100644 --- 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 index 6a755e0d2068..1d8ccb9be127 100644 --- 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/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-service.json index a58edb7684bf..2ca5174ce4b1 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-service.json +++ b/oap-server/server-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 @@ ] } } -] \ No newline at end of file +] diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-endpoint.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-endpoint.json index eaa3510f9297..2f245b1eda22 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-endpoint.json +++ b/oap-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/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-instance-relation.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-instance-relation.json index e687f4ecf5ac..458d8346a9c0 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-instance-relation.json +++ b/oap-server/server-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/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-service-relation.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-service-relation.json index 363694d92f0d..6685af6d8c10 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-service-relation.json +++ b/oap-server/server-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 index 3760a4dc0e37..1ca96d54c255 100644 --- 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/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_oap/so11y-instance.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_oap/so11y-instance.json index 00f5453dc333..a9a52b48690d 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_oap/so11y-instance.json +++ b/oap-server/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/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_cache/virtual-cache-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_cache/virtual-cache-service.json index c67051a7cbaf..b160ddd23b88 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_cache/virtual-cache-service.json +++ b/oap-server/server-starter/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/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_database/virtual-database-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_database/virtual-database-service.json index 84386312d35f..ca9e48af59ff 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_database/virtual-database-service.json +++ b/oap-server/server-starter/src/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/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-endpoint.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-endpoint.json index 02e18c808cd5..de4d7db8c4da 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-endpoint.json +++ b/oap-server/server-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/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-service.json index 3b81b5764c13..3073f5f32c47 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-service.json +++ b/oap-server/server-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 index 8bc67614681b..460b24f42cec 160000 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit 8bc67614681b37623fa64233f8389d6754e64cf2 +Subproject commit 460b24f42cec9d8db63b9300c8e00c8ab3312c82