From 7c1e3d98a1911a0743d9e7ccbdf72ec2d854f779 Mon Sep 17 00:00:00 2001 From: Wan Kai Date: Wed, 19 Apr 2023 19:58:57 +0800 Subject: [PATCH] UI templates: Simplify metric name with the label. (#10704) --- docs/en/changes/changes.md | 1 + .../browser/browser-page.json | 62 ++++-- .../general/general-instance.json | 199 +++++++++++++++--- .../k8s/k8s-cluster.json | 95 ++++----- .../k8s/k8s-node.json | 52 +++-- .../k8s_service/k8s-service-pod.json | 17 ++ .../k8s_service/k8s-service-service.json | 33 ++- .../mesh/mesh-instance.json | 110 +++++----- .../mesh/mesh-service.json | 100 +++------ .../mesh_cp/mesh-control-plane-service.json | 117 ++++++---- .../mesh_dp/mesh-data-plane-instance.json | 52 +++-- .../os_linux/linux-service.json | 79 ++++--- .../so11y_oap/so11y-instance.json | 88 +++++++- 13 files changed, 660 insertions(+), 345 deletions(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index b1b56ec41d..0fc57149ef 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -52,6 +52,7 @@ * Add elasticsearch menu. * [Clean UI templates before upgrade] Set `showSymbol: true`, and make the data point shows on the Line graph. Please clean `ui_template` index in elasticsearch storage or table in JDBC storage. +* [Clean UI templates before upgrade] UI templates: Simplify metric name with the label. #### 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 4545c9cbdd..a8b7786bb4 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 @@ -63,8 +63,6 @@ "label": "P50, P75, P90, P95, P99" } ], - "value": "12-0-0", - "label": "12-0-0", "associate": [ { "widgetId": "12-0-1" @@ -121,8 +119,6 @@ "label": "P50, P75, P90, P95, P99" } ], - "value": "12-0-1", - "label": "Page_First_Pack_Latency", "associate": [ { "widgetId": "12-0-0" @@ -179,8 +175,6 @@ "label": "P50, P75, P90, P95, P99" } ], - "value": "12-0-2", - "label": "Page_FPT_Latency", "associate": [ { "widgetId": "12-0-1" @@ -237,8 +231,6 @@ "label": "P50, P75, P90, P95, P99" } ], - "value": "12-0-3", - "label": "Page_DOM_Ready_Latency", "associate": [ { "widgetId": "12-0-1" @@ -295,8 +287,6 @@ "label": "P50, P75, P90, P95, P99" } ], - "value": "12-0-4", - "label": "Page_TTL_Latency", "associate": [ { "widgetId": "12-0-1" @@ -353,8 +343,6 @@ "labelsIndex": "0,1,2,3,4" } ], - "value": "12-0-8", - "label": "Page_Load_Latency", "associate": [ { "widgetId": "12-0-1" @@ -422,8 +410,6 @@ "readMetricsValues", "readMetricsValues" ], - "value": "12-0-9", - "label": "Page_Performance", "associate": [ { "widgetId": "12-0-1" @@ -446,6 +432,38 @@ { "widgetId": "12-0-10" } + ], + "metricConfig": [ + { + "label": "res_avg" + }, + { + "label": "load_page_avg" + }, + { + "label": "trans_avg" + }, + { + "label": "fpt_avg" + }, + { + "label": "dom_analysis_avg" + }, + { + "label": "dns_avg" + }, + { + "label": "dom_ready_avg" + }, + { + "label": "redirect_avg" + }, + { + "label": "tcp_avg" + }, + { + "label": "ttfb_avg" + } ] }, { @@ -475,8 +493,6 @@ "readMetricsValues", "readMetricsValues" ], - "value": "12-0-10", - "label": "Page_Error_Count_Layout", "associate": [ { "widgetId": "12-0-1" @@ -499,6 +515,20 @@ { "widgetId": "12-0-0" } + ], + "metricConfig": [ + { + "label": "resource_error_sum" + }, + { + "label": "js_error_sum" + }, + { + "label": "unknown_error_sum" + }, + { + "label": "ajax_error_sum" + } ] } ] diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-instance.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-instance.json index d41b4a2511..c64b712af6 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-instance.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-instance.json @@ -70,10 +70,6 @@ "widgetId": "0-0-10" } ], - "filters": { - "dataIndex": 9, - "sourceId": "0-0-3" - }, "relatedTrace": { "enableRelate": true, "latency": true @@ -123,10 +119,6 @@ "widgetId": "0-0-10" } ], - "filters": { - "dataIndex": 9, - "sourceId": "0-0-3" - }, "relatedTrace": { "enableRelate": true, "status": "ERROR" @@ -170,11 +162,7 @@ { "widgetId": "0-0-10" } - ], - "filters": { - "dataIndex": 28, - "sourceId": "0-0-0" - } + ] }, { "x": 12, @@ -214,11 +202,7 @@ { "widgetId": "0-0-16" } - ], - "filters": { - "dataIndex": 9, - "sourceId": "0-0-3" - } + ] }, { "x": 0, @@ -258,11 +242,7 @@ { "widgetId": "0-0-10" } - ], - "filters": { - "dataIndex": 9, - "sourceId": "0-0-3" - } + ] } ] }, @@ -327,16 +307,20 @@ ], "metricConfig": [ { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "noheap_max" }, { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "noheap" }, { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "heap" }, { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "heap_max" } ] }, @@ -367,6 +351,17 @@ "readMetricsValues", "readMetricsValues", "readMetricsValues" + ], + "metricConfig": [ + { + "label": "live" + }, + { + "label": "daemon" + }, + { + "label": "peak" + } ] }, { @@ -394,6 +389,20 @@ "readMetricsValues", "readMetricsValues", "readMetricsValues" + ], + "metricConfig": [ + { + "label": "timed_waiting" + }, + { + "label": "blocked" + }, + { + "label": "waiting" + }, + { + "label": "runnable" + } ] }, { @@ -446,6 +455,17 @@ "readMetricsValues", "readMetricsValues", "readMetricsValues" + ], + "metricConfig": [ + { + "label": "loaded" + }, + { + "label": "total_loaded" + }, + { + "label": "total_unloaded" + } ] }, { @@ -475,6 +495,17 @@ "readMetricsValues", "readMetricsValues", "readMetricsValues" + ], + "metricConfig": [ + { + "label": "young_gc" + }, + { + "label": "old_gc" + }, + { + "label": "normal_gc" + } ] }, { @@ -500,6 +531,17 @@ "readMetricsValues", "readMetricsValues", "readMetricsValues" + ], + "metricConfig": [ + { + "label": "young_gc" + }, + { + "label": "old_gc" + }, + { + "label": "normal_gc" + } ] } ] @@ -534,6 +576,17 @@ "readMetricsValues", "readMetricsValues", "readMetricsValues" + ], + "metricConfig": [ + { + "label": "available_worker" + }, + { + "label": "available_completion_port" + }, + { + "label": "max_completion_port" + } ] }, { @@ -581,14 +634,25 @@ "showBackground": true }, "metrics": [ - "instance_clr_gen1_collect_count", "instance_clr_gen0_collect_count", + "instance_clr_gen1_collect_count", "instance_clr_gen2_collect_count" ], "metricTypes": [ "readMetricsValues", "readMetricsValues", "readMetricsValues" + ], + "metricConfig": [ + { + "label": "gen0" + }, + { + "label": "gen1" + }, + { + "label": "gen2" + } ] }, { @@ -739,6 +803,17 @@ "meter_jdbc_connections_active", "meter_jdbc_connections_idle" ], + "metricConfig": [ + { + "label": "max" + }, + { + "label": "active" + }, + { + "label": "idle" + } + ], "graph": { "type": "Line", "step": false, @@ -769,6 +844,17 @@ "meter_tomcat_sessions_active_current", "meter_tomcat_sessions_rejected" ], + "metricConfig": [ + { + "label": "active_max" + }, + { + "label": "active_current" + }, + { + "label": "rejected" + } + ], "graph": { "type": "Line", "step": false, @@ -822,6 +908,14 @@ "meter_process_files_max", "meter_process_files_open" ], + "metricConfig": [ + { + "label": "max" + }, + { + "label": "open" + } + ], "graph": { "type": "Line", "step": false, @@ -889,14 +983,17 @@ "metricConfig": [ { "calculation": "byteToMB", + "label": "max", "unit": "MB" }, { "calculation": "byteToMB", + "label": "used", "unit": "MB" }, { "calculation": "byteToMB", + "label": "committed", "unit": "MB" } ], @@ -921,6 +1018,17 @@ "meter_jvm_threads_live", "meter_jvm_threads_daemon" ], + "metricConfig": [ + { + "label": "peak" + }, + { + "label": "live" + }, + { + "label": "daemon" + } + ], "graph": { "type": "Line", "step": false, @@ -948,6 +1056,14 @@ "meter_jvm_classes_loaded", "meter_jvm_classes_unloaded" ], + "metricConfig": [ + { + "label": "loaded" + }, + { + "label": "unloaded" + } + ], "graph": { "type": "Line", "step": false, @@ -1200,6 +1316,14 @@ "metricTypes": [ "readMetricsValues", "readMetricsValues" + ], + "metricConfig": [ + { + "label": "total_cpu_utilization" + }, + { + "label": "process_cpu_utilization" + } ] }, { @@ -1250,6 +1374,17 @@ "readMetricsValues", "readMetricsValues", "readMetricsValues" + ], + "metricConfig": [ + { + "label": "gc_g0" + }, + { + "label": "gc_g1" + }, + { + "label": "gc_g2" + } ] }, { @@ -1275,6 +1410,14 @@ "metricTypes": [ "readMetricsValues", "readMetricsValues" + ], + "metricConfig": [ + { + "label": "total_mem_utilization" + }, + { + "label": "process_mem_utilization" + } ] }, { 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 d886412b91..4abe90c4f7 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 @@ -27,17 +27,6 @@ "h": 52, "i": "16", "type": "Tab", - "widget": { - "title": "Title" - }, - "graph": {}, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "activedTabIndex": 1, "children": [ { "name": "Overview", @@ -70,7 +59,20 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false + "metricConfig": [ + { + "label": "cores" + }, + { + "label": "cores_request" + }, + { + "label": "cores_limits" + }, + { + "label": "cores_allocatable" + } + ] }, { "x": 8, @@ -100,19 +102,22 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false, "metricConfig": [ { - "calculation": "byteToGB" + "calculation": "byteToGB", + "label": "request" }, { - "calculation": "byteToGB" + "calculation": "byteToGB", + "label": "allocatable" }, { - "calculation": "byteToGB" + "calculation": "byteToGB", + "label": "limits" }, { - "calculation": "byteToGB" + "calculation": "byteToGB", + "label": "total" } ] }, @@ -140,13 +145,14 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false, "metricConfig": [ { - "calculation": "byteToGB" + "calculation": "byteToGB", + "label": "total" }, { - "calculation": "byteToGB" + "calculation": "byteToGB", + "label": "allocatable" } ] }, @@ -171,8 +177,7 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ], - "moved": false + ] }, { "x": 0, @@ -195,8 +200,7 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ], - "moved": false + ] }, { "x": 8, @@ -219,8 +223,7 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ], - "moved": false + ] }, { "x": 0, @@ -243,8 +246,7 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ], - "moved": false + ] }, { "x": 16, @@ -267,8 +269,7 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ], - "moved": false + ] }, { "x": 8, @@ -291,8 +292,7 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ], - "moved": false + ] }, { "x": 21, @@ -315,8 +315,7 @@ ], "metricTypes": [ "readMetricsValue" - ], - "moved": false + ] }, { "x": 18, @@ -339,8 +338,7 @@ ], "metricTypes": [ "readMetricsValue" - ], - "moved": false + ] }, { "x": 15, @@ -363,8 +361,7 @@ ], "metricTypes": [ "readMetricsValue" - ], - "moved": false + ] }, { "x": 0, @@ -387,8 +384,7 @@ ], "metricTypes": [ "readMetricsValue" - ], - "moved": false + ] }, { "x": 3, @@ -411,8 +407,7 @@ ], "metricTypes": [ "readMetricsValue" - ], - "moved": false + ] }, { "x": 6, @@ -435,8 +430,7 @@ ], "metricTypes": [ "readMetricsValue" - ], - "moved": false + ] }, { "x": 9, @@ -459,8 +453,7 @@ ], "metricTypes": [ "readMetricsValue" - ], - "moved": false + ] }, { "x": 12, @@ -483,8 +476,7 @@ ], "metricTypes": [ "readMetricsValue" - ], - "moved": false + ] } ] }, @@ -498,9 +490,6 @@ "h": 48, "i": "0", "type": "Widget", - "widget": { - "title": "" - }, "graph": { "type": "InstanceList", "dashboardName": "K8S-Node", @@ -514,7 +503,6 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false, "metricConfig": [ { "label": "CPU Usage", @@ -529,8 +517,7 @@ } ] } - ], - "moved": false + ] } ], "layer": "K8S", 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 dea6cd9f96..9e029935e6 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 @@ -43,8 +43,7 @@ ], "metricTypes": [ "readMetricsValues" - ], - "moved": false + ] }, { "x": 8, @@ -72,13 +71,14 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false, "metricConfig": [ { - "calculation": "byteToKB" + "calculation": "byteToKB", + "label": "receive" }, { - "calculation": "byteToKB" + "calculation": "byteToKB", + "label": "transmit" } ] }, @@ -103,8 +103,7 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ], - "moved": false + ] }, { "x": 8, @@ -130,13 +129,14 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false, "metricConfig": [ { - "calculation": "byteToGB" + "calculation": "byteToGB", + "label": "total" }, { - "calculation": "byteToGB" + "calculation": "byteToGB", + "label": "allocatable" } ] }, @@ -168,7 +168,20 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false + "metricConfig": [ + { + "label": "cores_limits" + }, + { + "label": "cores_requests" + }, + { + "label": "cores" + }, + { + "label": "cores_allocatable" + } + ] }, { "x": 0, @@ -198,19 +211,22 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false, "metricConfig": [ { - "calculation": "byteToGB" + "calculation": "byteToGB", + "label": "total" }, { - "calculation": "byteToGB" + "calculation": "byteToGB", + "label": "limits" }, { - "calculation": "byteToGB" + "calculation": "byteToGB", + "label": "allocatable" }, { - "calculation": "byteToGB" + "calculation": "byteToGB", + "label": "requests" } ] }, @@ -238,7 +254,6 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "byteToGB" @@ -268,8 +283,7 @@ ], "metricTypes": [ "readMetricsValues" - ], - "moved": false + ] } ], "layer": "K8S", diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-pod.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-pod.json index 9461af9736..1cbfc5e92a 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-pod.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-pod.json @@ -1,3 +1,20 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + [ { "id": "89a35b46-449d-4ef0-8297-2109f69086eb", 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 7f3bf6c240..44bd27f6ee 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 @@ -1,3 +1,20 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + [ { "id": "K8S-Service-Service", @@ -65,10 +82,12 @@ }, "metricConfig": [ { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "requests" }, { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "limits" } ] }, @@ -95,7 +114,15 @@ "opacity": 0.4, "showXAxis": true, "showYAxis": true - } + }, + "metricConfig": [ + { + "label": "cores_requests" + }, + { + "label": "cores_limits" + } + ] }, { "x": 8, diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-instance.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-instance.json index fc529b7647..c8f8630d6d 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-instance.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-instance.json @@ -56,8 +56,6 @@ "metricTypes": [ "readMetricsValues" ], - "value": "1-0-0", - "label": "Instance_Latency", "associate": [ { "widgetId": "1-0-2" @@ -68,11 +66,7 @@ { "widgetId": "1-0-3" } - ], - "filters": { - "dataIndex": 17, - "sourceId": "1-0-3" - } + ] }, { "x": 0, @@ -99,8 +93,6 @@ "metricTypes": [ "readMetricsValues" ], - "value": "1-0-1", - "label": "Instance_Successful_Rate", "associate": [ { "widgetId": "1-0-0" @@ -111,11 +103,7 @@ { "widgetId": "1-0-3" } - ], - "filters": { - "dataIndex": 17, - "sourceId": "1-0-3" - } + ] }, { "x": 11, @@ -145,8 +133,6 @@ "readMetricsValues", "readMetricsValues" ], - "value": "1-0-2", - "label": "Service_Instance_Throughput", "associate": [ { "widgetId": "1-0-0" @@ -158,10 +144,14 @@ "widgetId": "1-0-3" } ], - "filters": { - "dataIndex": 17, - "sourceId": "1-0-3" - } + "metricConfig": [ + { + "label": "received" + }, + { + "label": "sent" + } + ] }, { "x": 0, @@ -188,8 +178,6 @@ "metricTypes": [ "readMetricsValues" ], - "value": "1-0-3", - "label": "Instance_Load", "associate": [ { "widgetId": "1-0-0" @@ -230,9 +218,7 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ], - "value": "1-1-10", - "label": "1-1-10" + ] }, { "x": 6, @@ -260,8 +246,14 @@ "readMetricsValues", "readMetricsValues" ], - "value": "1-1-11", - "label": "1-1-11" + "metricConfig": [ + { + "label": "total" + }, + { + "label": "parent" + } + ] }, { "x": 0, @@ -286,9 +278,7 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ], - "value": "1-1-12", - "label": "1-1-12" + ] }, { "x": 12, @@ -313,9 +303,7 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ], - "value": "1-1-13", - "label": "1-1-13" + ] }, { "x": 6, @@ -340,9 +328,7 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ], - "value": "1-1-14", - "label": "1-1-14" + ] }, { "x": 0, @@ -380,26 +366,30 @@ ], "metricConfig": [ { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "allocated_max" }, { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "heap_memory_used" }, { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "allocated" }, { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "physical_size" }, { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "physical_size_max" }, { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "max_used" } - ], - "value": "1-1-15", - "label": "1-1-15" + ] }, { "x": 18, @@ -424,9 +414,7 @@ ], "metricTypes": [ "readMetricsValues" - ], - "value": "1-1-16", - "label": "1-1-16" + ] }, { "x": 12, @@ -454,8 +442,14 @@ "readMetricsValues", "readMetricsValues" ], - "value": "1-1-17", - "label": "1-1-17" + "metricConfig": [ + { + "label": "threads_max" + }, + { + "label": "threads" + } + ] }, { "x": 6, @@ -480,9 +474,7 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ], - "value": "1-1-18", - "label": "1-1-18" + ] }, { "x": 0, @@ -507,9 +499,7 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ], - "value": "1-1-19", - "label": "1-1-19" + ] }, { "x": 12, @@ -535,9 +525,7 @@ "showSymbol": true, "showXAxis": true, "showYAxis": true - }, - "value": "1-1-20", - "label": "1-1-20" + } }, { "x": 18, @@ -563,9 +551,7 @@ "showSymbol": true, "showXAxis": true, "showYAxis": true - }, - "value": "1-1-21", - "label": "1-1-21" + } } ] }, 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 da36160fe5..e39e71eb26 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 @@ -56,9 +56,7 @@ { "calculation": "apdex" } - ], - "value": "0-0-0", - "label": "0-0-0" + ] }, { "x": 8, @@ -87,9 +85,7 @@ "calculation": "percentage", "unit": "%" } - ], - "value": "0-0-1", - "label": "0-0-1" + ] }, { "x": 16, @@ -117,9 +113,7 @@ { "unit": "calls or packets / min" } - ], - "value": "0-0-2", - "label": "0-0-2" + ] }, { "x": 8, @@ -146,8 +140,6 @@ "metricTypes": [ "readMetricsValues" ], - "value": "0-0-3", - "label": "Service_Response", "associate": [ { "widgetId": "0-0-9" @@ -164,11 +156,7 @@ { "widgetId": "0-0-7" } - ], - "filters": { - "dataIndex": 27, - "sourceId": "0-0-7" - } + ] }, { "x": 0, @@ -200,8 +188,6 @@ "calculation": "apdex" } ], - "value": "0-0-4", - "label": "Service_Apdex", "associate": [ { "widgetId": "0-0-3" @@ -218,11 +204,7 @@ { "widgetId": "0-0-7" } - ], - "filters": { - "dataIndex": 27, - "sourceId": "0-0-7" - } + ] }, { "x": 16, @@ -255,8 +237,6 @@ "labelsIndex": "0, 1, 2, 3, 4" } ], - "value": "0-0-5", - "label": "Service_Response_Percentile", "associate": [ { "widgetId": "0-0-3" @@ -273,11 +253,7 @@ { "widgetId": "0-0-7" } - ], - "filters": { - "dataIndex": 27, - "sourceId": "0-0-7" - } + ] }, { "x": 0, @@ -309,8 +285,6 @@ "calculation": "percentage" } ], - "value": "0-0-6", - "label": "Success_Rate", "associate": [ { "widgetId": "0-0-3" @@ -327,11 +301,7 @@ { "widgetId": "0-0-7" } - ], - "filters": { - "dataIndex": 27, - "sourceId": "0-0-7" - } + ] }, { "x": 8, @@ -358,8 +328,6 @@ "metricTypes": [ "readMetricsValues" ], - "value": "0-0-7", - "label": "Service_Load", "associate": [ { "widgetId": "0-0-3" @@ -406,8 +374,6 @@ "readMetricsValues", "readMetricsValues" ], - "value": "0-0-9", - "label": "0-0-9", "associate": [ { "widgetId": "0-0-3" @@ -425,10 +391,14 @@ "widgetId": "0-0-7" } ], - "filters": { - "dataIndex": 27, - "sourceId": "0-0-7" - } + "metricConfig": [ + { + "label": "received" + }, + { + "label": "sent" + } + ] }, { "x": 0, @@ -448,9 +418,7 @@ ], "metricTypes": [ "sortMetrics" - ], - "value": "0-0-11", - "label": "0-0-11" + ] }, { "x": 8, @@ -471,9 +439,7 @@ ], "metricTypes": [ "sortMetrics" - ], - "value": "0-0-12", - "label": "0-0-12" + ] }, { "x": 16, @@ -500,9 +466,7 @@ "sortOrder": "ASC", "calculation": "percentage" } - ], - "value": "0-0-13", - "label": "0-0-13" + ] }, { "x": 16, @@ -529,9 +493,7 @@ "sortOrder": "ASC", "calculation": "percentage" } - ], - "value": "0-0-20", - "label": "0-0-20" + ] }, { "x": 8, @@ -552,9 +514,7 @@ ], "metricTypes": [ "sortMetrics" - ], - "value": "0-0-21", - "label": "0-0-21" + ] }, { "x": 0, @@ -575,9 +535,7 @@ ], "metricTypes": [ "sortMetrics" - ], - "value": "0-0-22", - "label": "0-0-22" + ] }, { "x": 0, @@ -603,9 +561,7 @@ "widget": { "title": "Proxy Sidecar Internal Latency in Nanoseconds (Request)", "tips": "For more details to understand this metrics, refer to https://www.envoyproxy.io/docs/envoy/v1.22.0/api-v3/data/accesslog/v3/accesslog.proto.html#data-accesslog-v3-accesslogcommon" - }, - "value": "0-0-23", - "label": "0-0-23" + } }, { "x": 8, @@ -631,9 +587,7 @@ "showSymbol": true, "showXAxis": true, "showYAxis": true - }, - "value": "0-0-24", - "label": "0-0-24" + } } ] }, @@ -678,9 +632,7 @@ "label": "Latency", "unit": "ms" } - ], - "value": "0-1-0", - "label": "0-1-0" + ] } ] }, @@ -727,9 +679,7 @@ "label": "Latency", "unit": "ms" } - ], - "value": "0-2-0", - "label": "0-2-0" + ] } ] }, diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_cp/mesh-control-plane-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_cp/mesh-control-plane-service.json index ed4c537200..7dcb69739c 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_cp/mesh-control-plane-service.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_cp/mesh-control-plane-service.json @@ -36,16 +36,12 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "%" - }, "metrics": [ "meter_istio_cpu" ], "metricTypes": [ "readMetricsValues" - ], - "moved": false + ] }, { "x": 18, @@ -63,14 +59,12 @@ "showXAxis": true, "showYAxis": true }, - "standard": {}, "metrics": [ "meter_istio_go_goroutines" ], "metricTypes": [ "readMetricsValues" - ], - "moved": false + ] }, { "x": 0, @@ -88,14 +82,12 @@ "showXAxis": true, "showYAxis": true }, - "standard": {}, "metrics": [ "meter_istio_pilot_version" ], "metricTypes": [ "readLabeledMetricsValues" - ], - "moved": false + ] }, { "x": 6, @@ -113,17 +105,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "0": "1", - "1": "0", - "2": "4", - "3": "8", - "4": "5", - "5": "7", - "6": "6", - "unit": "MB", - "divide": "1048576" - }, "metrics": [ "meter_istio_go_stack_inuse", "meter_istio_virtual_memory", @@ -138,22 +119,26 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false, "metricConfig": [ { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "go_stack_inuse" }, { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "virtual_memory" }, { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "go_alloc" }, { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "resident_memory" }, { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "go_heap_inuse" } ] }, @@ -173,7 +158,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": {}, "metrics": [ "meter_istio_pilot_xds_cds_reject", "meter_istio_pilot_xds_eds_reject", @@ -188,7 +172,23 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false + "metricConfig": [ + { + "label": "xds_cds_reject" + }, + { + "label": "xds_eds_reject" + }, + { + "label": "xds_rds_reject" + }, + { + "label": "xds_lds_reject" + }, + { + "label": "xds_write_timeout" + } + ] }, { "x": 16, @@ -206,16 +206,18 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "%" - }, "metrics": [ "meter_istio_pilot_proxy_push_percentile" ], "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false + "metricConfig": [ + { + "labelsIndex": "50,90,99", + "label": "P50,P90,P99" + } + ] }, { "x": 0, @@ -231,14 +233,12 @@ "type": "Bar", "showBackground": true }, - "standard": {}, "metrics": [ "meter_istio_pilot_xds_pushes" ], "metricTypes": [ "readLabeledMetricsValues" - ], - "moved": false + ] }, { "x": 12, @@ -256,14 +256,12 @@ "showXAxis": true, "showYAxis": true }, - "standard": {}, "metrics": [ "meter_istio_sidecar_injection_success_total" ], "metricTypes": [ "readMetricsValues" - ], - "moved": false + ] }, { "x": 12, @@ -281,7 +279,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": {}, "metrics": [ "meter_istio_pilot_xds", "meter_istio_pilot_services", @@ -292,7 +289,17 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false + "metricConfig": [ + { + "label": "xds" + }, + { + "label": "services" + }, + { + "label": "virt_services" + } + ] }, { "x": 0, @@ -312,7 +319,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": {}, "metrics": [ "meter_istio_galley_validation_passed", "meter_istio_galley_validation_failed" @@ -321,7 +327,14 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false + "metricConfig": [ + { + "label": "galley_validation_passed" + }, + { + "label": "galley_validation_failed" + } + ] }, { "x": 0, @@ -337,7 +350,6 @@ "type": "Bar", "showBackground": true }, - "standard": {}, "metrics": [ "meter_istio_pilot_conflict_ol_tcp_tcp", "meter_istio_pilot_conflict_il", @@ -350,7 +362,20 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false + "metricConfig": [ + { + "label": "ol_tpc_tpc" + }, + { + "label": "il" + }, + { + "label": "ol_tcp_http" + }, + { + "label": "ol_http_tcp" + } + ] } ], "layer": "MESH_CP", diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-instance.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-instance.json index 48baf3d776..9cf03981aa 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-instance.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-instance.json @@ -81,6 +81,14 @@ "metricTypes": [ "readMetricsValues", "readMetricsValues" + ], + "metricConfig": [ + { + "label": "total_used" + }, + { + "label": "parent_used" + } ] }, { @@ -194,22 +202,28 @@ ], "metricConfig": [ { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "allocated_max" }, { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "heap_used" }, { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "allocated" }, { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "physical_size" }, { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "physical_size_max" }, { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "heap_max_used" } ] }, @@ -263,6 +277,14 @@ "metricTypes": [ "readMetricsValues", "readMetricsValues" + ], + "metricConfig": [ + { + "label": "threads_max" + }, + { + "label": "threads" + } ] }, { @@ -331,16 +353,16 @@ ] }, { - "name":"Network Profiling", - "children":[ + "name": "Network Profiling", + "children": [ { - "x":0, - "y":0, - "w":24, - "h":47, - "i":"0", - "type":"NetworkProfiling", - "linkDashboard":"ServiceMesh-Data-Plane-Process-Relation-Metrics" + "x": 0, + "y": 0, + "w": 24, + "h": 47, + "i": "0", + "type": "NetworkProfiling", + "linkDashboard": "ServiceMesh-Data-Plane-Process-Relation-Metrics" } ] } diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-service.json index be4e857e56..48dd7304ee 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-service.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-service.json @@ -44,7 +44,11 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "metricConfig": [ + { + "label": "filefd_allocated" + } + ] }, { "x": 8, @@ -76,7 +80,23 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false + "metricConfig": [ + { + "label": "tcp_curr_estab" + }, + { + "label": "tcp_tw" + }, + { + "label": "tcp_alloc" + }, + { + "label": "sockets_used" + }, + { + "label": "udp_inuse" + } + ] }, { "x": 0, @@ -102,7 +122,14 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false + "metricConfig": [ + { + "label": "receive" + }, + { + "label": "transmit" + } + ] }, { "x": 16, @@ -128,13 +155,14 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false, "metricConfig": [ { - "calculation": "byteToKB" + "calculation": "byteToKB", + "label": "read" }, { - "calculation": "byteToKB" + "calculation": "byteToKB", + "label": "written" } ] }, @@ -160,8 +188,7 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ], - "moved": false + ] }, { "x": 0, @@ -186,8 +213,7 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ], - "moved": false + ] }, { "x": 16, @@ -217,19 +243,22 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false, "metricConfig": [ { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "used" }, { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "total" }, { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "available" }, { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "buffer_cache" } ] }, @@ -261,16 +290,18 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false, "metricConfig": [ { - "calculation": "percentage" + "calculation": "percentage", + "label": "load5" }, { - "calculation": "percentage" + "calculation": "percentage", + "label": "load1" }, { - "calculation": "percentage" + "calculation": "percentage", + "label": "load15" } ] }, @@ -298,13 +329,14 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false, "metricConfig": [ { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "free" }, { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "total" } ] }, @@ -330,7 +362,6 @@ "metricTypes": [ "readMetricsValue" ], - "moved": false, "metricConfig": [ { "calculation": "percentage", @@ -360,7 +391,6 @@ "metricTypes": [ "readMetricsValue" ], - "moved": false, "metricConfig": [ { "calculation": "byteToMB", @@ -390,7 +420,6 @@ "metricTypes": [ "readMetricsValue" ], - "moved": false, "metricConfig": [ { "unit": "%" 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 df6da6fc0e..992660ef6f 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 @@ -67,7 +67,8 @@ ], "metricConfig": [ { - "calculation": "byteToMB" + "calculation": "byteToMB", + "label": "used" } ] }, @@ -117,6 +118,14 @@ "metricTypes": [ "readMetricsValues", "readMetricsValues" + ], + "metricConfig": [ + { + "label": "count" + }, + { + "label": "error_count" + } ] }, { @@ -142,6 +151,12 @@ ], "metricTypes": [ "readLabeledMetricsValues" + ], + "metricConfig": [ + { + "labelsIndex": "50,70,90,99", + "label": "P50,P70,P90,P99" + } ] }, { @@ -169,6 +184,17 @@ "readMetricsValues", "readMetricsValues", "readMetricsValues" + ], + "metricConfig": [ + { + "label": "loaded" + }, + { + "label": "total_unloaded" + }, + { + "label": "total_loaded" + } ] }, { @@ -192,6 +218,14 @@ "metricTypes": [ "readMetricsValues", "readMetricsValues" + ], + "metricConfig": [ + { + "label": "prepare_count" + }, + { + "label": "execute_count" + } ] }, { @@ -221,6 +255,17 @@ "readMetricsValues", "readMetricsValues", "readMetricsValues" + ], + "metricConfig": [ + { + "label": "live" + }, + { + "label": "peak" + }, + { + "label": "daemon" + } ] }, { @@ -246,6 +291,12 @@ ], "metricTypes": [ "readLabeledMetricsValues" + ], + "metricConfig": [ + { + "labelsIndex": "50,70,90,99", + "label": "P50,P70,P90,P99" + } ] }, { @@ -271,6 +322,12 @@ ], "metricTypes": [ "readLabeledMetricsValues" + ], + "metricConfig": [ + { + "labelsIndex": "50,70,90,99", + "label": "P50,P70,P90,P99" + } ] }, { @@ -298,6 +355,20 @@ "readMetricsValues", "readMetricsValues", "readMetricsValues" + ], + "metricConfig": [ + { + "label": "runnable" + }, + { + "label": "timed_waiting" + }, + { + "label": "blocked" + }, + { + "label": "waiting" + } ] }, { @@ -351,7 +422,7 @@ ], "metricConfig": [ { - "label": "50,70,90,99", + "label": "P50,P70,P90,P99", "labelsIndex": "50,70,90,99" } ] @@ -377,6 +448,14 @@ "metricTypes": [ "readMetricsValues", "readMetricsValues" + ], + "metricConfig": [ + { + "label": "count" + }, + { + "label": "error_count" + } ] }, { @@ -402,6 +481,11 @@ ], "metricTypes": [ "readMetricsValues" + ], + "metricConfig": [ + { + "label": "percentage" + } ] }, {