This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 146aa2f079 Add Zipkin trace tab in service mesh panel (#10239)
146aa2f079 is described below
commit 146aa2f0795a4f03c07e4ad429a4a4a181e4e0a1
Author: kezhenxu94 <[email protected]>
AuthorDate: Fri Jan 6 15:11:29 2023 +0800
Add Zipkin trace tab in service mesh panel (#10239)
---
docs/en/changes/changes.md | 1 +
.../ui-initialized-templates/mesh/mesh-root.json | 57 ++++++++--------------
skywalking-ui | 2 +-
3 files changed, 21 insertions(+), 39 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 3d19126baa..b91a85258c 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -79,6 +79,7 @@
* Add Micrometer icon
* Update MySQL UI to support MariaDB
* Add AWS menu for supporting AWS monitoring
+* Add Zipkin Lens UI as part of Service Mesh dashboard.
#### Documentation
diff --git
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-root.json
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-root.json
index 5b2c6a609e..29b7bc9b73 100644
---
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-root.json
+++
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-root.json
@@ -27,18 +27,6 @@
"h": 52,
"i": "1",
"type": "Tab",
- "widget": {
- "title": "Title"
- },
- "graph": {},
- "standard": {},
- "metrics": [
- ""
- ],
- "metricTypes": [
- ""
- ],
- "activedTabIndex": 1,
"children": [
{
"name": "Services",
@@ -50,9 +38,6 @@
"h": 48,
"i": "0",
"type": "Widget",
- "widget": {
- "title": ""
- },
"graph": {
"type": "ServiceList",
"dashboardName": "Mesh-Service",
@@ -61,7 +46,6 @@
"showYAxis": false,
"showGroup": true
},
- "standard": {},
"metrics": [
"service_cpm",
"service_sla",
@@ -74,7 +58,6 @@
"readMetricsValues",
"readMetricsValues"
],
- "moved": false,
"metricConfig": [
{
"label": "Load",
@@ -109,19 +92,9 @@
"h": 48,
"i": "0",
"type": "Topology",
- "widget": {
- "title": "Title"
- },
"graph": {
"showDepth": true
},
- "metrics": [
- ""
- ],
- "metricTypes": [
- ""
- ],
- "moved": false,
"linkDashboard": "Mesh-Service-Relation",
"nodeDashboard": [
{
@@ -203,9 +176,24 @@
]
}
]
+ },
+ {
+ "name": "Zipkin Trace",
+ "children": [
+ {
+ "x": 0,
+ "y": 0,
+ "w": 24,
+ "h": 32,
+ "i": "0",
+ "type": "ThirdPartyApp",
+ "widget": {
+ "url": "/zipkin"
+ }
+ }
+ ]
}
- ],
- "moved": false
+ ]
},
{
"x": 0,
@@ -214,12 +202,6 @@
"h": 2,
"i": "100",
"type": "Text",
- "metricTypes": [
- ""
- ],
- "metrics": [
- ""
- ],
"graph": {
"fontColor": "blue",
"backgroundColor": "white",
@@ -227,14 +209,13 @@
"fontSize": 14,
"textAlign": "left",
"url":
"https://skywalking.apache.org/docs/main/next/en/setup/envoy/als_setting/";
- },
- "moved": false
+ }
}
],
+ "id": "Mesh-Root",
"layer": "MESH",
"entity": "All",
"name": "Mesh-Root",
- "id": "Mesh-Root",
"isRoot": true
}
}
diff --git a/skywalking-ui b/skywalking-ui
index 1278454148..163de5e5cf 160000
--- a/skywalking-ui
+++ b/skywalking-ui
@@ -1 +1 @@
-Subproject commit 127845414890fc3868dc9af73972f1c89e776366
+Subproject commit 163de5e5cf2a16a3e25e42d0aaa4b6b1c551a85f
