Skip to content

Commit 5212376

Browse files
committed
updated grafana dashboards
1 parent 5b02c10 commit 5212376

File tree

2 files changed

+45
-42
lines changed

2 files changed

+45
-42
lines changed

grafana/dashboards/docker containers.json

Lines changed: 41 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"gnetId": 1150,
1818
"graphTooltip": 0,
1919
"id": null,
20-
"iteration": 1543013823545,
20+
"iteration": 1543014926870,
2121
"links": [],
2222
"panels": [
2323
{
@@ -30,7 +30,7 @@
3030
"error": false,
3131
"fill": 1,
3232
"gridPos": {
33-
"h": 7,
33+
"h": 5,
3434
"w": 10,
3535
"x": 0,
3636
"y": 0
@@ -173,7 +173,7 @@
173173
"thresholdMarkers": true
174174
},
175175
"gridPos": {
176-
"h": 7,
176+
"h": 5,
177177
"w": 4,
178178
"x": 10,
179179
"y": 0
@@ -293,7 +293,7 @@
293293
"thresholdMarkers": true
294294
},
295295
"gridPos": {
296-
"h": 7,
296+
"h": 5,
297297
"w": 4,
298298
"x": 14,
299299
"y": 0
@@ -413,7 +413,7 @@
413413
"thresholdMarkers": true
414414
},
415415
"gridPos": {
416-
"h": 7,
416+
"h": 5,
417417
"w": 6,
418418
"x": 18,
419419
"y": 0
@@ -526,20 +526,21 @@
526526
"datasource": "telegraf_ds",
527527
"editable": true,
528528
"error": false,
529-
"fill": 1,
529+
"fill": 2,
530530
"gridPos": {
531531
"h": 9,
532532
"w": 24,
533533
"x": 0,
534-
"y": 7
534+
"y": 5
535535
},
536-
"id": 3,
536+
"id": 9,
537537
"legend": {
538538
"alignAsTable": true,
539-
"avg": true,
539+
"avg": false,
540540
"current": true,
541+
"hideEmpty": false,
541542
"max": true,
542-
"min": false,
543+
"min": true,
543544
"rightSide": true,
544545
"show": true,
545546
"total": false,
@@ -555,10 +556,11 @@
555556
"renderer": "flot",
556557
"seriesOverrides": [],
557558
"spaceLength": 10,
558-
"stack": false,
559+
"stack": true,
559560
"steppedLine": false,
560561
"targets": [
561562
{
563+
"$$hashKey": "object:721",
562564
"alias": "$tag_container_name",
563565
"dsType": "influxdb",
564566
"expr": "",
@@ -583,15 +585,16 @@
583585
}
584586
],
585587
"intervalFactor": 2,
586-
"measurement": "docker_container_cpu",
588+
"measurement": "docker_container_mem",
589+
"orderByTime": "ASC",
587590
"policy": "default",
588591
"refId": "A",
589592
"resultFormat": "time_series",
590593
"select": [
591594
[
592595
{
593596
"params": [
594-
"usage_percent"
597+
"usage"
595598
],
596599
"type": "field"
597600
},
@@ -613,14 +616,13 @@
613616
"thresholds": [],
614617
"timeFrom": null,
615618
"timeShift": null,
616-
"title": "CPU global usage",
619+
"title": "Memory usage",
617620
"tooltip": {
618621
"msResolution": false,
619622
"shared": true,
620623
"sort": 0,
621624
"value_type": "individual"
622625
},
623-
"transparent": true,
624626
"type": "graph",
625627
"xaxis": {
626628
"buckets": null,
@@ -631,7 +633,7 @@
631633
},
632634
"yaxes": [
633635
{
634-
"format": "percent",
636+
"format": "bytes",
635637
"label": null,
636638
"logBase": 1,
637639
"max": null,
@@ -662,10 +664,10 @@
662664
"error": false,
663665
"fill": 1,
664666
"gridPos": {
665-
"h": 8,
666-
"w": 10,
667+
"h": 9,
668+
"w": 7,
667669
"x": 0,
668-
"y": 16
670+
"y": 14
669671
},
670672
"id": 5,
671673
"legend": {
@@ -881,24 +883,24 @@
881883
"datasource": "telegraf_ds",
882884
"editable": true,
883885
"error": false,
884-
"fill": 2,
886+
"fill": 1,
885887
"gridPos": {
886-
"h": 8,
887-
"w": 14,
888-
"x": 10,
889-
"y": 16
888+
"h": 9,
889+
"w": 17,
890+
"x": 7,
891+
"y": 14
890892
},
891-
"id": 9,
893+
"id": 3,
892894
"legend": {
893895
"alignAsTable": true,
894-
"avg": false,
895-
"current": false,
896-
"max": false,
896+
"avg": true,
897+
"current": true,
898+
"max": true,
897899
"min": false,
898900
"rightSide": true,
899901
"show": true,
900902
"total": false,
901-
"values": false
903+
"values": true
902904
},
903905
"lines": true,
904906
"linewidth": 1,
@@ -910,7 +912,7 @@
910912
"renderer": "flot",
911913
"seriesOverrides": [],
912914
"spaceLength": 10,
913-
"stack": true,
915+
"stack": false,
914916
"steppedLine": false,
915917
"targets": [
916918
{
@@ -938,15 +940,15 @@
938940
}
939941
],
940942
"intervalFactor": 2,
941-
"measurement": "docker_container_mem",
943+
"measurement": "docker_container_cpu",
942944
"policy": "default",
943945
"refId": "A",
944946
"resultFormat": "time_series",
945947
"select": [
946948
[
947949
{
948950
"params": [
949-
"usage"
951+
"usage_percent"
950952
],
951953
"type": "field"
952954
},
@@ -968,13 +970,14 @@
968970
"thresholds": [],
969971
"timeFrom": null,
970972
"timeShift": null,
971-
"title": "Memory usage",
973+
"title": "CPU global usage",
972974
"tooltip": {
973975
"msResolution": false,
974976
"shared": true,
975977
"sort": 0,
976978
"value_type": "individual"
977979
},
980+
"transparent": true,
978981
"type": "graph",
979982
"xaxis": {
980983
"buckets": null,
@@ -985,7 +988,7 @@
985988
},
986989
"yaxes": [
987990
{
988-
"format": "bytes",
991+
"format": "percent",
989992
"label": null,
990993
"logBase": 1,
991994
"max": null,
@@ -1019,7 +1022,7 @@
10191022
"h": 8,
10201023
"w": 24,
10211024
"x": 0,
1022-
"y": 24
1025+
"y": 23
10231026
},
10241027
"id": 8,
10251028
"legend": {
@@ -1240,8 +1243,8 @@
12401243
"allValue": null,
12411244
"current": {
12421245
"tags": [],
1243-
"text": "telegraf_642982_676605",
1244-
"value": "telegraf_642982_676605"
1246+
"text": "node-red-test_642987_676605",
1247+
"value": "node-red-test_642987_676605"
12451248
},
12461249
"datasource": "telegraf_ds",
12471250
"hide": 0,
@@ -1294,5 +1297,5 @@
12941297
"timezone": "browser",
12951298
"title": "docker containers",
12961299
"uid": "K-0EGGkgz",
1297-
"version": 3
1300+
"version": 1
12981301
}

grafana/dashboards/system metrics.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"gnetId": 1138,
1919
"graphTooltip": 0,
2020
"id": null,
21-
"iteration": 1542730758550,
21+
"iteration": 1543014739894,
2222
"links": [],
2323
"panels": [
2424
{
@@ -289,9 +289,9 @@
289289
"colorBackground": false,
290290
"colorValue": false,
291291
"colors": [
292-
"rgba(50, 172, 45, 0.97)",
292+
"rgba(245, 54, 54, 0.9)",
293293
"rgba(237, 129, 40, 0.89)",
294-
"rgba(245, 54, 54, 0.9)"
294+
"rgba(50, 172, 45, 0.97)"
295295
],
296296
"datasource": "telegraf_ds",
297297
"editable": true,
@@ -393,7 +393,7 @@
393393
]
394394
}
395395
],
396-
"thresholds": "70,85",
396+
"thresholds": "20,40",
397397
"title": "Memory available",
398398
"transparent": true,
399399
"type": "singlestat",

0 commit comments

Comments
 (0)