Skip to content

Commit 462a4dc

Browse files
ceeliasceelias
authored
Merge pull request #767 from sassoftware/dashfix2507
Grafana Dashboard: Make datasource generic
2 parents c068e9a + 222f6f6 commit 462a4dc

15 files changed

+872
-794
lines changed

‎monitoring/dashboards/kube/k8s-cluster-dashboard.json‎

Lines changed: 89 additions & 76 deletions
Large diffs are not rendered by default.

‎monitoring/dashboards/kube/k8s-deployment-dashboard.json‎

Lines changed: 51 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
{
2727
"datasource": {
2828
"type": "prometheus",
29-
"uid": "PBFA97CFB590B2093"
29+
"uid": "$datasource"
3030
},
3131
"fieldConfig": {
3232
"defaults": {
@@ -95,7 +95,7 @@
9595
{
9696
"datasource": {
9797
"type": "prometheus",
98-
"uid": "PBFA97CFB590B2093"
98+
"uid": "$datasource"
9999
},
100100
"expr": "sum (container_memory_working_set_bytes{node=~\"^$Node$\",pod=~\"^$Deployment.*$\"}) / sum (kube_node_status_capacity{resource=\"memory\",node=~\"^$Node$\"}) * 100",
101101
"interval": "10s",
@@ -111,7 +111,7 @@
111111
{
112112
"datasource": {
113113
"type": "prometheus",
114-
"uid": "PBFA97CFB590B2093"
114+
"uid": "$datasource"
115115
},
116116
"fieldConfig": {
117117
"defaults": {
@@ -181,7 +181,7 @@
181181
{
182182
"datasource": {
183183
"type": "prometheus",
184-
"uid": "PBFA97CFB590B2093"
184+
"uid": "$datasource"
185185
},
186186
"expr": "sum (rate (container_cpu_usage_seconds_total{node=~\"^$Node$\",pod=~\"^$Deployment.*$\"}[1m])) / sum (kube_node_status_capacity{resource=\"cpu\",node=~\"^$Node$\"}) * 100",
187187
"interval": "10s",
@@ -197,7 +197,7 @@
197197
{
198198
"datasource": {
199199
"type": "prometheus",
200-
"uid": "PBFA97CFB590B2093"
200+
"uid": "$datasource"
201201
},
202202
"fieldConfig": {
203203
"defaults": {
@@ -262,7 +262,7 @@
262262
{
263263
"datasource": {
264264
"type": "prometheus",
265-
"uid": "PBFA97CFB590B2093"
265+
"uid": "$datasource"
266266
},
267267
"expr": "sum(kube_deployment_status_replicas_available{deployment=~\"^$Deployment$\"}) / sum(kube_deployment_status_replicas{deployment=~\"^$Deployment$\"}) * 100",
268268
"intervalFactor": 2,
@@ -276,7 +276,7 @@
276276
{
277277
"datasource": {
278278
"type": "prometheus",
279-
"uid": "PBFA97CFB590B2093"
279+
"uid": "$datasource"
280280
},
281281
"fieldConfig": {
282282
"defaults": {
@@ -337,7 +337,7 @@
337337
{
338338
"datasource": {
339339
"type": "prometheus",
340-
"uid": "PBFA97CFB590B2093"
340+
"uid": "$datasource"
341341
},
342342
"expr": "sum (container_memory_working_set_bytes{node=~\"^$Node$\",pod=~\"^$Deployment.*$\"})",
343343
"interval": "",
@@ -353,7 +353,7 @@
353353
{
354354
"datasource": {
355355
"type": "prometheus",
356-
"uid": "PBFA97CFB590B2093"
356+
"uid": "$datasource"
357357
},
358358
"fieldConfig": {
359359
"defaults": {
@@ -414,7 +414,7 @@
414414
{
415415
"datasource": {
416416
"type": "prometheus",
417-
"uid": "PBFA97CFB590B2093"
417+
"uid": "$datasource"
418418
},
419419
"expr": "sum (kube_node_status_capacity{resource=\"memory\",node=~\"^$Node$\"})",
420420
"interval": "",
@@ -430,7 +430,7 @@
430430
{
431431
"datasource": {
432432
"type": "prometheus",
433-
"uid": "PBFA97CFB590B2093"
433+
"uid": "$datasource"
434434
},
435435
"fieldConfig": {
436436
"defaults": {
@@ -491,7 +491,7 @@
491491
{
492492
"datasource": {
493493
"type": "prometheus",
494-
"uid": "PBFA97CFB590B2093"
494+
"uid": "$datasource"
495495
},
496496
"expr": "sum (rate (container_cpu_usage_seconds_total{node=~\"^$Node$\",pod=~\"^$Deployment.*$\"}[1m]))",
497497
"interval": "",
@@ -507,7 +507,7 @@
507507
{
508508
"datasource": {
509509
"type": "prometheus",
510-
"uid": "PBFA97CFB590B2093"
510+
"uid": "$datasource"
511511
},
512512
"fieldConfig": {
513513
"defaults": {
@@ -568,7 +568,7 @@
568568
{
569569
"datasource": {
570570
"type": "prometheus",
571-
"uid": "PBFA97CFB590B2093"
571+
"uid": "$datasource"
572572
},
573573
"expr": "sum (kube_node_status_capacity{resource=\"cpu\",node=~\"^$Node$\"})",
574574
"intervalFactor": 2,
@@ -582,7 +582,7 @@
582582
{
583583
"datasource": {
584584
"type": "prometheus",
585-
"uid": "PBFA97CFB590B2093"
585+
"uid": "$datasource"
586586
},
587587
"fieldConfig": {
588588
"defaults": {
@@ -643,7 +643,7 @@
643643
{
644644
"datasource": {
645645
"type": "prometheus",
646-
"uid": "PBFA97CFB590B2093"
646+
"uid": "$datasource"
647647
},
648648
"expr": "sum(kube_deployment_status_replicas_available{deployment=~\"^$Deployment$\"})",
649649
"interval": "",
@@ -659,7 +659,7 @@
659659
{
660660
"datasource": {
661661
"type": "prometheus",
662-
"uid": "PBFA97CFB590B2093"
662+
"uid": "$datasource"
663663
},
664664
"fieldConfig": {
665665
"defaults": {
@@ -720,7 +720,7 @@
720720
{
721721
"datasource": {
722722
"type": "prometheus",
723-
"uid": "PBFA97CFB590B2093"
723+
"uid": "$datasource"
724724
},
725725
"expr": "sum(kube_deployment_status_replicas{deployment=~\"^$Deployment$\"})",
726726
"intervalFactor": 2,
@@ -734,7 +734,7 @@
734734
{
735735
"datasource": {
736736
"type": "prometheus",
737-
"uid": "PBFA97CFB590B2093"
737+
"uid": "$datasource"
738738
},
739739
"fieldConfig": {
740740
"defaults": {
@@ -822,7 +822,7 @@
822822
{
823823
"datasource": {
824824
"type": "prometheus",
825-
"uid": "PBFA97CFB590B2093"
825+
"uid": "$datasource"
826826
},
827827
"expr": "sum (rate (container_cpu_usage_seconds_total{image!=\"\",pod=~\"^$Deployment.*$\"}[1m])) by (pod)",
828828
"interval": "10s",
@@ -839,7 +839,7 @@
839839
{
840840
"datasource": {
841841
"type": "prometheus",
842-
"uid": "PBFA97CFB590B2093"
842+
"uid": "$datasource"
843843
},
844844
"fieldConfig": {
845845
"defaults": {
@@ -927,7 +927,7 @@
927927
{
928928
"datasource": {
929929
"type": "prometheus",
930-
"uid": "PBFA97CFB590B2093"
930+
"uid": "$datasource"
931931
},
932932
"expr": "sum (rate (container_cpu_usage_seconds_total{image!=\"\",name=~\"^k8s_.*\",io_kubernetes_container_name!=\"POD\",pod=~\"^$Deployment.*$\"}[1m])) by (io_kubernetes_container_name, pod)",
933933
"hide": false,
@@ -941,7 +941,7 @@
941941
{
942942
"datasource": {
943943
"type": "prometheus",
944-
"uid": "PBFA97CFB590B2093"
944+
"uid": "$datasource"
945945
},
946946
"expr": "sum (rate (container_cpu_usage_seconds_total{image!=\"\",name!~\"^k8s_.*\",pod=~\"^$Deployment.*$\"}[1m])) by (pod, name, image)",
947947
"hide": false,
@@ -955,7 +955,7 @@
955955
{
956956
"datasource": {
957957
"type": "prometheus",
958-
"uid": "PBFA97CFB590B2093"
958+
"uid": "$datasource"
959959
},
960960
"expr": "sum (rate (container_cpu_usage_seconds_total{rkt_container_name!=\"\",pod=~\"^$Deployment.*$\"}[1m])) by (pod, rkt_container_name)",
961961
"interval": "10s",
@@ -972,7 +972,7 @@
972972
{
973973
"datasource": {
974974
"type": "prometheus",
975-
"uid": "PBFA97CFB590B2093"
975+
"uid": "$datasource"
976976
},
977977
"fieldConfig": {
978978
"defaults": {
@@ -1060,7 +1060,7 @@
10601060
{
10611061
"datasource": {
10621062
"type": "prometheus",
1063-
"uid": "PBFA97CFB590B2093"
1063+
"uid": "$datasource"
10641064
},
10651065
"expr": "sum (rate (container_cpu_usage_seconds_total{id!=\"/\",pod=~\"^$Deployment.*$\"}[1m])) by (id)",
10661066
"hide": false,
@@ -1078,7 +1078,7 @@
10781078
{
10791079
"datasource": {
10801080
"type": "prometheus",
1081-
"uid": "PBFA97CFB590B2093"
1081+
"uid": "$datasource"
10821082
},
10831083
"fieldConfig": {
10841084
"defaults": {
@@ -1164,7 +1164,7 @@
11641164
{
11651165
"datasource": {
11661166
"type": "prometheus",
1167-
"uid": "PBFA97CFB590B2093"
1167+
"uid": "$datasource"
11681168
},
11691169
"expr": "sum (container_memory_working_set_bytes{image!=\"\",pod=~\"^$Deployment.*$\"}) by (pod)",
11701170
"interval": "10s",
@@ -1181,7 +1181,7 @@
11811181
{
11821182
"datasource": {
11831183
"type": "prometheus",
1184-
"uid": "PBFA97CFB590B2093"
1184+
"uid": "$datasource"
11851185
},
11861186
"fieldConfig": {
11871187
"defaults": {
@@ -1269,7 +1269,7 @@
12691269
{
12701270
"datasource": {
12711271
"type": "prometheus",
1272-
"uid": "PBFA97CFB590B2093"
1272+
"uid": "$datasource"
12731273
},
12741274
"expr": "sum (container_memory_working_set_bytes{id!=\"/\",pod=~\"^$Deployment.*$\"}) by (id)",
12751275
"interval": "10s",
@@ -1286,7 +1286,7 @@
12861286
{
12871287
"datasource": {
12881288
"type": "prometheus",
1289-
"uid": "PBFA97CFB590B2093"
1289+
"uid": "$datasource"
12901290
},
12911291
"fieldConfig": {
12921292
"defaults": {
@@ -1372,7 +1372,7 @@
13721372
{
13731373
"datasource": {
13741374
"type": "prometheus",
1375-
"uid": "PBFA97CFB590B2093"
1375+
"uid": "$datasource"
13761376
},
13771377
"expr": "sum (rate (container_network_receive_bytes_total{image!=\"\",pod=~\"^$Deployment.*$\"}[1m])) by (pod)",
13781378
"interval": "10s",
@@ -1385,7 +1385,7 @@
13851385
{
13861386
"datasource": {
13871387
"type": "prometheus",
1388-
"uid": "PBFA97CFB590B2093"
1388+
"uid": "$datasource"
13891389
},
13901390
"expr": "- sum (rate (container_network_transmit_bytes_total{image!=\"\",pod=~\"^$Deployment.*$\"}[1m])) by (pod)",
13911391
"interval": "10s",
@@ -1402,7 +1402,7 @@
14021402
{
14031403
"datasource": {
14041404
"type": "prometheus",
1405-
"uid": "PBFA97CFB590B2093"
1405+
"uid": "$datasource"
14061406
},
14071407
"fieldConfig": {
14081408
"defaults": {
@@ -1490,7 +1490,7 @@
14901490
{
14911491
"datasource": {
14921492
"type": "prometheus",
1493-
"uid": "PBFA97CFB590B2093"
1493+
"uid": "$datasource"
14941494
},
14951495
"expr": "sum (rate (container_network_receive_bytes_total{id!=\"/\",pod=~\"^$Deployment.*$\"}[1m])) by (id)",
14961496
"interval": "10s",
@@ -1503,7 +1503,7 @@
15031503
{
15041504
"datasource": {
15051505
"type": "prometheus",
1506-
"uid": "PBFA97CFB590B2093"
1506+
"uid": "$datasource"
15071507
},
15081508
"expr": "- sum (rate (container_network_transmit_bytes_total{id!=\"/\",pod=~\"^$Deployment.*$\"}[1m])) by (id)",
15091509
"interval": "10s",
@@ -1525,6 +1525,19 @@
15251525
],
15261526
"templating": {
15271527
"list": [
1528+
{
1529+
"allowCustomValue": false,
1530+
"current": {
1531+
"text": "Prometheus",
1532+
"value": "prometheus"
1533+
},
1534+
"name": "datasource",
1535+
"options": [],
1536+
"query": "prometheus",
1537+
"refresh": 1,
1538+
"regex": "",
1539+
"type": "datasource"
1540+
},
15281541
{
15291542
"allValue": ".*",
15301543
"current": {
@@ -1534,7 +1547,7 @@
15341547
},
15351548
"datasource": {
15361549
"type": "prometheus",
1537-
"uid": "PBFA97CFB590B2093"
1550+
"uid": "$datasource"
15381551
},
15391552
"definition": "",
15401553
"hide": 0,
@@ -1561,7 +1574,7 @@
15611574
},
15621575
"datasource": {
15631576
"type": "prometheus",
1564-
"uid": "PBFA97CFB590B2093"
1577+
"uid": "$datasource"
15651578
},
15661579
"definition": "",
15671580
"hide": 2,

‎monitoring/dashboards/kube/perf-k8s-container-util.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"collapsed": false,
3030
"datasource": {
3131
"type": "prometheus",
32-
"uid": "PBFA97CFB590B2093"
32+
"uid": "$datasource"
3333
},
3434
"gridPos": {
3535
"h": 1,
@@ -43,7 +43,7 @@
4343
{
4444
"datasource": {
4545
"type": "prometheus",
46-
"uid": "PBFA97CFB590B2093"
46+
"uid": "$datasource"
4747
},
4848
"refId": "A"
4949
}
@@ -1657,7 +1657,7 @@
16571657
"collapsed": true,
16581658
"datasource": {
16591659
"type": "prometheus",
1660-
"uid": "PBFA97CFB590B2093"
1660+
"uid": "$datasource"
16611661
},
16621662
"gridPos": {
16631663
"h": 1,
@@ -3350,7 +3350,7 @@
33503350
{
33513351
"datasource": {
33523352
"type": "prometheus",
3353-
"uid": "PBFA97CFB590B2093"
3353+
"uid": "$datasource"
33543354
},
33553355
"refId": "A"
33563356
}

0 commit comments

Comments
 (0)