From 9cb3ef12ae4de7fab34aca4cf5c94767f9fb70c1 Mon Sep 17 00:00:00 2001 From: kezhenxu94 Date: Thu, 21 Jul 2022 09:18:23 +0800 Subject: [PATCH] Add event widgets in dashboard where applicable (#9361) --- docs/en/changes/changes.md | 1 + .../browser/browser-app.json | 11 +++- .../browser/browser-page.json | 11 +++- .../browser/browser-version.json | 11 +++- .../faas/faas-function.json | 10 +++- .../faas/faas-instance.json | 11 +++- .../general/general-instance.json | 11 +++- .../general/general-service.json | 11 +++- .../mesh/mesh-instance.json | 11 +++- .../mesh/mesh-service.json | 11 +++- .../mesh_dp/mesh-data-plane-instance.json | 59 +++++++------------ skywalking-ui | 2 +- 12 files changed, 112 insertions(+), 48 deletions(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index b13d97360e..99205b65d1 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -48,6 +48,7 @@ * Dashboard: Fix `Mesh-Service-Relation` metric `Throughput` and `Proxy Sidecar Internal Latency in Nanoseconds (Client Response)`. * Dashboard: Fix `Mesh-Instance-Relation` metric `Throughput`. * Enhance associations for the Event widget. +* Add event widgets in dashboard where applicable. #### 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 cd3ed2a34b..36395714d4 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 @@ -22,7 +22,7 @@ "children": [ { "x": 0, - "y": 0, + "y": 12, "w": 24, "h": 52, "i": "12", @@ -417,6 +417,15 @@ ] } ] + }, + { + "x": 0, + "y": 0, + "w": 24, + "h": 12, + "i": "13", + "type": "Event", + "eventAssociate": true } ], "layer": "BROWSER", 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 c6ace41d69..a39ea5c3a8 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-page.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-page.json @@ -22,7 +22,7 @@ "children": [ { "x": 0, - "y": 0, + "y": 12, "w": 24, "h": 52, "i": "12", @@ -530,6 +530,15 @@ ] } ] + }, + { + "x": 0, + "y": 0, + "w": 24, + "h": 12, + "i": "13", + "type": "Event", + "eventAssociate": true } ], "layer": "BROWSER", 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 2ed34ae4be..cb83c3f0d1 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 @@ -22,7 +22,7 @@ "children": [ { "x": 0, - "y": 0, + "y": 12, "w": 24, "h": 52, "i": "12", @@ -182,6 +182,15 @@ ] } ] + }, + { + "x": 0, + "y": 0, + "w": 24, + "h": 12, + "i": "13", + "type": "Event", + "eventAssociate": true } ], "layer": "BROWSER", 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 0797595639..09824cab8e 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 @@ -22,7 +22,7 @@ "children": [ { "x": 0, - "y": 0, + "y": 12, "w": 24, "h": 52, "i": "4", @@ -544,6 +544,14 @@ ] } ] + }, + { + "x": 0, + "y": 0, + "w": 24, + "h": 12, + "i": "5", + "type": "Event" } ], "layer": "FAAS", 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 7b8c738de6..8216a141ba 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 @@ -22,7 +22,7 @@ "children": [ { "x": 0, - "y": 0, + "y": 12, "w": 24, "h": 52, "i": "0", @@ -174,6 +174,15 @@ ] } ] + }, + { + "x": 0, + "y": 0, + "w": 24, + "h": 12, + "i": "1", + "type": "Event", + "eventAssociate": true } ], "layer": "FAAS", 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 e49266d3a8..9387f15acb 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 @@ -22,7 +22,7 @@ "children": [ { "x": 0, - "y": 0, + "y": 12, "w": 24, "h": 52, "i": "0", @@ -644,6 +644,15 @@ ] } ] + }, + { + "x": 0, + "y": 0, + "w": 24, + "h": 12, + "i": "1", + "type": "Event", + "eventAssociate": true } ], "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 c6a391f6c7..21f6129814 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 @@ -22,7 +22,7 @@ "children": [ { "x": 0, - "y": 0, + "y": 12, "w": 24, "h": 52, "i": "4", @@ -941,6 +941,15 @@ ] } ] + }, + { + "x": 0, + "y": 0, + "w": 24, + "h": 12, + "i": "5", + "type": "Event", + "eventAssociate": true } ], "layer": "GENERAL", 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 4f34582445..1fd4baf1ef 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 @@ -22,7 +22,7 @@ "children": [ { "x": 0, - "y": 0, + "y": 12, "w": 24, "h": 52, "i": "1", @@ -597,6 +597,15 @@ ] } ] + }, + { + "x": 0, + "y": 0, + "w": 24, + "h": 12, + "i": "2", + "type": "Event", + "eventAssociate": true } ], "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 8266843a3e..113267cc31 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 @@ -22,7 +22,7 @@ "children": [ { "x": 0, - "y": 0, + "y": 12, "w": 24, "h": 51, "i": "0", @@ -887,6 +887,15 @@ ] } ] + }, + { + "x": 0, + "y": 0, + "w": 24, + "h": 12, + "i": "1", + "type": "Event", + "eventAssociate": true } ], "layer": "MESH", diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-instance.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-instance.json index 373af64749..4e707d2376 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-instance.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-instance.json @@ -22,18 +22,11 @@ "children": [ { "x": 0, - "y": 0, + "y": 12, "w": 24, "h": 51, "i": "10", "type": "Tab", - "metricTypes": [ - "" - ], - "metrics": [ - "" - ], - "activedTabIndex": 1, "children": [ { "name": "Envoy Proxy", @@ -61,8 +54,7 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ], - "moved": false + ] }, { "x": 6, @@ -82,7 +74,6 @@ "showXAxis": true, "showYAxis": true }, - "standard": {}, "metrics": [ "envoy_total_connections_used", "envoy_parent_connections_used" @@ -90,8 +81,7 @@ "metricTypes": [ "readMetricsValues", "readMetricsValues" - ], - "moved": false + ] }, { "x": 0, @@ -116,8 +106,7 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ], - "moved": false + ] }, { "x": 12, @@ -142,8 +131,7 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ], - "moved": false + ] }, { "x": 6, @@ -168,8 +156,7 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ], - "moved": false + ] }, { "x": 0, @@ -205,7 +192,6 @@ "readMetricsValues", "readMetricsValues" ], - "moved": false, "metricConfig": [ { "calculation": "byteToMB" @@ -250,8 +236,7 @@ ], "metricTypes": [ "readMetricsValues" - ], - "moved": false + ] }, { "x": 12, @@ -278,8 +263,7 @@ "metricTypes": [ "readMetricsValues", "readMetricsValues" - ], - "moved": false + ] }, { "x": 6, @@ -304,8 +288,7 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ], - "moved": false + ] }, { "x": 0, @@ -330,8 +313,7 @@ ], "metricTypes": [ "readLabeledMetricsValues" - ], - "moved": false + ] } ] }, @@ -344,19 +326,20 @@ "w": 24, "h": 47, "i": "0", - "type": "Log", - "metricTypes": [ - "" - ], - "metrics": [ - "" - ], - "moved": false + "type": "Log" } ] } - ], - "moved": false + ] + }, + { + "x": 0, + "y": 0, + "w": 24, + "h": 12, + "i": "11", + "type": "Event", + "eventAssociate": true } ], "layer": "MESH_DP", diff --git a/skywalking-ui b/skywalking-ui index ec7a8bbfa9..017f5bf709 160000 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit ec7a8bbfa9a2698a4ecb26588413e704a3f76016 +Subproject commit 017f5bf7094b29871d63f2a5b15761ca5520d253 -- GitLab