Skip to content

Commit a42968f

Browse files
v-zhuravlevv-zhuravlev
authored
fix(update_dashboards): Updating datasource and adding prefix
* Update dashboards This queries prometheus datasource name from first templated variable 'datasource' and use it in all panels. This ensures that dashboard would work in the grafana environment with any prometheus datasource name. Also prefixes esx.json dashboard with 'VMware' so dashboards are better sorted in grafana and easier to find. * Add dashboard tags
1 parent f32eaa9 commit a42968f

File tree

4 files changed

+104
-80
lines changed

4 files changed

+104
-80
lines changed

‎dashboards/cluster.json‎

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"rgba(237, 129, 40, 0.89)",
3232
"#d44a3a"
3333
],
34-
"datasource": "Prometheus",
34+
"datasource": "$datasource",
3535
"format": "short",
3636
"gauge": {
3737
"maxValue": 100,
@@ -112,7 +112,7 @@
112112
"rgba(237, 129, 40, 0.89)",
113113
"#d44a3a"
114114
],
115-
"datasource": "Prometheus",
115+
"datasource": "$datasource",
116116
"format": "hertz",
117117
"gauge": {
118118
"maxValue": 100,
@@ -193,7 +193,7 @@
193193
"rgba(237, 129, 40, 0.89)",
194194
"#d44a3a"
195195
],
196-
"datasource": "Prometheus",
196+
"datasource": "$datasource",
197197
"format": "decmbytes",
198198
"gauge": {
199199
"maxValue": 100,
@@ -274,7 +274,7 @@
274274
"rgba(237, 129, 40, 0.89)",
275275
"#d44a3a"
276276
],
277-
"datasource": "Prometheus",
277+
"datasource": "$datasource",
278278
"format": "none",
279279
"gauge": {
280280
"maxValue": 100,
@@ -355,7 +355,7 @@
355355
"rgba(237, 129, 40, 0.89)",
356356
"#d44a3a"
357357
],
358-
"datasource": "Prometheus",
358+
"datasource": "$datasource",
359359
"format": "none",
360360
"gauge": {
361361
"maxValue": 100,
@@ -439,7 +439,7 @@
439439
},
440440
{
441441
"cacheTimeout": null,
442-
"datasource": "Prometheus",
442+
"datasource": "$datasource",
443443
"gridPos": {
444444
"h": 5,
445445
"w": 4,
@@ -504,7 +504,7 @@
504504
},
505505
{
506506
"cacheTimeout": null,
507-
"datasource": "Prometheus",
507+
"datasource": "$datasource",
508508
"gridPos": {
509509
"h": 5,
510510
"w": 4,
@@ -569,7 +569,7 @@
569569
},
570570
{
571571
"cacheTimeout": null,
572-
"datasource": "Prometheus",
572+
"datasource": "$datasource",
573573
"gridPos": {
574574
"h": 5,
575575
"w": 4,
@@ -638,7 +638,7 @@
638638
"cacheTimeout": null,
639639
"dashLength": 10,
640640
"dashes": false,
641-
"datasource": "Prometheus",
641+
"datasource": "$datasource",
642642
"fill": 1,
643643
"fillGradient": 0,
644644
"gridPos": {
@@ -732,7 +732,7 @@
732732
"rgba(237, 129, 40, 0.89)",
733733
"#d44a3a"
734734
],
735-
"datasource": "Prometheus",
735+
"datasource": "$datasource",
736736
"format": "percent",
737737
"gauge": {
738738
"maxValue": 100,
@@ -807,7 +807,7 @@
807807
},
808808
{
809809
"cacheTimeout": null,
810-
"datasource": "Prometheus",
810+
"datasource": "$datasource",
811811
"gridPos": {
812812
"h": 5,
813813
"w": 4,
@@ -872,7 +872,7 @@
872872
},
873873
{
874874
"cacheTimeout": null,
875-
"datasource": "Prometheus",
875+
"datasource": "$datasource",
876876
"gridPos": {
877877
"h": 5,
878878
"w": 4,
@@ -941,7 +941,7 @@
941941
"cacheTimeout": null,
942942
"dashLength": 10,
943943
"dashes": false,
944-
"datasource": "Prometheus",
944+
"datasource": "$datasource",
945945
"fill": 1,
946946
"fillGradient": 0,
947947
"gridPos": {
@@ -1032,7 +1032,7 @@
10321032
"cacheTimeout": null,
10331033
"dashLength": 10,
10341034
"dashes": false,
1035-
"datasource": "Prometheus",
1035+
"datasource": "$datasource",
10361036
"decimals": 1,
10371037
"fill": 1,
10381038
"fillGradient": 0,
@@ -1124,7 +1124,7 @@
11241124
"cacheTimeout": null,
11251125
"dashLength": 10,
11261126
"dashes": false,
1127-
"datasource": "Prometheus",
1127+
"datasource": "$datasource",
11281128
"decimals": 1,
11291129
"fill": 1,
11301130
"fillGradient": 0,
@@ -1216,7 +1216,7 @@
12161216
"cacheTimeout": null,
12171217
"dashLength": 10,
12181218
"dashes": false,
1219-
"datasource": "Prometheus",
1219+
"datasource": "$datasource",
12201220
"fill": 1,
12211221
"fillGradient": 0,
12221222
"gridPos": {
@@ -1307,7 +1307,7 @@
13071307
"cacheTimeout": null,
13081308
"dashLength": 10,
13091309
"dashes": false,
1310-
"datasource": "Prometheus",
1310+
"datasource": "$datasource",
13111311
"decimals": 1,
13121312
"fill": 1,
13131313
"fillGradient": 0,
@@ -1399,7 +1399,7 @@
13991399
"cacheTimeout": null,
14001400
"dashLength": 10,
14011401
"dashes": false,
1402-
"datasource": "Prometheus",
1402+
"datasource": "$datasource",
14031403
"fill": 1,
14041404
"fillGradient": 0,
14051405
"gridPos": {
@@ -1490,7 +1490,7 @@
14901490
"cacheTimeout": null,
14911491
"dashLength": 10,
14921492
"dashes": false,
1493-
"datasource": "Prometheus",
1493+
"datasource": "$datasource",
14941494
"decimals": 1,
14951495
"fill": 1,
14961496
"fillGradient": 0,
@@ -1582,7 +1582,7 @@
15821582
"cacheTimeout": null,
15831583
"dashLength": 10,
15841584
"dashes": false,
1585-
"datasource": "Prometheus",
1585+
"datasource": "$datasource",
15861586
"decimals": 1,
15871587
"fill": 1,
15881588
"fillGradient": 0,
@@ -1674,7 +1674,7 @@
16741674
"cacheTimeout": null,
16751675
"dashLength": 10,
16761676
"dashes": false,
1677-
"datasource": "Prometheus",
1677+
"datasource": "$datasource",
16781678
"fill": 1,
16791679
"fillGradient": 0,
16801680
"gridPos": {
@@ -1765,7 +1765,7 @@
17651765
"cacheTimeout": null,
17661766
"dashLength": 10,
17671767
"dashes": false,
1768-
"datasource": "Prometheus",
1768+
"datasource": "$datasource",
17691769
"fill": 1,
17701770
"fillGradient": 0,
17711771
"gridPos": {
@@ -1856,7 +1856,7 @@
18561856
"cacheTimeout": null,
18571857
"dashLength": 10,
18581858
"dashes": false,
1859-
"datasource": "Prometheus",
1859+
"datasource": "$datasource",
18601860
"fill": 1,
18611861
"fillGradient": 0,
18621862
"gridPos": {
@@ -1944,7 +1944,9 @@
19441944
],
19451945
"schemaVersion": 20,
19461946
"style": "dark",
1947-
"tags": [],
1947+
"tags": [
1948+
"vmware"
1949+
],
19481950
"templating": {
19491951
"list": [
19501952
{
@@ -1972,7 +1974,7 @@
19721974
"cluster1"
19731975
]
19741976
},
1975-
"datasource": "Prometheus",
1977+
"datasource": "$datasource",
19761978
"definition": "label_values(cluster_name)",
19771979
"hide": 0,
19781980
"includeAll": false,

‎dashboards/esx.json‎

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"__inputs": [
33
{
4-
"name": "DS_PROMETHEUS",
4+
"name": "datasource",
55
"label": "prometheus",
66
"description": "",
77
"type": "datasource",
@@ -59,7 +59,7 @@
5959
"rgba(237, 129, 40, 0.89)",
6060
"rgba(50, 172, 45, 0.97)"
6161
],
62-
"datasource": "${DS_PROMETHEUS}",
62+
"datasource": "${datasource}",
6363
"decimals": 1,
6464
"description": "System uptime",
6565
"format": "s",
@@ -139,7 +139,7 @@
139139
"rgba(237, 129, 40, 0.89)",
140140
"rgba(245, 54, 54, 0.9)"
141141
],
142-
"datasource": "${DS_PROMETHEUS}",
142+
"datasource": "${datasource}",
143143
"format": "percent",
144144
"gauge": {
145145
"maxValue": 100,
@@ -218,7 +218,7 @@
218218
"rgba(237, 129, 40, 0.89)",
219219
"rgba(245, 54, 54, 0.9)"
220220
],
221-
"datasource": "${DS_PROMETHEUS}",
221+
"datasource": "${datasource}",
222222
"format": "percent",
223223
"gauge": {
224224
"maxValue": 100,
@@ -296,7 +296,7 @@
296296
"rgba(237, 129, 40, 0.89)",
297297
"rgba(50, 172, 45, 0.97)"
298298
],
299-
"datasource": "${DS_PROMETHEUS}",
299+
"datasource": "${datasource}",
300300
"format": "none",
301301
"gauge": {
302302
"maxValue": 100,
@@ -385,7 +385,7 @@
385385
"bars": false,
386386
"dashLength": 10,
387387
"dashes": false,
388-
"datasource": "${DS_PROMETHEUS}",
388+
"datasource": "${datasource}",
389389
"decimals": 1,
390390
"fill": 0,
391391
"id": 1,
@@ -468,7 +468,7 @@
468468
"bars": false,
469469
"dashLength": 10,
470470
"dashes": false,
471-
"datasource": "${DS_PROMETHEUS}",
471+
"datasource": "${datasource}",
472472
"decimals": 1,
473473
"fill": 1,
474474
"id": 2,
@@ -557,13 +557,33 @@
557557
],
558558
"schemaVersion": 14,
559559
"style": "dark",
560-
"tags": [],
560+
"tags": [
561+
"vmware",
562+
"esx"
563+
],
561564
"templating": {
562565
"list": [
566+
{
567+
"current": {
568+
"text": "Prometheus",
569+
"value": "Prometheus"
570+
},
571+
"hide": 0,
572+
"includeAll": false,
573+
"label": "Datasource",
574+
"multi": false,
575+
"name": "datasource",
576+
"options": [],
577+
"query": "prometheus",
578+
"refresh": 1,
579+
"regex": "",
580+
"skipUrlSync": false,
581+
"type": "datasource"
582+
},
563583
{
564584
"allValue": null,
565585
"current": {},
566-
"datasource": "${DS_PROMETHEUS}",
586+
"datasource": "$datasource",
567587
"hide": 0,
568588
"includeAll": false,
569589
"label": "Host:",
@@ -612,6 +632,7 @@
612632
]
613633
},
614634
"timezone": "browser",
615-
"title": "ESX Hosts Information",
635+
"title": "VMware ESX Hosts Information",
636+
"uid": "ed9d4bbf8801a8f79194b2ce6ead0ffcb8f9952a",
616637
"version": 17
617638
}

0 commit comments

Comments
 (0)