diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 834ae5a98a89..540273269152 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 d336ffdd4125..87021d68a81a 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 1dcb11f7795b..54b96f0e2c24 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 56a3feb58baa..a18f4947c2bb 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 37cbb90824bf..650ce9a5803c 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 333e6ca9919d..65478ca4edcb 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 15d72074631a..5b56cca6006a 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 15aedceefc24..c3fd7804442f 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 b568b92f0b9b..62a32db2fbcf 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 5822c71ca38f..6c6d14541bcc 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 d0b16e64a415..e6b8913db778 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 6caa93a35fa2..e0fc10897e46 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 1bb9036d8478..ef2d148cf652 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 aca26fc69e6f..7c6ebea9a2d3 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 ac396e3ded6f..b1f0372ca90a 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 14fa5d65b605..64d4a2b59bc5 160000 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit 14fa5d65b60570a77052793062eb5225de9132b5 +Subproject commit 64d4a2b59bc56361229ef0b277073c974a72c71e