From 74fbc3d8ecce103eeefc2a7e52b3d369b0b2c956 Mon Sep 17 00:00:00 2001 From: Kai Date: Fri, 1 Apr 2022 20:04:49 +0800 Subject: [PATCH] update ui-template: browser, general, mesh (#8786) --- .../browser/browser-app.json | 195 +++++++------ .../browser/browser-page.json | 210 +++++--------- .../browser/browser-root.json | 1 - .../browser/browser-version.json | 26 +- .../general/general-endpoint-relation.json | 44 ++- .../general/general-endpoint.json | 153 ++++------ .../general/general-instance-relation.json | 179 +++++++++--- .../general/general-instance.json | 6 +- .../general/general-root.json | 72 ++++- .../general/general-service-relation.json | 144 ++++++---- .../general/general-service.json | 165 +++++++++-- .../mesh/mesh-endpoint.json | 113 ++------ .../mesh/mesh-instance-relation.json | 263 ++++++++++++++++++ .../mesh/mesh-instance.json | 6 +- .../mesh/{mesh-all.json => mesh-root.json} | 71 ++++- .../mesh/mesh-service-relation.json | 180 ++++++------ .../mesh/mesh-service.json | 262 +++++++++++++---- skywalking-ui | 2 +- 18 files changed, 1348 insertions(+), 744 deletions(-) create mode 100644 oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-instance-relation.json rename oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/{mesh-all.json => mesh-root.json} (61%) 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 b6e6a130c4..6c990eb1bc 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 @@ -31,59 +31,58 @@ "title": "Title" }, "graph": {}, - "standard": {}, "metrics": [ "" ], "metricTypes": [ "" ], - "activedTabIndex": 2, + "activedTabIndex": 0, "children": [ { "name": "Overview", "children": [ { - "x": 16, - "y": 16, + "x": 8, + "y": 15, "w": 8, - "h": 16, + "h": 14, "i": "2", "type": "Widget", "widget": { - "title": "Error Rate of Versions In The Selected App" + "title": "Error Rate of Versions In The Selected App (%)" }, "graph": { "type": "TopList", "topN": "10" }, - "standard": { - "divide": 100, - "unit": "%" - }, "metrics": [ "browser_app_single_version_error_rate" ], "metricTypes": [ "sortMetrics" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "calculation": "percentage" + } + ] }, { "x": 0, - "y": 32, + "y": 15, "w": 8, - "h": 16, + "h": 14, "i": "3", "type": "Widget", "widget": { - "title": "Load of Versions In The Selected App (CPM - calls per minute)" + "title": "Load of Versions In The Selected App (calls / min)" }, "graph": { "type": "TopList", "topN": "10" }, - "standard": {}, "metrics": [ "browser_app_single_version_pv" ], @@ -93,10 +92,10 @@ "moved": false }, { - "x": 8, - "y": 16, + "x": 16, + "y": 0, "w": 8, - "h": 16, + "h": 15, "i": "5", "type": "Widget", "widget": { @@ -106,7 +105,6 @@ "type": "Bar", "showBackground": true }, - "standard": {}, "metrics": [ "browser_app_error_sum" ], @@ -119,57 +117,11 @@ "x": 0, "y": 0, "w": 8, - "h": 16, + "h": 15, "i": "7", "type": "Widget", "widget": { - "title": "All Browsers App Load (CPM - calls per minute)" - }, - "graph": { - "type": "TopList", - "topN": "10" - }, - "standard": {}, - "metrics": [ - "browser_app_pv" - ], - "metricTypes": [ - "sortMetrics" - ], - "moved": false - }, - { - "x": 8, - "y": 0, - "w": 8, - "h": 16, - "i": "8", - "type": "Widget", - "widget": { - "title": "All Browsers App Error Count" - }, - "graph": { - "type": "TopList", - "topN": "10" - }, - "standard": {}, - "metrics": [ - "browser_app_error_sum" - ], - "metricTypes": [ - "sortMetrics" - ], - "moved": false - }, - { - "x": 16, - "y": 0, - "w": 8, - "h": 16, - "i": "9", - "type": "Widget", - "widget": { - "title": "App Load (CPM - calls per minute)" + "title": "App Load (calls / min)" }, "graph": { "type": "Line", @@ -179,7 +131,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": {}, "metrics": [ "browser_app_pv" ], @@ -190,24 +141,20 @@ }, { "x": 8, - "y": 32, + "y": 29, "w": 8, - "h": 16, + "h": 14, "i": "10", "type": "Widget", "widget": { - "title": "All Browsers App Error Rate" + "title": "Top Unstable Pages / Error Count" }, "graph": { "type": "TopList", - "topN": "10" - }, - "standard": { - "divide": 100, - "unit": "%" + "color": "purple" }, "metrics": [ - "browser_app_error_rate" + "browser_app_page_error_sum" ], "metricTypes": [ "sortMetrics" @@ -215,14 +162,14 @@ "moved": false }, { - "x": 0, - "y": 16, + "x": 8, + "y": 0, "w": 8, - "h": 16, + "h": 15, "i": "11", "type": "Widget", "widget": { - "title": "App Error Rate" + "title": "App Error Rate (%)" }, "graph": { "type": "Line", @@ -232,17 +179,89 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "divide": 100, - "unit": "%" - }, "metrics": [ "browser_app_error_rate" ], "metricTypes": [ "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "calculation": "percentage" + } + ] + }, + { + "x": 0, + "y": 29, + "w": 8, + "h": 14, + "i": "12", + "type": "Widget", + "metricTypes": [ + "sortMetrics" + ], + "metrics": [ + "browser_app_page_pv" + ], + "moved": false, + "widget": { + "title": "Top Hot Pages (calls / min)" + }, + "graph": { + "type": "TopList", + "color": "purple" + } + }, + { + "x": 16, + "y": 29, + "w": 8, + "h": 14, + "i": "13", + "type": "Widget", + "metricTypes": [ + "sortMetrics" + ], + "metrics": [ + "browser_app_page_error_rate" + ], + "moved": false, + "widget": { + "title": "Top Unstable Pages / Error Rate (%)" + }, + "graph": { + "type": "TopList", + "color": "purple" + }, + "metricConfig": [ + { + "calculation": "percentage" + } + ] + }, + { + "x": 16, + "y": 15, + "w": 8, + "h": 14, + "i": "14", + "type": "Widget", + "metricTypes": [ + "sortMetrics" + ], + "metrics": [ + "browser_app_single_version_error_sum" + ], + "moved": false, + "widget": { + "title": "Error Count of Versions In The Selected App" + }, + "graph": { + "type": "TopList", + "color": "purple" + } } ] }, @@ -261,10 +280,9 @@ }, "graph": { "type": "InstanceList", - "dashboardName": "", + "dashboardName": "Browser-Version", "fontSize": 12 }, - "standard": {}, "metrics": [ "browser_app_single_version_pv" ], @@ -295,7 +313,6 @@ "showXAxis": false, "showYAxis": false }, - "standard": {}, "metrics": [ "browser_app_page_pv" ], 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 05710337d0..5d008297e4 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 @@ -22,13 +22,13 @@ "children": [ { "x": 16, - "y": 45, + "y": 30, "w": 8, "h": 15, "i": "0", "type": "Widget", "widget": { - "title": "Page FMP Latency" + "title": "Page FMP Latency (ms)" }, "graph": { "type": "Line", @@ -38,29 +38,30 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "divide": 1, - "unit": "ms", - "metricLabels": "P50,P75,P90,P95,P99", - "labelsIndex": "0,1,2,3,4" - }, "metrics": [ "browser_app_page_fmp_percentile" ], "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "key": "P50, P75, P90, P95, P99", + "labelsIndex": "0,1,2,3,4", + "label": "P50, P75, P90, P95, P99" + } + ] }, { "x": 8, - "y": 45, + "y": 30, "w": 8, "h": 15, "i": "1", "type": "Widget", "widget": { - "title": "Page First Pack Latency" + "title": "Page First Pack Latency (ms)" }, "graph": { "type": "Line", @@ -70,29 +71,30 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "divide": 1, - "unit": "ms", - "metricLabels": "P50,P75,P90,P95,P99", - "labelsIndex": "0,1,2,3,4" - }, "metrics": [ "browser_app_page_first_pack_percentile" ], "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "key": "P50, P75, P90, P95, P99", + "labelsIndex": "0,1,2,3,4", + "label": "P50, P75, P90, P95, P99" + } + ] }, { "x": 0, - "y": 30, + "y": 15, "w": 8, "h": 15, "i": "2", "type": "Widget", "widget": { - "title": "Page FPT Latency" + "title": "Page FPT Latency (ms)" }, "graph": { "type": "Line", @@ -102,27 +104,30 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "ms", - "metricLabels": "P50, P75, P90, P95, P99" - }, "metrics": [ "browser_app_page_fpt_percentile" ], "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "key": "P50, P75, P90, P95, P99", + "labelsIndex": "0,1,2,3,4", + "label": "P50, P75, P90, P95, P99" + } + ] }, { "x": 16, - "y": 30, + "y": 15, "w": 8, "h": 15, "i": "3", "type": "Widget", "widget": { - "title": "Page DOM Ready Latency" + "title": "Page DOM Ready Latency (ms)" }, "graph": { "type": "Line", @@ -132,29 +137,30 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "divide": 1, - "unit": "ms", - "metricLabels": "P50,P75,P90,P95,P99", - "labelsIndex": "0,1,2,3,4" - }, "metrics": [ "browser_app_page_dom_ready_percentile" ], "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "key": "P50, P75, P90, P95, P99", + "labelsIndex": "0,1,2,3,4", + "label": "P50, P75, P90, P95, P99" + } + ] }, { "x": 8, - "y": 30, + "y": 15, "w": 8, "h": 15, "i": "4", "type": "Widget", "widget": { - "title": "Page TTL Latency" + "title": "Page TTL Latency (ms)" }, "graph": { "type": "Line", @@ -164,111 +170,30 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "divide": 1, - "unit": "ms", - "metricLabels": "P50,P75,P90,P95,P99", - "labelsIndex": "0,1,2,3,4" - }, "metrics": [ "browser_app_page_ttl_percentile" ], "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "key": "P50, P75, P90, P95, P99", + "labelsIndex": "0,1,2,3,4", + "label": "P50, P75, P90, P95, P99" + } + ] }, { "x": 0, - "y": 0, - "w": 8, - "h": 15, - "i": "5", - "type": "Widget", - "widget": { - "title": "Top Hot Pages (CPM - calls per minute)" - }, - "graph": { - "type": "TopList", - "topN": "10" - }, - "standard": { - "divide": 1, - "unit": "ms", - "metricLabels": "P50,P75,P90,P95,P99", - "labelsIndex": "0,1,2,3,4" - }, - "metrics": [ - "browser_app_page_pv" - ], - "metricTypes": [ - "sortMetrics" - ], - "moved": false - }, - { - "x": 16, - "y": 0, - "w": 8, - "h": 15, - "i": "6", - "type": "Widget", - "widget": { - "title": "Top Unstable Pages / Error Count" - }, - "graph": { - "type": "TopList", - "topN": "10" - }, - "standard": { - "divide": 1, - "unit": "ms", - "metricLabels": "P50,P75,P90,P95,P99", - "labelsIndex": "0,1,2,3,4" - }, - "metrics": [ - "browser_app_page_error_sum" - ], - "metricTypes": [ - "sortMetrics" - ], - "moved": false - }, - { - "x": 8, - "y": 0, - "w": 8, - "h": 15, - "i": "7", - "type": "Widget", - "widget": { - "title": "Top Unstable Pages / Error Rate" - }, - "graph": { - "type": "TopList", - "topN": "10" - }, - "standard": { - "divide": 100, - "unit": "%" - }, - "metrics": [ - "browser_app_page_error_rate" - ], - "metricTypes": [ - "sortMetrics" - ], - "moved": false - }, - { - "x": 0, - "y": 45, + "y": 30, "w": 8, "h": 15, "i": "8", "type": "Widget", "widget": { - "title": "Page Load Latency" + "title": "Page Load Latency (ms)" }, "graph": { "type": "Line", @@ -278,29 +203,30 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "divide": 1, - "unit": "ms", - "metricLabels": "P50,P75,P90,P95,P99", - "labelsIndex": "0,1,2,3,4" - }, "metrics": [ "browser_app_page_load_page_percentile" ], "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "key": "0,1,2,3,4", + "label": "P50, P75, P90, P95, P99", + "labelsIndex": "0,1,2,3,4" + } + ] }, { "x": 12, - "y": 15, + "y": 0, "w": 12, "h": 15, "i": "9", "type": "Widget", "widget": { - "title": "Page Performance" + "title": "Page Performance (ms)" }, "graph": { "type": "Line", @@ -310,10 +236,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "divide": 1, - "unit": "ms" - }, "metrics": [ "browser_app_page_res_avg", "browser_app_page_load_page_avg", @@ -342,7 +264,7 @@ }, { "x": 0, - "y": 15, + "y": 0, "w": 12, "h": 15, "i": "10", @@ -354,12 +276,6 @@ "type": "Bar", "showBackground": true }, - "standard": { - "divide": 1, - "unit": "ms", - "metricLabels": "P50,P75,P90,P95,P99", - "labelsIndex": "0,1,2,3,4" - }, "metrics": [ "browser_app_page_resource_error_sum", "browser_app_page_js_error_sum", 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 78d5742d1e..4494b9c1ac 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 @@ -38,7 +38,6 @@ "showYAxis": false, "showGroup": true }, - "standard": {}, "metrics": [ "browser_app_pv" ], diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-version.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-version.json index 9dcae2d302..7fcc1e9056 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-version.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-version.json @@ -34,17 +34,18 @@ "type": "Bar", "showBackground": true }, - "standard": { - "divide": 100, - "unit": "%" - }, "metrics": [ "browser_app_single_version_error_sum" ], "metricTypes": [ "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "calculation": "percentage" + } + ] }, { "x": 0, @@ -64,17 +65,18 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "divide": 100, - "unit": "%" - }, "metrics": [ "browser_app_single_version_error_rate" ], "metricTypes": [ "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "calculation": "percentage" + } + ] }, { "x": 0, @@ -94,10 +96,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "divide": 100, - "unit": "%" - }, "metrics": [ "browser_app_single_version_pv" ], 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 f2338ecf0e..3d0d417d16 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 @@ -28,7 +28,7 @@ "i": "0", "type": "Widget", "widget": { - "title": "Service Response Time Percentile" + "title": "Service Response Time Percentile (ms)" }, "graph": { "type": "Line", @@ -38,18 +38,19 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "divide": 100, - "unit": "%", - "metricLabels": "P50, P75, P90, P95, P99" - }, "metrics": [ "endpoint_relation_percentile" ], "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "label": "P50, P75, P90, P95, P99", + "labelsIndex": "0,1,2,3,4" + } + ] }, { "x": 0, @@ -59,7 +60,7 @@ "i": "1", "type": "Widget", "widget": { - "title": "Successful Rate" + "title": "Success Rate (%)" }, "graph": { "type": "Line", @@ -69,17 +70,18 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "divide": 100, - "unit": "%" - }, "metrics": [ "endpoint_relation_sla" ], "metricTypes": [ "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "calculation": "percentage" + } + ] }, { "x": 0, @@ -89,7 +91,7 @@ "i": "2", "type": "Widget", "widget": { - "title": "Load" + "title": "Load (calls / min)" }, "graph": { "type": "Line", @@ -99,12 +101,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "divide": 100, - "unit": "%", - "metricLabels": "P50, P75, P90, P95, P99", - "labelsIndex": "0, 1, 2, 3, 4" - }, "metrics": [ "endpoint_relation_cpm" ], @@ -121,7 +117,7 @@ "i": "3", "type": "Widget", "widget": { - "title": "Response Time" + "title": "Response Time (ms)" }, "graph": { "type": "Line", @@ -131,12 +127,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "divide": 100, - "unit": "%", - "metricLabels": "P50, P75, P90, P95, P99", - "labelsIndex": "0, 1, 2, 3, 4" - }, "metrics": [ "endpoint_relation_resp_time" ], 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 1cbcb42be9..462728c1c3 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 @@ -31,14 +31,13 @@ "title": "Title" }, "graph": {}, - "standard": {}, "metrics": [ "" ], "metricTypes": [ "" ], - "activedTabIndex": 0, + "activedTabIndex": 1, "children": [ { "name": "Overview", @@ -48,84 +47,6 @@ "y": 0, "w": 8, "h": 13, - "i": "0", - "type": "Widget", - "widget": { - "title": "Successful Rate in Current Service (%)" - }, - "graph": { - "type": "TopList", - "topN": "10" - }, - "standard": { - }, - "metrics": [ - "endpoint_sla" - ], - "metricTypes": [ - "sortMetrics" - ], - "moved": false, - "metricConfig": [ - { - "calculation": "percentage" - } - ] - }, - { - "x": 8, - "y": 0, - "w": 8, - "h": 13, - "i": "1", - "type": "Widget", - "widget": { - "title": "Slow Endpoints in Current Service (ms)" - }, - "graph": { - "type": "TopList", - "topN": "10" - }, - "standard": { - }, - "metrics": [ - "endpoint_resp_time" - ], - "metricTypes": [ - "sortMetrics" - ], - "moved": false - }, - { - "x": 0, - "y": 0, - "w": 8, - "h": 13, - "i": "2", - "type": "Widget", - "widget": { - "title": "Endpoint Load in Current Service (CPM)", - "tips": "For HTTP 1/2, gRPC, RPC services, this means Calls Per Minute (CPM), for TCP services, this means Packets Per Minute (PPM)" - }, - "graph": { - "type": "TopList", - "topN": "10" - }, - "standard": { - }, - "metrics": [ - "endpoint_cpm" - ], - "metricTypes": [ - "sortMetrics" - ], - "moved": false - }, - { - "x": 16, - "y": 13, - "w": 8, - "h": 13, "i": "3", "type": "Widget", "widget": { @@ -139,8 +60,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - }, "metrics": [ "endpoint_percentile" ], @@ -157,7 +76,7 @@ }, { "x": 8, - "y": 13, + "y": 0, "w": 8, "h": 13, "i": "4", @@ -173,8 +92,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - }, "metrics": [ "endpoint_resp_time" ], @@ -185,7 +102,7 @@ }, { "x": 16, - "y": 26, + "y": 13, "w": 8, "h": 13, "i": "5", @@ -202,8 +119,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - }, "metrics": [ "endpoint_mq_consume_latency" ], @@ -214,7 +129,7 @@ }, { "x": 8, - "y": 26, + "y": 13, "w": 8, "h": 13, "i": "6", @@ -242,13 +157,13 @@ }, { "x": 0, - "y": 26, + "y": 13, "w": 8, "h": 13, "i": "7", "type": "Widget", "widget": { - "title": "Endpoint Successful Rate (%)" + "title": "Endpoint Success Rate (%)" }, "graph": { "type": "Line", @@ -258,8 +173,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - }, "metrics": [ "endpoint_sla" ], @@ -270,13 +183,13 @@ }, { "x": 0, - "y": 13, + "y": 0, "w": 8, "h": 13, "i": "8", "type": "Widget", "widget": { - "title": "Endpoint Load (CPM)" + "title": "Endpoint Load (calls / min)" }, "graph": { "type": "Line", @@ -313,7 +226,6 @@ "graph": { "showDepth": true }, - "standard": {}, "metrics": [ "" ], @@ -322,11 +234,50 @@ ], "moved": false, "linkDashboard": "Endpoint-Relation", - "nodeDashboard": [], - "linkServerMetrics": [], + "nodeDashboard": "General-Endpoint", + "linkServerMetrics": [ + "endpoint_relation_sla", + "endpoint_relation_resp_time", + "endpoint_relation_cpm" + ], "linkClientMetrics": [], - "nodeMetrics": [], - "legend": [] + "nodeMetrics": [ + "endpoint_sla", + "endpoint_resp_time", + "endpoint_cpm" + ], + "legend": [], + "description": {}, + "linkServerMetricConfig": [ + { + "unit": "%", + "label": "Success Rate", + "calculation": "percentage" + }, + { + "unit": "ms", + "label": "Latency" + }, + { + "unit": "calls / min", + "label": "Load" + } + ], + "nodeMetricConfig": [ + { + "unit": "%", + "label": "Success Rate", + "calculation": "percentage" + }, + { + "unit": "ms", + "label": "Latency" + }, + { + "unit": "calls / min ", + "label": "Load" + } + ] } ] }, @@ -344,7 +295,6 @@ "title": "Title" }, "graph": {}, - "standard": {}, "metrics": [ "" ], @@ -387,6 +337,7 @@ "layer": "GENERAL", "entity": "Endpoint", "name": "General-Endpoint", + "id": "General-Endpoint", "isRoot": false } } diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-instance-relation.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-instance-relation.json index 88b91ff9a5..ddd61a3b07 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-instance-relation.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-instance-relation.json @@ -21,14 +21,14 @@ "configuration": { "children": [ { - "x": 0, - "y": 36, - "w": 24, + "x": 12, + "y": 12, + "w": 12, "h": 12, "i": "1", "type": "Widget", "widget": { - "title": "Response Time Percentile" + "title": "Response Time Percentile (Client) (ms)" }, "graph": { "type": "Line", @@ -38,28 +38,30 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "divide": 100, - "unit": "%", - "metricLabels": "P50, P75, P90, P95, P99" - }, "metrics": [ "service_instance_relation_client_percentile" ], "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "key": "P50, P75, P90, P95, P99", + "labelsIndex": "0,1,2,3,4", + "label": "P50, P75, P90, P95, P99" + } + ] }, { "x": 0, "y": 24, - "w": 24, + "w": 12, "h": 12, "i": "2", "type": "Widget", "widget": { - "title": "Successful Rate" + "title": "Success Rate (Client) (%)" }, "graph": { "type": "Line", @@ -69,27 +71,28 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "divide": 100, - "unit": "%" - }, "metrics": [ "service_instance_relation_client_call_sla" ], "metricTypes": [ "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "calculation": "percentage" + } + ] }, { - "x": 0, - "y": 12, - "w": 24, + "x": 12, + "y": 36, + "w": 12, "h": 12, "i": "3", "type": "Widget", "widget": { - "title": "Load" + "title": "Load (Client) (calls / min)" }, "graph": { "type": "Line", @@ -99,12 +102,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "divide": 100, - "unit": "%", - "metricLabels": "P50, P75, P90, P95, P99", - "labelsIndex": "0,1,2,3,4" - }, "metrics": [ "service_instance_relation_client_cpm" ], @@ -115,13 +112,13 @@ }, { "x": 0, - "y": 0, - "w": 24, + "y": 12, + "w": 12, "h": 12, "i": "4", "type": "Widget", "widget": { - "title": "Response Time" + "title": "Response Time (Client) (ms)" }, "graph": { "type": "Line", @@ -131,12 +128,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "divide": 100, - "unit": "%", - "metricLabels": "P50, P75, P90, P95, P99", - "labelsIndex": "0,1,2,3,4" - }, "metrics": [ "service_instance_relation_client_resp_time" ], @@ -144,6 +135,122 @@ "readMetricsValues" ], "moved": false + }, + { + "x": 12, + "y": 0, + "w": 12, + "h": 12, + "i": "5", + "type": "Widget", + "widget": { + "title": "Response Time Percentile (Server) (ms)" + }, + "graph": { + "type": "Line", + "step": false, + "smooth": false, + "showSymbol": false, + "showXAxis": true, + "showYAxis": true + }, + "metrics": [ + "service_instance_relation_server_percentile" + ], + "metricTypes": [ + "readLabeledMetricsValues" + ], + "moved": false, + "metricConfig": [ + { + "key": "P50, P75, P90, P95, P99", + "labelsIndex": "0,1,2,3,4", + "label": "P50, P75, P90, P95, P99" + } + ] + }, + { + "x": 0, + "y": 36, + "w": 12, + "h": 12, + "i": "6", + "type": "Widget", + "widget": { + "title": "Success Rate (Server) (%)" + }, + "graph": { + "type": "Line", + "step": false, + "smooth": false, + "showSymbol": false, + "showXAxis": true, + "showYAxis": true + }, + "metrics": [ + "service_instance_relation_server_call_sla" + ], + "metricTypes": [ + "readMetricsValues" + ], + "moved": false, + "metricConfig": [ + { + "calculation": "percentage" + } + ] + }, + { + "x": 12, + "y": 24, + "w": 12, + "h": 12, + "i": "7", + "type": "Widget", + "widget": { + "title": "Load (Server) (calls / min)" + }, + "graph": { + "type": "Line", + "step": false, + "smooth": false, + "showSymbol": false, + "showXAxis": true, + "showYAxis": true + }, + "metrics": [ + "service_instance_relation_server_cpm" + ], + "metricTypes": [ + "readMetricsValues" + ], + "moved": false + }, + { + "x": 0, + "y": 0, + "w": 12, + "h": 12, + "i": "8", + "type": "Widget", + "widget": { + "title": "Response Time (Server) (ms)" + }, + "graph": { + "type": "Line", + "step": false, + "smooth": false, + "showSymbol": false, + "showXAxis": true, + "showYAxis": true + }, + "metrics": [ + "service_instance_relation_server_resp_time" + ], + "metricTypes": [ + "readMetricsValues" + ], + "moved": false } ], "layer": "GENERAL", 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 9a1f53829e..e159f7dccb 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 @@ -76,7 +76,7 @@ "i": "1", "type": "Widget", "widget": { - "title": "Service Instance Successful Rate (%)" + "title": "Service Instance Success Rate (%)" }, "graph": { "type": "Line", @@ -107,8 +107,8 @@ "i": "3", "type": "Widget", "widget": { - "title": "Service Instance Load (CPM)", - "tips": "For HTTP 1/2, gRPC, RPC services, this means Calls Per Minute (CPM), for TCP services, this means Packets Per Minute (PPM)" + "title": "Service Instance Load (calls / min)", + "tips": "For HTTP 1/2, gRPC, RPC services, this means Calls Per Minute (calls / min), for TCP services, this means Packets Per Minute (PPM)" }, "graph": { "type": "Line", 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 1f580abbe2..ad2e3dfc7f 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 @@ -31,7 +31,6 @@ "title": "Title" }, "graph": {}, - "standard": {}, "metrics": [ "" ], @@ -41,7 +40,7 @@ "activedTabIndex": 1, "children": [ { - "name": "Services", + "name": "Service", "children": [ { "x": 0, @@ -61,14 +60,19 @@ "showYAxis": false, "showGroup": true }, - "standard": {}, "metrics": [ "service_cpm" ], "metricTypes": [ "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "label": "Service Load", + "unit": "calls / min" + } + ] } ] }, @@ -88,7 +92,6 @@ "graph": { "showDepth": true }, - "standard": {}, "metrics": [ "" ], @@ -119,8 +122,62 @@ "service_relation_client_cpm", "service_relation_client_resp_time" ], - "nodeMetrics": [], - "legend": [] + "nodeMetrics": [ + "service_cpm", + "service_sla", + "service_resp_time" + ], + "legend": [ + { + "name": "service_sla", + "condition": "<", + "value": "9500" + }, + { + "name": "service_cpm", + "condition": ">", + "value": "1" + } + ], + "description": { + "healthy": "Healthy", + "unhealthy": "Success Rate < 95% and Traffic > 1 calls / min" + }, + "nodeMetricConfig": [ + { + "unit": "calls / min", + "label": "Load" + }, + { + "calculation": "percentage", + "unit": "%", + "label": "Success Rate" + }, + { + "unit": "ms", + "label": "Latency" + } + ], + "linkServerMetricConfig": [ + { + "unit": "ms", + "label": "Server Latency" + }, + { + "unit": "calls / min", + "label": "Server Load" + } + ], + "linkClientMetricConfig": [ + { + "unit": "calls / min", + "label": "Client Load" + }, + { + "unit": "ms", + "label": "Client Latency" + } + ] } ] }, @@ -153,6 +210,7 @@ "moved": false } ], + "id": "General-Root", "layer": "GENERAL", "entity": "All", "name": "General-Root", diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service-relation.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service-relation.json index e25b7e6544..dd587ece4b 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service-relation.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service-relation.json @@ -31,7 +31,6 @@ "title": "Title" }, "graph": {}, - "standard": {}, "metrics": [ "" ], @@ -51,7 +50,7 @@ "i": "0", "type": "Widget", "widget": { - "title": "Load (Server)" + "title": "Load (Server) (calls / min)" }, "graph": { "type": "Line", @@ -61,9 +60,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "CPM - Calls Per Minute" - }, "metrics": [ "service_relation_server_cpm" ], @@ -80,7 +76,7 @@ "i": "1", "type": "Widget", "widget": { - "title": "Successful Rate (Server)" + "title": "Success Rate (Server) (%)" }, "graph": { "type": "Line", @@ -90,17 +86,18 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "%", - "divide": 100 - }, "metrics": [ "service_relation_server_call_sla" ], "metricTypes": [ "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "calculation": "percentage" + } + ] }, { "x": 12, @@ -110,7 +107,7 @@ "i": "2", "type": "Widget", "widget": { - "title": "Response Time Percentile (Server)" + "title": "Response Time Percentile (Server) (ms)" }, "graph": { "type": "Line", @@ -120,18 +117,20 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "ms", - "metricLabels": "P50, P75, P90, P95, P99", - "labelsIndex": "0,1,2,3,4" - }, "metrics": [ "service_relation_server_percentile" ], "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "key": "P50, P75, P90, P95, P99", + "labelsIndex": "0,1,2,3,4", + "label": "P50, P75, P90, P95, P99" + } + ] }, { "x": 0, @@ -141,7 +140,7 @@ "i": "3", "type": "Widget", "widget": { - "title": "Response Time (Server)" + "title": "Response Time (Server) (ms)" }, "graph": { "type": "Line", @@ -151,9 +150,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "ms" - }, "metrics": [ "service_relation_server_resp_time" ], @@ -170,7 +166,7 @@ "i": "4", "type": "Widget", "widget": { - "title": "Response Time (Client)" + "title": "Response Time (Client) (ms)" }, "graph": { "type": "Line", @@ -180,9 +176,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "ms" - }, "metrics": [ "service_relation_client_resp_time" ], @@ -199,7 +192,7 @@ "i": "5", "type": "Widget", "widget": { - "title": "Response Time Percentile (Client)" + "title": "Response Time Percentile (Client) (ms)" }, "graph": { "type": "Line", @@ -209,18 +202,20 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "ms", - "metricLabels": "P50, P75, P90, P95, P99", - "labelsIndex": "0,1,2,3,4" - }, "metrics": [ "service_relation_client_percentile" ], "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "key": "P50, P75, P90, P95, P99", + "labelsIndex": "0,1,2,3,4", + "label": "P50, P75, P90, P95, P99" + } + ] }, { "x": 0, @@ -230,7 +225,7 @@ "i": "6", "type": "Widget", "widget": { - "title": "Successful Rate (Client)" + "title": "Success Rate (Client) (%)" }, "graph": { "type": "Line", @@ -240,19 +235,18 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "divide": 100, - "unit": "%", - "metricLabels": "", - "labelsIndex": "" - }, "metrics": [ "service_relation_client_call_sla" ], "metricTypes": [ "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "calculation": "percentage" + } + ] }, { "x": 12, @@ -262,7 +256,7 @@ "i": "7", "type": "Widget", "widget": { - "title": "Load (Client)" + "title": "Load (Client) (calls / min)" }, "graph": { "type": "Line", @@ -272,12 +266,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "divide": 1, - "unit": "CPM - Calls Per Minute", - "metricLabels": "", - "labelsIndex": "" - }, "metrics": [ "service_relation_client_cpm" ], @@ -304,19 +292,65 @@ "graph": { "showDepth": true }, - "standard": { - "divide": 1, - "unit": "CPM - Calls Per Minute", - "metricLabels": "", - "labelsIndex": "" - }, "metrics": [ "" ], "metricTypes": [ "" ], - "moved": false + "moved": false, + "linkDashboard": "General-Instance-Relation", + "nodeDashboard": "General-Instance", + "linkServerMetrics": [ + "service_instance_relation_server_resp_time", + "service_instance_relation_server_cpm" + ], + "linkClientMetrics": [ + "service_instance_relation_client_resp_time", + "service_instance_relation_client_cpm" + ], + "nodeMetrics": [ + "service_instance_sla", + "service_instance_cpm", + "service_instance_resp_time" + ], + "legend": [], + "description": {}, + "nodeMetricConfig": [ + { + "unit": "%", + "calculation": "percentage", + "label": "Success Rate" + }, + { + "unit": "calls / min", + "label": "Load" + }, + { + "unit": "ms", + "label": "Latency" + } + ], + "linkServerMetricConfig": [ + { + "unit": "ms", + "label": "Server Latency" + }, + { + "unit": "calls / min ", + "label": "Server Load" + } + ], + "linkClientMetricConfig": [ + { + "unit": "ms", + "label": "Client Latency" + }, + { + "unit": "calls / min", + "label": "Client Load" + } + ] } ] } 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 1349ca5283..fe08a78bbb 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 @@ -78,7 +78,7 @@ "i": "1", "type": "Widget", "widget": { - "title": "Successful Rate" + "title": "Success Rate" }, "graph": { "type": "Card", @@ -108,8 +108,8 @@ "i": "2", "type": "Widget", "widget": { - "title": "Service Load", - "tips": "For HTTP 1/2, gRPC, RPC services, this means Calls Per Minute (CPM)" + "title": "Service Load (calls / min)", + "tips": "For HTTP 1/2, gRPC, RPC services, this means Calls Per Minute (calls / min)" }, "graph": { "type": "Card", @@ -126,7 +126,7 @@ "moved": false, "metricConfig": [ { - "unit": "CPM" + "unit": "calls / min" } ] }, @@ -230,7 +230,7 @@ "i": "6", "type": "Widget", "widget": { - "title": "Successful Rate (%)" + "title": "Success Rate (%)" }, "graph": { "type": "Line", @@ -261,8 +261,8 @@ "i": "7", "type": "Widget", "widget": { - "title": "Service Load (CPM)", - "tips": "For HTTP 1/2, gRPC, RPC services, this means Calls Per Minute (CPM)" + "title": "Service Load (calls / min)", + "tips": "For HTTP 1/2, gRPC, RPC services, this means Calls Per Minute (calls / min)" }, "graph": { "type": "Line", @@ -341,8 +341,8 @@ "i": "11", "type": "Widget", "widget": { - "title": "Service Instances Load (CPM)", - "tips": "For HTTP 1/2, gRPC, RPC services, this means Calls Per Minute (CPM)," + "title": "Service Instances Load (calls / min)", + "tips": "For HTTP 1/2, gRPC, RPC services, this means Calls Per Minute (calls / min)," }, "graph": { "type": "TopList" @@ -397,7 +397,7 @@ "i": "13", "type": "Widget", "widget": { - "title": "Service Instance Successful Rate (%)" + "title": "Service Instance Success Rate (%)" }, "graph": { "type": "TopList", @@ -416,6 +416,79 @@ } ], "moved": false + }, + { + "x": 16, + "y": 41, + "w": 8, + "h": 13, + "i": "20", + "type": "Widget", + "widget": { + "title": "Success Rate in Current Service (%)" + }, + "graph": { + "type": "TopList", + "topN": "10" + }, + "metrics": [ + "endpoint_sla" + ], + "metricTypes": [ + "sortMetrics" + ], + "moved": false, + "metricConfig": [ + { + "calculation": "percentage" + } + ] + }, + { + "x": 8, + "y": 41, + "w": 8, + "h": 13, + "i": "21", + "type": "Widget", + "widget": { + "title": "Slow Endpoints in Current Service (ms)" + }, + "graph": { + "type": "TopList", + "topN": "10" + }, + "standard": {}, + "metrics": [ + "endpoint_resp_time" + ], + "metricTypes": [ + "sortMetrics" + ], + "moved": false + }, + { + "x": 0, + "y": 41, + "w": 8, + "h": 13, + "i": "22", + "type": "Widget", + "widget": { + "title": "Endpoint Load in Current Service (calls / min)", + "tips": "For HTTP 1/2, gRPC, RPC services, this means Calls Per Minute (calls / min), for TCP services" + }, + "graph": { + "type": "TopList", + "topN": "10" + }, + "metrics": [ + "endpoint_cpm" + ], + "metricTypes": [ + "sortMetrics" + ], + "moved": false } ] }, @@ -484,7 +557,7 @@ "x": 0, "y": 0, "w": 24, - "h": 47, + "h": 48, "i": "0", "type": "Topology", "widget": { @@ -515,10 +588,69 @@ "dashboard": "General-Endpoint" } ], - "linkServerMetrics": [], - "linkClientMetrics": [], - "nodeMetrics": [], - "legend": [] + "linkServerMetrics": [ + "service_relation_server_resp_time", + "service_relation_server_cpm" + ], + "linkClientMetrics": [ + "service_relation_client_cpm", + "service_relation_client_resp_time" + ], + "nodeMetrics": [ + "service_cpm", + "service_sla", + "service_resp_time" + ], + "legend": [ + { + "name": "service_sla", + "condition": "<", + "value": "9500" + }, + { + "name": "service_cpm", + "condition": ">", + "value": "1" + } + ], + "description": { + "unhealthy": "Success Rate < 95% and Traffic > 1 call/min" + }, + "nodeMetricConfig": [ + { + "unit": "calls / min", + "label": "Load" + }, + { + "calculation": "percentage", + "unit": "%", + "label": "Success Rate" + }, + { + "unit": "ms", + "label": "Latency" + } + ], + "linkServerMetricConfig": [ + { + "unit": "ms", + "label": "Server Latency" + }, + { + "unit": "calls / min", + "label": "Server Load" + } + ], + "linkClientMetricConfig": [ + { + "unit": "calls / min", + "label": "Client Load" + }, + { + "unit": "ms", + "label": "Client Latency" + } + ] } ] }, @@ -600,7 +732,8 @@ ], "layer": "GENERAL", "entity": "Service", - "name": "General-Service" + "name": "General-Service", + "id": "General-Service" } } ] 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 488c2884b1..fd80e2b2dc 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 @@ -31,7 +31,6 @@ "title": "Title" }, "graph": {}, - "standard": {}, "metrics": [ "" ], @@ -44,85 +43,10 @@ "name": "Overview", "children": [ { - "x": 16, - "y": 0, - "w": 8, - "h": 13, - "i": "0", - "type": "Widget", - "widget": { - "title": "Successful Rate in Current Service (%)" - }, - "graph": { - "type": "TopList", - "topN": "10" - }, - "standard": {}, - "metrics": [ - "endpoint_sla" - ], - "metricTypes": [ - "sortMetrics" - ], - "moved": false, - "metricConfig": [ - { - "calculation": "percentage" - } - ] - }, - { - "x": 8, - "y": 0, - "w": 8, - "h": 13, - "i": "1", - "type": "Widget", - "widget": { - "title": "Slow Endpoints in Current Service (ms)" - }, - "graph": { - "type": "TopList", - "topN": "10" - }, - "standard": {}, - "metrics": [ - "endpoint_resp_time" - ], - "metricTypes": [ - "sortMetrics" - ], - "moved": false - }, - { - "x": 0, - "y": 0, - "w": 8, - "h": 13, - "i": "2", - "type": "Widget", - "widget": { - "title": "Endpoint Load in Current Service (CPM / PPM)", - "tips": "For HTTP 1/2, gRPC, RPC services, this means Calls Per Minute (CPM), for TCP services, this means Packets Per Minute (PPM)" - }, - "graph": { - "type": "TopList", - "topN": "10" - }, - "standard": {}, - "metrics": [ - "endpoint_cpm" - ], - "metricTypes": [ - "sortMetrics" - ], - "moved": false - }, - { - "x": 16, - "y": 13, - "w": 8, - "h": 13, + "x": 11, + "y": 14, + "w": 13, + "h": 14, "i": "3", "type": "Widget", "widget": { @@ -156,10 +80,10 @@ ] }, { - "x": 8, - "y": 13, - "w": 8, - "h": 13, + "x": 11, + "y": 0, + "w": 13, + "h": 14, "i": "4", "type": "Widget", "widget": { @@ -173,7 +97,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": {}, "metrics": [ "endpoint_resp_time" ], @@ -184,9 +107,9 @@ }, { "x": 0, - "y": 26, - "w": 8, - "h": 13, + "y": 14, + "w": 11, + "h": 14, "i": "7", "type": "Widget", "widget": { @@ -200,7 +123,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": {}, "metrics": [ "endpoint_sla" ], @@ -216,13 +138,13 @@ }, { "x": 0, - "y": 13, - "w": 8, - "h": 13, + "y": 0, + "w": 11, + "h": 14, "i": "8", "type": "Widget", "widget": { - "title": "Endpoint Load (CPM / PPM)" + "title": "Endpoint Load (calls or packets / min)" }, "graph": { "type": "Line", @@ -232,7 +154,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": {}, "metrics": [ "endpoint_cpm" ], @@ -257,7 +178,6 @@ "title": "Title" }, "graph": {}, - "standard": {}, "metrics": [ "" ], @@ -274,7 +194,8 @@ ], "layer": "MESH", "entity": "Endpoint", - "name": "Mesh-Endpoint" + "name": "Mesh-Endpoint", + "id": "Mesh-Endpoint" } } ] 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 new file mode 100644 index 0000000000..728923bfd1 --- /dev/null +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-instance-relation.json @@ -0,0 +1,263 @@ +/** + * 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": "Mesh-Instance-Relation", + "configuration": { + "children": [ + { + "x": 12, + "y": 12, + "w": 12, + "h": 12, + "i": "1", + "type": "Widget", + "widget": { + "title": "Response Time Percentile (Client) (ms)" + }, + "graph": { + "type": "Line", + "step": false, + "smooth": false, + "showSymbol": false, + "showXAxis": true, + "showYAxis": true + }, + "metrics": [ + "service_instance_relation_client_percentile" + ], + "metricTypes": [ + "readLabeledMetricsValues" + ], + "moved": false, + "metricConfig": [ + { + "key": "P50, P75, P90, P95, P99", + "labelsIndex": "0,1,2,3,4", + "label": "P50, P75, P90, P95, P99" + } + ] + }, + { + "x": 0, + "y": 24, + "w": 12, + "h": 12, + "i": "2", + "type": "Widget", + "widget": { + "title": "Success Rate (Client) (%)" + }, + "graph": { + "type": "Line", + "step": false, + "smooth": false, + "showSymbol": false, + "showXAxis": true, + "showYAxis": true + }, + "metrics": [ + "service_instance_relation_client_call_sla" + ], + "metricTypes": [ + "readMetricsValues" + ], + "moved": false, + "metricConfig": [ + { + "calculation": "percentage" + } + ] + }, + { + "x": 12, + "y": 36, + "w": 12, + "h": 12, + "i": "3", + "type": "Widget", + "widget": { + "title": "Load (Client) (calls or packets / min)" + }, + "graph": { + "type": "Line", + "step": false, + "smooth": false, + "showSymbol": false, + "showXAxis": true, + "showYAxis": true + }, + "metrics": [ + "service_instance_relation_client_cpm" + ], + "metricTypes": [ + "readMetricsValues" + ], + "moved": false + }, + { + "x": 0, + "y": 12, + "w": 12, + "h": 12, + "i": "4", + "type": "Widget", + "widget": { + "title": "Response Time (Client) (ms)" + }, + "graph": { + "type": "Line", + "step": false, + "smooth": false, + "showSymbol": false, + "showXAxis": true, + "showYAxis": true + }, + "metrics": [ + "service_instance_relation_client_resp_time" + ], + "metricTypes": [ + "readMetricsValues" + ], + "moved": false + }, + { + "x": 12, + "y": 0, + "w": 12, + "h": 12, + "i": "5", + "type": "Widget", + "widget": { + "title": "Response Time Percentile (Server) (ms)" + }, + "graph": { + "type": "Line", + "step": false, + "smooth": false, + "showSymbol": false, + "showXAxis": true, + "showYAxis": true + }, + "metrics": [ + "service_instance_relation_server_percentile" + ], + "metricTypes": [ + "readLabeledMetricsValues" + ], + "moved": false, + "metricConfig": [ + { + "key": "P50, P75, P90, P95, P99", + "labelsIndex": "0,1,2,3,4", + "label": "P50, P75, P90, P95, P99" + } + ] + }, + { + "x": 0, + "y": 36, + "w": 12, + "h": 12, + "i": "6", + "type": "Widget", + "widget": { + "title": "Success Rate (Server) (%)" + }, + "graph": { + "type": "Line", + "step": false, + "smooth": false, + "showSymbol": false, + "showXAxis": true, + "showYAxis": true + }, + "metrics": [ + "service_instance_relation_server_call_sla" + ], + "metricTypes": [ + "readMetricsValues" + ], + "moved": false, + "metricConfig": [ + { + "calculation": "percentage" + } + ] + }, + { + "x": 12, + "y": 24, + "w": 12, + "h": 12, + "i": "7", + "type": "Widget", + "widget": { + "title": "Load (Server) (calls or packets / min)" + }, + "graph": { + "type": "Line", + "step": false, + "smooth": false, + "showSymbol": false, + "showXAxis": true, + "showYAxis": true + }, + "metrics": [ + "service_instance_relation_server_cpm" + ], + "metricTypes": [ + "readMetricsValues" + ], + "moved": false + }, + { + "x": 0, + "y": 0, + "w": 12, + "h": 12, + "i": "8", + "type": "Widget", + "widget": { + "title": "Response Time (Server) (ms)" + }, + "graph": { + "type": "Line", + "step": false, + "smooth": false, + "showSymbol": false, + "showXAxis": true, + "showYAxis": true + }, + "metrics": [ + "service_instance_relation_server_resp_time" + ], + "metricTypes": [ + "readMetricsValues" + ], + "moved": false + } + ], + "layer": "MESH", + "entity": "ServiceInstanceRelation", + "name": "Mesh-Instance-Relation", + "id": "Mesh-Instance-Relation", + "isRoot": false + } + } +] 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 c6b16d5930..6d01902063 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 @@ -130,8 +130,8 @@ "i": "3", "type": "Widget", "widget": { - "title": "Service Instance Load (CPM / PPM)", - "tips": "For HTTP 1/2, gRPC, RPC services, this means Calls Per Minute (CPM), for TCP services, this means Packets Per Minute (PPM)" + "title": "Service Instance Load (calls or packets / min)", + "tips": "For HTTP 1/2, gRPC, RPC services, this means Calls Per Minute (calls / min), for TCP services, this means Packets Per Minute (packets / min)" }, "graph": { "type": "Line", @@ -478,9 +478,9 @@ "moved": false } ], + "name": "Mesh-Instance", "layer": "MESH", "entity": "ServiceInstance", - "name": "Mesh-Instance", "id": "Mesh-Instance" } } diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-all.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-root.json similarity index 61% rename from oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-all.json rename to oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-root.json index de52fe38fb..502a4dbcc2 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-all.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-root.json @@ -79,7 +79,7 @@ "x": 0, "y": 0, "w": 24, - "h": 49, + "h": 48, "i": "0", "type": "Topology", "widget": { @@ -88,7 +88,6 @@ "graph": { "showDepth": true }, - "standard": {}, "metrics": [ "" ], @@ -111,10 +110,70 @@ "dashboard": "Mesh-Endpoint" } ], - "linkServerMetrics": [], - "linkClientMetrics": [], - "nodeMetrics": [], - "legend": [] + "linkServerMetrics": [ + "service_relation_server_resp_time", + "service_relation_server_cpm" + ], + "linkClientMetrics": [ + "service_relation_client_cpm", + "service_relation_client_resp_time" + ], + "nodeMetrics": [ + "service_cpm", + "service_sla", + "service_resp_time" + ], + "legend": [ + { + "name": "service_sla", + "condition": "<", + "value": "9500" + }, + { + "name": "service_cpm", + "condition": ">", + "value": "1" + } + ], + "description": { + "healthy": "Healthy", + "unhealthy": "Success Rate < 95% and Traffic > 1 calls or packets / min" + }, + "nodeMetricConfig": [ + { + "unit": "calls or packets / min", + "label": "Load" + }, + { + "calculation": "percentage", + "unit": "%", + "label": "Success Rate" + }, + { + "unit": "ms", + "label": "Latency" + } + ], + "linkServerMetricConfig": [ + { + "unit": "ms", + "label": "Server Latency" + }, + { + "unit": "calls or packets / min", + "label": "Server Load" + } + ], + "linkClientMetricConfig": [ + { + "unit": "calls or packets / min", + "label": "Client Load" + }, + { + "unit": "ms", + "label": "Client Latency" + } + ] } ] } 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 e035fa6dc6..9ad3619876 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 @@ -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": "Load (Server)" + "title": "Load (Server) (calls or packets / min)" }, "graph": { "type": "Line", @@ -61,9 +60,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "CPM - Calls Per Minute" - }, "metrics": [ "service_relation_server_cpm" ], @@ -80,7 +76,7 @@ "i": "1", "type": "Widget", "widget": { - "title": "Successful Rate (Server)" + "title": "Successful Rate (Server) (%)" }, "graph": { "type": "Line", @@ -90,17 +86,18 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "%", - "divide": 100 - }, "metrics": [ "service_relation_server_call_sla" ], "metricTypes": [ "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "calculation": "percentage" + } + ] }, { "x": 8, @@ -110,7 +107,7 @@ "i": "2", "type": "Widget", "widget": { - "title": "Response Time Percentile (Server)" + "title": "Response Time Percentile (Server) (ms)" }, "graph": { "type": "Line", @@ -120,18 +117,19 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "ms", - "metricLabels": "P50, P75, P90, P95, P99", - "labelsIndex": "0,1,2,3,4" - }, "metrics": [ "service_relation_server_percentile" ], "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "label": "P50, P75, P90, P95, P99", + "labelsIndex": "0,1,2,3,4" + } + ] }, { "x": 0, @@ -141,7 +139,7 @@ "i": "3", "type": "Widget", "widget": { - "title": "Response Time (Server)" + "title": "Response Time (Server) (ms)" }, "graph": { "type": "Line", @@ -151,9 +149,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "ms" - }, "metrics": [ "service_relation_server_resp_time" ], @@ -170,7 +165,7 @@ "i": "4", "type": "Widget", "widget": { - "title": "Response Time (Client)" + "title": "Response Time (Client) (ms)" }, "graph": { "type": "Line", @@ -180,9 +175,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "ms" - }, "metrics": [ "service_relation_client_resp_time" ], @@ -199,7 +191,7 @@ "i": "5", "type": "Widget", "widget": { - "title": "Response Time Percentile (Client)" + "title": "Response Time Percentile (Client) (ms)" }, "graph": { "type": "Line", @@ -209,18 +201,19 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "ms", - "metricLabels": "P50, P75, P90, P95, P99", - "labelsIndex": "0,1,2,3,4" - }, "metrics": [ "service_relation_client_percentile" ], "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "label": "P50, P75, P90, P95, P99", + "labelsIndex": "0,1,2,3,4" + } + ] }, { "x": 16, @@ -230,7 +223,7 @@ "i": "6", "type": "Widget", "widget": { - "title": "Successful Rate (Client)" + "title": "Successful Rate (Client) (%)" }, "graph": { "type": "Line", @@ -240,19 +233,18 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "divide": 100, - "unit": "%", - "metricLabels": "", - "labelsIndex": "" - }, "metrics": [ "service_relation_client_call_sla" ], "metricTypes": [ "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "calculation": "percentage" + } + ] }, { "x": 0, @@ -262,7 +254,7 @@ "i": "7", "type": "Widget", "widget": { - "title": "Load (Client)" + "title": "Load (Client) (calls or packets / min)" }, "graph": { "type": "Line", @@ -272,12 +264,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "divide": 1, - "unit": "CPM - Calls Per Minute", - "metricLabels": "", - "labelsIndex": "" - }, "metrics": [ "service_relation_client_cpm" ], @@ -294,13 +280,10 @@ "i": "8", "type": "Widget", "widget": { - "title": "Service Throughput (Server)", + "title": "Service Throughput (Server) (Bytes)", "tips": "This metrics is only avaible for TCP services" }, "graph": {}, - "standard": { - "unit": "Bytes" - }, "metrics": [ "" ], @@ -317,13 +300,10 @@ "i": "9", "type": "Widget", "widget": { - "title": "Service Throughput (Client)", + "title": "Service Throughput (Client) (Bytes)", "tips": "This metrics is only avaible for TCP services" }, "graph": {}, - "standard": { - "unit": "Bytes" - }, "metrics": [ "" ], @@ -350,19 +330,70 @@ "graph": { "showDepth": true }, - "standard": {}, "metrics": [ "" ], "metricTypes": [ "" ], - "moved": false + "moved": false, + "linkDashboard": "Mesh-Instance-Relation", + "nodeDashboard": "Mesh-Instance", + "linkServerMetrics": [ + "service_instance_relation_server_resp_time", + "service_instance_relation_server_cpm" + ], + "linkClientMetrics": [ + "service_instance_relation_client_resp_time", + "service_instance_relation_client_cpm" + ], + "nodeMetrics": [ + "service_instance_sla", + "service_instance_cpm", + "service_instance_resp_time" + ], + "legend": [], + "description": {}, + "nodeMetricConfig": [ + { + "unit": "%", + "calculation": "percentage", + "label": "Success Rate" + }, + { + "unit": "calls or packets / min", + "label": "Load" + }, + { + "unit": "ms", + "label": "Latency" + } + ], + "linkServerMetricConfig": [ + { + "unit": "ms", + "label": "Server Latency" + }, + { + "unit": "calls or packets / min ", + "label": "Server Load" + } + ], + "linkClientMetricConfig": [ + { + "unit": "ms", + "label": "Client Latency" + }, + { + "unit": "calls or packets / min", + "label": "Client Load" + } + ] } ] }, { - "name": "Envoy", + "name": "Envoy Proxy", "children": [ { "x": 0, @@ -372,7 +403,7 @@ "i": "0", "type": "Widget", "widget": { - "title": "Upstream Connection None Healthy Increase" + "title": "Upstream Connection None Healthy Increase (Per Minute)" }, "graph": { "type": "Line", @@ -382,9 +413,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "Per Minute" - }, "metrics": [ "envoy_sr_cluster_up_cx_none_healthy_incr" ], @@ -401,7 +429,7 @@ "i": "1", "type": "Widget", "widget": { - "title": "LB Healthy Panic Increase" + "title": "LB Healthy Panic Increase (Per Minute)" }, "graph": { "type": "Line", @@ -411,9 +439,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "Per Minute" - }, "metrics": [ "envoy_sr_cluster_lb_healthy_panic_incr" ], @@ -440,9 +465,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "Per Minute" - }, "metrics": [ "envoy_sr_cluster_up_rq_pending_active" ], @@ -469,9 +491,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "Per Minute" - }, "metrics": [ "envoy_sr_cluster_up_cx_active" ], @@ -498,9 +517,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "Per Minute" - }, "metrics": [ "envoy_sr_cluster_up_rq_active" ], @@ -517,7 +533,7 @@ "i": "5", "type": "Widget", "widget": { - "title": "Upstream Connection Increase" + "title": "Upstream Connection Increase (Per Minute)" }, "graph": { "type": "Line", @@ -527,9 +543,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "Per Minute" - }, "metrics": [ "envoy_sr_cluster_up_cx_incr" ], @@ -546,7 +559,7 @@ "i": "6", "type": "Widget", "widget": { - "title": "Upstream Request Increase" + "title": "Upstream Request Increase (Per Minute)" }, "graph": { "type": "Line", @@ -556,9 +569,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "Per Minute" - }, "metrics": [ "envoy_sr_cluster_up_rq_incr" ], 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 a69a84b830..d16978a528 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 @@ -31,7 +31,6 @@ "title": "Title" }, "graph": {}, - "standard": {}, "metrics": [ "" ], @@ -58,7 +57,6 @@ "fontSize": 14, "textAlign": "center" }, - "standard": {}, "metrics": [ "service_apdex" ], @@ -80,7 +78,7 @@ "i": "1", "type": "Widget", "widget": { - "title": "Successful Rate" + "title": "Success Rate" }, "graph": { "type": "Card", @@ -88,7 +86,6 @@ "textAlign": "center", "showUnit": true }, - "standard": {}, "metrics": [ "service_sla" ], @@ -111,8 +108,8 @@ "i": "2", "type": "Widget", "widget": { - "title": "Service Load", - "tips": "For HTTP 1/2, gRPC, RPC services, this means Calls Per Minute (CPM), for TCP services, this means Packets Per Minute (PPM)" + "title": "Service Load (calls or packets / min)", + "tips": "For HTTP 1/2, gRPC, RPC services, this means Calls Per Minute (calls / min), for TCP services, this means Packets Per Minute (packets / min)" }, "graph": { "type": "Card", @@ -120,7 +117,6 @@ "textAlign": "center", "showUnit": true }, - "standard": {}, "metrics": [ "service_cpm" ], @@ -130,15 +126,15 @@ "moved": false, "metricConfig": [ { - "unit": "CPM / PPM" + "unit": "calls or packets / min" } ] }, { - "x": 0, + "x": 8, "y": 5, "w": 8, - "h": 12, + "h": 11, "i": "3", "type": "Widget", "widget": { @@ -152,20 +148,22 @@ "showXAxis": true, "showYAxis": true }, - "standard": {}, "metrics": [ "service_resp_time" ], "metricTypes": [ "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + {} + ] }, { - "x": 8, - "y": 17, + "x": 0, + "y": 5, "w": 8, - "h": 12, + "h": 11, "i": "4", "type": "Widget", "widget": { @@ -179,7 +177,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": {}, "metrics": [ "service_apdex" ], @@ -194,10 +191,10 @@ ] }, { - "x": 8, + "x": 16, "y": 5, "w": 8, - "h": 12, + "h": 11, "i": "5", "type": "Widget", "widget": { @@ -211,7 +208,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": {}, "metrics": [ "service_percentile" ], @@ -228,13 +224,13 @@ }, { "x": 0, - "y": 17, + "y": 16, "w": 8, - "h": 12, + "h": 11, "i": "6", "type": "Widget", "widget": { - "title": "Successful Rate (%)" + "title": "Success Rate (%)" }, "graph": { "type": "Line", @@ -244,25 +240,29 @@ "showXAxis": true, "showYAxis": true }, - "standard": {}, "metrics": [ "service_sla" ], "metricTypes": [ "readMetricsValues" ], - "moved": false + "moved": false, + "metricConfig": [ + { + "calculation": "percentage" + } + ] }, { - "x": 16, - "y": 17, + "x": 8, + "y": 16, "w": 8, - "h": 12, + "h": 11, "i": "7", "type": "Widget", "widget": { - "title": "Service Load (CPM / PPM)", - "tips": "For HTTP 1/2, gRPC, RPC services, this means Calls Per Minute (CPM), for TCP services, this means Packets Per Minute (PPM)" + "title": "Service Load (calls or packets / min)", + "tips": "For HTTP 1/2, gRPC, RPC services, this means Calls Per Minute (calls / min), for TCP services, this means Packets Per Minute (packets / min)" }, "graph": { "type": "Line", @@ -272,7 +272,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": {}, "metrics": [ "service_cpm" ], @@ -283,10 +282,10 @@ }, { "x": 16, - "y": 5, + "y": 16, "w": 8, - "h": 12, - "i": "8", + "h": 11, + "i": "9", "type": "Widget", "widget": { "title": "Service Throughput (Bytes)", @@ -300,7 +299,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": {}, "metrics": [ "service_throughput_received", "service_throughput_sent" @@ -313,19 +311,18 @@ }, { "x": 0, - "y": 29, + "y": 27, "w": 8, "h": 14, - "i": "9", + "i": "11", "type": "Widget", "widget": { - "title": "Service Instances Load (CPM / PPM)" + "title": "Service Instances Load (calls or packets / min)", + "tips": "For HTTP 1/2, gRPC, RPC services, this means Calls Per Minute (calls / min), for TCP services, this means Packets Per Minute (packets / min)" }, "graph": { - "type": "TopList", - "topN": "10" + "type": "TopList" }, - "standard": {}, "metrics": [ "service_instance_cpm" ], @@ -334,6 +331,7 @@ ], "metricConfig": [ { + "sortOrder": "DES", "calculation": "percentage" } ], @@ -341,18 +339,18 @@ }, { "x": 8, - "y": 29, + "y": 27, "w": 8, "h": 14, - "i": "10", + "i": "12", "type": "Widget", "widget": { "title": "Slow Service Instance (ms)" }, "graph": { - "type": "TopList" + "type": "TopList", + "topN": "10" }, - "standard": {}, "metrics": [ "service_instance_resp_time" ], @@ -361,6 +359,7 @@ ], "metricConfig": [ { + "sortOrder": "DES", "calculation": "percentage" } ], @@ -368,18 +367,18 @@ }, { "x": 16, - "y": 29, + "y": 27, "w": 8, "h": 14, - "i": "11", + "i": "13", "type": "Widget", "widget": { - "title": "Service Instance Successful Rate (%)" + "title": "Service Instance Success Rate (%)" }, "graph": { - "type": "TopList" + "type": "TopList", + "topN": "10" }, - "standard": {}, "metrics": [ "service_instance_sla" ], @@ -388,10 +387,83 @@ ], "metricConfig": [ { + "sortOrder": "ASC", "calculation": "percentage" } ], "moved": false + }, + { + "x": 16, + "y": 41, + "w": 8, + "h": 13, + "i": "20", + "type": "Widget", + "widget": { + "title": "Success Rate in Current Service (%)" + }, + "graph": { + "type": "TopList", + "topN": "10" + }, + "metrics": [ + "endpoint_sla" + ], + "metricTypes": [ + "sortMetrics" + ], + "moved": false, + "metricConfig": [ + { + "calculation": "percentage" + } + ] + }, + { + "x": 8, + "y": 41, + "w": 8, + "h": 13, + "i": "21", + "type": "Widget", + "widget": { + "title": "Slow Endpoints in Current Service (ms)" + }, + "graph": { + "type": "TopList", + "topN": "10" + }, + "metrics": [ + "endpoint_resp_time" + ], + "metricTypes": [ + "sortMetrics" + ], + "moved": false + }, + { + "x": 0, + "y": 41, + "w": 8, + "h": 13, + "i": "22", + "type": "Widget", + "widget": { + "title": "Endpoint Load in Current Service (calls or packets / min)", + "tips": "For HTTP 1/2, gRPC, RPC services, this means Calls Per Minute (calls / min), for TCP services, this means Packets Per Minute (packets / min)" + }, + "graph": { + "type": "TopList", + "topN": "10" + }, + "metrics": [ + "endpoint_cpm" + ], + "metricTypes": [ + "sortMetrics" + ], + "moved": false } ] }, @@ -406,14 +478,13 @@ "i": "0", "type": "Widget", "widget": { - "title": "Title" + "title": "" }, "graph": { "type": "InstanceList", "dashboardName": "Mesh-Instance", "fontSize": 12 }, - "standard": {}, "metrics": [ "service_instance_cpm" ], @@ -444,7 +515,6 @@ "showXAxis": false, "showYAxis": false }, - "standard": {}, "metrics": [ "endpoint_cpm" ], @@ -462,7 +532,7 @@ "x": 0, "y": 0, "w": 24, - "h": 49, + "h": 48, "i": "0", "type": "Topology", "widget": { @@ -471,14 +541,92 @@ "graph": { "showDepth": true }, - "standard": {}, "metrics": [ "" ], "metricTypes": [ "" ], - "moved": false + "moved": false, + "linkDashboard": "Mesh-Service-Relation", + "nodeDashboard": [ + { + "scope": "Service", + "dashboard": "Mesh-Service" + }, + { + "scope": "ServiceInstance", + "dashboard": "Mesh-Instance" + }, + { + "scope": "Endpoint", + "dashboard": "Mesh-Endpoint" + } + ], + "linkServerMetrics": [ + "service_relation_server_resp_time", + "service_relation_server_cpm" + ], + "linkClientMetrics": [ + "service_relation_client_cpm", + "service_relation_client_resp_time" + ], + "nodeMetrics": [ + "service_cpm", + "service_sla", + "service_resp_time" + ], + "legend": [ + { + "name": "service_sla", + "condition": "<", + "value": "9500" + }, + { + "name": "service_cpm", + "condition": ">", + "value": "1" + } + ], + "description": { + "healthy": "Healthy", + "unhealthy": "Success Rate < 95% and Traffic > 1 calls or packets / min" + }, + "nodeMetricConfig": [ + { + "unit": "calls or packets / min", + "label": "Load" + }, + { + "calculation": "percentage", + "unit": "%", + "label": "Success Rate" + }, + { + "unit": "ms", + "label": "Latency" + } + ], + "linkServerMetricConfig": [ + { + "unit": "ms", + "label": "Server Latency" + }, + { + "unit": "calls or packets / min", + "label": "Server Load" + } + ], + "linkClientMetricConfig": [ + { + "unit": "calls or packets / min", + "label": "Client Load" + }, + { + "unit": "ms", + "label": "Client Latency" + } + ] } ] }, @@ -496,7 +644,6 @@ "title": "Title" }, "graph": {}, - "standard": {}, "metrics": [ "" ], @@ -513,7 +660,8 @@ ], "layer": "MESH", "entity": "Service", - "name": "Mesh-Service" + "name": "Mesh-Service", + "id": "Mesh-Service" } } ] diff --git a/skywalking-ui b/skywalking-ui index b51e423c2b..f62d0bd22b 160000 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit b51e423c2b729bdd45d1abfa91ec7f7354f0a221 +Subproject commit f62d0bd22b7ff7d2c94bcdafe6fc3046e0b8fe31