From f8feaa97b7aba577551e2db092a3c29306127eed Mon Sep 17 00:00:00 2001 From: Kai Date: Fri, 1 Apr 2022 22:16:36 +0800 Subject: [PATCH] update UI templates (#8788) --- .../browser/browser-app.json | 16 +++- .../browser/browser-root.json | 9 +- .../general/general-root.json | 2 +- .../general/general-service.json | 17 +++- .../k8s/k8s-cluster.json | 75 +++++++++-------- .../k8s/k8s-node.json | 83 +++++++++++-------- .../k8s_service/k8s-service-service.json | 14 +++- .../mesh/mesh-root.json | 8 +- .../mesh/mesh-service.json | 16 +++- .../os_linux/linux-root.json | 8 +- .../so11y_oap/so11y-service.json | 8 +- .../virtual-database-root.json | 13 ++- .../virtual-database-service.json | 4 +- skywalking-ui | 2 +- 14 files changed, 180 insertions(+), 95 deletions(-) diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-app.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-app.json index 6c990eb1bc..25cdc4d6e7 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-app.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-app.json @@ -289,7 +289,13 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "label": "PV", + "unit": "calls / min" + } + ] } ] }, @@ -319,7 +325,13 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "label": "PV", + "unit": "calls / min" + } + ] } ] } diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-root.json index 4494b9c1ac..2390b8ea0d 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-root.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-root.json @@ -44,8 +44,13 @@ "metricTypes": [ "readMetricsValues" ], - "metricConfig": [], - "moved": false + "moved": false, + "metricConfig": [ + { + "label": "PV", + "unit": "calls / min" + } + ] } ], "layer": "BROWSER", diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-root.json index ad2e3dfc7f..8f90a73023 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-root.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-root.json @@ -69,7 +69,7 @@ "moved": false, "metricConfig": [ { - "label": "Service Load", + "label": "Load", "unit": "calls / min" } ] 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 fe08a78bbb..6c3ab167dc 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 @@ -516,7 +516,13 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "label": "Load", + "unit": "calls / min" + } + ] } ] }, @@ -546,7 +552,13 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "label": "Load", + "unit": "calls / min" + } + ] } ] }, @@ -614,6 +626,7 @@ } ], "description": { + "healthy": "Healthy", "unhealthy": "Success Rate < 95% and Traffic > 1 call/min" }, "nodeMetricConfig": [ 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 56f462aa57..e4c8f68012 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 @@ -31,14 +31,13 @@ "title": "Title" }, "graph": {}, - "standard": {}, "metrics": [ "" ], "metricTypes": [ "" ], - "activedTabIndex": 1, + "activedTabIndex": 0, "children": [ { "name": "Overview", @@ -51,7 +50,7 @@ "i": "0", "type": "Widget", "widget": { - "title": "CPU Resources" + "title": "CPU Resources (m)" }, "graph": { "type": "Area", @@ -59,9 +58,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "m" - }, "metrics": [ "k8s_cluster_cpu_cores", "k8s_cluster_cpu_cores_requests", @@ -84,7 +80,7 @@ "i": "1", "type": "Widget", "widget": { - "title": "Memory Resources" + "title": "Memory Resources (Gi)" }, "graph": { "type": "Area", @@ -92,15 +88,11 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "GB", - "divide": 1073741824 - }, "metrics": [ - "k8s_cluster_memory_total", "k8s_cluster_memory_requests", + "k8s_cluster_memory_allocatable", "k8s_cluster_memory_limits", - "k8s_cluster_memory_allocatable" + "k8s_cluster_memory_total" ], "metricTypes": [ "readMetricsValues", @@ -108,7 +100,21 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "calculation": "byteToGB" + }, + { + "calculation": "byteToGB" + }, + { + "calculation": "byteToGB" + }, + { + "calculation": "byteToGB" + } + ] }, { "x": 16, @@ -118,7 +124,7 @@ "i": "2", "type": "Widget", "widget": { - "title": "Storage Resources" + "title": "Storage Resources (Gi)" }, "graph": { "type": "Area", @@ -126,10 +132,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "GB", - "divide": 1073741824 - }, "metrics": [ "k8s_cluster_storage_total", "k8s_cluster_storage_allocatable" @@ -138,7 +140,15 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "calculation": "byteToGB" + }, + { + "calculation": "byteToGB" + } + ] }, { "x": 16, @@ -156,7 +166,6 @@ "tableHeaderCol1": "Container-Pod-Waiting Reason", "tableHeaderCol2": "" }, - "standard": {}, "metrics": [ "k8s_cluster_pod_status_waiting" ], @@ -177,11 +186,10 @@ }, "graph": { "type": "Table", - "showTableValues": true, + "showTableValues": false, "tableHeaderCol1": "Status-Service", "tableHeaderCol2": "" }, - "standard": {}, "metrics": [ "k8s_cluster_service_pod_status" ], @@ -206,7 +214,6 @@ "tableHeaderCol1": "Status-Pod", "tableHeaderCol2": "" }, - "standard": {}, "metrics": [ "k8s_cluster_pod_status_not_running" ], @@ -231,7 +238,6 @@ "tableHeaderCol1": "Status-Node", "tableHeaderCol2": "" }, - "standard": {}, "metrics": [ "k8s_cluster_node_status" ], @@ -256,7 +262,6 @@ "tableHeaderCol1": "Deployment", "tableHeaderCol2": "Replicas" }, - "standard": {}, "metrics": [ "k8s_cluster_deployment_spec_replicas" ], @@ -277,11 +282,10 @@ }, "graph": { "type": "Table", - "showTableValues": true, + "showTableValues": false, "tableHeaderCol1": "Deployment-Available", "tableHeaderCol2": "" }, - "standard": {}, "metrics": [ "k8s_cluster_deployment_status" ], @@ -306,7 +310,6 @@ "textAlign": "center", "showUint": true }, - "standard": {}, "metrics": [ "k8s_cluster_container_total" ], @@ -331,7 +334,6 @@ "textAlign": "center", "showUint": true }, - "standard": {}, "metrics": [ "k8s_cluster_pod_total" ], @@ -356,7 +358,6 @@ "textAlign": "center", "showUint": true }, - "standard": {}, "metrics": [ "k8s_cluster_service_total" ], @@ -381,7 +382,6 @@ "textAlign": "center", "showUint": true }, - "standard": {}, "metrics": [ "k8s_cluster_node_total" ], @@ -406,7 +406,6 @@ "textAlign": "center", "showUint": true }, - "standard": {}, "metrics": [ "k8s_cluster_namespace_total" ], @@ -431,7 +430,6 @@ "textAlign": "center", "showUint": true }, - "standard": {}, "metrics": [ "k8s_cluster_deployment_total" ], @@ -460,14 +458,19 @@ "dashboardName": "K8S-Node", "fontSize": 12 }, - "standard": {}, "metrics": [ "k8s_node_cpu_usage" ], "metricTypes": [ "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "label": "CPU Usage", + "unit": "m" + } + ] } ] } 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 1ec901d0ad..9cee3e8239 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 @@ -28,7 +28,7 @@ "i": "0", "type": "Widget", "widget": { - "title": "CPU Usage" + "title": "CPU Usage (m)" }, "graph": { "type": "Line", @@ -38,9 +38,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "m" - }, "metrics": [ "k8s_node_cpu_usage" ], @@ -57,7 +54,7 @@ "i": "1", "type": "Widget", "widget": { - "title": "Network I/O" + "title": "Network I/O (KB/s)" }, "graph": { "type": "Line", @@ -67,10 +64,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "divide": 1024, - "unit": "KB/s" - }, "metrics": [ "k8s_node_network_receive", "k8s_node_network_transmit" @@ -79,7 +72,15 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "calculation": "byteToKB" + }, + { + "calculation": "byteToKB" + } + ] }, { "x": 8, @@ -97,7 +98,6 @@ "tableHeaderCol1": "", "tableHeaderCol2": "" }, - "standard": {}, "metrics": [ "k8s_node_node_status" ], @@ -114,7 +114,7 @@ "i": "3", "type": "Widget", "widget": { - "title": "Storage Resources" + "title": "Storage Resources (Gi)" }, "graph": { "type": "Area", @@ -122,10 +122,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "divide": 1073741824, - "unit": "GB" - }, "metrics": [ "k8s_node_storage_total", "k8s_node_storage_allocatable" @@ -134,7 +130,15 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "calculation": "byteToGB" + }, + { + "calculation": "byteToGB" + } + ] }, { "x": 16, @@ -144,7 +148,7 @@ "i": "5", "type": "Widget", "widget": { - "title": "CPU Resources" + "title": "CPU Resources (m)" }, "graph": { "type": "Area", @@ -152,9 +156,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "m" - }, "metrics": [ "k8s_node_cpu_cores_limits", "k8s_node_cpu_cores_requests", @@ -177,7 +178,7 @@ "i": "6", "type": "Widget", "widget": { - "title": "Memory Resources" + "title": "Memory Resources (Gi)" }, "graph": { "type": "Area", @@ -185,15 +186,11 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "divide": 1073741824, - "unit": "GB" - }, "metrics": [ "k8s_node_memory_total", + "k8s_node_memory_limits", "k8s_node_memory_allocatable", - "k8s_node_memory_requests", - "k8s_node_memory_limits" + "k8s_node_memory_requests" ], "metricTypes": [ "readMetricsValues", @@ -201,7 +198,21 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "calculation": "byteToGB" + }, + { + "calculation": "byteToGB" + }, + { + "calculation": "byteToGB" + }, + { + "calculation": "byteToGB" + } + ] }, { "x": 0, @@ -211,7 +222,7 @@ "i": "7", "type": "Widget", "widget": { - "title": "Memory Usage" + "title": "Memory Usage (Gi)" }, "graph": { "type": "Line", @@ -221,17 +232,18 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "divide": 1073741824, - "unit": "GB" - }, "metrics": [ "k8s_node_memory_usage" ], "metricTypes": [ "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "calculation": "byteToGB" + } + ] }, { "x": 0, @@ -251,7 +263,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": {}, "metrics": [ "k8s_node_pod_total" ], 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 42a8d12d39..0976037b18 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 @@ -63,7 +63,7 @@ ], "moved": false, "widget": { - "title": "Service Memory Resources (MB)" + "title": "Service Memory Resources (Mi)" }, "graph": { "type": "Area", @@ -171,7 +171,7 @@ ], "moved": false, "widget": { - "title": "Pod Memory Usage" + "title": "Pod Memory Usage (Mi)" }, "graph": { "type": "Line", @@ -180,7 +180,12 @@ "showSymbol": false, "showXAxis": true, "showYAxis": true - } + }, + "metricConfig": [ + { + "calculation": "byteToMB" + } + ] }, { "x": 0, @@ -233,7 +238,8 @@ ], "layer": "K8S_SERVICE", "entity": "Service", - "name": "K8S-Service-Service" + "name": "K8S-Service-Service", + "id": "K8S-Service-Service" } } ] diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-root.json index 502a4dbcc2..ec46d70f83 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-root.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-root.json @@ -68,7 +68,13 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "label": "Load", + "unit": "calls or packets / min" + } + ] } ] }, 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 d16978a528..964ba7766d 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 @@ -491,7 +491,13 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "label": "Load", + "unit": "calls or packets / min" + } + ] } ] }, @@ -521,7 +527,13 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "label": "Load", + "unit": "calls or packets / min" + } + ] } ] }, diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-root.json index 4e2f8ab633..6860aafdf9 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-root.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-root.json @@ -44,7 +44,13 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "label": "CPU", + "unit": "%" + } + ] } ], "name": "Linux-Root", diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_oap/so11y-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_oap/so11y-service.json index 4ecd3848a7..1c9417737e 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_oap/so11y-service.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_oap/so11y-service.json @@ -42,7 +42,13 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "label": "CPU", + "unit": "%" + } + ] } ], "layer": "SO11Y_OAP", diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_database/virtual-database-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_database/virtual-database-root.json index 1b09cfa1c8..facc71050e 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_database/virtual-database-root.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_database/virtual-database-root.json @@ -36,22 +36,27 @@ "fontSize": 12, "showXAxis": false, "showYAxis": false, - "showGroup": true + "showGroup": false }, - "standard": {}, "metrics": [ "database_access_resp_time" ], "metricTypes": [ "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "unit": "ms", + "label": "Latency" + } + ] } ], + "id": "Virtual-Database-Root", "layer": "VIRTUAL_DATABASE", "entity": "All", "name": "Virtual-Database-Root", - "id": "Virtual-Database-Root", "isRoot": true } } 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 42f2deaa8c..e7535d5f79 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 @@ -81,7 +81,7 @@ "i": "4", "type": "Widget", "widget": { - "title": "Database Traffic (CPM)" + "title": "Database Traffic (calls / min)" }, "graph": { "type": "Line", @@ -107,7 +107,7 @@ "i": "5", "type": "Widget", "widget": { - "title": "Database Access Latency Percentile" + "title": "Database Access Latency Percentile (ms)" }, "graph": { "type": "Line", diff --git a/skywalking-ui b/skywalking-ui index f62d0bd22b..fce818aebe 160000 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit f62d0bd22b7ff7d2c94bcdafe6fc3046e0b8fe31 +Subproject commit fce818aebecbf31d3c787eb09eb04361617b6ce6