From c28500fabe15939b97f64b1c7ba0c8ba87ebab18 Mon Sep 17 00:00:00 2001 From: Vladimir Rutsky Date: Thu, 2 Mar 2017 16:16:41 +0300 Subject: [PATCH 01/10] split used memory to actually used memory, buffers, caches --- assets/grafana/node-dashboard.json | 328 ++++++++++++++--------------- 1 file changed, 153 insertions(+), 175 deletions(-) diff --git a/assets/grafana/node-dashboard.json b/assets/grafana/node-dashboard.json index 272d54ea..dd8c3d5e 100644 --- a/assets/grafana/node-dashboard.json +++ b/assets/grafana/node-dashboard.json @@ -11,57 +11,48 @@ } ], "__requires": [ + { + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.1.1" + }, { "type": "panel", "id": "graph", "name": "Graph", "version": "" }, - { - "type": "panel", - "id": "singlestat", - "name": "Singlestat", - "version": "" - }, - { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, { "type": "datasource", "id": "prometheus", "name": "Prometheus", "version": "1.0.0" + }, + { + "type": "panel", + "id": "singlestat", + "name": "Singlestat", + "version": "" } ], - "id": null, - "title": "Nodes", + "annotations": { + "list": [] + }, "description": "Dashboard to get an overview of one server", - "tags": [ - "prometheus" - ], - "style": "dark", - "timezone": "browser", "editable": true, + "gnetId": 22, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "250px", "panels": [ { - "alert": { - "crit": { - "op": ">" - }, - "warn": { - "op": ">" - } - }, "alerting": {}, "aliasColors": {}, "bars": false, @@ -69,14 +60,8 @@ "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": null, - "threshold2": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 3, - "isNew": true, "legend": { "avg": false, "current": false, @@ -120,7 +105,10 @@ }, "type": "graph", "xaxis": { - "show": true + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -142,14 +130,6 @@ ] }, { - "alert": { - "crit": { - "op": ">" - }, - "warn": { - "op": ">" - } - }, "alerting": {}, "aliasColors": {}, "bars": false, @@ -157,14 +137,8 @@ "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": null, - "threshold2": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "avg": false, "current": false, @@ -224,7 +198,10 @@ }, "type": "graph", "xaxis": { - "show": true + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -246,22 +223,18 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { - "alert": { - "crit": { - "op": ">" - }, - "warn": { - "op": ">" - } - }, "alerting": {}, "aliasColors": {}, "bars": false, @@ -269,19 +242,17 @@ "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": null, - "threshold2": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 4, - "isNew": true, "legend": { + "alignAsTable": false, "avg": false, "current": false, + "hideEmpty": false, + "hideZero": false, "max": false, "min": false, + "rightSide": false, "show": true, "total": false, "values": false @@ -301,26 +272,43 @@ } ], "span": 9, - "stack": false, + "stack": true, "steppedLine": false, "targets": [ { - "expr": "node_memory_MemTotal{instance=\"$server\"} - node_memory_MemFree{instance=\"$server\"}", + "expr": "node_memory_MemTotal{instance=\"$server\"} - node_memory_MemFree{instance=\"$server\"} - node_memory_Buffers{instance=\"$server\"} - node_memory_Cached{instance=\"$server\"}", + "hide": false, + "interval": "", "intervalFactor": 2, - "legendFormat": "memory usage", - "metric": "memo", - "refId": "A", - "step": 4, - "target": "" + "legendFormat": "memory used", + "metric": "", + "refId": "C", + "step": 4 }, { - "expr": "node_memory_MemTotal{instance=\"$server\"}", + "expr": "node_memory_Buffers{instance=\"$server\"}", + "interval": "", "intervalFactor": 2, - "legendFormat": "memory total", - "metric": "memo", - "refId": "B", - "step": 4, - "target": "" + "legendFormat": "memory buffers", + "metric": "", + "refId": "E", + "step": 4 + }, + { + "expr": "node_memory_Cached{instance=\"$server\"}", + "intervalFactor": 2, + "legendFormat": "", + "metric": "", + "refId": "F", + "step": 4 + }, + { + "expr": "node_memory_MemFree{instance=\"$server\"}", + "intervalFactor": 2, + "legendFormat": "memory free", + "metric": "", + "refId": "D", + "step": 4 } ], "thresholds": [], @@ -331,11 +319,14 @@ "msResolution": false, "shared": true, "sort": 0, - "value_type": "cumulative" + "value_type": "individual" }, "type": "graph", "xaxis": { - "show": true + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -343,7 +334,7 @@ "label": null, "logBase": 1, "max": null, - "min": null, + "min": "0", "show": true }, { @@ -378,7 +369,6 @@ }, "id": 5, "interval": null, - "isNew": true, "links": [], "mappingType": 1, "mappingTypes": [ @@ -414,7 +404,7 @@ }, "targets": [ { - "expr": "((node_memory_MemTotal{instance=\"$server\"} - node_memory_MemFree{instance=\"$server\"}) / node_memory_MemTotal{instance=\"$server\"}) * 100", + "expr": "((node_memory_MemTotal{instance=\"$server\"} - node_memory_MemFree{instance=\"$server\"} - node_memory_Buffers{instance=\"$server\"} - node_memory_Cached{instance=\"$server\"}) / node_memory_MemTotal{instance=\"$server\"}) * 100", "intervalFactor": 2, "refId": "A", "step": 60, @@ -435,22 +425,18 @@ "valueName": "avg" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { - "alert": { - "crit": { - "op": ">" - }, - "warn": { - "op": ">" - } - }, "alerting": {}, "aliasColors": {}, "bars": false, @@ -458,14 +444,8 @@ "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": null, - "threshold2": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "avg": false, "current": false, @@ -537,7 +517,10 @@ }, "type": "graph", "xaxis": { - "show": true + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -580,7 +563,6 @@ }, "id": 7, "interval": null, - "isNew": true, "links": [], "mappingType": 1, "mappingTypes": [ @@ -637,22 +619,18 @@ "valueName": "current" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { - "alert": { - "crit": { - "op": ">" - }, - "warn": { - "op": ">" - } - }, "alerting": {}, "aliasColors": {}, "bars": false, @@ -660,14 +638,8 @@ "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": null, - "threshold2": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 8, - "isNew": true, "legend": { "avg": false, "current": false, @@ -717,7 +689,10 @@ }, "type": "graph", "xaxis": { - "show": true + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -739,14 +714,6 @@ ] }, { - "alert": { - "crit": { - "op": ">" - }, - "warn": { - "op": ">" - } - }, "alerting": {}, "aliasColors": {}, "bars": false, @@ -754,14 +721,8 @@ "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": null, - "threshold2": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 10, - "isNew": true, "legend": { "avg": false, "current": false, @@ -811,7 +772,10 @@ }, "type": "graph", "xaxis": { - "show": true + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -833,9 +797,43 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "prometheus" + ], + "templating": { + "list": [ + { + "allValue": null, + "current": {}, + "datasource": "${DS_PROMETHEUS}", + "hide": 0, + "includeAll": false, + "label": null, + "multi": false, + "name": "server", + "options": [], + "query": "label_values(node_boot_time, instance)", + "refresh": 1, + "regex": "", + "sort": 0, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false + } + ] + }, "time": { "from": "now-1h", "to": "now" @@ -865,38 +863,18 @@ "30d" ] }, - "templating": { - "list": [ - { - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "hide": 0, - "includeAll": false, - "multi": false, - "name": "server", - "options": [], - "query": "label_values(node_boot_time, instance)", - "refresh": 1, - "type": "query" - } - ] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 1, - "links": [], - "gnetId": 22 + "timezone": "browser", + "title": "Nodes", + "version": 1 }, - "inputs": [ - { - "name": "DS_PROMETHEUS", - "pluginId": "prometheus", - "type": "datasource", - "value": "prometheus" - } - ], - "overwrite": true + "inputs": [ + { + "name": "DS_PROMETHEUS", + "pluginId": "prometheus", + "type": "datasource", + "value": "prometheus" + } + ], + "overwrite": true } + From 4132bb5ec480512ff70b39b99e7ee16a98c40560 Mon Sep 17 00:00:00 2001 From: Vladimir Rutsky Date: Thu, 2 Mar 2017 16:37:25 +0300 Subject: [PATCH 02/10] resave dashboard from Grafana editor Dummy alert specifications were removed. --- assets/grafana/all-nodes-dashboard.json | 241 ++++++++++-------------- 1 file changed, 95 insertions(+), 146 deletions(-) diff --git a/assets/grafana/all-nodes-dashboard.json b/assets/grafana/all-nodes-dashboard.json index d16c4463..6e6536a2 100644 --- a/assets/grafana/all-nodes-dashboard.json +++ b/assets/grafana/all-nodes-dashboard.json @@ -11,57 +11,48 @@ } ], "__requires": [ + { + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.1.1" + }, { "type": "panel", "id": "graph", "name": "Graph", "version": "" }, - { - "type": "panel", - "id": "singlestat", - "name": "Singlestat", - "version": "" - }, - { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, { "type": "datasource", "id": "prometheus", "name": "Prometheus", "version": "1.0.0" + }, + { + "type": "panel", + "id": "singlestat", + "name": "Singlestat", + "version": "" } ], - "id": null, - "title": "All Nodes", + "annotations": { + "list": [] + }, "description": "Dashboard to get an overview of one server", - "tags": [ - "prometheus" - ], - "style": "dark", - "timezone": "browser", "editable": true, + "gnetId": 22, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "250px", "panels": [ { - "alert": { - "crit": { - "op": ">" - }, - "warn": { - "op": ">" - } - }, "alerting": {}, "aliasColors": {}, "bars": false, @@ -69,14 +60,8 @@ "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 3, - "isNew": true, "legend": { "avg": false, "current": false, @@ -120,7 +105,10 @@ }, "type": "graph", "xaxis": { - "show": true + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -142,14 +130,6 @@ ] }, { - "alert": { - "crit": { - "op": ">" - }, - "warn": { - "op": ">" - } - }, "alerting": {}, "aliasColors": {}, "bars": false, @@ -157,14 +137,8 @@ "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "avg": false, "current": false, @@ -224,7 +198,10 @@ }, "type": "graph", "xaxis": { - "show": true + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -246,22 +223,18 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { - "alert": { - "crit": { - "op": ">" - }, - "warn": { - "op": ">" - } - }, "alerting": {}, "aliasColors": {}, "bars": false, @@ -269,14 +242,8 @@ "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 4, - "isNew": true, "legend": { "avg": false, "current": false, @@ -335,7 +302,10 @@ }, "type": "graph", "xaxis": { - "show": true + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -378,7 +348,6 @@ }, "id": 5, "interval": null, - "isNew": true, "links": [], "mappingType": 1, "mappingTypes": [ @@ -435,22 +404,18 @@ "valueName": "avg" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { - "alert": { - "crit": { - "op": ">" - }, - "warn": { - "op": ">" - } - }, "alerting": {}, "aliasColors": {}, "bars": false, @@ -458,14 +423,8 @@ "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "avg": false, "current": false, @@ -537,7 +496,10 @@ }, "type": "graph", "xaxis": { - "show": true + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -580,7 +542,6 @@ }, "id": 7, "interval": null, - "isNew": true, "links": [], "mappingType": 1, "mappingTypes": [ @@ -637,22 +598,18 @@ "valueName": "current" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { - "alert": { - "crit": { - "op": ">" - }, - "warn": { - "op": ">" - } - }, "alerting": {}, "aliasColors": {}, "bars": false, @@ -660,14 +617,8 @@ "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 8, - "isNew": true, "legend": { "avg": false, "current": false, @@ -717,7 +668,10 @@ }, "type": "graph", "xaxis": { - "show": true + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -739,14 +693,6 @@ ] }, { - "alert": { - "crit": { - "op": ">" - }, - "warn": { - "op": ">" - } - }, "alerting": {}, "aliasColors": {}, "bars": false, @@ -754,14 +700,8 @@ "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 10, - "isNew": true, "legend": { "avg": false, "current": false, @@ -811,7 +751,10 @@ }, "type": "graph", "xaxis": { - "show": true + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -833,9 +776,22 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "prometheus" + ], + "templating": { + "list": [] + }, "time": { "from": "now-1h", "to": "now" @@ -865,25 +821,18 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 10, - "links": [], - "gnetId": 22 + "timezone": "browser", + "title": "All Nodes", + "version": 1 }, - "inputs": [ - { - "name": "DS_PROMETHEUS", - "pluginId": "prometheus", - "type": "datasource", - "value": "prometheus" - } - ], - "overwrite": true + "inputs": [ + { + "name": "DS_PROMETHEUS", + "pluginId": "prometheus", + "type": "datasource", + "value": "prometheus" + } + ], + "overwrite": true } + From c606f145aec170f91c97e159d19af21e19d2b827 Mon Sep 17 00:00:00 2001 From: Vladimir Rutsky Date: Thu, 2 Mar 2017 16:59:17 +0300 Subject: [PATCH 03/10] split used memory on used, buffers and cache in all-nodes dashboard --- assets/grafana/all-nodes-dashboard.json | 35 ++++++++++++++++++++----- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/assets/grafana/all-nodes-dashboard.json b/assets/grafana/all-nodes-dashboard.json index 6e6536a2..85e88b41 100644 --- a/assets/grafana/all-nodes-dashboard.json +++ b/assets/grafana/all-nodes-dashboard.json @@ -1,5 +1,6 @@ { - "dashboard": { + "dashboard": +{ "__inputs": [ { "name": "DS_PROMETHEUS", @@ -268,11 +269,11 @@ } ], "span": 9, - "stack": false, + "stack": true, "steppedLine": false, "targets": [ { - "expr": "sum(node_memory_MemTotal) - sum(node_memory_MemFree)", + "expr": "sum(node_memory_MemTotal) - sum(node_memory_MemFree) - sum(node_memory_Buffers) - sum(node_memory_Cached)", "intervalFactor": 2, "legendFormat": "memory usage", "metric": "memo", @@ -281,13 +282,34 @@ "target": "" }, { - "expr": "sum(node_memory_MemTotal)", + "expr": "sum(node_memory_Buffers)", + "interval": "", "intervalFactor": 2, - "legendFormat": "memory total", + "legendFormat": "memory buffers", "metric": "memo", "refId": "B", "step": 4, "target": "" + }, + { + "expr": "sum(node_memory_Cached)", + "interval": "", + "intervalFactor": 2, + "legendFormat": "memory cached", + "metric": "memo", + "refId": "C", + "step": 4, + "target": "" + }, + { + "expr": "sum(node_memory_MemFree)", + "interval": "", + "intervalFactor": 2, + "legendFormat": "memory cached", + "metric": "memo", + "refId": "D", + "step": 4, + "target": "" } ], "thresholds": [], @@ -313,7 +335,7 @@ "label": null, "logBase": 1, "max": null, - "min": null, + "min": "0", "show": true }, { @@ -835,4 +857,3 @@ ], "overwrite": true } - From 01b5b3922489731c793d9fef52c6ef9724023a8b Mon Sep 17 00:00:00 2001 From: Vladimir Rutsky Date: Thu, 2 Mar 2017 17:02:58 +0300 Subject: [PATCH 04/10] regenerate Grafana configmap --- manifests/grafana/grafana-cm.yaml | 604 ++++++++++++++---------------- 1 file changed, 276 insertions(+), 328 deletions(-) diff --git a/manifests/grafana/grafana-cm.yaml b/manifests/grafana/grafana-cm.yaml index 4e3dfcb2..2c2a0f19 100644 --- a/manifests/grafana/grafana-cm.yaml +++ b/manifests/grafana/grafana-cm.yaml @@ -2,7 +2,8 @@ apiVersion: v1 data: all-nodes-dashboard.json: | { - "dashboard": { + "dashboard": + { "__inputs": [ { "name": "DS_PROMETHEUS", @@ -14,57 +15,48 @@ data: } ], "__requires": [ + { + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.1.1" + }, { "type": "panel", "id": "graph", "name": "Graph", "version": "" }, - { - "type": "panel", - "id": "singlestat", - "name": "Singlestat", - "version": "" - }, - { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, { "type": "datasource", "id": "prometheus", "name": "Prometheus", "version": "1.0.0" + }, + { + "type": "panel", + "id": "singlestat", + "name": "Singlestat", + "version": "" } ], - "id": null, - "title": "All Nodes", + "annotations": { + "list": [] + }, "description": "Dashboard to get an overview of one server", - "tags": [ - "prometheus" - ], - "style": "dark", - "timezone": "browser", "editable": true, + "gnetId": 22, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "250px", "panels": [ { - "alert": { - "crit": { - "op": ">" - }, - "warn": { - "op": ">" - } - }, "alerting": {}, "aliasColors": {}, "bars": false, @@ -72,14 +64,8 @@ data: "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 3, - "isNew": true, "legend": { "avg": false, "current": false, @@ -123,7 +109,10 @@ data: }, "type": "graph", "xaxis": { - "show": true + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -145,14 +134,6 @@ data: ] }, { - "alert": { - "crit": { - "op": ">" - }, - "warn": { - "op": ">" - } - }, "alerting": {}, "aliasColors": {}, "bars": false, @@ -160,14 +141,8 @@ data: "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "avg": false, "current": false, @@ -227,7 +202,10 @@ data: }, "type": "graph", "xaxis": { - "show": true + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -249,22 +227,18 @@ data: ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { - "alert": { - "crit": { - "op": ">" - }, - "warn": { - "op": ">" - } - }, "alerting": {}, "aliasColors": {}, "bars": false, @@ -272,14 +246,8 @@ data: "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 4, - "isNew": true, "legend": { "avg": false, "current": false, @@ -304,11 +272,11 @@ data: } ], "span": 9, - "stack": false, + "stack": true, "steppedLine": false, "targets": [ { - "expr": "sum(node_memory_MemTotal) - sum(node_memory_MemFree)", + "expr": "sum(node_memory_MemTotal) - sum(node_memory_MemFree) - sum(node_memory_Buffers) - sum(node_memory_Cached)", "intervalFactor": 2, "legendFormat": "memory usage", "metric": "memo", @@ -317,13 +285,34 @@ data: "target": "" }, { - "expr": "sum(node_memory_MemTotal)", + "expr": "sum(node_memory_Buffers)", + "interval": "", "intervalFactor": 2, - "legendFormat": "memory total", + "legendFormat": "memory buffers", "metric": "memo", "refId": "B", "step": 4, "target": "" + }, + { + "expr": "sum(node_memory_Cached)", + "interval": "", + "intervalFactor": 2, + "legendFormat": "memory cached", + "metric": "memo", + "refId": "C", + "step": 4, + "target": "" + }, + { + "expr": "sum(node_memory_MemFree)", + "interval": "", + "intervalFactor": 2, + "legendFormat": "memory cached", + "metric": "memo", + "refId": "D", + "step": 4, + "target": "" } ], "thresholds": [], @@ -338,7 +327,10 @@ data: }, "type": "graph", "xaxis": { - "show": true + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -346,7 +338,7 @@ data: "label": null, "logBase": 1, "max": null, - "min": null, + "min": "0", "show": true }, { @@ -381,7 +373,6 @@ data: }, "id": 5, "interval": null, - "isNew": true, "links": [], "mappingType": 1, "mappingTypes": [ @@ -438,22 +429,18 @@ data: "valueName": "avg" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { - "alert": { - "crit": { - "op": ">" - }, - "warn": { - "op": ">" - } - }, "alerting": {}, "aliasColors": {}, "bars": false, @@ -461,14 +448,8 @@ data: "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "avg": false, "current": false, @@ -540,7 +521,10 @@ data: }, "type": "graph", "xaxis": { - "show": true + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -583,7 +567,6 @@ data: }, "id": 7, "interval": null, - "isNew": true, "links": [], "mappingType": 1, "mappingTypes": [ @@ -640,22 +623,18 @@ data: "valueName": "current" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { - "alert": { - "crit": { - "op": ">" - }, - "warn": { - "op": ">" - } - }, "alerting": {}, "aliasColors": {}, "bars": false, @@ -663,14 +642,8 @@ data: "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 8, - "isNew": true, "legend": { "avg": false, "current": false, @@ -720,7 +693,10 @@ data: }, "type": "graph", "xaxis": { - "show": true + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -742,14 +718,6 @@ data: ] }, { - "alert": { - "crit": { - "op": ">" - }, - "warn": { - "op": ">" - } - }, "alerting": {}, "aliasColors": {}, "bars": false, @@ -757,14 +725,8 @@ data: "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 10, - "isNew": true, "legend": { "avg": false, "current": false, @@ -814,7 +776,10 @@ data: }, "type": "graph", "xaxis": { - "show": true + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -836,9 +801,22 @@ data: ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "prometheus" + ], + "templating": { + "list": [] + }, "time": { "from": "now-1h", "to": "now" @@ -868,27 +846,19 @@ data: "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 10, - "links": [], - "gnetId": 22 + "timezone": "browser", + "title": "All Nodes", + "version": 1 }, - "inputs": [ - { - "name": "DS_PROMETHEUS", - "pluginId": "prometheus", - "type": "datasource", - "value": "prometheus" - } - ], - "overwrite": true + "inputs": [ + { + "name": "DS_PROMETHEUS", + "pluginId": "prometheus", + "type": "datasource", + "value": "prometheus" + } + ], + "overwrite": true } deployment-dashboard.json: |- { @@ -2118,7 +2088,7 @@ data: ], "overwrite": true } - node-dashboard.json: | + node-dashboard.json: |+ { "dashboard": { "__inputs": [ @@ -2132,57 +2102,48 @@ data: } ], "__requires": [ + { + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.1.1" + }, { "type": "panel", "id": "graph", "name": "Graph", "version": "" }, - { - "type": "panel", - "id": "singlestat", - "name": "Singlestat", - "version": "" - }, - { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, { "type": "datasource", "id": "prometheus", "name": "Prometheus", "version": "1.0.0" + }, + { + "type": "panel", + "id": "singlestat", + "name": "Singlestat", + "version": "" } ], - "id": null, - "title": "Nodes", + "annotations": { + "list": [] + }, "description": "Dashboard to get an overview of one server", - "tags": [ - "prometheus" - ], - "style": "dark", - "timezone": "browser", "editable": true, + "gnetId": 22, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "250px", "panels": [ { - "alert": { - "crit": { - "op": ">" - }, - "warn": { - "op": ">" - } - }, "alerting": {}, "aliasColors": {}, "bars": false, @@ -2190,14 +2151,8 @@ data: "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": null, - "threshold2": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 3, - "isNew": true, "legend": { "avg": false, "current": false, @@ -2241,7 +2196,10 @@ data: }, "type": "graph", "xaxis": { - "show": true + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -2263,14 +2221,6 @@ data: ] }, { - "alert": { - "crit": { - "op": ">" - }, - "warn": { - "op": ">" - } - }, "alerting": {}, "aliasColors": {}, "bars": false, @@ -2278,14 +2228,8 @@ data: "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": null, - "threshold2": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "avg": false, "current": false, @@ -2345,7 +2289,10 @@ data: }, "type": "graph", "xaxis": { - "show": true + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -2367,22 +2314,18 @@ data: ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { - "alert": { - "crit": { - "op": ">" - }, - "warn": { - "op": ">" - } - }, "alerting": {}, "aliasColors": {}, "bars": false, @@ -2390,19 +2333,17 @@ data: "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": null, - "threshold2": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 4, - "isNew": true, "legend": { + "alignAsTable": false, "avg": false, "current": false, + "hideEmpty": false, + "hideZero": false, "max": false, "min": false, + "rightSide": false, "show": true, "total": false, "values": false @@ -2422,26 +2363,43 @@ data: } ], "span": 9, - "stack": false, + "stack": true, "steppedLine": false, "targets": [ { - "expr": "node_memory_MemTotal{instance=\"$server\"} - node_memory_MemFree{instance=\"$server\"}", + "expr": "node_memory_MemTotal{instance=\"$server\"} - node_memory_MemFree{instance=\"$server\"} - node_memory_Buffers{instance=\"$server\"} - node_memory_Cached{instance=\"$server\"}", + "hide": false, + "interval": "", "intervalFactor": 2, - "legendFormat": "memory usage", - "metric": "memo", - "refId": "A", - "step": 4, - "target": "" + "legendFormat": "memory used", + "metric": "", + "refId": "C", + "step": 4 }, { - "expr": "node_memory_MemTotal{instance=\"$server\"}", + "expr": "node_memory_Buffers{instance=\"$server\"}", + "interval": "", "intervalFactor": 2, - "legendFormat": "memory total", - "metric": "memo", - "refId": "B", - "step": 4, - "target": "" + "legendFormat": "memory buffers", + "metric": "", + "refId": "E", + "step": 4 + }, + { + "expr": "node_memory_Cached{instance=\"$server\"}", + "intervalFactor": 2, + "legendFormat": "", + "metric": "", + "refId": "F", + "step": 4 + }, + { + "expr": "node_memory_MemFree{instance=\"$server\"}", + "intervalFactor": 2, + "legendFormat": "memory free", + "metric": "", + "refId": "D", + "step": 4 } ], "thresholds": [], @@ -2452,11 +2410,14 @@ data: "msResolution": false, "shared": true, "sort": 0, - "value_type": "cumulative" + "value_type": "individual" }, "type": "graph", "xaxis": { - "show": true + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -2464,7 +2425,7 @@ data: "label": null, "logBase": 1, "max": null, - "min": null, + "min": "0", "show": true }, { @@ -2499,7 +2460,6 @@ data: }, "id": 5, "interval": null, - "isNew": true, "links": [], "mappingType": 1, "mappingTypes": [ @@ -2535,7 +2495,7 @@ data: }, "targets": [ { - "expr": "((node_memory_MemTotal{instance=\"$server\"} - node_memory_MemFree{instance=\"$server\"}) / node_memory_MemTotal{instance=\"$server\"}) * 100", + "expr": "((node_memory_MemTotal{instance=\"$server\"} - node_memory_MemFree{instance=\"$server\"} - node_memory_Buffers{instance=\"$server\"} - node_memory_Cached{instance=\"$server\"}) / node_memory_MemTotal{instance=\"$server\"}) * 100", "intervalFactor": 2, "refId": "A", "step": 60, @@ -2556,22 +2516,18 @@ data: "valueName": "avg" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { - "alert": { - "crit": { - "op": ">" - }, - "warn": { - "op": ">" - } - }, "alerting": {}, "aliasColors": {}, "bars": false, @@ -2579,14 +2535,8 @@ data: "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": null, - "threshold2": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "avg": false, "current": false, @@ -2658,7 +2608,10 @@ data: }, "type": "graph", "xaxis": { - "show": true + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -2701,7 +2654,6 @@ data: }, "id": 7, "interval": null, - "isNew": true, "links": [], "mappingType": 1, "mappingTypes": [ @@ -2758,22 +2710,18 @@ data: "valueName": "current" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { - "alert": { - "crit": { - "op": ">" - }, - "warn": { - "op": ">" - } - }, "alerting": {}, "aliasColors": {}, "bars": false, @@ -2781,14 +2729,8 @@ data: "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": null, - "threshold2": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 8, - "isNew": true, "legend": { "avg": false, "current": false, @@ -2838,7 +2780,10 @@ data: }, "type": "graph", "xaxis": { - "show": true + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -2860,14 +2805,6 @@ data: ] }, { - "alert": { - "crit": { - "op": ">" - }, - "warn": { - "op": ">" - } - }, "alerting": {}, "aliasColors": {}, "bars": false, @@ -2875,14 +2812,8 @@ data: "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": null, - "threshold2": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 10, - "isNew": true, "legend": { "avg": false, "current": false, @@ -2932,7 +2863,10 @@ data: }, "type": "graph", "xaxis": { - "show": true + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -2954,9 +2888,43 @@ data: ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "prometheus" + ], + "templating": { + "list": [ + { + "allValue": null, + "current": {}, + "datasource": "${DS_PROMETHEUS}", + "hide": 0, + "includeAll": false, + "label": null, + "multi": false, + "name": "server", + "options": [], + "query": "label_values(node_boot_time, instance)", + "refresh": 1, + "regex": "", + "sort": 0, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false + } + ] + }, "time": { "from": "now-1h", "to": "now" @@ -2986,41 +2954,21 @@ data: "30d" ] }, - "templating": { - "list": [ - { - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "hide": 0, - "includeAll": false, - "multi": false, - "name": "server", - "options": [], - "query": "label_values(node_boot_time, instance)", - "refresh": 1, - "type": "query" - } - ] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 1, - "links": [], - "gnetId": 22 + "timezone": "browser", + "title": "Nodes", + "version": 1 }, - "inputs": [ - { - "name": "DS_PROMETHEUS", - "pluginId": "prometheus", - "type": "datasource", - "value": "prometheus" - } - ], - "overwrite": true + "inputs": [ + { + "name": "DS_PROMETHEUS", + "pluginId": "prometheus", + "type": "datasource", + "value": "prometheus" + } + ], + "overwrite": true } + prometheus-datasource.json: | { "access": "proxy", From 4da29a61147bd9321a56f37b12b4ca7ca5ae0b56 Mon Sep 17 00:00:00 2001 From: Vladimir Rutsky Date: Thu, 2 Mar 2017 17:06:59 +0300 Subject: [PATCH 05/10] fix legend --- assets/grafana/all-nodes-dashboard.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/grafana/all-nodes-dashboard.json b/assets/grafana/all-nodes-dashboard.json index 85e88b41..33b683e3 100644 --- a/assets/grafana/all-nodes-dashboard.json +++ b/assets/grafana/all-nodes-dashboard.json @@ -305,7 +305,7 @@ "expr": "sum(node_memory_MemFree)", "interval": "", "intervalFactor": 2, - "legendFormat": "memory cached", + "legendFormat": "memory free", "metric": "memo", "refId": "D", "step": 4, From 1dc772d8e77a44cf6af373ef850fd7f5e4b28788 Mon Sep 17 00:00:00 2001 From: Vladimir Rutsky Date: Thu, 2 Mar 2017 17:07:10 +0300 Subject: [PATCH 06/10] display individual metrics on hover since this is stack chart now --- assets/grafana/all-nodes-dashboard.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/grafana/all-nodes-dashboard.json b/assets/grafana/all-nodes-dashboard.json index 33b683e3..94d9d4eb 100644 --- a/assets/grafana/all-nodes-dashboard.json +++ b/assets/grafana/all-nodes-dashboard.json @@ -320,7 +320,7 @@ "msResolution": false, "shared": true, "sort": 0, - "value_type": "cumulative" + "value_type": "individual" }, "type": "graph", "xaxis": { From a663eb15aa09d9c4fba72594ade5b614a82b446f Mon Sep 17 00:00:00 2001 From: Vladimir Rutsky Date: Thu, 2 Mar 2017 17:07:38 +0300 Subject: [PATCH 07/10] use used memory without caches and buffers in gauge widget --- assets/grafana/all-nodes-dashboard.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/grafana/all-nodes-dashboard.json b/assets/grafana/all-nodes-dashboard.json index 94d9d4eb..7a7c2bde 100644 --- a/assets/grafana/all-nodes-dashboard.json +++ b/assets/grafana/all-nodes-dashboard.json @@ -405,8 +405,9 @@ }, "targets": [ { - "expr": "((sum(node_memory_MemTotal) - sum(node_memory_MemFree)) / sum(node_memory_MemTotal)) * 100", + "expr": "((sum(node_memory_MemTotal) - sum(node_memory_MemFree) - sum(node_memory_Buffers) - sum(node_memory_Cached)) / sum(node_memory_MemTotal)) * 100", "intervalFactor": 2, + "metric": "", "refId": "A", "step": 60, "target": "" From 6fd5181a7a3d0af90a3bb5055b9b083fa10e0e5d Mon Sep 17 00:00:00 2001 From: Vladimir Rutsky Date: Thu, 2 Mar 2017 17:08:19 +0300 Subject: [PATCH 08/10] regenerate Grafana configmap --- manifests/grafana/grafana-cm.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/manifests/grafana/grafana-cm.yaml b/manifests/grafana/grafana-cm.yaml index 2c2a0f19..131752f1 100644 --- a/manifests/grafana/grafana-cm.yaml +++ b/manifests/grafana/grafana-cm.yaml @@ -308,7 +308,7 @@ data: "expr": "sum(node_memory_MemFree)", "interval": "", "intervalFactor": 2, - "legendFormat": "memory cached", + "legendFormat": "memory free", "metric": "memo", "refId": "D", "step": 4, @@ -323,7 +323,7 @@ data: "msResolution": false, "shared": true, "sort": 0, - "value_type": "cumulative" + "value_type": "individual" }, "type": "graph", "xaxis": { @@ -408,8 +408,9 @@ data: }, "targets": [ { - "expr": "((sum(node_memory_MemTotal) - sum(node_memory_MemFree)) / sum(node_memory_MemTotal)) * 100", + "expr": "((sum(node_memory_MemTotal) - sum(node_memory_MemFree) - sum(node_memory_Buffers) - sum(node_memory_Cached)) / sum(node_memory_MemTotal)) * 100", "intervalFactor": 2, + "metric": "", "refId": "A", "step": 60, "target": "" From e5fde0047653c25c8f821a8a7f147bcb791d52c8 Mon Sep 17 00:00:00 2001 From: Vladimir Rutsky Date: Thu, 2 Mar 2017 17:11:19 +0300 Subject: [PATCH 09/10] add missing title --- assets/grafana/node-dashboard.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/grafana/node-dashboard.json b/assets/grafana/node-dashboard.json index dd8c3d5e..78a5bb37 100644 --- a/assets/grafana/node-dashboard.json +++ b/assets/grafana/node-dashboard.json @@ -1,5 +1,6 @@ { - "dashboard": { + "dashboard": +{ "__inputs": [ { "name": "DS_PROMETHEUS", @@ -297,7 +298,7 @@ { "expr": "node_memory_Cached{instance=\"$server\"}", "intervalFactor": 2, - "legendFormat": "", + "legendFormat": "memory cached", "metric": "", "refId": "F", "step": 4 @@ -877,4 +878,3 @@ ], "overwrite": true } - From d492d0efded85139b9f416dd8f64b0d84b9a7b99 Mon Sep 17 00:00:00 2001 From: Vladimir Rutsky Date: Thu, 2 Mar 2017 17:11:41 +0300 Subject: [PATCH 10/10] regenerate Grafana configmap --- manifests/grafana/grafana-cm.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/grafana/grafana-cm.yaml b/manifests/grafana/grafana-cm.yaml index 131752f1..f9757dc1 100644 --- a/manifests/grafana/grafana-cm.yaml +++ b/manifests/grafana/grafana-cm.yaml @@ -2089,9 +2089,10 @@ data: ], "overwrite": true } - node-dashboard.json: |+ + node-dashboard.json: | + { + "dashboard": { - "dashboard": { "__inputs": [ { "name": "DS_PROMETHEUS", @@ -2389,7 +2390,7 @@ data: { "expr": "node_memory_Cached{instance=\"$server\"}", "intervalFactor": 2, - "legendFormat": "", + "legendFormat": "memory cached", "metric": "", "refId": "F", "step": 4 @@ -2969,7 +2970,6 @@ data: ], "overwrite": true } - prometheus-datasource.json: | { "access": "proxy",