From a5eafaebd5052338d0c68b8f7267c68552228481 Mon Sep 17 00:00:00 2001 From: Wan Kai Date: Mon, 18 Jul 2022 22:55:50 +0800 Subject: [PATCH] Dashboard: Add metrics association and fix. (#9347) --- docs/en/changes/changes.md | 5 + .../browser/browser-app.json | 103 ++- .../browser/browser-page.json | 243 ++++- .../browser/browser-version.json | 65 +- .../faas/faas-function-relation.json | 312 +++++-- .../faas/faas-function.json | 159 ++-- .../faas/faas-instance-relation.json | 290 +++++- .../faas/faas-instance.json | 71 +- .../faas/faas-root.json | 4 +- .../general/general-endpoint-relation.json | 84 +- .../general/general-endpoint.json | 191 ++-- .../general/general-instance-relation.json | 288 +++++- .../general/general-instance.json | 199 +++-- .../general/general-service-relation.json | 312 +++++-- .../general/general-service.json | 330 +++++-- .../mesh/mesh-endpoint.json | 193 +++- .../mesh/mesh-instance-relation.json | 663 ++++++++++++-- .../mesh/mesh-instance.json | 152 +++- .../mesh/mesh-service-relation.json | 834 ++++++++++++++++-- .../mesh/mesh-service.json | 264 ++++-- .../virtual-database-service.json | 87 +- 21 files changed, 3983 insertions(+), 866 deletions(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 65749a99e690..8193dac662e9 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -41,6 +41,11 @@ * Fix tag dropdown style. * Hide the copy button when db.statement is empty. * Fix legend metrics for topology. +* Dashboard: Add metrics association. +* Dashboard: Fix `FaaS-Root` document link and topology service relation dashboard link. +* Dashboard: Fix `Mesh-Instance` metric `Throughput`. +* Dashboard: Fix `Mesh-Service-Relation` metric `Throughput` and `Proxy Sidecar Internal Latency in Nanoseconds (Client Response)`. +* Dashboard: Fix `Mesh-Instance-Relation` metric `Throughput`. #### Documentation 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 6ba66d1740c5..cd3ed2a34b7c 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 @@ -27,17 +27,6 @@ "h": 52, "i": "12", "type": "Tab", - "widget": { - "title": "Title" - }, - "graph": {}, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "activedTabIndex": 0, "children": [ { "name": "Overview", @@ -62,12 +51,13 @@ "metricTypes": [ "sortMetrics" ], - "moved": false, "metricConfig": [ { "calculation": "percentage" } - ] + ], + "value": "12-0-2", + "label": "12-0-2" }, { "x": 0, @@ -89,7 +79,8 @@ "metricTypes": [ "sortMetrics" ], - "moved": false + "value": "12-0-3", + "label": "12-0-3" }, { "x": 16, @@ -99,7 +90,8 @@ "i": "5", "type": "Widget", "widget": { - "title": "App Error Count" + "title": "App Error Count", + "name": "App_Error_Count" }, "graph": { "type": "Bar", @@ -111,7 +103,20 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "12-0-5", + "label": "12-0-5", + "associate": [ + { + "widgetId": "12-0-7" + }, + { + "widgetId": "12-0-11" + } + ], + "filters": { + "dataIndex": 11, + "sourceId": "12-0-11" + } }, { "x": 0, @@ -121,7 +126,8 @@ "i": "7", "type": "Widget", "widget": { - "title": "App Load (calls / min)" + "title": "App Load (calls / min)", + "name": "App_Load" }, "graph": { "type": "Line", @@ -137,7 +143,20 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "12-0-7", + "label": "App_Load", + "associate": [ + { + "widgetId": "12-0-5" + }, + { + "widgetId": "12-0-11" + } + ], + "filters": { + "dataIndex": 11, + "sourceId": "12-0-11" + } }, { "x": 8, @@ -159,7 +178,8 @@ "metricTypes": [ "sortMetrics" ], - "moved": false + "value": "12-0-10", + "label": "12-0-10" }, { "x": 8, @@ -169,7 +189,8 @@ "i": "11", "type": "Widget", "widget": { - "title": "App Error Rate (%)" + "title": "App Error Rate (%)", + "name": "App_Error_Rate" }, "graph": { "type": "Line", @@ -185,12 +206,25 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "percentage" } - ] + ], + "value": "12-0-11", + "label": "App_Error_Rate", + "associate": [ + { + "widgetId": "12-0-7" + }, + { + "widgetId": "12-0-5" + } + ], + "filters": { + "dataIndex": 11, + "sourceId": "12-0-7" + } }, { "x": 0, @@ -205,14 +239,15 @@ "metrics": [ "browser_app_page_pv" ], - "moved": false, "widget": { "title": "Top Hot Pages (calls / min)" }, "graph": { "type": "TopList", "color": "purple" - } + }, + "value": "12-0-12", + "label": "12-0-12" }, { "x": 16, @@ -227,7 +262,6 @@ "metrics": [ "browser_app_page_error_rate" ], - "moved": false, "widget": { "title": "Top Unstable Pages / Error Rate (%)" }, @@ -239,7 +273,9 @@ { "calculation": "percentage" } - ] + ], + "value": "12-0-13", + "label": "12-0-13" }, { "x": 16, @@ -254,14 +290,15 @@ "metrics": [ "browser_app_single_version_error_sum" ], - "moved": false, "widget": { "title": "Error Count of Versions In The Selected App" }, "graph": { "type": "TopList", "color": "purple" - } + }, + "value": "12-0-14", + "label": "12-0-14" } ] }, @@ -291,7 +328,6 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false, "metricConfig": [ { "label": "PV", @@ -303,7 +339,9 @@ "unit": "%", "label": "Error Rate" } - ] + ], + "value": "12-1-0", + "label": "12-1-0" } ] }, @@ -335,7 +373,6 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false, "metricConfig": [ { "label": "PV", @@ -347,7 +384,9 @@ "unit": "%", "label": "Error Rate" } - ] + ], + "value": "12-2-0", + "label": "12-2-0" } ] }, 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 4174f11055be..c6ace41d696b 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 @@ -27,17 +27,6 @@ "h": 52, "i": "12", "type": "Tab", - "widget": { - "title": "Title" - }, - "graph": {}, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "activedTabIndex": 0, "children": [ { "name": "Overview", @@ -50,7 +39,8 @@ "i": "0", "type": "Widget", "widget": { - "title": "Page FMP Latency (ms)" + "title": "Page FMP Latency (ms)", + "name": "Page_FMP_Latency" }, "graph": { "type": "Line", @@ -66,13 +56,37 @@ "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false, "metricConfig": [ { "key": "P50, P75, P90, P95, P99", "labelsIndex": "0,1,2,3,4", "label": "P50, P75, P90, P95, P99" } + ], + "value": "12-0-0", + "label": "12-0-0", + "associate": [ + { + "widgetId": "12-0-1" + }, + { + "widgetId": "12-0-2" + }, + { + "widgetId": "12-0-3" + }, + { + "widgetId": "12-0-4" + }, + { + "widgetId": "12-0-8" + }, + { + "widgetId": "12-0-9" + }, + { + "widgetId": "12-0-10" + } ] }, { @@ -83,7 +97,8 @@ "i": "1", "type": "Widget", "widget": { - "title": "Page First Pack Latency (ms)" + "title": "Page First Pack Latency (ms)", + "name": "Page_First_Pack_Latency" }, "graph": { "type": "Line", @@ -99,13 +114,37 @@ "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false, "metricConfig": [ { "key": "P50, P75, P90, P95, P99", "labelsIndex": "0,1,2,3,4", "label": "P50, P75, P90, P95, P99" } + ], + "value": "12-0-1", + "label": "Page_First_Pack_Latency", + "associate": [ + { + "widgetId": "12-0-0" + }, + { + "widgetId": "12-0-2" + }, + { + "widgetId": "12-0-3" + }, + { + "widgetId": "12-0-4" + }, + { + "widgetId": "12-0-8" + }, + { + "widgetId": "12-0-9" + }, + { + "widgetId": "12-0-10" + } ] }, { @@ -116,7 +155,8 @@ "i": "2", "type": "Widget", "widget": { - "title": "Page FPT Latency (ms)" + "title": "Page FPT Latency (ms)", + "name": "Page_FPT_Latency" }, "graph": { "type": "Line", @@ -132,13 +172,37 @@ "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false, "metricConfig": [ { "key": "P50, P75, P90, P95, P99", "labelsIndex": "0,1,2,3,4", "label": "P50, P75, P90, P95, P99" } + ], + "value": "12-0-2", + "label": "Page_FPT_Latency", + "associate": [ + { + "widgetId": "12-0-1" + }, + { + "widgetId": "12-0-0" + }, + { + "widgetId": "12-0-3" + }, + { + "widgetId": "12-0-4" + }, + { + "widgetId": "12-0-8" + }, + { + "widgetId": "12-0-9" + }, + { + "widgetId": "12-0-10" + } ] }, { @@ -149,7 +213,8 @@ "i": "3", "type": "Widget", "widget": { - "title": "Page DOM Ready Latency (ms)" + "title": "Page DOM Ready Latency (ms)", + "name": "Page_DOM_Ready_Latency" }, "graph": { "type": "Line", @@ -165,13 +230,37 @@ "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false, "metricConfig": [ { "key": "P50, P75, P90, P95, P99", "labelsIndex": "0,1,2,3,4", "label": "P50, P75, P90, P95, P99" } + ], + "value": "12-0-3", + "label": "Page_DOM_Ready_Latency", + "associate": [ + { + "widgetId": "12-0-1" + }, + { + "widgetId": "12-0-2" + }, + { + "widgetId": "12-0-0" + }, + { + "widgetId": "12-0-4" + }, + { + "widgetId": "12-0-8" + }, + { + "widgetId": "12-0-9" + }, + { + "widgetId": "12-0-10" + } ] }, { @@ -182,7 +271,8 @@ "i": "4", "type": "Widget", "widget": { - "title": "Page TTL Latency (ms)" + "title": "Page TTL Latency (ms)", + "name": "Page_TTL_Latency" }, "graph": { "type": "Line", @@ -198,13 +288,37 @@ "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false, "metricConfig": [ { "key": "P50, P75, P90, P95, P99", "labelsIndex": "0,1,2,3,4", "label": "P50, P75, P90, P95, P99" } + ], + "value": "12-0-4", + "label": "Page_TTL_Latency", + "associate": [ + { + "widgetId": "12-0-1" + }, + { + "widgetId": "12-0-2" + }, + { + "widgetId": "12-0-3" + }, + { + "widgetId": "12-0-0" + }, + { + "widgetId": "12-0-8" + }, + { + "widgetId": "12-0-9" + }, + { + "widgetId": "12-0-10" + } ] }, { @@ -215,7 +329,8 @@ "i": "8", "type": "Widget", "widget": { - "title": "Page Load Latency (ms)" + "title": "Page Load Latency (ms)", + "name": "Page_Load_Latency" }, "graph": { "type": "Line", @@ -231,13 +346,37 @@ "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false, "metricConfig": [ { "key": "0,1,2,3,4", "label": "P50, P75, P90, P95, P99", "labelsIndex": "0,1,2,3,4" } + ], + "value": "12-0-8", + "label": "Page_Load_Latency", + "associate": [ + { + "widgetId": "12-0-1" + }, + { + "widgetId": "12-0-2" + }, + { + "widgetId": "12-0-3" + }, + { + "widgetId": "12-0-4" + }, + { + "widgetId": "12-0-0" + }, + { + "widgetId": "12-0-9" + }, + { + "widgetId": "12-0-10" + } ] }, { @@ -248,7 +387,8 @@ "i": "9", "type": "Widget", "widget": { - "title": "Page Performance (ms)" + "title": "Page Performance (ms)", + "name": "Page_Performance" }, "graph": { "type": "Line", @@ -282,7 +422,31 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false + "value": "12-0-9", + "label": "Page_Performance", + "associate": [ + { + "widgetId": "12-0-1" + }, + { + "widgetId": "12-0-2" + }, + { + "widgetId": "12-0-3" + }, + { + "widgetId": "12-0-4" + }, + { + "widgetId": "12-0-8" + }, + { + "widgetId": "12-0-0" + }, + { + "widgetId": "12-0-10" + } + ] }, { "x": 0, @@ -292,7 +456,8 @@ "i": "10", "type": "Widget", "widget": { - "title": "Page Error Count Layout" + "title": "Page Error Count Layout", + "name": "Page_Error_Count_Layout" }, "graph": { "type": "Bar", @@ -310,7 +475,31 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false + "value": "12-0-10", + "label": "Page_Error_Count_Layout", + "associate": [ + { + "widgetId": "12-0-1" + }, + { + "widgetId": "12-0-2" + }, + { + "widgetId": "12-0-3" + }, + { + "widgetId": "12-0-4" + }, + { + "widgetId": "12-0-8" + }, + { + "widgetId": "12-0-9" + }, + { + "widgetId": "12-0-0" + } + ] } ] }, 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 157fa9e95da3..2ed34ae4bedb 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 @@ -27,17 +27,6 @@ "h": 52, "i": "12", "type": "Tab", - "widget": { - "title": "Title" - }, - "graph": {}, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "activedTabIndex": 0, "children": [ { "name": "Overview", @@ -50,7 +39,8 @@ "i": "0", "type": "Widget", "widget": { - "title": "Error Count of The Selected Version" + "title": "Error Count of The Selected Version", + "name": "Error_Count" }, "graph": { "type": "Bar", @@ -62,12 +52,25 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "percentage" } - ] + ], + "value": "12-0-0", + "label": "12-0-0", + "associate": [ + { + "widgetId": "12-0-1" + }, + { + "widgetId": "12-0-2" + } + ], + "filters": { + "dataIndex": 15, + "sourceId": "12-0-2" + } }, { "x": 0, @@ -77,7 +80,8 @@ "i": "1", "type": "Widget", "widget": { - "title": "Error Rate of The Selected Version" + "title": "Error Rate of The Selected Version", + "name": "Error_Rate" }, "graph": { "type": "Line", @@ -93,12 +97,25 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "percentage" } - ] + ], + "value": "12-0-1", + "label": "Error_Rate", + "associate": [ + { + "widgetId": "12-0-0" + }, + { + "widgetId": "12-0-2" + } + ], + "filters": { + "dataIndex": 15, + "sourceId": "12-0-2" + } }, { "x": 0, @@ -108,7 +125,8 @@ "i": "2", "type": "Widget", "widget": { - "title": "Load of The Selected Version (CPM - calls per minute) " + "title": "Load of The Selected Version (CPM - calls per minute) ", + "name": "Load_Version" }, "graph": { "type": "Line", @@ -124,7 +142,16 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "12-0-2", + "label": "Load_Version", + "associate": [ + { + "widgetId": "12-0-1" + }, + { + "widgetId": "12-0-0" + } + ] } ] }, diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function-relation.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function-relation.json index f1f85cac1607..8dac795c064b 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function-relation.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function-relation.json @@ -27,30 +27,20 @@ "h": 52, "i": "0", "type": "Tab", - "widget": { - "title": "Title" - }, - "graph": {}, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "activedTabIndex": 1, "children": [ { "name": "Overview", "children": [ { "x": 12, - "y": 24, + "y": 36, "w": 12, "h": 12, "i": "0", "type": "Widget", "widget": { - "title": "Load (Server) (calls / min)" + "title": "Load (Server) (calls / min)", + "name": "Load_Server" }, "graph": { "type": "Line", @@ -66,17 +56,46 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-0-0", + "label": "0-0-0", + "associate": [ + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + } + ], + "filters": { + "dataIndex": 15, + "sourceId": "0-0-1" + } }, { - "x": 0, - "y": 24, + "x": 12, + "y": 12, "w": 12, "h": 12, "i": "1", "type": "Widget", "widget": { - "title": "Success Rate (Server) (%)" + "title": "Success Rate (Server) (%)", + "name": "Success_Rate_Server" }, "graph": { "type": "Line", @@ -92,22 +111,47 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "percentage" } + ], + "value": "0-0-1", + "label": "Success_Rate_Server", + "associate": [ + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + } ] }, { "x": 12, - "y": 0, + "y": 24, "w": 12, "h": 12, "i": "2", "type": "Widget", "widget": { - "title": "Response Time Percentile (Server) (ms)" + "title": "Response Time Percentile (Server) (ms)", + "name": "Response_Percentile_Server" }, "graph": { "type": "Line", @@ -123,24 +167,53 @@ "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false, "metricConfig": [ { "key": "P50, P75, P90, P95, P99", "labelsIndex": "0,1,2,3,4", "label": "P50, P75, P90, P95, P99" } - ] + ], + "value": "0-0-2", + "label": "Response_Percentile_Server", + "associate": [ + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + } + ], + "filters": { + "dataIndex": 15, + "sourceId": "0-0-1" + } }, { - "x": 0, + "x": 12, "y": 0, "w": 12, "h": 12, "i": "3", "type": "Widget", "widget": { - "title": "Response Time (Server) (ms)" + "title": "Response Time (Server) (ms)", + "name": "Response_Time_Server" }, "graph": { "type": "Line", @@ -156,17 +229,46 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-0-3", + "label": "Response_Time_Server", + "associate": [ + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + } + ], + "filters": { + "dataIndex": 15, + "sourceId": "0-0-1" + } }, { "x": 0, - "y": 12, + "y": 0, "w": 12, "h": 12, "i": "4", "type": "Widget", "widget": { - "title": "Response Time (Client) (ms)" + "title": "Response Time (Client) (ms)", + "name": "Response_Time_Client" }, "graph": { "type": "Line", @@ -182,17 +284,46 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-0-4", + "label": "Response_Time_Client", + "associate": [ + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + } + ], + "filters": { + "dataIndex": 15, + "sourceId": "0-0-1" + } }, { - "x": 12, - "y": 12, + "x": 0, + "y": 24, "w": 12, "h": 12, "i": "5", "type": "Widget", "widget": { - "title": "Response Time Percentile (Client) (ms)" + "title": "Response Time Percentile (Client) (ms)", + "name": "Response_Percentile_Client" }, "graph": { "type": "Line", @@ -208,24 +339,53 @@ "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false, "metricConfig": [ { "key": "P50, P75, P90, P95, P99", "labelsIndex": "0,1,2,3,4", "label": "P50, P75, P90, P95, P99" } - ] + ], + "value": "0-0-5", + "label": "Response_Percentile_Client", + "associate": [ + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + } + ], + "filters": { + "dataIndex": 15, + "sourceId": "0-0-1" + } }, { "x": 0, - "y": 36, + "y": 12, "w": 12, "h": 12, "i": "6", "type": "Widget", "widget": { - "title": "Success Rate (Client) (%)" + "title": "Success Rate (Client) (%)", + "name": "Success_Rate_Client" }, "graph": { "type": "Line", @@ -241,22 +401,51 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "percentage" } - ] + ], + "value": "0-0-6", + "label": "Success_Rate_Client", + "associate": [ + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-7" + } + ], + "filters": { + "dataIndex": 15, + "sourceId": "0-0-1" + } }, { - "x": 12, + "x": 0, "y": 36, "w": 12, "h": 12, "i": "7", "type": "Widget", "widget": { - "title": "Load (Client) (calls / min)" + "title": "Load (Client) (calls / min)", + "name": "Load_Client" }, "graph": { "type": "Line", @@ -272,7 +461,35 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-0-7", + "label": "Load_Client", + "associate": [ + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-0" + } + ], + "filters": { + "dataIndex": 15, + "sourceId": "0-0-1" + } } ] }, @@ -286,19 +503,9 @@ "h": 49, "i": "0", "type": "Topology", - "widget": { - "title": "Title" - }, "graph": { "showDepth": true }, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "moved": false, "linkDashboard": "FaaS-Instance-Relation", "nodeDashboard": "FaaS-Instance", "linkServerMetrics": [ @@ -354,8 +561,7 @@ } ] } - ], - "moved": false + ] } ], "layer": "FAAS", @@ -365,4 +571,4 @@ "isRoot": false } } -] \ No newline at end of file +] diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function.json index f6397f27baff..0797595639f2 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function.json @@ -27,17 +27,6 @@ "h": 52, "i": "4", "type": "Tab", - "widget": { - "title": "Title" - }, - "graph": {}, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "activedTabIndex": 0, "children": [ { "name": "Overview", @@ -63,12 +52,13 @@ "metricTypes": [ "readMetricsValue" ], - "moved": false, "metricConfig": [ { "calculation": "apdex" } - ] + ], + "value": "4-0-0", + "label": "4-0-0" }, { "x": 8, @@ -92,13 +82,14 @@ "metricTypes": [ "readMetricsValue" ], - "moved": false, "metricConfig": [ { "calculation": "percentage", "unit": "%" } - ] + ], + "value": "4-0-1", + "label": "4-0-1" }, { "x": 16, @@ -123,12 +114,13 @@ "metricTypes": [ "readMetricsValue" ], - "moved": false, "metricConfig": [ { "unit": "calls / min" } - ] + ], + "value": "4-0-2", + "label": "4-0-2" }, { "x": 0, @@ -138,7 +130,8 @@ "i": "3", "type": "Widget", "widget": { - "title": "Function Avg Response Time (ms)" + "title": "Function Avg Response Time (ms)", + "name": "Function_Avg_Response" }, "graph": { "type": "Line", @@ -154,10 +147,23 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, - "metricConfig": [ - {} - ] + "value": "4-0-3", + "label": "Function_Avg_Response", + "associate": [ + { + "widgetId": "4-0-5" + }, + { + "widgetId": "4-0-6" + }, + { + "widgetId": "4-0-7" + } + ], + "filters": { + "dataIndex": 5, + "sourceId": "4-0-5" + } }, { "x": 6, @@ -167,7 +173,8 @@ "i": "5", "type": "Widget", "widget": { - "title": "Function Response Time Percentile (ms)" + "title": "Function Response Time Percentile (ms)", + "name": "Function_Response_Percentile" }, "graph": { "type": "Line", @@ -183,12 +190,24 @@ "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false, "metricConfig": [ { "label": "P50, P75, P90, P95, P99", "labelsIndex": "0, 1, 2, 3, 4" } + ], + "value": "4-0-5", + "label": "Function_Response_Percentile", + "associate": [ + { + "widgetId": "4-0-3" + }, + { + "widgetId": "4-0-6" + }, + { + "widgetId": "4-0-7" + } ] }, { @@ -199,7 +218,8 @@ "i": "6", "type": "Widget", "widget": { - "title": "Success Rate (%)" + "title": "Success Rate (%)", + "name": "Success_Rate" }, "graph": { "type": "Line", @@ -215,12 +235,28 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "percentage" } - ] + ], + "value": "4-0-6", + "label": "Success_Rate", + "associate": [ + { + "widgetId": "4-0-5" + }, + { + "widgetId": "4-0-3" + }, + { + "widgetId": "4-0-7" + } + ], + "filters": { + "dataIndex": 5, + "sourceId": "4-0-5" + } }, { "x": 18, @@ -231,7 +267,8 @@ "type": "Widget", "widget": { "title": "Function Load (calls / min)", - "tips": "For HTTP 1/2, gRPC, RPC functions, this means Calls Per Minute (calls / min)" + "tips": "For HTTP 1/2, gRPC, RPC functions, this means Calls Per Minute (calls / min)", + "name": "Function_Load" }, "graph": { "type": "Line", @@ -247,7 +284,23 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "4-0-7", + "label": "Function_Load", + "associate": [ + { + "widgetId": "4-0-5" + }, + { + "widgetId": "4-0-6" + }, + { + "widgetId": "4-0-3" + } + ], + "filters": { + "dataIndex": 5, + "sourceId": "4-0-5" + } }, { "x": 0, @@ -258,7 +311,8 @@ "type": "Widget", "widget": { "title": "Function Instances Load (calls / min)", - "tips": "For HTTP 1/2, gRPC, RPC functions, this means Calls Per Minute (calls / min)," + "tips": "For HTTP 1/2, gRPC, RPC functions, this means Calls Per Minute (calls / min),", + "name": "Function_Instances_Load" }, "graph": { "type": "TopList" @@ -275,7 +329,8 @@ "calculation": "percentage" } ], - "moved": false + "value": "4-0-11", + "label": "Function_Instances_Load" }, { "x": 8, @@ -303,7 +358,8 @@ "calculation": "percentage" } ], - "moved": false + "value": "4-0-12", + "label": "4-0-12" }, { "x": 16, @@ -331,7 +387,8 @@ "calculation": "percentage" } ], - "moved": false + "value": "4-0-13", + "label": "4-0-13" } ] }, @@ -345,9 +402,6 @@ "h": 49, "i": "0", "type": "Widget", - "widget": { - "title": "" - }, "graph": { "type": "InstanceList", "dashboardName": "FaaS-Instance", @@ -363,7 +417,6 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false, "metricConfig": [ { "label": "Load", @@ -380,7 +433,9 @@ "label": "Latency", "unit": "ms" } - ] + ], + "value": "4-1-0", + "label": "4-1-0" } ] }, @@ -394,19 +449,9 @@ "h": 48, "i": "0", "type": "Topology", - "widget": { - "title": "Title" - }, "graph": { "showDepth": true }, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "moved": false, "linkDashboard": "FaaS-Function-Relation", "nodeDashboard": [ { @@ -494,23 +539,11 @@ "w": 24, "h": 48, "i": "0", - "type": "Trace", - "widget": { - "title": "Title" - }, - "graph": {}, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "moved": false + "type": "Trace" } ] } - ], - "moved": false + ] } ], "layer": "FAAS", @@ -520,4 +553,4 @@ "isRoot": false } } -] \ No newline at end of file +] diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance-relation.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance-relation.json index 84479ee83cb0..db2253120e44 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance-relation.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance-relation.json @@ -21,14 +21,15 @@ "configuration": { "children": [ { - "x": 12, + "x": 0, "y": 12, "w": 12, "h": 12, "i": "1", "type": "Widget", "widget": { - "title": "Response Time Percentile (Client) (ms)" + "title": "Response Time Percentile (Client) (ms)", + "name": "Response_Percentile_Client" }, "graph": { "type": "Line", @@ -44,14 +45,42 @@ "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false, "metricConfig": [ { "key": "P50, P75, P90, P95, P99", "labelsIndex": "0,1,2,3,4", "label": "P50, P75, P90, P95, P99" } - ] + ], + "value": "1", + "label": "Response_Percentile_Client", + "associate": [ + { + "widgetId": "7" + }, + { + "widgetId": "2" + }, + { + "widgetId": "3" + }, + { + "widgetId": "4" + }, + { + "widgetId": "5" + }, + { + "widgetId": "6" + }, + { + "widgetId": "8" + } + ], + "filters": { + "dataIndex": 27, + "sourceId": "4" + } }, { "x": 0, @@ -61,7 +90,8 @@ "i": "2", "type": "Widget", "widget": { - "title": "Success Rate (Client) (%)" + "title": "Success Rate (Client) (%)", + "name": "Success_Rate_Client" }, "graph": { "type": "Line", @@ -77,22 +107,51 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "percentage" } - ] + ], + "value": "2", + "label": "Success_Rate_Client", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "7" + }, + { + "widgetId": "3" + }, + { + "widgetId": "4" + }, + { + "widgetId": "5" + }, + { + "widgetId": "6" + }, + { + "widgetId": "8" + } + ], + "filters": { + "dataIndex": 27, + "sourceId": "4" + } }, { - "x": 12, + "x": 0, "y": 36, "w": 12, "h": 12, "i": "3", "type": "Widget", "widget": { - "title": "Load (Client) (calls / min)" + "title": "Load (Client) (calls / min)", + "name": "Load_Client" }, "graph": { "type": "Line", @@ -108,17 +167,46 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "3", + "label": "Load_Client", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "2" + }, + { + "widgetId": "7" + }, + { + "widgetId": "4" + }, + { + "widgetId": "5" + }, + { + "widgetId": "6" + }, + { + "widgetId": "8" + } + ], + "filters": { + "dataIndex": 27, + "sourceId": "4" + } }, { "x": 0, - "y": 12, + "y": 0, "w": 12, "h": 12, "i": "4", "type": "Widget", "widget": { - "title": "Response Time (Client) (ms)" + "title": "Response Time (Client) (ms)", + "name": "Response_Client" }, "graph": { "type": "Line", @@ -134,17 +222,46 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "4", + "label": "Response_Client", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "2" + }, + { + "widgetId": "3" + }, + { + "widgetId": "7" + }, + { + "widgetId": "5" + }, + { + "widgetId": "6" + }, + { + "widgetId": "8" + } + ], + "filters": { + "dataIndex": 15, + "sourceId": "8" + } }, { "x": 12, - "y": 0, + "y": 12, "w": 12, "h": 12, "i": "5", "type": "Widget", "widget": { - "title": "Response Time Percentile (Server) (ms)" + "title": "Response Time Percentile (Server) (ms)", + "name": "Response_Percentile_Server" }, "graph": { "type": "Line", @@ -160,24 +277,53 @@ "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false, "metricConfig": [ { "key": "P50, P75, P90, P95, P99", "labelsIndex": "0,1,2,3,4", "label": "P50, P75, P90, P95, P99" } - ] + ], + "value": "5", + "label": "Response_Percentile_Server", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "2" + }, + { + "widgetId": "3" + }, + { + "widgetId": "4" + }, + { + "widgetId": "7" + }, + { + "widgetId": "6" + }, + { + "widgetId": "8" + } + ], + "filters": { + "dataIndex": 27, + "sourceId": "4" + } }, { - "x": 0, - "y": 36, + "x": 12, + "y": 24, "w": 12, "h": 12, "i": "6", "type": "Widget", "widget": { - "title": "Success Rate (Server) (%)" + "title": "Success Rate (Server) (%)", + "name": "Success_Rate_Server" }, "graph": { "type": "Line", @@ -193,22 +339,51 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "percentage" } - ] + ], + "value": "6", + "label": "Success_Rate_Server", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "2" + }, + { + "widgetId": "3" + }, + { + "widgetId": "4" + }, + { + "widgetId": "5" + }, + { + "widgetId": "7" + }, + { + "widgetId": "8" + } + ], + "filters": { + "dataIndex": 27, + "sourceId": "4" + } }, { "x": 12, - "y": 24, + "y": 36, "w": 12, "h": 12, "i": "7", "type": "Widget", "widget": { - "title": "Load (Server) (calls / min)" + "title": "Load (Server) (calls / min)", + "name": "Load_Server" }, "graph": { "type": "Line", @@ -224,17 +399,46 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "7", + "label": "7", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "2" + }, + { + "widgetId": "3" + }, + { + "widgetId": "4" + }, + { + "widgetId": "5" + }, + { + "widgetId": "6" + }, + { + "widgetId": "8" + } + ], + "filters": { + "dataIndex": 27, + "sourceId": "4" + } }, { - "x": 0, + "x": 12, "y": 0, "w": 12, "h": 12, "i": "8", "type": "Widget", "widget": { - "title": "Response Time (Server) (ms)" + "title": "Response Time (Server) (ms)", + "name": "Response_Server" }, "graph": { "type": "Line", @@ -250,7 +454,35 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "8", + "label": "Response_Server", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "2" + }, + { + "widgetId": "3" + }, + { + "widgetId": "4" + }, + { + "widgetId": "5" + }, + { + "widgetId": "6" + }, + { + "widgetId": "7" + } + ], + "filters": { + "dataIndex": 27, + "sourceId": "4" + } } ], "layer": "FAAS", @@ -260,4 +492,4 @@ "isRoot": false } } -] \ No newline at end of file +] diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance.json index 19dcdf0dc284..7b8c738de63d 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance.json @@ -27,17 +27,6 @@ "h": 52, "i": "0", "type": "Tab", - "widget": { - "title": "Title" - }, - "graph": {}, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "activedTabIndex": 0, "children": [ { "name": "Overview", @@ -50,7 +39,8 @@ "i": "0", "type": "Widget", "widget": { - "title": "Function Instance Latency (ms)" + "title": "Function Instance Latency (ms)", + "name": "Latency" }, "graph": { "type": "Line", @@ -66,7 +56,16 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-0-0", + "label": "0-0-0", + "associate": [ + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-3" + } + ] }, { "x": 0, @@ -76,7 +75,8 @@ "i": "1", "type": "Widget", "widget": { - "title": "Function Instance Success Rate (%)" + "title": "Function Instance Success Rate (%)", + "name": "Success_Rate" }, "graph": { "type": "Line", @@ -92,11 +92,20 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "percentage" } + ], + "value": "0-0-1", + "label": "Success_Rate", + "associate": [ + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-3" + } ] }, { @@ -108,7 +117,8 @@ "type": "Widget", "widget": { "title": "Function Instance Load (calls / min)", - "tips": "For HTTP 1/2, gRPC, RPC functions, this means Calls Per Minute (calls / min)" + "tips": "For HTTP 1/2, gRPC, RPC functions, this means Calls Per Minute (calls / min)", + "name": "Function_Instance_Load" }, "graph": { "type": "Line", @@ -124,7 +134,16 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-0-3", + "label": "Function_Instance_Load", + "associate": [ + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-0" + } + ] } ] }, @@ -137,18 +156,7 @@ "w": 24, "h": 49, "i": "0", - "type": "Trace", - "widget": { - "title": "Title" - }, - "graph": {}, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "moved": false + "type": "Trace" } ] }, @@ -165,8 +173,7 @@ } ] } - ], - "moved": false + ] } ], "layer": "FAAS", @@ -176,4 +183,4 @@ "isRoot": false } } -] \ No newline at end of file +] diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-root.json index 6af9f17bd144..ccfe41b89f80 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-root.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-root.json @@ -120,7 +120,7 @@ "" ], "moved": false, - "linkDashboard": "Function-Function-Relation", + "linkDashboard": "FaaS-Function-Relation", "nodeDashboard": [ { "scope": "Service", @@ -245,7 +245,7 @@ "content": "FaaS (Function-as-a-Service) is a type of cloud-computing service that allows you to execute code in response to events without the complex infrastructure typically associated with building and launching microservices applications. OpenFunction as a FaaS platform, provides out-of-box observability with SkyWalking integration.", "fontSize": 14, "textAlign": "left", - "url": "https://openfunction.dev/docs/best-practices/skywalking-solution-for-openfunction/" + "url": "https://openfunction.dev/" }, "moved": false } 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 3d0d417d163a..0dac73c6eac6 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,8 @@ "i": "0", "type": "Widget", "widget": { - "title": "Service Response Time Percentile (ms)" + "title": "Service Response Time Percentile (ms)", + "name": "Service_Response_Percentile" }, "graph": { "type": "Line", @@ -44,13 +45,29 @@ "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false, "metricConfig": [ { "label": "P50, P75, P90, P95, P99", "labelsIndex": "0,1,2,3,4" } - ] + ], + "value": "0", + "label": "0", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "2" + }, + { + "widgetId": "3" + } + ], + "filters": { + "dataIndex": 15, + "sourceId": "3" + } }, { "x": 0, @@ -60,7 +77,8 @@ "i": "1", "type": "Widget", "widget": { - "title": "Success Rate (%)" + "title": "Success Rate (%)", + "name": "Success_Rate" }, "graph": { "type": "Line", @@ -76,12 +94,28 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "percentage" } - ] + ], + "value": "1", + "label": "Success_Rate", + "associate": [ + { + "widgetId": "0" + }, + { + "widgetId": "2" + }, + { + "widgetId": "3" + } + ], + "filters": { + "dataIndex": 15, + "sourceId": "3" + } }, { "x": 0, @@ -91,7 +125,8 @@ "i": "2", "type": "Widget", "widget": { - "title": "Load (calls / min)" + "title": "Load (calls / min)", + "name": "Load" }, "graph": { "type": "Line", @@ -107,7 +142,23 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "2", + "label": "Load", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "0" + }, + { + "widgetId": "3" + } + ], + "filters": { + "dataIndex": 15, + "sourceId": "3" + } }, { "x": 0, @@ -117,7 +168,8 @@ "i": "3", "type": "Widget", "widget": { - "title": "Response Time (ms)" + "title": "Response Time (ms)", + "name": "Response_Time" }, "graph": { "type": "Line", @@ -133,7 +185,19 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "3", + "label": "Response_Time", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "2" + }, + { + "widgetId": "0" + } + ] } ], "layer": "GENERAL", 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 a1634e3ad1bc..f32cb30f47f2 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 @@ -27,17 +27,6 @@ "h": 52, "i": "0", "type": "Tab", - "widget": { - "title": "Title" - }, - "graph": {}, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "activedTabIndex": 1, "children": [ { "name": "Overview", @@ -50,7 +39,8 @@ "i": "3", "type": "Widget", "widget": { - "title": "Endpoint Response Time Percentile (ms)" + "title": "Endpoint Response Time Percentile (ms)", + "name": "Endpoint_Response_Percentile" }, "graph": { "type": "Line", @@ -66,12 +56,30 @@ "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false, "metricConfig": [ { "label": "P50, P75, P90, P95, P99", "labelsIndex": "0, 1, 2, 3, 4" } + ], + "value": "0-0-3", + "label": "Endpoint_Response_Percentile", + "associate": [ + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + }, + { + "widgetId": "0-0-8" + } ] }, { @@ -82,7 +90,8 @@ "i": "4", "type": "Widget", "widget": { - "title": "Endpoint Avg Response Time (ms)" + "title": "Endpoint Avg Response Time (ms)", + "name": "Endpoint_Avg_Response" }, "graph": { "type": "Line", @@ -98,7 +107,25 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-0-4", + "label": "Endpoint_Avg_Response", + "associate": [ + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + }, + { + "widgetId": "0-0-8" + } + ] }, { "x": 16, @@ -109,7 +136,8 @@ "type": "Widget", "widget": { "title": "Message Queue Avg Consuming Latency (ms)", - "tips": "The avg latency of message consuming. Latency = timestamp(received) - timestamp(producing)" + "tips": "The avg latency of message consuming. Latency = timestamp(received) - timestamp(producing)", + "name": "Message_Consuming_Latency" }, "graph": { "type": "Line", @@ -125,7 +153,25 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-0-5", + "label": "0-0-5", + "associate": [ + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + }, + { + "widgetId": "0-0-8" + } + ] }, { "x": 8, @@ -136,7 +182,8 @@ "type": "Widget", "widget": { "title": "Message Queue Consuming Count", - "tips": "The number of consumed messages." + "tips": "The number of consumed messages.", + "name": "Message_Consuming_Count" }, "graph": { "type": "Line", @@ -146,14 +193,31 @@ "showXAxis": true, "showYAxis": true }, - "standard": {}, "metrics": [ "endpoint_mq_consume_count" ], "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-0-6", + "label": "Message_Consuming_Count", + "associate": [ + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-7" + }, + { + "widgetId": "0-0-8" + } + ] }, { "x": 0, @@ -163,7 +227,8 @@ "i": "7", "type": "Widget", "widget": { - "title": "Endpoint Success Rate (%)" + "title": "Endpoint Success Rate (%)", + "name": "Endpoint_Success_Rate" }, "graph": { "type": "Line", @@ -179,7 +244,25 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-0-7", + "label": "Endpoint_Success_Rate", + "associate": [ + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-8" + } + ] }, { "x": 0, @@ -189,7 +272,8 @@ "i": "8", "type": "Widget", "widget": { - "title": "Endpoint Load (calls / min)" + "title": "Endpoint Load (calls / min)", + "name": "Endpoint_Load" }, "graph": { "type": "Line", @@ -199,14 +283,31 @@ "showXAxis": true, "showYAxis": true }, - "standard": {}, "metrics": [ "endpoint_cpm" ], "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-0-8", + "label": "Endpoint_Load", + "associate": [ + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + }, + { + "widgetId": "0-0-5" + } + ] } ] }, @@ -220,19 +321,9 @@ "h": 49, "i": "0", "type": "Topology", - "widget": { - "title": "Title" - }, "graph": { "showDepth": true }, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "moved": false, "linkDashboard": "General-Endpoint-Relation", "nodeDashboard": "General-Endpoint", "linkServerMetrics": [ @@ -290,18 +381,7 @@ "w": 24, "h": 49, "i": "0", - "type": "Trace", - "widget": { - "title": "Title" - }, - "graph": {}, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "moved": false + "type": "Trace" } ] }, @@ -314,24 +394,11 @@ "w": 24, "h": 49, "i": "0", - "type": "Log", - "widget": { - "title": "Title" - }, - "graph": {}, - "standard": {}, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "moved": false + "type": "Log" } ] } - ], - "moved": false + ] } ], "layer": "GENERAL", 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 ddd61a3b073b..e0f3e73935c5 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,15 @@ "configuration": { "children": [ { - "x": 12, + "x": 0, "y": 12, "w": 12, "h": 12, "i": "1", "type": "Widget", "widget": { - "title": "Response Time Percentile (Client) (ms)" + "title": "Response Time Percentile (Client) (ms)", + "name": "Response_Percentile_Client" }, "graph": { "type": "Line", @@ -44,14 +45,42 @@ "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false, "metricConfig": [ { "key": "P50, P75, P90, P95, P99", "labelsIndex": "0,1,2,3,4", "label": "P50, P75, P90, P95, P99" } - ] + ], + "value": "1", + "label": "Response_Percentile_Client", + "associate": [ + { + "widgetId": "8" + }, + { + "widgetId": "2" + }, + { + "widgetId": "3" + }, + { + "widgetId": "4" + }, + { + "widgetId": "5" + }, + { + "widgetId": "6" + }, + { + "widgetId": "7" + } + ], + "filters": { + "dataIndex": 19, + "sourceId": "4" + } }, { "x": 0, @@ -61,7 +90,8 @@ "i": "2", "type": "Widget", "widget": { - "title": "Success Rate (Client) (%)" + "title": "Success Rate (Client) (%)", + "name": "Success_Rate_Client" }, "graph": { "type": "Line", @@ -77,22 +107,51 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "percentage" } - ] + ], + "value": "2", + "label": "Success_Rate_Client", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "8" + }, + { + "widgetId": "3" + }, + { + "widgetId": "4" + }, + { + "widgetId": "5" + }, + { + "widgetId": "6" + }, + { + "widgetId": "7" + } + ], + "filters": { + "dataIndex": 19, + "sourceId": "4" + } }, { - "x": 12, + "x": 0, "y": 36, "w": 12, "h": 12, "i": "3", "type": "Widget", "widget": { - "title": "Load (Client) (calls / min)" + "title": "Load (Client) (calls / min)", + "name": "Load_Client" }, "graph": { "type": "Line", @@ -108,17 +167,46 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "3", + "label": "Load_Client", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "2" + }, + { + "widgetId": "8" + }, + { + "widgetId": "4" + }, + { + "widgetId": "5" + }, + { + "widgetId": "6" + }, + { + "widgetId": "7" + } + ], + "filters": { + "dataIndex": 19, + "sourceId": "4" + } }, { "x": 0, - "y": 12, + "y": 0, "w": 12, "h": 12, "i": "4", "type": "Widget", "widget": { - "title": "Response Time (Client) (ms)" + "title": "Response Time (Client) (ms)", + "name": "Response_Time_Client" }, "graph": { "type": "Line", @@ -134,17 +222,46 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "4", + "label": "Response_Time_Client", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "2" + }, + { + "widgetId": "3" + }, + { + "widgetId": "8" + }, + { + "widgetId": "5" + }, + { + "widgetId": "6" + }, + { + "widgetId": "7" + } + ], + "filters": { + "dataIndex": 22, + "sourceId": "8" + } }, { "x": 12, - "y": 0, + "y": 12, "w": 12, "h": 12, "i": "5", "type": "Widget", "widget": { - "title": "Response Time Percentile (Server) (ms)" + "title": "Response Time Percentile (Server) (ms)", + "name": "Response_Percentile_Server" }, "graph": { "type": "Line", @@ -160,24 +277,53 @@ "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false, "metricConfig": [ { "key": "P50, P75, P90, P95, P99", "labelsIndex": "0,1,2,3,4", "label": "P50, P75, P90, P95, P99" } - ] + ], + "value": "5", + "label": "Response_Percentile_Server", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "2" + }, + { + "widgetId": "3" + }, + { + "widgetId": "4" + }, + { + "widgetId": "8" + }, + { + "widgetId": "6" + }, + { + "widgetId": "7" + } + ], + "filters": { + "dataIndex": 19, + "sourceId": "4" + } }, { - "x": 0, - "y": 36, + "x": 12, + "y": 24, "w": 12, "h": 12, "i": "6", "type": "Widget", "widget": { - "title": "Success Rate (Server) (%)" + "title": "Success Rate (Server) (%)", + "name": "Success_Rate_Server" }, "graph": { "type": "Line", @@ -193,22 +339,51 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "percentage" } - ] + ], + "value": "6", + "label": "Success_Rate_Server", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "2" + }, + { + "widgetId": "3" + }, + { + "widgetId": "4" + }, + { + "widgetId": "5" + }, + { + "widgetId": "8" + }, + { + "widgetId": "7" + } + ], + "filters": { + "dataIndex": 19, + "sourceId": "4" + } }, { "x": 12, - "y": 24, + "y": 36, "w": 12, "h": 12, "i": "7", "type": "Widget", "widget": { - "title": "Load (Server) (calls / min)" + "title": "Load (Server) (calls / min)", + "name": "Load_Server" }, "graph": { "type": "Line", @@ -224,17 +399,46 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "7", + "label": "Load_Server", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "2" + }, + { + "widgetId": "3" + }, + { + "widgetId": "4" + }, + { + "widgetId": "5" + }, + { + "widgetId": "6" + }, + { + "widgetId": "8" + } + ], + "filters": { + "dataIndex": 19, + "sourceId": "4" + } }, { - "x": 0, + "x": 12, "y": 0, "w": 12, "h": 12, "i": "8", "type": "Widget", "widget": { - "title": "Response Time (Server) (ms)" + "title": "Response Time (Server) (ms)", + "name": "Response_Time_Server" }, "graph": { "type": "Line", @@ -250,7 +454,35 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "8", + "label": "Response_Time_Server", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "2" + }, + { + "widgetId": "3" + }, + { + "widgetId": "4" + }, + { + "widgetId": "5" + }, + { + "widgetId": "6" + }, + { + "widgetId": "7" + } + ], + "filters": { + "dataIndex": 19, + "sourceId": "4" + } } ], "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 8432eb46dfbb..e49266d3a8ea 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 @@ -27,17 +27,6 @@ "h": 52, "i": "0", "type": "Tab", - "widget": { - "title": "Title" - }, - "graph": {}, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "activedTabIndex": 3, "children": [ { "name": "Overview", @@ -50,7 +39,8 @@ "i": "0", "type": "Widget", "widget": { - "title": "Service Instance Latency (ms)" + "title": "Service Instance Latency (ms)", + "name": "Instance_Latency" }, "graph": { "type": "Line", @@ -66,7 +56,26 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-0-0", + "label": "Instance_Latency", + "associate": [ + { + "widgetId": "0-0-16" + }, + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-10" + } + ], + "filters": { + "dataIndex": 9, + "sourceId": "0-0-3" + } }, { "x": 12, @@ -76,7 +85,8 @@ "i": "1", "type": "Widget", "widget": { - "title": "Service Instance Success Rate (%)" + "title": "Service Instance Success Rate (%)", + "name": "Instance_Success_Rate" }, "graph": { "type": "Line", @@ -92,12 +102,31 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "percentage" } - ] + ], + "value": "0-0-1", + "label": "Instance_Success_Rate", + "associate": [ + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-16" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-10" + } + ], + "filters": { + "dataIndex": 9, + "sourceId": "0-0-3" + } }, { "x": 0, @@ -108,7 +137,8 @@ "type": "Widget", "widget": { "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)" + "tips": "For HTTP 1/2, gRPC, RPC services, this means Calls Per Minute (calls / min), for TCP services, this means Packets Per Minute (PPM)", + "name": "Instance_Load" }, "graph": { "type": "Line", @@ -124,7 +154,26 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-0-3", + "label": "Instance_Load", + "associate": [ + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-16" + }, + { + "widgetId": "0-0-10" + } + ], + "filters": { + "dataIndex": 28, + "sourceId": "0-0-0" + } }, { "x": 12, @@ -134,7 +183,8 @@ "i": "10", "type": "Widget", "widget": { - "title": "Database Connection Pool" + "title": "Database Connection Pool", + "name": "Database_Connection_Pool" }, "graph": { "type": "Line", @@ -150,7 +200,26 @@ "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false + "value": "0-0-10", + "label": "Database_Connection_Pool", + "associate": [ + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-16" + } + ], + "filters": { + "dataIndex": 9, + "sourceId": "0-0-3" + } }, { "x": 0, @@ -160,7 +229,8 @@ "i": "16", "type": "Widget", "widget": { - "title": "Thread Pool" + "title": "Thread Pool", + "name": "Thread_Pool" }, "graph": { "type": "Line", @@ -176,7 +246,26 @@ "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false + "value": "0-0-16", + "label": "0-0-16", + "associate": [ + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-10" + } + ], + "filters": { + "dataIndex": 9, + "sourceId": "0-0-3" + } } ] }, @@ -189,18 +278,7 @@ "w": 24, "h": 49, "i": "0", - "type": "Trace", - "widget": { - "title": "Title" - }, - "graph": {}, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "moved": false + "type": "Trace" } ] }, @@ -213,18 +291,7 @@ "w": 24, "h": 49, "i": "0", - "type": "Log", - "widget": { - "title": "Title" - }, - "graph": {}, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "moved": false + "type": "Log" } ] }, @@ -261,7 +328,6 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "byteToMB" @@ -275,7 +341,9 @@ { "calculation": "byteToMB" } - ] + ], + "value": "0-3-5", + "label": "0-3-5" }, { "x": 8, @@ -305,7 +373,8 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false + "value": "0-3-12", + "label": "0-3-12" }, { "x": 16, @@ -333,7 +402,8 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false + "value": "0-3-13", + "label": "0-3-13" }, { "x": 0, @@ -359,7 +429,8 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-3-14", + "label": "0-3-14" }, { "x": 0, @@ -387,7 +458,8 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false + "value": "0-3-15", + "label": "0-3-15" }, { "x": 16, @@ -417,7 +489,8 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false + "value": "0-3-6", + "label": "0-3-6" }, { "x": 0, @@ -443,7 +516,8 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false + "value": "0-3-7", + "label": "0-3-7" } ] }, @@ -478,7 +552,8 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false + "value": "0-4-4", + "label": "0-4-4" }, { "x": 12, @@ -504,12 +579,13 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "byteToMB" } - ] + ], + "value": "0-4-8", + "label": "0-4-8" }, { "x": 6, @@ -535,7 +611,8 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false + "value": "0-4-9", + "label": "0-4-9" }, { "x": 0, @@ -561,12 +638,12 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-4-11", + "label": "0-4-11" } ] } - ], - "moved": false + ] } ], "layer": "GENERAL", 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 dd587ece4bcf..d6266d3f0f98 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 @@ -27,30 +27,20 @@ "h": 52, "i": "0", "type": "Tab", - "widget": { - "title": "Title" - }, - "graph": {}, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "activedTabIndex": 1, "children": [ { "name": "Overview", "children": [ { "x": 12, - "y": 24, + "y": 36, "w": 12, "h": 12, "i": "0", "type": "Widget", "widget": { - "title": "Load (Server) (calls / min)" + "title": "Load (Server) (calls / min)", + "name": "Load_Server" }, "graph": { "type": "Line", @@ -66,17 +56,46 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-0-0", + "label": "Load_Server", + "associate": [ + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + } + ], + "filters": { + "dataIndex": 8, + "sourceId": "0-0-4" + } }, { - "x": 0, + "x": 12, "y": 24, "w": 12, "h": 12, "i": "1", "type": "Widget", "widget": { - "title": "Success Rate (Server) (%)" + "title": "Success Rate (Server) (%)", + "name": "Success_Rate_Server" }, "graph": { "type": "Line", @@ -92,22 +111,51 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "percentage" } - ] + ], + "value": "0-0-1", + "label": "Success_Rate_Server", + "associate": [ + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + } + ], + "filters": { + "dataIndex": 8, + "sourceId": "0-0-4" + } }, { "x": 12, - "y": 0, + "y": 12, "w": 12, "h": 12, "i": "2", "type": "Widget", "widget": { - "title": "Response Time Percentile (Server) (ms)" + "title": "Response Time Percentile (Server) (ms)", + "name": "Response_Percentile_Server" }, "graph": { "type": "Line", @@ -123,24 +171,53 @@ "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false, "metricConfig": [ { "key": "P50, P75, P90, P95, P99", "labelsIndex": "0,1,2,3,4", "label": "P50, P75, P90, P95, P99" } - ] + ], + "value": "0-0-2", + "label": "Response_Percentile_Server", + "associate": [ + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + } + ], + "filters": { + "dataIndex": 8, + "sourceId": "0-0-4" + } }, { - "x": 0, + "x": 12, "y": 0, "w": 12, "h": 12, "i": "3", "type": "Widget", "widget": { - "title": "Response Time (Server) (ms)" + "title": "Response Time (Server) (ms)", + "name": "Response_Time_Server" }, "graph": { "type": "Line", @@ -156,17 +233,46 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-0-3", + "label": "Response_Time_Server", + "associate": [ + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + } + ], + "filters": { + "dataIndex": 8, + "sourceId": "0-0-4" + } }, { "x": 0, - "y": 12, + "y": 0, "w": 12, "h": 12, "i": "4", "type": "Widget", "widget": { - "title": "Response Time (Client) (ms)" + "title": "Response Time (Client) (ms)", + "name": "Response_Time_Client" }, "graph": { "type": "Line", @@ -182,17 +288,46 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-0-4", + "label": "Response_Time_Client", + "associate": [ + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + } + ], + "filters": { + "dataIndex": 19, + "sourceId": "0-0-3" + } }, { - "x": 12, + "x": 0, "y": 12, "w": 12, "h": 12, "i": "5", "type": "Widget", "widget": { - "title": "Response Time Percentile (Client) (ms)" + "title": "Response Time Percentile (Client) (ms)", + "name": "Response_Percentile_Client" }, "graph": { "type": "Line", @@ -208,24 +343,53 @@ "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false, "metricConfig": [ { "key": "P50, P75, P90, P95, P99", "labelsIndex": "0,1,2,3,4", "label": "P50, P75, P90, P95, P99" } - ] + ], + "value": "0-0-5", + "label": "Response_Percentile_Client", + "associate": [ + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + } + ], + "filters": { + "dataIndex": 8, + "sourceId": "0-0-4" + } }, { "x": 0, - "y": 36, + "y": 24, "w": 12, "h": 12, "i": "6", "type": "Widget", "widget": { - "title": "Success Rate (Client) (%)" + "title": "Success Rate (Client) (%)", + "name": "Success_Rate_Client" }, "graph": { "type": "Line", @@ -241,22 +405,51 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "percentage" } - ] + ], + "value": "0-0-6", + "label": "Success_Rate_Client", + "associate": [ + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-7" + } + ], + "filters": { + "dataIndex": 8, + "sourceId": "0-0-4" + } }, { - "x": 12, + "x": 0, "y": 36, "w": 12, "h": 12, "i": "7", "type": "Widget", "widget": { - "title": "Load (Client) (calls / min)" + "title": "Load (Client) (calls / min)", + "name": "Load_Client" }, "graph": { "type": "Line", @@ -272,7 +465,35 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-0-7", + "label": "Load_Client", + "associate": [ + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-4" + } + ], + "filters": { + "dataIndex": 8, + "sourceId": "0-0-4" + } } ] }, @@ -286,19 +507,9 @@ "h": 49, "i": "0", "type": "Topology", - "widget": { - "title": "Title" - }, "graph": { "showDepth": true }, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "moved": false, "linkDashboard": "General-Instance-Relation", "nodeDashboard": "General-Instance", "linkServerMetrics": [ @@ -354,8 +565,7 @@ } ] } - ], - "moved": false + ] } ], "layer": "GENERAL", 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 c77fc5bb7357..c6a391f6c78e 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 @@ -27,17 +27,6 @@ "h": 52, "i": "4", "type": "Tab", - "widget": { - "title": "Title" - }, - "graph": {}, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "activedTabIndex": 0, "children": [ { "name": "Overview", @@ -63,12 +52,13 @@ "metricTypes": [ "readMetricsValue" ], - "moved": false, "metricConfig": [ { "calculation": "apdex" } - ] + ], + "value": "4-0-0", + "label": "4-0-0" }, { "x": 8, @@ -92,13 +82,14 @@ "metricTypes": [ "readMetricsValue" ], - "moved": false, "metricConfig": [ { "calculation": "percentage", "unit": "%" } - ] + ], + "value": "4-0-1", + "label": "4-0-1" }, { "x": 16, @@ -123,12 +114,13 @@ "metricTypes": [ "readMetricsValue" ], - "moved": false, "metricConfig": [ { "unit": "calls / min" } - ] + ], + "value": "4-0-2", + "label": "4-0-2" }, { "x": 0, @@ -138,7 +130,8 @@ "i": "3", "type": "Widget", "widget": { - "title": "Service Avg Response Time (ms)" + "title": "Service Avg Response Time (ms)", + "name": "Service_Avg_Response" }, "graph": { "type": "Line", @@ -154,9 +147,27 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, - "metricConfig": [ - {} + "value": "4-0-3", + "label": "Service_Avg_Response", + "associate": [ + { + "widgetId": "4-0-10" + }, + { + "widgetId": "4-0-4" + }, + { + "widgetId": "4-0-5" + }, + { + "widgetId": "4-0-6" + }, + { + "widgetId": "4-0-7" + }, + { + "widgetId": "4-0-9" + } ] }, { @@ -167,7 +178,8 @@ "i": "4", "type": "Widget", "widget": { - "title": "Service Apdex" + "title": "Service Apdex", + "name": "Service_Apdex" }, "graph": { "type": "Line", @@ -183,12 +195,37 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "apdex" } - ] + ], + "value": "4-0-4", + "label": "Service_Apdex", + "associate": [ + { + "widgetId": "4-0-3" + }, + { + "widgetId": "4-0-10" + }, + { + "widgetId": "4-0-5" + }, + { + "widgetId": "4-0-6" + }, + { + "widgetId": "4-0-7" + }, + { + "widgetId": "4-0-9" + } + ], + "filters": { + "dataIndex": 12, + "sourceId": "4-0-3" + } }, { "x": 12, @@ -198,7 +235,8 @@ "i": "5", "type": "Widget", "widget": { - "title": "Service Response Time Percentile (ms)" + "title": "Service Response Time Percentile (ms)", + "name": "Service_Response_Percentile" }, "graph": { "type": "Line", @@ -214,23 +252,49 @@ "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false, "metricConfig": [ { "label": "P50, P75, P90, P95, P99", "labelsIndex": "0, 1, 2, 3, 4" } - ] + ], + "value": "4-0-5", + "label": "Service_Response_Percentile", + "associate": [ + { + "widgetId": "4-0-3" + }, + { + "widgetId": "4-0-4" + }, + { + "widgetId": "4-0-10" + }, + { + "widgetId": "4-0-6" + }, + { + "widgetId": "4-0-7" + }, + { + "widgetId": "4-0-9" + } + ], + "filters": { + "dataIndex": 12, + "sourceId": "4-0-3" + } }, { - "x": 18, - "y": 5, - "w": 6, + "x": 0, + "y": 16, + "w": 8, "h": 11, "i": "6", "type": "Widget", "widget": { - "title": "Success Rate (%)" + "title": "Success Rate (%)", + "name": "Success_Rate" }, "graph": { "type": "Line", @@ -246,23 +310,49 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "percentage" } - ] + ], + "value": "4-0-6", + "label": "Success_Rate", + "associate": [ + { + "widgetId": "4-0-3" + }, + { + "widgetId": "4-0-4" + }, + { + "widgetId": "4-0-5" + }, + { + "widgetId": "4-0-10" + }, + { + "widgetId": "4-0-7" + }, + { + "widgetId": "4-0-9" + } + ], + "filters": { + "dataIndex": 12, + "sourceId": "4-0-3" + } }, { - "x": 0, - "y": 16, - "w": 8, + "x": 18, + "y": 5, + "w": 6, "h": 11, "i": "7", "type": "Widget", "widget": { "title": "Service Load (calls / min)", - "tips": "For HTTP 1/2, gRPC, RPC services, this means Calls Per Minute (calls / min)" + "tips": "For HTTP 1/2, gRPC, RPC services, this means Calls Per Minute (calls / min)", + "name": "Service_Load" }, "graph": { "type": "Line", @@ -278,7 +368,32 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "4-0-7", + "label": "Service_Load", + "associate": [ + { + "widgetId": "4-0-3" + }, + { + "widgetId": "4-0-4" + }, + { + "widgetId": "4-0-5" + }, + { + "widgetId": "4-0-6" + }, + { + "widgetId": "4-0-10" + }, + { + "widgetId": "4-0-9" + } + ], + "filters": { + "dataIndex": 12, + "sourceId": "4-0-3" + } }, { "x": 8, @@ -288,7 +403,8 @@ "i": "9", "type": "Widget", "widget": { - "title": "Message Queue Consuming Count" + "title": "Message Queue Consuming Count", + "name": "Message_Consuming_Count" }, "graph": { "type": "Line", @@ -304,7 +420,32 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "4-0-9", + "label": "Message_Consuming_Count", + "associate": [ + { + "widgetId": "4-0-3" + }, + { + "widgetId": "4-0-4" + }, + { + "widgetId": "4-0-5" + }, + { + "widgetId": "4-0-6" + }, + { + "widgetId": "4-0-7" + }, + { + "widgetId": "4-0-10" + } + ], + "filters": { + "dataIndex": 12, + "sourceId": "4-0-3" + } }, { "x": 16, @@ -315,7 +456,8 @@ "type": "Widget", "widget": { "title": "Message Queue Avg Consuming Latency (ms)", - "tips": "The avg latency of message consuming. Latency = timestamp(received) - timestamp(producing)" + "tips": "The avg latency of message consuming. Latency = timestamp(received) - timestamp(producing)", + "name": "Message_Consuming_Latency" }, "graph": { "type": "Line", @@ -331,7 +473,32 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "4-0-10", + "label": "Message_Consuming_Latency", + "associate": [ + { + "widgetId": "4-0-3" + }, + { + "widgetId": "4-0-4" + }, + { + "widgetId": "4-0-5" + }, + { + "widgetId": "4-0-6" + }, + { + "widgetId": "4-0-7" + }, + { + "widgetId": "4-0-9" + } + ], + "filters": { + "dataIndex": 12, + "sourceId": "4-0-3" + } }, { "x": 0, @@ -359,7 +526,8 @@ "calculation": "percentage" } ], - "moved": false + "value": "4-0-11", + "label": "4-0-11" }, { "x": 8, @@ -387,7 +555,8 @@ "calculation": "percentage" } ], - "moved": false + "value": "4-0-12", + "label": "4-0-12" }, { "x": 16, @@ -415,7 +584,8 @@ "calculation": "percentage" } ], - "moved": false + "value": "4-0-13", + "label": "4-0-13" }, { "x": 16, @@ -437,12 +607,14 @@ "metricTypes": [ "sortMetrics" ], - "moved": false, "metricConfig": [ { + "sortOrder": "ASC", "calculation": "percentage" } - ] + ], + "value": "4-0-20", + "label": "4-0-20" }, { "x": 8, @@ -458,14 +630,14 @@ "type": "TopList", "topN": "10" }, - "standard": {}, "metrics": [ "endpoint_resp_time" ], "metricTypes": [ "sortMetrics" ], - "moved": false + "value": "4-0-21", + "label": "4-0-21" }, { "x": 0, @@ -488,7 +660,8 @@ "metricTypes": [ "sortMetrics" ], - "moved": false + "value": "4-0-22", + "label": "4-0-22" } ] }, @@ -502,9 +675,6 @@ "h": 49, "i": "0", "type": "Widget", - "widget": { - "title": "" - }, "graph": { "type": "InstanceList", "dashboardName": "General-Instance", @@ -520,7 +690,6 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false, "metricConfig": [ { "label": "Load", @@ -537,7 +706,9 @@ "label": "Latency", "unit": "ms" } - ] + ], + "value": "4-1-0", + "label": "4-1-0" } ] }, @@ -551,9 +722,6 @@ "h": 49, "i": "0", "type": "Widget", - "widget": { - "title": "" - }, "graph": { "type": "EndpointList", "dashboardName": "General-Endpoint", @@ -571,7 +739,6 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false, "metricConfig": [ { "label": "Load", @@ -588,7 +755,9 @@ "label": "Latency", "unit": "ms" } - ] + ], + "value": "4-2-0", + "label": "4-2-0" } ] }, @@ -602,19 +771,9 @@ "h": 48, "i": "0", "type": "Topology", - "widget": { - "title": "Title" - }, "graph": { "showDepth": true }, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "moved": false, "linkDashboard": "General-Service-Relation", "nodeDashboard": [ { @@ -706,18 +865,7 @@ "w": 24, "h": 48, "i": "0", - "type": "Trace", - "widget": { - "title": "Title" - }, - "graph": {}, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "moved": false + "type": "Trace" } ] }, @@ -788,23 +936,11 @@ "w": 24, "h": 48, "i": "0", - "type": "Log", - "widget": { - "title": "Title" - }, - "graph": {}, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "moved": false + "type": "Log" } ] } - ], - "moved": false + ] } ], "layer": "GENERAL", @@ -813,4 +949,4 @@ "id": "General-Service" } } -] \ No newline at end of file +] diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-endpoint.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-endpoint.json index 72d00c4a3a7c..f9d76f49afd8 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 @@ -27,17 +27,6 @@ "h": 52, "i": "1", "type": "Tab", - "widget": { - "title": "Title" - }, - "graph": {}, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "activedTabIndex": 0, "children": [ { "name": "Overview", @@ -50,7 +39,8 @@ "i": "3", "type": "Widget", "widget": { - "title": "Endpoint Response Time Percentile (ms)" + "title": "Endpoint Response Time Percentile (ms)", + "name": "Endpoint_Response_Percentile" }, "graph": { "type": "Line", @@ -60,24 +50,41 @@ "showXAxis": true, "showYAxis": true }, - "standard": { - "unit": "ms", - "metricLabels": "P50, P75, P90, P95, P99", - "labelsIndex": "0,1,2,3,4" - }, "metrics": [ "endpoint_percentile" ], "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false, "metricConfig": [ { "label": "P50, P75, P90, P95, P99", "labelsIndex": "0,1,2,3,4" } - ] + ], + "value": "1-0-3", + "label": "Endpoint_Response_Percentile", + "associate": [ + { + "widgetId": "1-0-10" + }, + { + "widgetId": "1-0-4" + }, + { + "widgetId": "1-0-7" + }, + { + "widgetId": "1-0-8" + }, + { + "widgetId": "1-0-9" + } + ], + "filters": { + "dataIndex": 13, + "sourceId": "1-0-7" + } }, { "x": 11, @@ -87,7 +94,8 @@ "i": "4", "type": "Widget", "widget": { - "title": "Endpoint Avg Response Time (ms)" + "title": "Endpoint Avg Response Time (ms)", + "name": "Endpoint_Avg_Response" }, "graph": { "type": "Line", @@ -103,7 +111,29 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "1-0-4", + "label": "Endpoint_Avg_Response", + "associate": [ + { + "widgetId": "1-0-3" + }, + { + "widgetId": "1-0-10" + }, + { + "widgetId": "1-0-7" + }, + { + "widgetId": "1-0-8" + }, + { + "widgetId": "1-0-9" + } + ], + "filters": { + "dataIndex": 13, + "sourceId": "1-0-7" + } }, { "x": 0, @@ -113,7 +143,8 @@ "i": "7", "type": "Widget", "widget": { - "title": "Endpoint Successful Rate (%)" + "title": "Endpoint Successful Rate (%)", + "name": "Endpoint_Successful_Rate" }, "graph": { "type": "Line", @@ -129,11 +160,29 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "percentage" } + ], + "value": "1-0-7", + "label": "Endpoint_Successful_Rate", + "associate": [ + { + "widgetId": "1-0-3" + }, + { + "widgetId": "1-0-4" + }, + { + "widgetId": "1-0-10" + }, + { + "widgetId": "1-0-8" + }, + { + "widgetId": "1-0-9" + } ] }, { @@ -144,7 +193,8 @@ "i": "8", "type": "Widget", "widget": { - "title": "Endpoint Load (calls or packets / min)" + "title": "Endpoint Load (calls or packets / min)", + "name": "Endpoint_Load" }, "graph": { "type": "Line", @@ -160,7 +210,29 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "1-0-8", + "label": "Endpoint_Load", + "associate": [ + { + "widgetId": "1-0-3" + }, + { + "widgetId": "1-0-4" + }, + { + "widgetId": "1-0-7" + }, + { + "widgetId": "1-0-10" + }, + { + "widgetId": "1-0-9" + } + ], + "filters": { + "dataIndex": 13, + "sourceId": "1-0-7" + } }, { "x": 0, @@ -175,10 +247,10 @@ "metrics": [ "endpoint_sidecar_internal_req_latency_nanos" ], - "moved": false, "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" + "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", + "name": "Sidecar_Request_Latency" }, "graph": { "type": "Line", @@ -188,7 +260,29 @@ "showXAxis": true, "showYAxis": true }, - "metricConfig": [] + "value": "1-0-9", + "label": "Sidecar_Request_Latency", + "associate": [ + { + "widgetId": "1-0-3" + }, + { + "widgetId": "1-0-4" + }, + { + "widgetId": "1-0-7" + }, + { + "widgetId": "1-0-8" + }, + { + "widgetId": "1-0-10" + } + ], + "filters": { + "dataIndex": 13, + "sourceId": "1-0-7" + } }, { "x": 11, @@ -203,10 +297,10 @@ "metrics": [ "endpoint_sidecar_internal_resp_latency_nanos" ], - "moved": false, "widget": { "title": "Proxy Sidecar Internal Latency in Nanoseconds (Response)", - "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" + "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", + "name": "Sidecar_Response_Latency" }, "graph": { "type": "Line", @@ -215,6 +309,29 @@ "showSymbol": false, "showXAxis": true, "showYAxis": true + }, + "value": "1-0-10", + "label": "1-0-10", + "associate": [ + { + "widgetId": "1-0-3" + }, + { + "widgetId": "1-0-4" + }, + { + "widgetId": "1-0-7" + }, + { + "widgetId": "1-0-8" + }, + { + "widgetId": "1-0-9" + } + ], + "filters": { + "dataIndex": 13, + "sourceId": "1-0-7" } } ] @@ -228,23 +345,11 @@ "w": 24, "h": 49, "i": "0", - "type": "Log", - "widget": { - "title": "Title" - }, - "graph": {}, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "moved": false + "type": "Log" } ] } - ], - "moved": false + ] } ], "layer": "MESH", diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-instance-relation.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-instance-relation.json index b33ece4b9039..362b466c237b 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-instance-relation.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-instance-relation.json @@ -22,13 +22,14 @@ "children": [ { "x": 12, - "y": 12, - "w": 12, + "y": 0, + "w": 6, "h": 12, "i": "1", "type": "Widget", "widget": { - "title": "Response Time Percentile (Client) (ms)" + "title": "Response Time Percentile (Client) (ms)", + "name": "Response_Percentile_Client" }, "graph": { "type": "Line", @@ -44,24 +45,64 @@ "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false, "metricConfig": [ { "key": "P50, P75, P90, P95, P99", "labelsIndex": "0,1,2,3,4", "label": "P50, P75, P90, P95, P99" } + ], + "value": "1", + "label": "Response_Percentile_Client", + "associate": [ + { + "widgetId": "10" + }, + { + "widgetId": "2" + }, + { + "widgetId": "3" + }, + { + "widgetId": "4" + }, + { + "widgetId": "5" + }, + { + "widgetId": "6" + }, + { + "widgetId": "7" + }, + { + "widgetId": "8" + }, + { + "widgetId": "9" + }, + { + "widgetId": "11" + }, + { + "widgetId": "12" + }, + { + "widgetId": "14" + } ] }, { "x": 0, - "y": 24, - "w": 12, + "y": 12, + "w": 6, "h": 12, "i": "2", "type": "Widget", "widget": { - "title": "Success Rate (Client) (%)" + "title": "Success Rate (Client) (%)", + "name": "Success_Rate_Client" }, "graph": { "type": "Line", @@ -77,22 +118,62 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "percentage" } + ], + "value": "2", + "label": "Success_Rate_Client", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "10" + }, + { + "widgetId": "3" + }, + { + "widgetId": "4" + }, + { + "widgetId": "5" + }, + { + "widgetId": "6" + }, + { + "widgetId": "7" + }, + { + "widgetId": "8" + }, + { + "widgetId": "9" + }, + { + "widgetId": "11" + }, + { + "widgetId": "12" + }, + { + "widgetId": "14" + } ] }, { "x": 12, - "y": 36, - "w": 12, + "y": 12, + "w": 6, "h": 12, "i": "3", "type": "Widget", "widget": { - "title": "Load (Client) (calls or packets / min)" + "title": "Load (Client) (calls or packets / min)", + "name": "Load_Client" }, "graph": { "type": "Line", @@ -108,17 +189,57 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "3", + "label": "Load_Client", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "2" + }, + { + "widgetId": "10" + }, + { + "widgetId": "4" + }, + { + "widgetId": "5" + }, + { + "widgetId": "6" + }, + { + "widgetId": "7" + }, + { + "widgetId": "8" + }, + { + "widgetId": "9" + }, + { + "widgetId": "11" + }, + { + "widgetId": "12" + }, + { + "widgetId": "14" + } + ] }, { "x": 0, - "y": 12, - "w": 12, + "y": 0, + "w": 6, "h": 12, "i": "4", "type": "Widget", "widget": { - "title": "Response Time (Client) (ms)" + "title": "Response Time (Client) (ms)", + "name": "Response_Client" }, "graph": { "type": "Line", @@ -134,17 +255,57 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "4", + "label": "Response_Client", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "2" + }, + { + "widgetId": "3" + }, + { + "widgetId": "10" + }, + { + "widgetId": "5" + }, + { + "widgetId": "6" + }, + { + "widgetId": "7" + }, + { + "widgetId": "8" + }, + { + "widgetId": "9" + }, + { + "widgetId": "11" + }, + { + "widgetId": "12" + }, + { + "widgetId": "14" + } + ] }, { - "x": 12, + "x": 18, "y": 0, - "w": 12, + "w": 6, "h": 12, "i": "5", "type": "Widget", "widget": { - "title": "Response Time Percentile (Server) (ms)" + "title": "Response Time Percentile (Server) (ms)", + "name": "Response_Percentile_Server" }, "graph": { "type": "Line", @@ -160,24 +321,64 @@ "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false, "metricConfig": [ { "key": "P50, P75, P90, P95, P99", "labelsIndex": "0,1,2,3,4", "label": "P50, P75, P90, P95, P99" } + ], + "value": "5", + "label": "Response_Percentile_Server", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "2" + }, + { + "widgetId": "3" + }, + { + "widgetId": "4" + }, + { + "widgetId": "10" + }, + { + "widgetId": "6" + }, + { + "widgetId": "7" + }, + { + "widgetId": "8" + }, + { + "widgetId": "9" + }, + { + "widgetId": "11" + }, + { + "widgetId": "12" + }, + { + "widgetId": "14" + } ] }, { - "x": 0, - "y": 36, - "w": 12, + "x": 6, + "y": 12, + "w": 6, "h": 12, "i": "6", "type": "Widget", "widget": { - "title": "Success Rate (Server) (%)" + "title": "Success Rate (Server) (%)", + "name": "Success_Rate_Server" }, "graph": { "type": "Line", @@ -193,22 +394,62 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "percentage" } + ], + "value": "6", + "label": "Success_Rate_Server", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "2" + }, + { + "widgetId": "3" + }, + { + "widgetId": "4" + }, + { + "widgetId": "5" + }, + { + "widgetId": "10" + }, + { + "widgetId": "7" + }, + { + "widgetId": "8" + }, + { + "widgetId": "9" + }, + { + "widgetId": "11" + }, + { + "widgetId": "12" + }, + { + "widgetId": "14" + } ] }, { - "x": 12, - "y": 24, - "w": 12, + "x": 18, + "y": 12, + "w": 6, "h": 12, "i": "7", "type": "Widget", "widget": { - "title": "Load (Server) (calls or packets / min)" + "title": "Load (Server) (calls or packets / min)", + "name": "Load_Server" }, "graph": { "type": "Line", @@ -224,17 +465,57 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "7", + "label": "Load_Server", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "2" + }, + { + "widgetId": "3" + }, + { + "widgetId": "4" + }, + { + "widgetId": "5" + }, + { + "widgetId": "6" + }, + { + "widgetId": "10" + }, + { + "widgetId": "8" + }, + { + "widgetId": "9" + }, + { + "widgetId": "11" + }, + { + "widgetId": "12" + }, + { + "widgetId": "14" + } + ] }, { - "x": 0, + "x": 6, "y": 0, - "w": 12, + "w": 6, "h": 12, "i": "8", "type": "Widget", "widget": { - "title": "Response Time (Server) (ms)" + "title": "Response Time (Server) (ms)", + "name": "Response_Server" }, "graph": { "type": "Line", @@ -250,11 +531,50 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "8", + "label": "Response_Server", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "2" + }, + { + "widgetId": "3" + }, + { + "widgetId": "4" + }, + { + "widgetId": "5" + }, + { + "widgetId": "6" + }, + { + "widgetId": "7" + }, + { + "widgetId": "10" + }, + { + "widgetId": "9" + }, + { + "widgetId": "11" + }, + { + "widgetId": "12" + }, + { + "widgetId": "14" + } + ] }, { "x": 6, - "y": 48, + "y": 24, "w": 6, "h": 12, "i": "9", @@ -265,10 +585,10 @@ "metrics": [ "instance_client_sidecar_internal_resp_latency_nanos" ], - "moved": false, "widget": { "title": "Proxy Sidecar Internal Latency in Nanoseconds (Client Response)", - "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" + "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", + "name": "Sidecar_Latency_Client_Rsp" }, "graph": { "type": "Line", @@ -277,11 +597,51 @@ "showSymbol": false, "showXAxis": true, "showYAxis": true - } + }, + "value": "9", + "label": "Sidecar_Latency_Client_Rsp", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "2" + }, + { + "widgetId": "3" + }, + { + "widgetId": "4" + }, + { + "widgetId": "5" + }, + { + "widgetId": "6" + }, + { + "widgetId": "7" + }, + { + "widgetId": "8" + }, + { + "widgetId": "10" + }, + { + "widgetId": "11" + }, + { + "widgetId": "12" + }, + { + "widgetId": "14" + } + ] }, { "x": 18, - "y": 48, + "y": 24, "w": 6, "h": 12, "i": "10", @@ -292,10 +652,10 @@ "metrics": [ "instance_server_sidecar_internal_resp_latency_nanos" ], - "moved": false, "widget": { "title": "Proxy Sidecar Internal Latency in Nanoseconds (Server Response)", - "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" + "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", + "name": "Sidecar_Latency_Server_Rsp" }, "graph": { "type": "Line", @@ -304,11 +664,51 @@ "showSymbol": false, "showXAxis": true, "showYAxis": true - } + }, + "value": "10", + "label": "10", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "2" + }, + { + "widgetId": "3" + }, + { + "widgetId": "4" + }, + { + "widgetId": "5" + }, + { + "widgetId": "6" + }, + { + "widgetId": "7" + }, + { + "widgetId": "8" + }, + { + "widgetId": "9" + }, + { + "widgetId": "11" + }, + { + "widgetId": "12" + }, + { + "widgetId": "14" + } + ] }, { "x": 12, - "y": 48, + "y": 24, "w": 6, "h": 12, "i": "11", @@ -319,10 +719,10 @@ "metrics": [ "instance_server_sidecar_internal_req_latency_nanos" ], - "moved": false, "widget": { "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", - "title": "Proxy Sidecar Internal Latency (Server Request)" + "title": "Proxy Sidecar Internal Latency (Server Request)", + "name": "Sidecar_Latency_Server_Request" }, "graph": { "type": "Line", @@ -331,11 +731,51 @@ "showSymbol": false, "showXAxis": true, "showYAxis": true - } + }, + "value": "11", + "label": "Sidecar_Latency_Server_Request", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "2" + }, + { + "widgetId": "3" + }, + { + "widgetId": "4" + }, + { + "widgetId": "5" + }, + { + "widgetId": "6" + }, + { + "widgetId": "7" + }, + { + "widgetId": "8" + }, + { + "widgetId": "9" + }, + { + "widgetId": "10" + }, + { + "widgetId": "12" + }, + { + "widgetId": "14" + } + ] }, { "x": 0, - "y": 48, + "y": 24, "w": 6, "h": 12, "i": "12", @@ -346,10 +786,10 @@ "metrics": [ "instance_client_sidecar_internal_req_latency_nanos" ], - "moved": false, "widget": { "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", - "title": "Proxy Sidecar Internal Latency (Client Request)" + "title": "Proxy Sidecar Internal Latency (Client Request)", + "name": "Sidecar_Latency_Client_Request" }, "graph": { "type": "Line", @@ -358,7 +798,130 @@ "showSymbol": false, "showXAxis": true, "showYAxis": true - } + }, + "value": "12", + "label": "Sidecar_Latency_Client_Request", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "2" + }, + { + "widgetId": "3" + }, + { + "widgetId": "4" + }, + { + "widgetId": "5" + }, + { + "widgetId": "6" + }, + { + "widgetId": "7" + }, + { + "widgetId": "8" + }, + { + "widgetId": "9" + }, + { + "widgetId": "11" + }, + { + "widgetId": "10" + }, + { + "widgetId": "14" + } + ] + }, + { + "x": 0, + "y": 36, + "w": 12, + "h": 12, + "i": "13", + "type": "Widget", + "metricTypes": [ + "readMetricsValues", + "readMetricsValues" + ], + "metrics": [ + "service_instance_relation_client_received", + "service_instance_relation_client_sent" + ], + "widget": { + "title": "Service Instance Throughput (Client) (Bytes)", + "tips": "This metrics is only avaible for TCP services" + }, + "value": "13", + "label": "13" + }, + { + "x": 12, + "y": 36, + "w": 12, + "h": 12, + "i": "14", + "type": "Widget", + "metricTypes": [ + "readMetricsValues", + "readMetricsValues" + ], + "metrics": [ + "service_instance_relation_server_received", + "service_instance_relation_server_sent" + ], + "widget": { + "title": "Service Instance Throughput (Server) (Bytes)", + "name": "Instance_Throughput_Server", + "tips": "This metrics is only avaible for TCP services" + }, + "value": "14", + "label": "Instance_Throughput_Server", + "associate": [ + { + "widgetId": "1" + }, + { + "widgetId": "2" + }, + { + "widgetId": "3" + }, + { + "widgetId": "4" + }, + { + "widgetId": "5" + }, + { + "widgetId": "6" + }, + { + "widgetId": "7" + }, + { + "widgetId": "8" + }, + { + "widgetId": "9" + }, + { + "widgetId": "11" + }, + { + "widgetId": "12" + }, + { + "widgetId": "10" + } + ] } ], "layer": "MESH", 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 d01ef5e76c4e..4f34582445b5 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 @@ -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": "Mesh-Instance", @@ -22,7 +39,8 @@ "i": "0", "type": "Widget", "widget": { - "title": "Service Instance Latency (ms)" + "title": "Service Instance Latency (ms)", + "name": "Instance_Latency" }, "graph": { "type": "Line", @@ -37,7 +55,24 @@ ], "metricTypes": [ "readMetricsValues" - ] + ], + "value": "1-0-0", + "label": "Instance_Latency", + "associate": [ + { + "widgetId": "1-0-2" + }, + { + "widgetId": "1-0-1" + }, + { + "widgetId": "1-0-3" + } + ], + "filters": { + "dataIndex": 17, + "sourceId": "1-0-3" + } }, { "x": 0, @@ -47,7 +82,8 @@ "i": "1", "type": "Widget", "widget": { - "title": "Service Instance Successful Rate (%)" + "title": "Service Instance Successful Rate (%)", + "name": "Instance_Successful_Rate" }, "graph": { "type": "Line", @@ -62,7 +98,24 @@ ], "metricTypes": [ "readMetricsValues" - ] + ], + "value": "1-0-1", + "label": "Instance_Successful_Rate", + "associate": [ + { + "widgetId": "1-0-0" + }, + { + "widgetId": "1-0-2" + }, + { + "widgetId": "1-0-3" + } + ], + "filters": { + "dataIndex": 17, + "sourceId": "1-0-3" + } }, { "x": 11, @@ -72,7 +125,9 @@ "i": "2", "type": "Widget", "widget": { - "title": "Service Throughput (Bytes)" + "title": "Service Instance Throughput (Bytes)", + "name": "Instance_Throughput", + "tips": "This metrics is only avaible for TCP services" }, "graph": { "type": "Line", @@ -83,13 +138,30 @@ "showYAxis": true }, "metrics": [ - "service_throughput_received", - "service_throughput_sent" + "service_instance_throughput_received", + "service_instance_throughput_sent" ], "metricTypes": [ "readMetricsValues", "readMetricsValues" - ] + ], + "value": "1-0-2", + "label": "Service_Instance_Throughput", + "associate": [ + { + "widgetId": "1-0-0" + }, + { + "widgetId": "1-0-1" + }, + { + "widgetId": "1-0-3" + } + ], + "filters": { + "dataIndex": 17, + "sourceId": "1-0-3" + } }, { "x": 0, @@ -100,7 +172,8 @@ "type": "Widget", "widget": { "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)" + "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)", + "name": "Instance_Load" }, "graph": { "type": "Line", @@ -115,6 +188,19 @@ ], "metricTypes": [ "readMetricsValues" + ], + "value": "1-0-3", + "label": "Instance_Load", + "associate": [ + { + "widgetId": "1-0-0" + }, + { + "widgetId": "1-0-1" + }, + { + "widgetId": "1-0-2" + } ] } ] @@ -145,7 +231,9 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ] + ], + "value": "1-1-10", + "label": "1-1-10" }, { "x": 6, @@ -172,7 +260,9 @@ "metricTypes": [ "readMetricsValues", "readMetricsValues" - ] + ], + "value": "1-1-11", + "label": "1-1-11" }, { "x": 0, @@ -197,7 +287,9 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ] + ], + "value": "1-1-12", + "label": "1-1-12" }, { "x": 12, @@ -222,7 +314,9 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ] + ], + "value": "1-1-13", + "label": "1-1-13" }, { "x": 6, @@ -247,7 +341,9 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ] + ], + "value": "1-1-14", + "label": "1-1-14" }, { "x": 0, @@ -302,7 +398,9 @@ { "calculation": "byteToMB" } - ] + ], + "value": "1-1-15", + "label": "1-1-15" }, { "x": 18, @@ -327,7 +425,9 @@ ], "metricTypes": [ "readMetricsValues" - ] + ], + "value": "1-1-16", + "label": "1-1-16" }, { "x": 12, @@ -354,7 +454,9 @@ "metricTypes": [ "readMetricsValues", "readMetricsValues" - ] + ], + "value": "1-1-17", + "label": "1-1-17" }, { "x": 6, @@ -379,7 +481,9 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ] + ], + "value": "1-1-18", + "label": "1-1-18" }, { "x": 0, @@ -404,7 +508,9 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ] + ], + "value": "1-1-19", + "label": "1-1-19" }, { "x": 12, @@ -430,7 +536,9 @@ "showSymbol": false, "showXAxis": true, "showYAxis": true - } + }, + "value": "1-1-20", + "label": "1-1-20" }, { "x": 18, @@ -456,7 +564,9 @@ "showSymbol": false, "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-relation.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-service-relation.json index 0cf50c1b964d..f00d788e7f24 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 @@ -27,30 +27,20 @@ "h": 52, "i": "0", "type": "Tab", - "widget": { - "title": "Title" - }, - "graph": {}, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "activedTabIndex": 0, "children": [ { "name": "Overview", "children": [ { - "x": 0, - "y": 24, - "w": 12, + "x": 6, + "y": 12, + "w": 6, "h": 12, "i": "0", "type": "Widget", "widget": { - "title": "Load (Server) (calls or packets / min)" + "title": "Load (Server) (calls or packets / min)", + "name": "Load_Server" }, "graph": { "type": "Line", @@ -66,17 +56,64 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-0-0", + "label": "Load_Server", + "associate": [ + { + "widgetId": "0-0-11" + }, + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + }, + { + "widgetId": "0-0-8" + }, + { + "widgetId": "0-0-9" + }, + { + "widgetId": "0-0-10" + }, + { + "widgetId": "0-0-12" + }, + { + "widgetId": "0-0-13" + } + ], + "filters": { + "dataIndex": 5, + "sourceId": "0-0-11" + } }, { - "x": 16, - "y": 0, - "w": 8, + "x": 18, + "y": 12, + "w": 6, "h": 12, "i": "1", "type": "Widget", "widget": { - "title": "Successful Rate (Server) (%)" + "title": "Successful Rate (Server) (%)", + "name": "Successful_Rate_Server" }, "graph": { "type": "Line", @@ -92,22 +129,69 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "percentage" } - ] + ], + "value": "0-0-1", + "label": "Successful_Rate_Server", + "associate": [ + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-11" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + }, + { + "widgetId": "0-0-8" + }, + { + "widgetId": "0-0-9" + }, + { + "widgetId": "0-0-10" + }, + { + "widgetId": "0-0-12" + }, + { + "widgetId": "0-0-13" + } + ], + "filters": { + "dataIndex": 5, + "sourceId": "0-0-11" + } }, { - "x": 8, + "x": 18, "y": 0, - "w": 8, + "w": 6, "h": 12, "i": "2", "type": "Widget", "widget": { - "title": "Response Time Percentile (Server) (ms)" + "title": "Response Time Percentile (Server) (ms)", + "name": "Response_Percentile_Server" }, "graph": { "type": "Line", @@ -123,23 +207,70 @@ "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false, "metricConfig": [ { "label": "P50, P75, P90, P95, P99", "labelsIndex": "0,1,2,3,4" } - ] + ], + "value": "0-0-2", + "label": "Response_Percentile_Server", + "associate": [ + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-11" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + }, + { + "widgetId": "0-0-8" + }, + { + "widgetId": "0-0-9" + }, + { + "widgetId": "0-0-10" + }, + { + "widgetId": "0-0-12" + }, + { + "widgetId": "0-0-13" + } + ], + "filters": { + "dataIndex": 5, + "sourceId": "0-0-11" + } }, { - "x": 0, + "x": 6, "y": 0, - "w": 8, + "w": 6, "h": 12, "i": "3", "type": "Widget", "widget": { - "title": "Response Time (Server) (ms)" + "title": "Response Time (Server) (ms)", + "name": "Response_Server" }, "graph": { "type": "Line", @@ -155,17 +286,64 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-0-3", + "label": "Response_Server", + "associate": [ + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-11" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + }, + { + "widgetId": "0-0-8" + }, + { + "widgetId": "0-0-9" + }, + { + "widgetId": "0-0-10" + }, + { + "widgetId": "0-0-12" + }, + { + "widgetId": "0-0-13" + } + ], + "filters": { + "dataIndex": 5, + "sourceId": "0-0-11" + } }, { "x": 0, - "y": 12, - "w": 8, + "y": 0, + "w": 6, "h": 12, "i": "4", "type": "Widget", "widget": { - "title": "Response Time (Client) (ms)" + "title": "Response Time (Client) (ms)", + "name": "Response_Client" }, "graph": { "type": "Line", @@ -181,17 +359,64 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-0-4", + "label": "Response_Client", + "associate": [ + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-11" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + }, + { + "widgetId": "0-0-8" + }, + { + "widgetId": "0-0-9" + }, + { + "widgetId": "0-0-10" + }, + { + "widgetId": "0-0-12" + }, + { + "widgetId": "0-0-13" + } + ], + "filters": { + "dataIndex": 5, + "sourceId": "0-0-11" + } }, { - "x": 8, - "y": 12, - "w": 8, + "x": 12, + "y": 0, + "w": 6, "h": 12, "i": "5", "type": "Widget", "widget": { - "title": "Response Time Percentile (Client) (ms)" + "title": "Response Time Percentile (Client) (ms)", + "name": "Response_Percentile_Client" }, "graph": { "type": "Line", @@ -207,23 +432,70 @@ "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false, "metricConfig": [ { "label": "P50, P75, P90, P95, P99", "labelsIndex": "0,1,2,3,4" } - ] + ], + "value": "0-0-5", + "label": "Response_Percentile_Client", + "associate": [ + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-11" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + }, + { + "widgetId": "0-0-8" + }, + { + "widgetId": "0-0-9" + }, + { + "widgetId": "0-0-10" + }, + { + "widgetId": "0-0-12" + }, + { + "widgetId": "0-0-13" + } + ], + "filters": { + "dataIndex": 5, + "sourceId": "0-0-11" + } }, { - "x": 16, + "x": 12, "y": 12, - "w": 8, + "w": 6, "h": 12, "i": "6", "type": "Widget", "widget": { - "title": "Successful Rate (Client) (%)" + "title": "Successful Rate (Client) (%)", + "name": "Successful_Rate_Client" }, "graph": { "type": "Line", @@ -239,22 +511,69 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "percentage" } - ] + ], + "value": "0-0-6", + "label": "Successful_Rate_Client", + "associate": [ + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-11" + }, + { + "widgetId": "0-0-7" + }, + { + "widgetId": "0-0-8" + }, + { + "widgetId": "0-0-9" + }, + { + "widgetId": "0-0-10" + }, + { + "widgetId": "0-0-12" + }, + { + "widgetId": "0-0-13" + } + ], + "filters": { + "dataIndex": 5, + "sourceId": "0-0-11" + } }, { "x": 0, - "y": 36, - "w": 12, + "y": 12, + "w": 6, "h": 12, "i": "7", "type": "Widget", "widget": { - "title": "Load (Client) (calls or packets / min)" + "title": "Load (Client) (calls or packets / min)", + "name": "Load_Client" }, "graph": { "type": "Line", @@ -270,30 +589,124 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-0-7", + "label": "Load_Client", + "associate": [ + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-11" + }, + { + "widgetId": "0-0-8" + }, + { + "widgetId": "0-0-9" + }, + { + "widgetId": "0-0-10" + }, + { + "widgetId": "0-0-12" + }, + { + "widgetId": "0-0-13" + } + ], + "filters": { + "dataIndex": 5, + "sourceId": "0-0-11" + } }, { "x": 12, - "y": 24, + "y": 36, "w": 12, "h": 12, "i": "8", "type": "Widget", "widget": { "title": "Service Throughput (Server) (Bytes)", - "tips": "This metrics is only avaible for TCP services" + "tips": "This metrics is only avaible for TCP services", + "name": "Service_Throughput_Server" }, - "graph": {}, + "value": "0-0-8", + "label": "Service_Throughput_Server", "metrics": [ - "" + "service_relation_server_received", + "service_relation_server_sent" ], "metricTypes": [ - "" + "readMetricsValues", + "readMetricsValues" ], - "moved": false + "associate": [ + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + }, + { + "widgetId": "0-0-11" + }, + { + "widgetId": "0-0-9" + }, + { + "widgetId": "0-0-10" + }, + { + "widgetId": "0-0-12" + }, + { + "widgetId": "0-0-13" + } + ], + "filters": { + "dataIndex": 5, + "sourceId": "0-0-11" + } }, { - "x": 12, + "x": 0, "y": 36, "w": 12, "h": 12, @@ -301,20 +714,68 @@ "type": "Widget", "widget": { "title": "Service Throughput (Client) (Bytes)", - "tips": "This metrics is only avaible for TCP services" + "tips": "This metrics is only avaible for TCP services", + "name": "Service_Throughput_Client" }, - "graph": {}, + "value": "0-0-9", + "label": "Service_Throughput_Client", "metrics": [ - "" + "service_relation_client_received", + "service_relation_client_sent" ], "metricTypes": [ - "" + "readMetricsValues", + "readMetricsValues" ], - "moved": false + "associate": [ + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + }, + { + "widgetId": "0-0-8" + }, + { + "widgetId": "0-0-11" + }, + { + "widgetId": "0-0-10" + }, + { + "widgetId": "0-0-12" + }, + { + "widgetId": "0-0-13" + } + ], + "filters": { + "dataIndex": 5, + "sourceId": "0-0-11" + } }, { "x": 0, - "y": 48, + "y": 24, "w": 6, "h": 12, "i": "10", @@ -325,10 +786,10 @@ "metrics": [ "service_client_sidecar_internal_req_latency_nanos" ], - "moved": false, "widget": { "title": "Proxy Sidecar Internal Latency in Nanoseconds (Client 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" + "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", + "name": "Sidecar_Latency_Client_Request" }, "graph": { "type": "Line", @@ -338,11 +799,57 @@ "showXAxis": true, "showYAxis": true }, - "metricConfig": [] + "value": "0-0-10", + "label": "Sidecar_Latency_Client_Request", + "associate": [ + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + }, + { + "widgetId": "0-0-8" + }, + { + "widgetId": "0-0-9" + }, + { + "widgetId": "0-0-11" + }, + { + "widgetId": "0-0-12" + }, + { + "widgetId": "0-0-13" + } + ], + "filters": { + "dataIndex": 5, + "sourceId": "0-0-11" + } }, { "x": 18, - "y": 48, + "y": 24, "w": 6, "h": 12, "i": "11", @@ -353,10 +860,10 @@ "metrics": [ "service_server_sidecar_internal_resp_latency_nanos" ], - "moved": false, "widget": { "title": "Proxy Sidecar Internal Latency in Nanoseconds (Server Response)", - "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" + "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", + "name": "Sidecar_Latency_Server_Rsp" }, "graph": { "type": "Line", @@ -365,11 +872,58 @@ "showSymbol": false, "showXAxis": true, "showYAxis": true + }, + "value": "0-0-11", + "label": "0-0-11", + "associate": [ + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + }, + { + "widgetId": "0-0-8" + }, + { + "widgetId": "0-0-9" + }, + { + "widgetId": "0-0-10" + }, + { + "widgetId": "0-0-12" + }, + { + "widgetId": "0-0-13" + } + ], + "filters": { + "dataIndex": 5, + "sourceId": "0-0-13" } }, { "x": 6, - "y": 48, + "y": 24, "w": 6, "h": 12, "i": "12", @@ -378,12 +932,12 @@ "readMetricsValues" ], "metrics": [ - "service_relation_client_resp_time" + "service_client_sidecar_internal_resp_latency_nanos" ], - "moved": false, "widget": { "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", - "title": "Proxy Sidecar Internal Latency in Nanoseconds (Client Response)" + "title": "Proxy Sidecar Internal Latency in Nanoseconds (Client Response)", + "name": "Sidecar_Latency_Client_Rsp" }, "graph": { "type": "Line", @@ -392,11 +946,58 @@ "showSymbol": false, "showXAxis": true, "showYAxis": true + }, + "value": "0-0-12", + "label": "Sidecar_Latency_Client_Rsp", + "associate": [ + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + }, + { + "widgetId": "0-0-8" + }, + { + "widgetId": "0-0-9" + }, + { + "widgetId": "0-0-10" + }, + { + "widgetId": "0-0-11" + }, + { + "widgetId": "0-0-13" + } + ], + "filters": { + "dataIndex": 5, + "sourceId": "0-0-11" } }, { "x": 12, - "y": 48, + "y": 24, "w": 6, "h": 12, "i": "13", @@ -407,10 +1008,10 @@ "metrics": [ "service_server_sidecar_internal_req_latency_nanos" ], - "moved": false, "widget": { "title": "Proxy Sidecar Internal Latency in Nanoseconds (Server 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" + "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", + "name": "Sidecar_Latency_Server_Request" }, "graph": { "type": "Line", @@ -419,6 +1020,53 @@ "showSymbol": false, "showXAxis": true, "showYAxis": true + }, + "value": "0-0-13", + "label": "Sidecar_Latency_Server_Request", + "associate": [ + { + "widgetId": "0-0-0" + }, + { + "widgetId": "0-0-1" + }, + { + "widgetId": "0-0-2" + }, + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + }, + { + "widgetId": "0-0-8" + }, + { + "widgetId": "0-0-9" + }, + { + "widgetId": "0-0-10" + }, + { + "widgetId": "0-0-12" + }, + { + "widgetId": "0-0-11" + } + ], + "filters": { + "dataIndex": 5, + "sourceId": "0-0-11" } } ] @@ -433,19 +1081,9 @@ "h": 49, "i": "0", "type": "Topology", - "widget": { - "title": "Title" - }, "graph": { "showDepth": true }, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "moved": false, "linkDashboard": "Mesh-Instance-Relation", "nodeDashboard": "Mesh-Instance", "linkServerMetrics": [ @@ -528,7 +1166,8 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-2-20", + "label": "0-2-20" }, { "x": 16, @@ -554,7 +1193,8 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-2-21", + "label": "0-2-21" }, { "x": 8, @@ -580,7 +1220,8 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-2-22", + "label": "0-2-22" }, { "x": 0, @@ -606,7 +1247,8 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-2-23", + "label": "0-2-23" }, { "x": 16, @@ -632,7 +1274,8 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-2-24", + "label": "0-2-24" }, { "x": 8, @@ -658,7 +1301,8 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-2-25", + "label": "0-2-25" }, { "x": 0, @@ -684,12 +1328,12 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-2-26", + "label": "0-2-26" } ] } - ], - "moved": false + ] } ], "layer": "MESH", 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 1009a4db4213..8266843a3ecd 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 @@ -27,17 +27,6 @@ "h": 51, "i": "0", "type": "Tab", - "widget": { - "title": "Title" - }, - "graph": {}, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "activedTabIndex": 0, "children": [ { "name": "Overview", @@ -63,12 +52,13 @@ "metricTypes": [ "readMetricsValue" ], - "moved": false, "metricConfig": [ { "calculation": "apdex" } - ] + ], + "value": "0-0-0", + "label": "0-0-0" }, { "x": 8, @@ -92,13 +82,14 @@ "metricTypes": [ "readMetricsValue" ], - "moved": false, "metricConfig": [ { "calculation": "percentage", "unit": "%" } - ] + ], + "value": "0-0-1", + "label": "0-0-1" }, { "x": 16, @@ -123,12 +114,13 @@ "metricTypes": [ "readMetricsValue" ], - "moved": false, "metricConfig": [ { "unit": "calls or packets / min" } - ] + ], + "value": "0-0-2", + "label": "0-0-2" }, { "x": 8, @@ -138,7 +130,8 @@ "i": "3", "type": "Widget", "widget": { - "title": "Service Avg Response Time (ms)" + "title": "Service Avg Response Time (ms)", + "name": "Service_Response" }, "graph": { "type": "Line", @@ -154,10 +147,29 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, - "metricConfig": [ - {} - ] + "value": "0-0-3", + "label": "Service_Response", + "associate": [ + { + "widgetId": "0-0-9" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + } + ], + "filters": { + "dataIndex": 27, + "sourceId": "0-0-7" + } }, { "x": 0, @@ -167,7 +179,8 @@ "i": "4", "type": "Widget", "widget": { - "title": "Service Apdex" + "title": "Service Apdex", + "name": "Service_Apdex" }, "graph": { "type": "Line", @@ -183,12 +196,34 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "apdex" } - ] + ], + "value": "0-0-4", + "label": "Service_Apdex", + "associate": [ + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-9" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + } + ], + "filters": { + "dataIndex": 27, + "sourceId": "0-0-7" + } }, { "x": 16, @@ -198,7 +233,8 @@ "i": "5", "type": "Widget", "widget": { - "title": "Service Response Time Percentile (ms)" + "title": "Service Response Time Percentile (ms)", + "name": "Service_Response_Percentile" }, "graph": { "type": "Line", @@ -214,13 +250,35 @@ "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false, "metricConfig": [ { "label": "P50, P75, P90, P95, P99", "labelsIndex": "0, 1, 2, 3, 4" } - ] + ], + "value": "0-0-5", + "label": "Service_Response_Percentile", + "associate": [ + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-9" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + } + ], + "filters": { + "dataIndex": 27, + "sourceId": "0-0-7" + } }, { "x": 0, @@ -230,7 +288,8 @@ "i": "6", "type": "Widget", "widget": { - "title": "Success Rate (%)" + "title": "Success Rate (%)", + "name": "Success_Rate" }, "graph": { "type": "Line", @@ -246,12 +305,34 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "percentage" } - ] + ], + "value": "0-0-6", + "label": "Success_Rate", + "associate": [ + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-9" + }, + { + "widgetId": "0-0-7" + } + ], + "filters": { + "dataIndex": 27, + "sourceId": "0-0-7" + } }, { "x": 8, @@ -262,7 +343,8 @@ "type": "Widget", "widget": { "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)" + "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)", + "name": "Service_Load" }, "graph": { "type": "Line", @@ -278,7 +360,25 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "0-0-7", + "label": "Service_Load", + "associate": [ + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-9" + } + ] }, { "x": 16, @@ -289,7 +389,8 @@ "type": "Widget", "widget": { "title": "Service Throughput (Bytes)", - "tips": "This metrics is only avaible for TCP services" + "tips": "This metrics is only avaible for TCP services", + "name": "Service_Throughput" }, "graph": { "type": "Line", @@ -307,7 +408,29 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false + "value": "0-0-9", + "label": "0-0-9", + "associate": [ + { + "widgetId": "0-0-3" + }, + { + "widgetId": "0-0-4" + }, + { + "widgetId": "0-0-5" + }, + { + "widgetId": "0-0-6" + }, + { + "widgetId": "0-0-7" + } + ], + "filters": { + "dataIndex": 27, + "sourceId": "0-0-7" + } }, { "x": 0, @@ -335,7 +458,8 @@ "calculation": "percentage" } ], - "moved": false + "value": "0-0-11", + "label": "0-0-11" }, { "x": 8, @@ -363,7 +487,8 @@ "calculation": "percentage" } ], - "moved": false + "value": "0-0-12", + "label": "0-0-12" }, { "x": 16, @@ -391,7 +516,8 @@ "calculation": "percentage" } ], - "moved": false + "value": "0-0-13", + "label": "0-0-13" }, { "x": 16, @@ -413,12 +539,14 @@ "metricTypes": [ "sortMetrics" ], - "moved": false, "metricConfig": [ { + "sortOrder": "ASC", "calculation": "percentage" } - ] + ], + "value": "0-0-20", + "label": "0-0-20" }, { "x": 8, @@ -440,7 +568,8 @@ "metricTypes": [ "sortMetrics" ], - "moved": false + "value": "0-0-21", + "label": "0-0-21" }, { "x": 0, @@ -463,7 +592,8 @@ "metricTypes": [ "sortMetrics" ], - "moved": false + "value": "0-0-22", + "label": "0-0-22" }, { "x": 0, @@ -478,7 +608,6 @@ "metrics": [ "service_sidecar_internal_req_latency_nanos" ], - "moved": false, "graph": { "type": "Line", "step": false, @@ -491,7 +620,8 @@ "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" }, - "metricConfig": [] + "value": "0-0-23", + "label": "0-0-23" }, { "x": 8, @@ -506,7 +636,6 @@ "metrics": [ "service_sidecar_internal_resp_latency_nanos" ], - "moved": false, "widget": { "title": "Proxy Sidecar Internal Latency in Nanoseconds (Response)", "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" @@ -518,7 +647,9 @@ "showSymbol": false, "showXAxis": true, "showYAxis": true - } + }, + "value": "0-0-24", + "label": "0-0-24" } ] }, @@ -532,9 +663,6 @@ "h": 48, "i": "0", "type": "Widget", - "widget": { - "title": "" - }, "graph": { "type": "InstanceList", "dashboardName": "Mesh-Instance", @@ -550,7 +678,6 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false, "metricConfig": [ { "label": "Load", @@ -567,7 +694,9 @@ "label": "Latency", "unit": "ms" } - ] + ], + "value": "0-1-0", + "label": "0-1-0" } ] }, @@ -581,9 +710,6 @@ "h": 49, "i": "0", "type": "Widget", - "widget": { - "title": "" - }, "graph": { "type": "EndpointList", "dashboardName": "Mesh-Endpoint", @@ -601,7 +727,6 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false, "metricConfig": [ { "label": "Load", @@ -618,7 +743,9 @@ "label": "Latency", "unit": "ms" } - ] + ], + "value": "0-2-0", + "label": "0-2-0" } ] }, @@ -632,19 +759,9 @@ "h": 48, "i": "0", "type": "Topology", - "widget": { - "title": "Title" - }, "graph": { "showDepth": true }, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "moved": false, "linkDashboard": "Mesh-Service-Relation", "nodeDashboard": [ { @@ -736,18 +853,7 @@ "w": 24, "h": 49, "i": "0", - "type": "Log", - "widget": { - "title": "Title" - }, - "graph": {}, - "metrics": [ - "" - ], - "metricTypes": [ - "" - ], - "moved": false + "type": "Log" } ] }, @@ -789,4 +895,4 @@ "id": "Mesh-Service" } } -] \ No newline at end of file +] 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 e7535d5f7963..873d788c9107 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 @@ -40,7 +40,8 @@ "metricTypes": [ "readSampledRecords" ], - "moved": false + "value": "2", + "label": "2" }, { "x": 6, @@ -50,7 +51,8 @@ "i": "3", "type": "Widget", "widget": { - "title": "Database Access Successful Rate (%)" + "title": "Database Access Successful Rate (%)", + "name": "Successful_Rate" }, "graph": { "type": "Line", @@ -66,12 +68,28 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "percentage" } - ] + ], + "value": "3", + "label": "Successful_Rate", + "associate": [ + { + "widgetId": "5" + }, + { + "widgetId": "4" + }, + { + "widgetId": "6" + } + ], + "filters": { + "dataIndex": 17, + "sourceId": "4" + } }, { "x": 12, @@ -81,7 +99,8 @@ "i": "4", "type": "Widget", "widget": { - "title": "Database Traffic (calls / min)" + "title": "Database Traffic (calls / min)", + "name": "Database_Traffic" }, "graph": { "type": "Line", @@ -97,7 +116,19 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "4", + "label": "Database_Traffic", + "associate": [ + { + "widgetId": "3" + }, + { + "widgetId": "5" + }, + { + "widgetId": "6" + } + ] }, { "x": 18, @@ -107,7 +138,8 @@ "i": "5", "type": "Widget", "widget": { - "title": "Database Access Latency Percentile (ms)" + "title": "Database Access Latency Percentile (ms)", + "name": "Latency_Percentile" }, "graph": { "type": "Line", @@ -123,13 +155,29 @@ "metricTypes": [ "readLabeledMetricsValues" ], - "moved": false, "metricConfig": [ { "label": "P50, P75, P90, P95, P99", "labelsIndex": "0,1,2,3,4" } - ] + ], + "value": "5", + "label": "5", + "associate": [ + { + "widgetId": "3" + }, + { + "widgetId": "4" + }, + { + "widgetId": "6" + } + ], + "filters": { + "dataIndex": 17, + "sourceId": "4" + } }, { "x": 0, @@ -139,7 +187,8 @@ "i": "6", "type": "Widget", "widget": { - "title": "Database Avg Response Time (ms)" + "title": "Database Avg Response Time (ms)", + "name": "Database_Avg_Response" }, "graph": { "type": "Line", @@ -155,7 +204,23 @@ "metricTypes": [ "readMetricsValues" ], - "moved": false + "value": "6", + "label": "Database_Avg_Response", + "associate": [ + { + "widgetId": "3" + }, + { + "widgetId": "4" + }, + { + "widgetId": "5" + } + ], + "filters": { + "dataIndex": 17, + "sourceId": "4" + } } ], "layer": "VIRTUAL_DATABASE",