Skip to content

Commit 9e36eac

Browse files
wankai123wankai123
authored
UI-templates: topN widget add related trace type and dashboard. (#12758)
1 parent 2ed6b58 commit 9e36eac

File tree

16 files changed

+199
-45
lines changed

16 files changed

+199
-45
lines changed

‎docs/en/changes/changes.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
* Update the Kubernetes metrics for reduce multiple metrics calculate in MQE.
3131
* Support view data value related dashboards in TopList widgets.
3232
* Add endpoint global topN widget on `General-Root`, `Mesh-Root`.
33+
* Implement owner option for TopList widgets in related trace options.
3334

3435

3536
#### Documentation

‎oap-server/server-starter/src/main/resources/ui-initialized-templates/activemq/activemq-cluster.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,10 @@
485485
"expressions": [
486486
"top_n(meter_activemq_destination_topic_consumer_count,10,des)"
487487
],
488+
"valueRelatedDashboard": "ActiveMQ-Destination",
489+
"relatedTrace": {
490+
"refIdType": "none"
491+
},
488492
"graph": {
489493
"type": "TopList",
490494
"color": "purple"
@@ -506,4 +510,4 @@
506510
"isRoot": false
507511
}
508512
}
509-
]
513+
]

‎oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-app.json‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@
3030
},
3131
"expressions": [
3232
"top_n(browser_app_single_version_error_rate,10,des)/100"
33-
]
33+
],
34+
"valueRelatedDashboard": "Browser-Version",
35+
"relatedTrace": {
36+
"refIdType": "owner"
37+
}
3438
},
3539
{
3640
"x": 0,
@@ -48,7 +52,11 @@
4852
},
4953
"expressions": [
5054
"top_n(browser_app_single_version_pv,10,des)"
51-
]
55+
],
56+
"valueRelatedDashboard": "Browser-Version",
57+
"relatedTrace": {
58+
"refIdType": "owner"
59+
}
5260
},
5361
{
5462
"x": 16,
@@ -124,7 +132,11 @@
124132
},
125133
"expressions": [
126134
"top_n(browser_app_page_error_sum,10,des)"
127-
]
135+
],
136+
"valueRelatedDashboard": "Browser-Page",
137+
"relatedTrace": {
138+
"refIdType": "owner"
139+
}
128140
},
129141
{
130142
"x": 8,
@@ -173,6 +185,10 @@
173185
"graph": {
174186
"type": "TopList",
175187
"color": "purple"
188+
},
189+
"valueRelatedDashboard": "Browser-Page",
190+
"relatedTrace": {
191+
"refIdType": "owner"
176192
}
177193
},
178194
{
@@ -191,6 +207,10 @@
191207
"graph": {
192208
"type": "TopList",
193209
"color": "purple"
210+
},
211+
"valueRelatedDashboard": "Browser-Page",
212+
"relatedTrace": {
213+
"refIdType": "owner"
194214
}
195215
},
196216
{
@@ -209,6 +229,10 @@
209229
"graph": {
210230
"type": "TopList",
211231
"color": "purple"
232+
},
233+
"valueRelatedDashboard": "Browser-Version",
234+
"relatedTrace": {
235+
"refIdType": "owner"
212236
}
213237
}
214238
]
@@ -330,9 +354,7 @@
330354
"layer": "BROWSER",
331355
"entity": "Service",
332356
"name": "Browser-App",
333-
"id": "Browser-app",
334-
"isRoot": false,
335-
"isDefault": true
357+
"isRoot": false
336358
}
337359
}
338360
]

‎oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-root.json‎

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,10 @@
212212
"widget": {
213213
"title": "Service Apdex"
214214
},
215-
"valueRelatedDashboard": "General-Service"
215+
"valueRelatedDashboard": "General-Service",
216+
"relatedTrace": {
217+
"refIdType": "owner"
218+
}
216219
},
217220
{
218221
"x": 12,
@@ -231,7 +234,10 @@
231234
"widget": {
232235
"title": "Service Avg Response Time (ms)"
233236
},
234-
"valueRelatedDashboard": "General-Service"
237+
"valueRelatedDashboard": "General-Service",
238+
"relatedTrace": {
239+
"refIdType": "owner"
240+
}
235241
},
236242
{
237243
"x": 6,
@@ -250,7 +256,10 @@
250256
"type": "TopList",
251257
"color": "purple"
252258
},
253-
"valueRelatedDashboard": "General-Service"
259+
"valueRelatedDashboard": "General-Service",
260+
"relatedTrace": {
261+
"refIdType": "owner"
262+
}
254263
},
255264
{
256265
"x": 18,
@@ -270,7 +279,10 @@
270279
"type": "TopList",
271280
"color": "purple"
272281
},
273-
"valueRelatedDashboard": "General-Service"
282+
"valueRelatedDashboard": "General-Service",
283+
"relatedTrace": {
284+
"refIdType": "owner"
285+
}
274286
},
275287
{
276288
"x": 0,
@@ -289,7 +301,10 @@
289301
"widget": {
290302
"title": "Endpoint Success Rate"
291303
},
292-
"valueRelatedDashboard": "General-Endpoint"
304+
"valueRelatedDashboard": "General-Endpoint",
305+
"relatedTrace": {
306+
"refIdType": "owner"
307+
}
293308
},
294309
{
295310
"x": 8,
@@ -308,7 +323,10 @@
308323
"widget": {
309324
"title": "Endpoint Avg Response Time (ms)"
310325
},
311-
"valueRelatedDashboard": "General-Endpoint"
326+
"valueRelatedDashboard": "General-Endpoint",
327+
"relatedTrace": {
328+
"refIdType": "owner"
329+
}
312330
},
313331
{
314332
"x": 16,
@@ -328,7 +346,10 @@
328346
"title": "Endpoint Load (calls / min)",
329347
"tips": "For HTTP 1/2, gRPC, RPC services, this means Calls Per Minute (calls / min), for TCP services"
330348
},
331-
"valueRelatedDashboard": "General-Endpoint"
349+
"valueRelatedDashboard": "General-Endpoint",
350+
"relatedTrace": {
351+
"refIdType": "owner"
352+
}
332353
}
333354
],
334355
"layer": "GENERAL",

‎oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,10 @@
452452
"expressions": [
453453
"top_n(service_instance_cpm,10,des)"
454454
],
455-
"valueRelatedDashboard": "General-Instance"
455+
"valueRelatedDashboard": "General-Instance",
456+
"relatedTrace": {
457+
"refIdType": "owner"
458+
}
456459
},
457460
{
458461
"x": 8,
@@ -471,7 +474,10 @@
471474
"expressions": [
472475
"top_n(service_instance_resp_time,10,des)"
473476
],
474-
"valueRelatedDashboard": "General-Instance"
477+
"valueRelatedDashboard": "General-Instance",
478+
"relatedTrace": {
479+
"refIdType": "owner"
480+
}
475481
},
476482
{
477483
"x": 16,
@@ -490,7 +496,10 @@
490496
"expressions": [
491497
"top_n(service_instance_sla,10,asc)/100"
492498
],
493-
"valueRelatedDashboard": "General-Instance"
499+
"valueRelatedDashboard": "General-Instance",
500+
"relatedTrace": {
501+
"refIdType": "owner"
502+
}
494503
},
495504
{
496505
"x": 16,
@@ -509,7 +518,10 @@
509518
"expressions": [
510519
"top_n(endpoint_sla,10,asc)/100"
511520
],
512-
"valueRelatedDashboard": "General-Endpoint"
521+
"valueRelatedDashboard": "General-Endpoint",
522+
"relatedTrace": {
523+
"refIdType": "owner"
524+
}
513525
},
514526
{
515527
"x": 8,
@@ -528,7 +540,10 @@
528540
"expressions": [
529541
"top_n(endpoint_resp_time,10,des)"
530542
],
531-
"valueRelatedDashboard": "General-Endpoint"
543+
"valueRelatedDashboard": "General-Endpoint",
544+
"relatedTrace": {
545+
"refIdType": "owner"
546+
}
532547
},
533548
{
534549
"x": 0,
@@ -548,7 +563,10 @@
548563
"expressions": [
549564
"top_n(endpoint_cpm,10,des)"
550565
],
551-
"valueRelatedDashboard": "General-Endpoint"
566+
"valueRelatedDashboard": "General-Endpoint",
567+
"relatedTrace": {
568+
"refIdType": "owner"
569+
}
552570
}
553571
]
554572
},

‎oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-root.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,10 @@
207207
"expressions": [
208208
"top_n(kubernetes_service_apdex,10,asc,attr0='K8S_SERVICE')/10000"
209209
],
210+
"valueRelatedDashboard": "K8S-Service-Service",
211+
"relatedTrace": {
212+
"refIdType": "none"
213+
},
210214
"graph": {
211215
"type": "TopList",
212216
"color": "purple"
@@ -225,6 +229,10 @@
225229
"expressions": [
226230
"top_n(kubernetes_service_http_call_successful_rate,10,asc,attr0='K8S_SERVICE')/100"
227231
],
232+
"valueRelatedDashboard": "K8S-Service-Service",
233+
"relatedTrace": {
234+
"refIdType": "none"
235+
},
228236
"graph": {
229237
"type": "TopList",
230238
"color": "purple"
@@ -243,6 +251,10 @@
243251
"expressions": [
244252
"top_n(kubernetes_service_http_call_time,10,des,attr0='K8S_SERVICE')"
245253
],
254+
"valueRelatedDashboard": "K8S-Service-Service",
255+
"relatedTrace": {
256+
"refIdType": "none"
257+
},
246258
"graph": {
247259
"type": "TopList",
248260
"color": "purple"
@@ -261,6 +273,10 @@
261273
"expressions": [
262274
"top_n(kubernetes_service_http_call_cpm,10,des,attr0='K8S_SERVICE')"
263275
],
276+
"valueRelatedDashboard": "K8S-Service-Service",
277+
"relatedTrace": {
278+
"refIdType": "none"
279+
},
264280
"graph": {
265281
"type": "TopList",
266282
"color": "purple"

‎oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-proces-relation.json‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1827,7 +1827,10 @@
18271827
},
18281828
"expressions": [
18291829
"top_n(sampled_slow_trace_record,50,DES)"
1830-
]
1830+
],
1831+
"relatedTrace": {
1832+
"refIdType": "traceId"
1833+
}
18311834
},
18321835
{
18331836
"x": 8,
@@ -1845,7 +1848,10 @@
18451848
},
18461849
"expressions": [
18471850
"top_n(sampled_status_4xx_trace_record,50,DES)"
1848-
]
1851+
],
1852+
"relatedTrace": {
1853+
"refIdType": "traceId"
1854+
}
18491855
},
18501856
{
18511857
"x": 16,
@@ -1863,7 +1869,10 @@
18631869
},
18641870
"expressions": [
18651871
"top_n(sampled_status_5xx_trace_record,50,DES)"
1866-
]
1872+
],
1873+
"relatedTrace": {
1874+
"refIdType": "traceId"
1875+
}
18671876
},
18681877
{
18691878
"x": 0,

0 commit comments

Comments
 (0)