Skip to content

Commit c43e1fe

Browse files
committed
update dashboards
1 parent 8fa8e24 commit c43e1fe

File tree

2 files changed

+44
-40
lines changed

2 files changed

+44
-40
lines changed

deploy/grafana/monitoring-dashboard.json

Lines changed: 43 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,26 @@
1515
}
1616
]
1717
},
18-
"description": "Ping-Admin.com Tasks Statistics Dashboard",
18+
"description": "Ping-Admin.com Tasks Monitoring Dashboard",
1919
"editable": true,
2020
"fiscalYearStartMonth": 0,
2121
"graphTooltip": 1,
22-
"id": 2465,
22+
"id": 3324,
2323
"links": [],
2424
"panels": [
25+
{
26+
"collapsed": false,
27+
"gridPos": {
28+
"h": 1,
29+
"w": 24,
30+
"x": 0,
31+
"y": 0
32+
},
33+
"id": 20,
34+
"panels": [],
35+
"title": "All Monitoring Tasks",
36+
"type": "row"
37+
},
2538
{
2639
"datasource": {
2740
"type": "prometheus",
@@ -51,10 +64,10 @@
5164
"overrides": []
5265
},
5366
"gridPos": {
54-
"h": 4,
55-
"w": 5,
56-
"x": 19,
57-
"y": 0
67+
"h": 5,
68+
"w": 2,
69+
"x": 0,
70+
"y": 1
5871
},
5972
"id": 27,
6073
"options": {
@@ -77,29 +90,20 @@
7790
"pluginVersion": "12.1.1",
7891
"targets": [
7992
{
93+
"datasource": {
94+
"type": "prometheus",
95+
"uid": "${datasource}"
96+
},
8097
"editorMode": "code",
8198
"expr": "count by (task_name) (apatit_mp_status{task_name=\"$task_name\"} == 1)",
8299
"legendFormat": "__auto",
83100
"range": true,
84101
"refId": "A"
85102
}
86103
],
87-
"title": "Number of Available Monitoring Points",
104+
"title": "Available Locations",
88105
"type": "stat"
89106
},
90-
{
91-
"collapsed": false,
92-
"gridPos": {
93-
"h": 1,
94-
"w": 24,
95-
"x": 0,
96-
"y": 4
97-
},
98-
"id": 20,
99-
"panels": [],
100-
"title": "All Monitoring Tasks",
101-
"type": "row"
102-
},
103107
{
104108
"datasource": {
105109
"type": "prometheus",
@@ -148,9 +152,9 @@
148152
},
149153
"gridPos": {
150154
"h": 16,
151-
"w": 24,
152-
"x": 0,
153-
"y": 5
155+
"w": 22,
156+
"x": 2,
157+
"y": 1
154158
},
155159
"id": 15,
156160
"options": {
@@ -442,7 +446,7 @@
442446
"h": 14,
443447
"w": 12,
444448
"x": 0,
445-
"y": 21
449+
"y": 17
446450
},
447451
"id": 21,
448452
"options": {
@@ -546,7 +550,7 @@
546550
"h": 14,
547551
"w": 12,
548552
"x": 12,
549-
"y": 21
553+
"y": 17
550554
},
551555
"id": 22,
552556
"options": {
@@ -593,7 +597,7 @@
593597
"h": 1,
594598
"w": 24,
595599
"x": 0,
596-
"y": 35
600+
"y": 31
597601
},
598602
"id": 14,
599603
"panels": [
@@ -1039,7 +1043,7 @@
10391043
"h": 5,
10401044
"w": 12,
10411045
"x": 0,
1042-
"y": 125
1046+
"y": 161
10431047
},
10441048
"id": 16,
10451049
"options": {
@@ -1143,7 +1147,7 @@
11431147
"h": 5,
11441148
"w": 12,
11451149
"x": 12,
1146-
"y": 125
1150+
"y": 161
11471151
},
11481152
"id": 17,
11491153
"options": {
@@ -1218,7 +1222,7 @@
12181222
"h": 1,
12191223
"w": 24,
12201224
"x": 0,
1221-
"y": 36
1225+
"y": 32
12221226
},
12231227
"id": 13,
12241228
"panels": [
@@ -1871,7 +1875,7 @@
18711875
"h": 1,
18721876
"w": 24,
18731877
"x": 0,
1874-
"y": 37
1878+
"y": 33
18751879
},
18761880
"id": 12,
18771881
"panels": [
@@ -1921,7 +1925,7 @@
19211925
"h": 7,
19221926
"w": 24,
19231927
"x": 0,
1924-
"y": 38
1928+
"y": 240
19251929
},
19261930
"id": 26,
19271931
"options": {
@@ -2026,7 +2030,7 @@
20262030
"h": 8,
20272031
"w": 24,
20282032
"x": 0,
2029-
"y": 45
2033+
"y": 247
20302034
},
20312035
"id": 23,
20322036
"options": {
@@ -2124,7 +2128,7 @@
21242128
"h": 7,
21252129
"w": 24,
21262130
"x": 0,
2127-
"y": 53
2131+
"y": 255
21282132
},
21292133
"id": 6,
21302134
"options": {
@@ -2229,7 +2233,7 @@
22292233
"h": 7,
22302234
"w": 24,
22312235
"x": 0,
2232-
"y": 60
2236+
"y": 262
22332237
},
22342238
"id": 1,
22352239
"options": {
@@ -2333,7 +2337,7 @@
23332337
"h": 7,
23342338
"w": 24,
23352339
"x": 0,
2336-
"y": 67
2340+
"y": 269
23372341
},
23382342
"id": 25,
23392343
"options": {
@@ -2414,8 +2418,8 @@
24142418
{
24152419
"allowCustomValue": false,
24162420
"current": {
2417-
"text": "VictoriaMetrics",
2418-
"value": "vbYsCp3nz"
2421+
"text": "VM Prometheus",
2422+
"value": "PD96A447B92CB9D03"
24192423
},
24202424
"name": "datasource",
24212425
"options": [],
@@ -2551,7 +2555,7 @@
25512555
]
25522556
},
25532557
"time": {
2554-
"from": "now-3h",
2558+
"from": "now-6h",
25552559
"to": "now"
25562560
},
25572561
"timepicker": {
@@ -2569,5 +2573,5 @@
25692573
"timezone": "",
25702574
"title": "Ping-Admin | World Wide Sites Monitoring",
25712575
"uid": "de4pre2zlmwowa",
2572-
"version": 5
2576+
"version": 3
25732577
}

deploy/grafana/statistics-dashboard.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@
522522
"options": [],
523523
"query": {
524524
"qryType": 1,
525-
"query": "label_values(apatit_exporter_loops_total,task_name)",
525+
"query": "label_values(apatit_exporter_refresh_duration_seconds,task_name)",
526526
"refId": "PrometheusVariableQueryEditor-VariableQuery"
527527
},
528528
"refresh": 1,

0 commit comments

Comments
 (0)