Skip to content

Commit 0b9bbb4

Browse files
wankai123wankai123
authored
Clean the unused elements in the UI-templates. (#12111)
1 parent 65a5b44 commit 0b9bbb4

File tree

105 files changed

+8648
-14599
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+8648
-14599
lines changed

‎oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/mqe/rt/MQEVisitor.java

-2
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,6 @@ public ExpressionResult visitMetric(MQEParser.MetricContext ctx) {
133133
queryMetrics(metricName, this.duration, result);
134134
}
135135
} else if (Column.ValueDataType.LABELED_VALUE == dataType) {
136-
137-
// DataLabel dataLabel = new DataLabel();
138136
if (ctx.parent instanceof MQEParser.TopNOPContext) {
139137
throw new IllegalExpressionException(
140138
"Metric: [" + metricName + "] is labeled value, dose not support top_n query.");

‎oap-server/server-starter/src/main/resources/ui-initialized-templates/apisix/apisix-endpoint.json

-14
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
[
32
{
43
"id": "APISIX-Endpoint",
@@ -25,10 +24,6 @@
2524
"expressions": [
2625
"meter_apisix_endpoint_http_status"
2726
],
28-
"metricMode": "Expression",
29-
"typesOfMQE": [
30-
"TIME_SERIES_VALUES"
31-
],
3227
"associate": [
3328
{
3429
"widgetId": "1"
@@ -62,10 +57,6 @@
6257
"expressions": [
6358
"meter_apisix_endpoint_http_latency"
6459
],
65-
"metricMode": "Expression",
66-
"typesOfMQE": [
67-
"TIME_SERIES_VALUES"
68-
],
6960
"associate": [
7061
{
7162
"widgetId": "1"
@@ -78,7 +69,6 @@
7869
}
7970
]
8071
},
81-
8272
{
8373
"x": 12,
8474
"y": 0,
@@ -100,10 +90,6 @@
10090
"expressions": [
10191
"meter_apisix_endpoint_bandwidth/1024"
10292
],
103-
"metricMode": "Expression",
104-
"typesOfMQE": [
105-
"TIME_SERIES_VALUES"
106-
],
10793
"associate": [
10894
{
10995
"widgetId": "1"

‎oap-server/server-starter/src/main/resources/ui-initialized-templates/apisix/apisix-instance.json

+1-58
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
[
32
{
43
"id": "APISIX-Instance",
@@ -24,13 +23,8 @@
2423
},
2524
"expressions": [
2625
"meter_apisix_instance_http_requests"
27-
],
28-
"metricMode": "Expression",
29-
"typesOfMQE": [
30-
"TIME_SERIES_VALUES"
3126
]
3227
},
33-
3428
{
3529
"x": 6,
3630
"y": 0,
@@ -52,10 +46,6 @@
5246
"expressions": [
5347
"meter_apisix_instance_http_status_matched"
5448
],
55-
"metricMode": "Expression",
56-
"typesOfMQE": [
57-
"TIME_SERIES_VALUES"
58-
],
5949
"associate": [
6050
{
6151
"widgetId": "1"
@@ -101,10 +91,6 @@
10191
"expressions": [
10292
"meter_apisix_instance_http_latency_matched"
10393
],
104-
"metricMode": "Expression",
105-
"typesOfMQE": [
106-
"TIME_SERIES_VALUES"
107-
],
10894
"associate": [
10995
{
11096
"widgetId": "1"
@@ -129,7 +115,6 @@
129115
}
130116
]
131117
},
132-
133118
{
134119
"x": 18,
135120
"y": 0,
@@ -151,10 +136,6 @@
151136
"expressions": [
152137
"meter_apisix_instance_bandwidth_matched/1024"
153138
],
154-
"metricMode": "Expression",
155-
"typesOfMQE": [
156-
"TIME_SERIES_VALUES"
157-
],
158139
"associate": [
159140
{
160141
"widgetId": "1"
@@ -186,10 +167,6 @@
186167
"h": 13,
187168
"i": "5",
188169
"type": "Widget",
189-
"metricMode": "Expression",
190-
"typesOfMQE": [
191-
"TIME_SERIES_VALUES"
192-
],
193170
"expressions": [
194171
"meter_apisix_instance_http_connections"
195172
],
@@ -228,7 +205,6 @@
228205
}
229206
]
230207
},
231-
232208
{
233209
"x": 6,
234210
"y": 13,
@@ -250,10 +226,6 @@
250226
"expressions": [
251227
"meter_apisix_instance_http_status_unmatched"
252228
],
253-
"metricMode": "Expression",
254-
"typesOfMQE": [
255-
"TIME_SERIES_VALUES"
256-
],
257229
"associate": [
258230
{
259231
"widgetId": "1"
@@ -299,10 +271,6 @@
299271
"expressions": [
300272
"meter_apisix_instance_http_latency_unmatched"
301273
],
302-
"metricMode": "Expression",
303-
"typesOfMQE": [
304-
"TIME_SERIES_VALUES"
305-
],
306274
"associate": [
307275
{
308276
"widgetId": "1"
@@ -327,7 +295,6 @@
327295
}
328296
]
329297
},
330-
331298
{
332299
"x": 18,
333300
"y": 13,
@@ -349,10 +316,6 @@
349316
"expressions": [
350317
"meter_apisix_instance_bandwidth_unmatched/1024"
351318
],
352-
"metricMode": "Expression",
353-
"typesOfMQE": [
354-
"TIME_SERIES_VALUES"
355-
],
356319
"associate": [
357320
{
358321
"widgetId": "1"
@@ -377,7 +340,6 @@
377340
}
378341
]
379342
},
380-
381343
{
382344
"x": 0,
383345
"y": 26,
@@ -399,10 +361,6 @@
399361
"expressions": [
400362
"meter_apisix_instance_shared_dict_capacity_bytes/1024/1024"
401363
],
402-
"metricMode": "Expression",
403-
"typesOfMQE": [
404-
"TIME_SERIES_VALUES"
405-
],
406364
"associate": [
407365
{
408366
"widgetId": "9"
@@ -412,7 +370,6 @@
412370
}
413371
]
414372
},
415-
416373
{
417374
"x": 6,
418375
"y": 26,
@@ -434,10 +391,6 @@
434391
"expressions": [
435392
"meter_apisix_instance_shared_dict_free_space_bytes/1024/1024"
436393
],
437-
"metricMode": "Expression",
438-
"typesOfMQE": [
439-
"TIME_SERIES_VALUES"
440-
],
441394
"associate": [
442395
{
443396
"widgetId": "9"
@@ -468,14 +421,8 @@
468421
"expressions": [
469422
"meter_apisix_instance_etcd_indexes"
470423
],
471-
"metricMode": "Expression",
472-
"typesOfMQE": [
473-
"TIME_SERIES_VALUES"
474-
],
475-
"associate": [
476-
]
424+
"associate": []
477425
},
478-
479426
{
480427
"x": 18,
481428
"y": 26,
@@ -496,10 +443,6 @@
496443
"expressions": [
497444
"latest(meter_apisix_instance_etcd_reachable)"
498445
],
499-
"metricMode": "Expression",
500-
"typesOfMQE": [
501-
"SINGLE_VALUE"
502-
],
503446
"associate": [
504447
{
505448
"widgetId": "1"

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

+43-44
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,45 @@
1-
21
[
3-
{
4-
"id":"APISIX-Root",
5-
"configuration":{
6-
"children":[
7-
{
8-
"x":0,
9-
"y":3,
10-
"w":24,
11-
"h":43,
12-
"i":"0",
13-
"type":"Widget",
14-
"graph":{
15-
"type":"ServiceList",
16-
"dashboardName":"APISIX-Service",
17-
"fontSize":12,
18-
"showXAxis":false,
19-
"showYAxis":false,
20-
"showGroup":true
21-
}
22-
},
23-
{
24-
"x":0,
25-
"y":0,
26-
"w":24,
27-
"h":3,
28-
"i":"1",
29-
"type":"Text",
30-
"graph":{
31-
"fontColor":"theme",
32-
"backgroundColor":"theme",
33-
"content":"Provide APISIX monitoring through OpenTelemetry's Prometheus Receiver",
34-
"fontSize":14,
35-
"textAlign":"left",
36-
"url":"https://skywalking.apache.org/docs/main/next/en/setup/backend/backend-apisix-monitoring/"
37-
}
38-
}
39-
],
40-
"layer":"APISIX",
41-
"entity":"All",
42-
"name":"APISIX-Root",
43-
"isRoot":true
44-
}
45-
}
2+
{
3+
"id": "APISIX-Root",
4+
"configuration": {
5+
"children": [
6+
{
7+
"x": 0,
8+
"y": 3,
9+
"w": 24,
10+
"h": 43,
11+
"i": "0",
12+
"type": "Widget",
13+
"graph": {
14+
"type": "ServiceList",
15+
"dashboardName": "APISIX-Service",
16+
"fontSize": 12,
17+
"showXAxis": false,
18+
"showYAxis": false,
19+
"showGroup": true
20+
}
21+
},
22+
{
23+
"x": 0,
24+
"y": 0,
25+
"w": 24,
26+
"h": 3,
27+
"i": "1",
28+
"type": "Text",
29+
"graph": {
30+
"fontColor": "theme",
31+
"backgroundColor": "theme",
32+
"content": "Provide APISIX monitoring through OpenTelemetry's Prometheus Receiver",
33+
"fontSize": 14,
34+
"textAlign": "left",
35+
"url": "https://skywalking.apache.org/docs/main/next/en/setup/backend/backend-apisix-monitoring/"
36+
}
37+
}
38+
],
39+
"layer": "APISIX",
40+
"entity": "All",
41+
"name": "APISIX-Root",
42+
"isRoot": true
43+
}
44+
}
4645
]

0 commit comments

Comments
 (0)