You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2022/04/03 06:59:25 UTC
[skywalking] branch master updated: Update ui-template and sync UI (#8795)
This is an automated email from the ASF dual-hosted git repository.
wusheng 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 b670ea6 Update ui-template and sync UI (#8795)
b670ea6 is described below
commit b670ea6031d0e23c8947459ccb9c02ee435ca9f5
Author: Kai <wa...@foxmail.com>
AuthorDate: Sun Apr 3 14:59:00 2022 +0800
Update ui-template and sync UI (#8795)
---
.../browser/browser-root.json | 27 ++++++++++++++++++++--
.../ui-initialized-templates/faas/faas-root.json | 4 ++--
.../general/general-root.json | 25 +++++++++++++++++++-
.../ui-initialized-templates/k8s/k8s-root.json | 26 +++++++++++++++++++--
.../k8s_service/k8s-service-root.json | 25 +++++++++++++++++++-
.../mesh/mesh-instance.json | 4 ++--
.../ui-initialized-templates/mesh/mesh-root.json | 25 +++++++++++++++++++-
.../mesh/mesh-service-relation.json | 14 +++++------
.../mesh_cp/mesh-control-plane-root.json | 26 +++++++++++++++++++--
.../mesh_dp/mesh-data-plane-instance.json | 4 ++--
.../mesh_dp/mesh-data-plane-root.json | 25 +++++++++++++++++++-
.../os_linux/linux-root.json | 25 +++++++++++++++++++-
.../so11y_oap/so11y-service.json | 26 ++++++++++++++++++++-
.../so11y_satellite/so11y-root.json | 4 ++--
.../virtual_database/virtual-database-root.json | 25 +++++++++++++++++++-
skywalking-ui | 2 +-
16 files changed, 258 insertions(+), 29 deletions(-)
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-root.json
index 2390b8e..b06838f 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-root.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-root.json
@@ -22,7 +22,7 @@
"children": [
{
"x": 0,
- "y": 0,
+ "y": 2,
"w": 24,
"h": 51,
"i": "0",
@@ -51,12 +51,35 @@
"unit": "calls / min"
}
]
+ },
+ {
+ "x": 0,
+ "y": 0,
+ "w": 24,
+ "h": 2,
+ "i": "100",
+ "type": "Text",
+ "metricTypes": [
+ ""
+ ],
+ "metrics": [
+ ""
+ ],
+ "graph": {
+ "fontColor": "blue",
+ "backgroundColor": "white",
+ "content": "Provide Browser-Side monitoring of Web-App, Versions and Pages, through Apache SkyWalking Client JS.",
+ "fontSize": 14,
+ "textAlign": "left",
+ "url": "https://skywalking.apache.org/docs/main/latest/en/setup/service-agent/browser-agent/"
+ },
+ "moved": false
}
],
+ "id": "Browser-Root",
"layer": "BROWSER",
"entity": "All",
"name": "Browser-Root",
- "id": "Browser-Root",
"isRoot": true
}
}
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 b4fd8e9..0447575 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
@@ -219,7 +219,7 @@
""
],
"graph": {
- "fontColor": "black",
+ "fontColor": "blue",
"backgroundColor": "white",
"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,
@@ -236,4 +236,4 @@
"isRoot": true
}
}
-]
\ No newline at end of file
+]
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-root.json
index 8f90a73..d2b5857 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-root.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-root.json
@@ -22,7 +22,7 @@
"children": [
{
"x": 0,
- "y": 0,
+ "y": 2,
"w": 24,
"h": 52,
"i": "1",
@@ -208,6 +208,29 @@
}
],
"moved": false
+ },
+ {
+ "x": 0,
+ "y": 0,
+ "w": 24,
+ "h": 2,
+ "i": "100",
+ "type": "Text",
+ "metricTypes": [
+ ""
+ ],
+ "metrics": [
+ ""
+ ],
+ "graph": {
+ "fontColor": "blue",
+ "backgroundColor": "white",
+ "content": "Observe Service through telemetry data collected from SkyWalking Agent.",
+ "fontSize": 14,
+ "textAlign": "left",
+ "url": "https://skywalking.apache.org/docs/main/latest/en/setup/service-agent/server-agents/"
+ },
+ "moved": false
}
],
"id": "General-Root",
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s/k8s-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s/k8s-root.json
index 8a9c4d5..54e2f61 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s/k8s-root.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s/k8s-root.json
@@ -22,7 +22,7 @@
"children": [
{
"x": 0,
- "y": 0,
+ "y": 2,
"w": 24,
"h": 52,
"i": "0",
@@ -38,7 +38,6 @@
"showYAxis": false,
"showGroup": true
},
- "standard": {},
"metrics": [
""
],
@@ -46,6 +45,29 @@
""
],
"moved": false
+ },
+ {
+ "x": 0,
+ "y": 0,
+ "w": 24,
+ "h": 2,
+ "i": "100",
+ "type": "Text",
+ "metricTypes": [
+ ""
+ ],
+ "metrics": [
+ ""
+ ],
+ "graph": {
+ "fontColor": "blue",
+ "backgroundColor": "white",
+ "content": "Provide monitoring of the status and resources of the K8S Cluster.",
+ "fontSize": 14,
+ "textAlign": "left",
+ "url": "https://skywalking.apache.org/docs/main/latest/en/setup/backend/backend-k8s-monitoring/"
+ },
+ "moved": false
}
],
"layer": "K8S",
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-root.json
index d449ef3..12e78ef 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-root.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-root.json
@@ -22,7 +22,7 @@
"children": [
{
"x": 0,
- "y": 0,
+ "y": 2,
"w": 24,
"h": 50,
"i": "0",
@@ -42,6 +42,29 @@
"showYAxis": false,
"showGroup": true
}
+ },
+ {
+ "x": 0,
+ "y": 0,
+ "w": 24,
+ "h": 2,
+ "i": "100",
+ "type": "Text",
+ "metricTypes": [
+ ""
+ ],
+ "metrics": [
+ ""
+ ],
+ "graph": {
+ "fontColor": "blue",
+ "backgroundColor": "white",
+ "content": "Observe Service status and resources from Kubernetes.",
+ "fontSize": 14,
+ "textAlign": "left",
+ "url": "https://skywalking.apache.org/docs/main/latest/en/setup/backend/backend-k8s-monitoring/"
+ },
+ "moved": false
}
],
"layer": "K8S_SERVICE",
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 6d01902..69e169c 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
@@ -242,7 +242,7 @@
"i": "13",
"type": "Widget",
"widget": {
- "title": "Upstream Connection Increase"
+ "title": "Upstream Connection Increase (Per Minute)"
},
"graph": {
"type": "Line",
@@ -430,7 +430,7 @@
"i": "19",
"type": "Widget",
"widget": {
- "title": "Upstream Request Increase"
+ "title": "Upstream Request Increase (Per Minute)"
},
"graph": {
"type": "Line",
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 ec46d70..fa09b5c 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
@@ -22,7 +22,7 @@
"children": [
{
"x": 0,
- "y": 0,
+ "y": 2,
"w": 24,
"h": 52,
"i": "1",
@@ -185,6 +185,29 @@
}
],
"moved": false
+ },
+ {
+ "x": 0,
+ "y": 0,
+ "w": 24,
+ "h": 2,
+ "i": "100",
+ "type": "Text",
+ "metricTypes": [
+ ""
+ ],
+ "metrics": [
+ ""
+ ],
+ "graph": {
+ "fontColor": "blue",
+ "backgroundColor": "white",
+ "content": "Observe Service Mesh through telemetry data collected from Envoy Access Log Service (ALS).",
+ "fontSize": 14,
+ "textAlign": "left",
+ "url": "https://skywalking.apache.org/docs/main/latest/en/setup/envoy/als_setting/"
+ },
+ "moved": false
}
],
"layer": "MESH",
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 9ad3619..b3b4444 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
@@ -400,7 +400,7 @@
"y": 26,
"w": 8,
"h": 13,
- "i": "0",
+ "i": "20",
"type": "Widget",
"widget": {
"title": "Upstream Connection None Healthy Increase (Per Minute)"
@@ -426,7 +426,7 @@
"y": 13,
"w": 8,
"h": 13,
- "i": "1",
+ "i": "21",
"type": "Widget",
"widget": {
"title": "LB Healthy Panic Increase (Per Minute)"
@@ -452,7 +452,7 @@
"y": 13,
"w": 8,
"h": 13,
- "i": "2",
+ "i": "22",
"type": "Widget",
"widget": {
"title": "Upstream Request Pending Active"
@@ -478,7 +478,7 @@
"y": 0,
"w": 8,
"h": 13,
- "i": "3",
+ "i": "23",
"type": "Widget",
"widget": {
"title": "Upstream Connection Active"
@@ -504,7 +504,7 @@
"y": 0,
"w": 8,
"h": 13,
- "i": "4",
+ "i": "24",
"type": "Widget",
"widget": {
"title": "Upstream Request Active"
@@ -530,7 +530,7 @@
"y": 0,
"w": 8,
"h": 13,
- "i": "5",
+ "i": "25",
"type": "Widget",
"widget": {
"title": "Upstream Connection Increase (Per Minute)"
@@ -556,7 +556,7 @@
"y": 13,
"w": 8,
"h": 13,
- "i": "6",
+ "i": "26",
"type": "Widget",
"widget": {
"title": "Upstream Request Increase (Per Minute)"
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_cp/mesh-control-plane-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_cp/mesh-control-plane-root.json
index ed2d9ae..7e2aba3 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_cp/mesh-control-plane-root.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_cp/mesh-control-plane-root.json
@@ -22,7 +22,7 @@
"children": [
{
"x": 0,
- "y": 0,
+ "y": 2,
"w": 24,
"h": 51,
"i": "0",
@@ -38,7 +38,6 @@
"showYAxis": false,
"showGroup": true
},
- "standard": {},
"metrics": [
""
],
@@ -46,6 +45,29 @@
""
],
"moved": false
+ },
+ {
+ "x": 0,
+ "y": 0,
+ "w": 24,
+ "h": 2,
+ "i": "100",
+ "type": "Text",
+ "metricTypes": [
+ ""
+ ],
+ "metrics": [
+ ""
+ ],
+ "graph": {
+ "fontColor": "blue",
+ "backgroundColor": "white",
+ "content": "Provide monitoring of the behavior of Istio through its self-monitoring metrics.",
+ "fontSize": 14,
+ "textAlign": "left",
+ "url": "https://skywalking.apache.org/docs/main/latest/en/setup/istio/readme/"
+ },
+ "moved": false
}
],
"layer": "MESH_CP",
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 c10df91..373af64 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
@@ -127,7 +127,7 @@
"i": "3",
"type": "Widget",
"widget": {
- "title": "Upstream Connection Increase"
+ "title": "Upstream Connection Increase (Per Minute)"
},
"graph": {
"type": "Line",
@@ -315,7 +315,7 @@
"i": "9",
"type": "Widget",
"widget": {
- "title": "Upstream Request Increase"
+ "title": "Upstream Request Increase (Per Minute)"
},
"graph": {
"type": "Line",
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-root.json
index f09e8a7..3fa911a 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-root.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-root.json
@@ -22,7 +22,7 @@
"children": [
{
"x": 0,
- "y": 0,
+ "y": 2,
"w": 24,
"h": 51,
"i": "0",
@@ -46,6 +46,29 @@
],
"metricConfig": [],
"moved": false
+ },
+ {
+ "x": 0,
+ "y": 0,
+ "w": 24,
+ "h": 2,
+ "i": "100",
+ "type": "Text",
+ "metricTypes": [
+ ""
+ ],
+ "metrics": [
+ ""
+ ],
+ "graph": {
+ "fontColor": "black",
+ "backgroundColor": "white",
+ "content": "Observe Envoy Proxy through Envoy Metrics Service.",
+ "fontSize": 14,
+ "textAlign": "left",
+ "url": "https://skywalking.apache.org/docs/main/latest/en/setup/envoy/metrics_service_setting/"
+ },
+ "moved": false
}
],
"layer": "MESH_DP",
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-root.json
index 6860aaf..0e53fdd 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-root.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-root.json
@@ -22,7 +22,7 @@
"children": [
{
"x": 0,
- "y": 0,
+ "y": 2,
"w": 24,
"h": 51,
"i": "0",
@@ -51,6 +51,29 @@
"unit": "%"
}
]
+ },
+ {
+ "x": 0,
+ "y": 0,
+ "w": 24,
+ "h": 2,
+ "i": "100",
+ "type": "Text",
+ "metricTypes": [
+ ""
+ ],
+ "metrics": [
+ ""
+ ],
+ "graph": {
+ "fontColor": "blue",
+ "backgroundColor": "white",
+ "content": "Provide Linux OS monitoring.",
+ "fontSize": 14,
+ "textAlign": "left",
+ "url": "https://skywalking.apache.org/docs/main/latest/en/setup/backend/backend-vm-monitoring/"
+ },
+ "moved": false
}
],
"name": "Linux-Root",
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_oap/so11y-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_oap/so11y-service.json
index 1c94177..7d98df4 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_oap/so11y-service.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_oap/so11y-service.json
@@ -22,7 +22,7 @@
"children": [
{
"x": 0,
- "y": 0,
+ "y": 2,
"w": 24,
"h": 52,
"i": "0",
@@ -49,8 +49,32 @@
"unit": "%"
}
]
+ },
+ {
+ "x": 0,
+ "y": 0,
+ "w": 24,
+ "h": 2,
+ "i": "100",
+ "type": "Text",
+ "metricTypes": [
+ ""
+ ],
+ "metrics": [
+ ""
+ ],
+ "graph": {
+ "fontColor": "blue",
+ "backgroundColor": "white",
+ "content": "The OAP backend cluster itself is a distributed streaming process system, this is the monitoring for the OAP backend itself.",
+ "fontSize": 14,
+ "textAlign": "left",
+ "url": "https://skywalking.apache.org/docs/main/latest/en/setup/backend/backend-telemetry/"
+ },
+ "moved": false
}
],
+ "id": "Self-Observability-OAP-Service",
"layer": "SO11Y_OAP",
"entity": "Service",
"name": "Self-Observability-OAP-Service",
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_satellite/so11y-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_satellite/so11y-root.json
index d08c203..4d96efb 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_satellite/so11y-root.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_satellite/so11y-root.json
@@ -236,7 +236,7 @@
""
],
"graph":{
- "fontColor":"black",
+ "fontColor":"blue",
"backgroundColor":"white",
"content":"Satellite: an open-source agent designed for the cloud-native infrastructures, which provides a low-cost, high-efficient, and more secure way to collect telemetry data. It is the recommended load balancer for telemetry collecting.",
"fontSize":14,
@@ -252,4 +252,4 @@
"isRoot":true
}
}
-]
\ No newline at end of file
+]
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_database/virtual-database-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_database/virtual-database-root.json
index facc710..784b07a 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_database/virtual-database-root.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_database/virtual-database-root.json
@@ -22,7 +22,7 @@
"children": [
{
"x": 0,
- "y": 0,
+ "y": 2,
"w": 24,
"h": 52,
"i": "0",
@@ -51,6 +51,29 @@
"label": "Latency"
}
]
+ },
+ {
+ "x": 0,
+ "y": 0,
+ "w": 24,
+ "h": 2,
+ "i": "100",
+ "type": "Text",
+ "metricTypes": [
+ ""
+ ],
+ "metrics": [
+ ""
+ ],
+ "graph": {
+ "fontColor": "blue",
+ "backgroundColor": "white",
+ "content": "Observe the Virtual Database which is conjectured by language agent through various plugins.",
+ "fontSize": 14,
+ "textAlign": "left",
+ "url": "test"
+ },
+ "moved": false
}
],
"id": "Virtual-Database-Root",
diff --git a/skywalking-ui b/skywalking-ui
index fce818a..8d87777 160000
--- a/skywalking-ui
+++ b/skywalking-ui
@@ -1 +1 @@
-Subproject commit fce818aebecbf31d3c787eb09eb04361617b6ce6
+Subproject commit 8d87777832620721b33ba5c46067fefe0d50efa9