This is an automated email from the ASF dual-hosted git repository.
wankai 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 9e36eaccb4 UI-templates: topN widget add related trace type and
dashboard. (#12758)
9e36eaccb4 is described below
commit 9e36eaccb4b4703101d83f920c3c58638e739298
Author: Wan Kai <[email protected]>
AuthorDate: Fri Nov 8 13:50:27 2024 +0800
UI-templates: topN widget add related trace type and dashboard. (#12758)
---
docs/en/changes/changes.md | 1 +
.../activemq/activemq-cluster.json | 6 +++-
.../browser/browser-app.json | 34 +++++++++++++++++----
.../general/general-root.json | 35 +++++++++++++++++-----
.../general/general-service.json | 30 +++++++++++++++----
.../k8s_service/k8s-service-root.json | 16 ++++++++++
.../mesh/mesh-proces-relation.json | 15 ++++++++--
.../ui-initialized-templates/mesh/mesh-root.json | 29 +++++++++++++++---
.../mesh/mesh-service.json | 30 +++++++++++++++----
.../mesh_dp/mesh-data-plane-process-relation.json | 15 ++++++++--
.../mysql/mysql-service.json | 7 +++--
.../postgresql/postgresql-service.json | 7 +++--
.../redis/redis-service.json | 7 +++--
.../virtual_cache/virtual-cache-service.json | 5 +++-
.../virtual_database/virtual-database-service.json | 5 +++-
skywalking-ui | 2 +-
16 files changed, 199 insertions(+), 45 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 834ae5a98a..5402732691 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -30,6 +30,7 @@
* Update the Kubernetes metrics for reduce multiple metrics calculate in MQE.
* Support view data value related dashboards in TopList widgets.
* Add endpoint global topN widget on `General-Root`, `Mesh-Root`.
+* Implement owner option for TopList widgets in related trace options.
#### Documentation
diff --git
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/activemq/activemq-cluster.json
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/activemq/activemq-cluster.json
index d336ffdd41..87021d68a8 100644
---
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/activemq/activemq-cluster.json
+++
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/activemq/activemq-cluster.json
@@ -485,6 +485,10 @@
"expressions": [
"top_n(meter_activemq_destination_topic_consumer_count,10,des)"
],
+ "valueRelatedDashboard":
"ActiveMQ-Destination",
+ "relatedTrace": {
+ "refIdType": "none"
+ },
"graph": {
"type": "TopList",
"color": "purple"
@@ -506,4 +510,4 @@
"isRoot": false
}
}
-]
\ No newline at end of file
+]
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 1dcb11f779..54b96f0e2c 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
@@ -30,7 +30,11 @@
},
"expressions": [
"top_n(browser_app_single_version_error_rate,10,des)/100"
- ]
+ ],
+ "valueRelatedDashboard": "Browser-Version",
+ "relatedTrace": {
+ "refIdType": "owner"
+ }
},
{
"x": 0,
@@ -48,7 +52,11 @@
},
"expressions": [
"top_n(browser_app_single_version_pv,10,des)"
- ]
+ ],
+ "valueRelatedDashboard": "Browser-Version",
+ "relatedTrace": {
+ "refIdType": "owner"
+ }
},
{
"x": 16,
@@ -124,7 +132,11 @@
},
"expressions": [
"top_n(browser_app_page_error_sum,10,des)"
- ]
+ ],
+ "valueRelatedDashboard": "Browser-Page",
+ "relatedTrace": {
+ "refIdType": "owner"
+ }
},
{
"x": 8,
@@ -173,6 +185,10 @@
"graph": {
"type": "TopList",
"color": "purple"
+ },
+ "valueRelatedDashboard": "Browser-Page",
+ "relatedTrace": {
+ "refIdType": "owner"
}
},
{
@@ -191,6 +207,10 @@
"graph": {
"type": "TopList",
"color": "purple"
+ },
+ "valueRelatedDashboard": "Browser-Page",
+ "relatedTrace": {
+ "refIdType": "owner"
}
},
{
@@ -209,6 +229,10 @@
"graph": {
"type": "TopList",
"color": "purple"
+ },
+ "valueRelatedDashboard": "Browser-Version",
+ "relatedTrace": {
+ "refIdType": "owner"
}
}
]
@@ -330,9 +354,7 @@
"layer": "BROWSER",
"entity": "Service",
"name": "Browser-App",
- "id": "Browser-app",
- "isRoot": false,
- "isDefault": true
+ "isRoot": false
}
}
]
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 56a3feb58b..a18f4947c2 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
@@ -212,7 +212,10 @@
"widget": {
"title": "Service Apdex"
},
- "valueRelatedDashboard": "General-Service"
+ "valueRelatedDashboard": "General-Service",
+ "relatedTrace": {
+ "refIdType": "owner"
+ }
},
{
"x": 12,
@@ -231,7 +234,10 @@
"widget": {
"title": "Service Avg Response Time (ms)"
},
- "valueRelatedDashboard": "General-Service"
+ "valueRelatedDashboard": "General-Service",
+ "relatedTrace": {
+ "refIdType": "owner"
+ }
},
{
"x": 6,
@@ -250,7 +256,10 @@
"type": "TopList",
"color": "purple"
},
- "valueRelatedDashboard": "General-Service"
+ "valueRelatedDashboard": "General-Service",
+ "relatedTrace": {
+ "refIdType": "owner"
+ }
},
{
"x": 18,
@@ -270,7 +279,10 @@
"type": "TopList",
"color": "purple"
},
- "valueRelatedDashboard": "General-Service"
+ "valueRelatedDashboard": "General-Service",
+ "relatedTrace": {
+ "refIdType": "owner"
+ }
},
{
"x": 0,
@@ -289,7 +301,10 @@
"widget": {
"title": "Endpoint Success Rate"
},
- "valueRelatedDashboard": "General-Endpoint"
+ "valueRelatedDashboard": "General-Endpoint",
+ "relatedTrace": {
+ "refIdType": "owner"
+ }
},
{
"x": 8,
@@ -308,7 +323,10 @@
"widget": {
"title": "Endpoint Avg Response Time (ms)"
},
- "valueRelatedDashboard": "General-Endpoint"
+ "valueRelatedDashboard": "General-Endpoint",
+ "relatedTrace": {
+ "refIdType": "owner"
+ }
},
{
"x": 16,
@@ -328,7 +346,10 @@
"title": "Endpoint Load (calls / min)",
"tips": "For HTTP 1/2, gRPC, RPC services, this means Calls Per
Minute (calls / min), for TCP services"
},
- "valueRelatedDashboard": "General-Endpoint"
+ "valueRelatedDashboard": "General-Endpoint",
+ "relatedTrace": {
+ "refIdType": "owner"
+ }
}
],
"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 37cbb90824..650ce9a580 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
@@ -452,7 +452,10 @@
"expressions": [
"top_n(service_instance_cpm,10,des)"
],
- "valueRelatedDashboard": "General-Instance"
+ "valueRelatedDashboard": "General-Instance",
+ "relatedTrace": {
+ "refIdType": "owner"
+ }
},
{
"x": 8,
@@ -471,7 +474,10 @@
"expressions": [
"top_n(service_instance_resp_time,10,des)"
],
- "valueRelatedDashboard": "General-Instance"
+ "valueRelatedDashboard": "General-Instance",
+ "relatedTrace": {
+ "refIdType": "owner"
+ }
},
{
"x": 16,
@@ -490,7 +496,10 @@
"expressions": [
"top_n(service_instance_sla,10,asc)/100"
],
- "valueRelatedDashboard": "General-Instance"
+ "valueRelatedDashboard": "General-Instance",
+ "relatedTrace": {
+ "refIdType": "owner"
+ }
},
{
"x": 16,
@@ -509,7 +518,10 @@
"expressions": [
"top_n(endpoint_sla,10,asc)/100"
],
- "valueRelatedDashboard": "General-Endpoint"
+ "valueRelatedDashboard": "General-Endpoint",
+ "relatedTrace": {
+ "refIdType": "owner"
+ }
},
{
"x": 8,
@@ -528,7 +540,10 @@
"expressions": [
"top_n(endpoint_resp_time,10,des)"
],
- "valueRelatedDashboard": "General-Endpoint"
+ "valueRelatedDashboard": "General-Endpoint",
+ "relatedTrace": {
+ "refIdType": "owner"
+ }
},
{
"x": 0,
@@ -548,7 +563,10 @@
"expressions": [
"top_n(endpoint_cpm,10,des)"
],
- "valueRelatedDashboard": "General-Endpoint"
+ "valueRelatedDashboard": "General-Endpoint",
+ "relatedTrace": {
+ "refIdType": "owner"
+ }
}
]
},
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 333e6ca991..65478ca4ed 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
@@ -207,6 +207,10 @@
"expressions": [
"top_n(kubernetes_service_apdex,10,asc,attr0='K8S_SERVICE')/10000"
],
+ "valueRelatedDashboard": "K8S-Service-Service",
+ "relatedTrace": {
+ "refIdType": "none"
+ },
"graph": {
"type": "TopList",
"color": "purple"
@@ -225,6 +229,10 @@
"expressions": [
"top_n(kubernetes_service_http_call_successful_rate,10,asc,attr0='K8S_SERVICE')/100"
],
+ "valueRelatedDashboard": "K8S-Service-Service",
+ "relatedTrace": {
+ "refIdType": "none"
+ },
"graph": {
"type": "TopList",
"color": "purple"
@@ -243,6 +251,10 @@
"expressions": [
"top_n(kubernetes_service_http_call_time,10,des,attr0='K8S_SERVICE')"
],
+ "valueRelatedDashboard": "K8S-Service-Service",
+ "relatedTrace": {
+ "refIdType": "none"
+ },
"graph": {
"type": "TopList",
"color": "purple"
@@ -261,6 +273,10 @@
"expressions": [
"top_n(kubernetes_service_http_call_cpm,10,des,attr0='K8S_SERVICE')"
],
+ "valueRelatedDashboard": "K8S-Service-Service",
+ "relatedTrace": {
+ "refIdType": "none"
+ },
"graph": {
"type": "TopList",
"color": "purple"
diff --git
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-proces-relation.json
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-proces-relation.json
index 15d7207463..5b56cca600 100644
---
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-proces-relation.json
+++
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-proces-relation.json
@@ -1827,7 +1827,10 @@
},
"expressions": [
"top_n(sampled_slow_trace_record,50,DES)"
- ]
+ ],
+ "relatedTrace": {
+ "refIdType": "traceId"
+ }
},
{
"x": 8,
@@ -1845,7 +1848,10 @@
},
"expressions": [
"top_n(sampled_status_4xx_trace_record,50,DES)"
- ]
+ ],
+ "relatedTrace": {
+ "refIdType": "traceId"
+ }
},
{
"x": 16,
@@ -1863,7 +1869,10 @@
},
"expressions": [
"top_n(sampled_status_5xx_trace_record,50,DES)"
- ]
+ ],
+ "relatedTrace": {
+ "refIdType": "traceId"
+ }
},
{
"x": 0,
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 15aedceefc..c3fd780444 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
@@ -198,7 +198,10 @@
"widget": {
"title": "Service Avg Response Time (ms)"
},
- "valueRelatedDashboard": "Mesh-Service"
+ "valueRelatedDashboard": "Mesh-Service",
+ "relatedTrace": {
+ "refIdType": "none"
+ }
},
{
"x": 18,
@@ -217,7 +220,10 @@
"type": "TopList",
"color": "purple"
},
- "valueRelatedDashboard": "Mesh-Service"
+ "valueRelatedDashboard": "Mesh-Service",
+ "relatedTrace": {
+ "refIdType": "none"
+ }
},
{
"x": 6,
@@ -236,7 +242,10 @@
"type": "TopList",
"color": "purple"
},
- "valueRelatedDashboard": "Mesh-Service"
+ "valueRelatedDashboard": "Mesh-Service",
+ "relatedTrace": {
+ "refIdType": "none"
+ }
},
{
"x": 0,
@@ -255,7 +264,10 @@
"widget": {
"title": "Service Apdex"
},
- "valueRelatedDashboard": "Mesh-Service"
+ "valueRelatedDashboard": "Mesh-Service",
+ "relatedTrace": {
+ "refIdType": "none"
+ }
},
{
"x": 0,
@@ -272,6 +284,9 @@
"color": "purple"
},
"valueRelatedDashboard": "Mesh-Endpoint",
+ "relatedTrace": {
+ "refIdType": "none"
+ },
"widget": {
"title": "Endpoint Success Rate"
}
@@ -291,6 +306,9 @@
"color": "purple"
},
"valueRelatedDashboard": "Mesh-Endpoint",
+ "relatedTrace": {
+ "refIdType": "none"
+ },
"widget": {
"title": "Endpoint Avg Response Time (ms)"
}
@@ -310,6 +328,9 @@
"color": "purple"
},
"valueRelatedDashboard": "Mesh-Endpoint",
+ "relatedTrace": {
+ "refIdType": "none"
+ },
"widget": {
"title": "Endpoint Load (calls or packets / min)"
}
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 b568b92f0b..62a32db2fb 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
@@ -331,7 +331,10 @@
"expressions": [
"top_n(service_instance_cpm,10,des)"
],
- "valueRelatedDashboard": "Mesh-Instance"
+ "valueRelatedDashboard": "Mesh-Instance",
+ "relatedTrace": {
+ "refIdType": "none"
+ }
},
{
"x": 8,
@@ -350,7 +353,10 @@
"expressions": [
"top_n(service_instance_resp_time,10,des)"
],
- "valueRelatedDashboard": "Mesh-Instance"
+ "valueRelatedDashboard": "Mesh-Instance",
+ "relatedTrace": {
+ "refIdType": "none"
+ }
},
{
"x": 16,
@@ -369,7 +375,10 @@
"expressions": [
"top_n(service_instance_sla,10,asc)/100"
],
- "valueRelatedDashboard": "Mesh-Instance"
+ "valueRelatedDashboard": "Mesh-Instance",
+ "relatedTrace": {
+ "refIdType": "none"
+ }
},
{
"x": 16,
@@ -388,7 +397,10 @@
"expressions": [
"top_n(endpoint_sla,10,asc)/100"
],
- "valueRelatedDashboard": "Mesh-Endpoint"
+ "valueRelatedDashboard": "Mesh-Endpoint",
+ "relatedTrace": {
+ "refIdType": "none"
+ }
},
{
"x": 8,
@@ -407,7 +419,10 @@
"expressions": [
"top_n(endpoint_resp_time,10,des)"
],
- "valueRelatedDashboard": "Mesh-Endpoint"
+ "valueRelatedDashboard": "Mesh-Endpoint",
+ "relatedTrace": {
+ "refIdType": "none"
+ }
},
{
"x": 0,
@@ -426,7 +441,10 @@
"expressions": [
"top_n(endpoint_cpm,10,des)"
],
- "valueRelatedDashboard": "Mesh-Endpoint"
+ "valueRelatedDashboard": "Mesh-Endpoint",
+ "relatedTrace": {
+ "refIdType": "none"
+ }
},
{
"x": 0,
diff --git
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-process-relation.json
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-process-relation.json
index 5822c71ca3..6c6d14541b 100644
---
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-process-relation.json
+++
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-process-relation.json
@@ -1827,7 +1827,10 @@
},
"expressions": [
"top_n(sampled_slow_trace_record,50,DES)"
- ]
+ ],
+ "relatedTrace": {
+ "refIdType": "traceId"
+ }
},
{
"x": 8,
@@ -1845,7 +1848,10 @@
},
"expressions": [
"top_n(sampled_status_4xx_trace_record,50,DES)"
- ]
+ ],
+ "relatedTrace": {
+ "refIdType": "traceId"
+ }
},
{
"x": 16,
@@ -1863,7 +1869,10 @@
},
"expressions": [
"top_n(sampled_status_5xx_trace_record,50,DES)"
- ]
+ ],
+ "relatedTrace": {
+ "refIdType": "traceId"
+ }
},
{
"x": 0,
diff --git
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mysql/mysql-service.json
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mysql/mysql-service.json
index d0b16e64a4..e6b8913db7 100644
---
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mysql/mysql-service.json
+++
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mysql/mysql-service.json
@@ -252,7 +252,10 @@
},
"expressions": [
"top_n(top_n_database_statement,10,des)"
- ]
+ ],
+ "relatedTrace": {
+ "refIdType": "none"
+ }
}
]
},
@@ -321,4 +324,4 @@
"id": "MySQL-Service"
}
}
-]
\ No newline at end of file
+]
diff --git
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/postgresql/postgresql-service.json
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/postgresql/postgresql-service.json
index 6caa93a35f..e0fc10897e 100644
---
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/postgresql/postgresql-service.json
+++
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/postgresql/postgresql-service.json
@@ -487,7 +487,10 @@
},
"expressions": [
"top_n(top_n_database_statement,10,des)"
- ]
+ ],
+ "relatedTrace": {
+ "refIdType": "none"
+ }
}
]
},
@@ -547,4 +550,4 @@
]
}
}
-]
\ No newline at end of file
+]
diff --git
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/redis/redis-service.json
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/redis/redis-service.json
index 1bb9036d84..ef2d148cf6 100644
---
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/redis/redis-service.json
+++
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/redis/redis-service.json
@@ -297,7 +297,10 @@
},
"expressions": [
"top_n(top_n_database_statement,10,des)"
- ]
+ ],
+ "relatedTrace": {
+ "refIdType": "none"
+ }
}
]
}
@@ -311,4 +314,4 @@
"isRoot": false
}
}
-]
\ No newline at end of file
+]
diff --git
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_cache/virtual-cache-service.json
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_cache/virtual-cache-service.json
index aca26fc69e..7c6ebea9a2 100644
---
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_cache/virtual-cache-service.json
+++
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_cache/virtual-cache-service.json
@@ -499,7 +499,10 @@
},
"expressions": [
"top_n(top_n_cache_read_command,10,des)"
- ]
+ ],
+ "relatedTrace": {
+ "refIdType": "traceId"
+ }
},
{
"x": 12,
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 ac396e3ded..b1f0372ca9 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
@@ -19,7 +19,10 @@
},
"expressions": [
"top_n(top_n_database_statement,10,des)"
- ]
+ ],
+ "relatedTrace": {
+ "refIdType": "traceId"
+ }
},
{
"x": 6,
diff --git a/skywalking-ui b/skywalking-ui
index 14fa5d65b6..64d4a2b59b 160000
--- a/skywalking-ui
+++ b/skywalking-ui
@@ -1 +1 @@
-Subproject commit 14fa5d65b60570a77052793062eb5225de9132b5
+Subproject commit 64d4a2b59bc56361229ef0b277073c974a72c71e
