diff --git a/assets/grafana/all-nodes-dashboard.json b/assets/grafana/all-nodes-dashboard.json
index d16c44634d0e7b3aaf252a29be103c07ca22f5f8..7a7c2bde52a2860dae69b1d5784f8e67ab13a6dd 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",
@@ -12,56 +13,47 @@
],
"__requires": [
{
- "type": "panel",
- "id": "graph",
- "name": "Graph",
- "version": ""
+ "type": "grafana",
+ "id": "grafana",
+ "name": "Grafana",
+ "version": "4.1.1"
},
{
"type": "panel",
- "id": "singlestat",
- "name": "Singlestat",
+ "id": "graph",
+ "name": "Graph",
"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 +61,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 +106,10 @@
},
"type": "graph",
"xaxis": {
- "show": true
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
"yaxes": [
{
@@ -142,14 +131,6 @@
]
},
{
- "alert": {
- "crit": {
- "op": ">"
- },
- "warn": {
- "op": ">"
- }
- },
"alerting": {},
"aliasColors": {},
"bars": false,
@@ -157,14 +138,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 +199,10 @@
},
"type": "graph",
"xaxis": {
- "show": true
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
"yaxes": [
{
@@ -246,22 +224,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 +243,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,
@@ -301,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",
@@ -314,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 free",
+ "metric": "memo",
+ "refId": "D",
+ "step": 4,
+ "target": ""
}
],
"thresholds": [],
@@ -331,11 +320,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 +335,7 @@
"label": null,
"logBase": 1,
"max": null,
- "min": null,
+ "min": "0",
"show": true
},
{
@@ -378,7 +370,6 @@
},
"id": 5,
"interval": null,
- "isNew": true,
"links": [],
"mappingType": 1,
"mappingTypes": [
@@ -414,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": ""
@@ -435,22 +427,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 +446,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 +519,10 @@
},
"type": "graph",
"xaxis": {
- "show": true
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
"yaxes": [
{
@@ -580,7 +565,6 @@
},
"id": 7,
"interval": null,
- "isNew": true,
"links": [],
"mappingType": 1,
"mappingTypes": [
@@ -637,22 +621,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 +640,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 +691,10 @@
},
"type": "graph",
"xaxis": {
- "show": true
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
"yaxes": [
{
@@ -739,14 +716,6 @@
]
},
{
- "alert": {
- "crit": {
- "op": ">"
- },
- "warn": {
- "op": ">"
- }
- },
"alerting": {},
"aliasColors": {},
"bars": false,
@@ -754,14 +723,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 +774,10 @@
},
"type": "graph",
"xaxis": {
- "show": true
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
"yaxes": [
{
@@ -833,9 +799,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 +844,17 @@
"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
}
diff --git a/assets/grafana/node-dashboard.json b/assets/grafana/node-dashboard.json
index 272d54ea17360707fcc02ee519e46ec156839c5d..78a5bb378226f4b9054e8b83d95b1bc12514ac53 100644
--- a/assets/grafana/node-dashboard.json
+++ b/assets/grafana/node-dashboard.json
@@ -1,5 +1,6 @@
{
- "dashboard": {
+ "dashboard":
+{
"__inputs": [
{
"name": "DS_PROMETHEUS",
@@ -12,56 +13,47 @@
],
"__requires": [
{
- "type": "panel",
- "id": "graph",
- "name": "Graph",
- "version": ""
+ "type": "grafana",
+ "id": "grafana",
+ "name": "Grafana",
+ "version": "4.1.1"
},
{
"type": "panel",
- "id": "singlestat",
- "name": "Singlestat",
+ "id": "graph",
+ "name": "Graph",
"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 +61,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 +106,10 @@
},
"type": "graph",
"xaxis": {
- "show": true
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
"yaxes": [
{
@@ -142,14 +131,6 @@
]
},
{
- "alert": {
- "crit": {
- "op": ">"
- },
- "warn": {
- "op": ">"
- }
- },
"alerting": {},
"aliasColors": {},
"bars": false,
@@ -157,14 +138,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 +199,10 @@
},
"type": "graph",
"xaxis": {
- "show": true
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
"yaxes": [
{
@@ -246,22 +224,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 +243,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 +273,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": "memory cached",
+ "metric": "",
+ "refId": "F",
+ "step": 4
+ },
+ {
+ "expr": "node_memory_MemFree{instance=\"$server\"}",
+ "intervalFactor": 2,
+ "legendFormat": "memory free",
+ "metric": "",
+ "refId": "D",
+ "step": 4
}
],
"thresholds": [],
@@ -331,11 +320,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 +335,7 @@
"label": null,
"logBase": 1,
"max": null,
- "min": null,
+ "min": "0",
"show": true
},
{
@@ -378,7 +370,6 @@
},
"id": 5,
"interval": null,
- "isNew": true,
"links": [],
"mappingType": 1,
"mappingTypes": [
@@ -414,7 +405,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 +426,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 +445,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 +518,10 @@
},
"type": "graph",
"xaxis": {
- "show": true
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
"yaxes": [
{
@@ -580,7 +564,6 @@
},
"id": 7,
"interval": null,
- "isNew": true,
"links": [],
"mappingType": 1,
"mappingTypes": [
@@ -637,22 +620,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 +639,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 +690,10 @@
},
"type": "graph",
"xaxis": {
- "show": true
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
"yaxes": [
{
@@ -739,14 +715,6 @@
]
},
{
- "alert": {
- "crit": {
- "op": ">"
- },
- "warn": {
- "op": ">"
- }
- },
"alerting": {},
"aliasColors": {},
"bars": false,
@@ -754,14 +722,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 +773,10 @@
},
"type": "graph",
"xaxis": {
- "show": true
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
"yaxes": [
{
@@ -833,9 +798,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 +864,17 @@
"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
}
diff --git a/manifests/grafana/grafana-cm.yaml b/manifests/grafana/grafana-cm.yaml
index 4e3dfcb229a5dc16017dffb003a80412e66617f3..f9757dc1abb40aad9b11ae44d6160e2c39b6c970 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",
@@ -15,56 +16,47 @@ data:
],
"__requires": [
{
- "type": "panel",
- "id": "graph",
- "name": "Graph",
- "version": ""
+ "type": "grafana",
+ "id": "grafana",
+ "name": "Grafana",
+ "version": "4.1.1"
},
{
"type": "panel",
- "id": "singlestat",
- "name": "Singlestat",
+ "id": "graph",
+ "name": "Graph",
"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 free",
+ "metric": "memo",
+ "refId": "D",
+ "step": 4,
+ "target": ""
}
],
"thresholds": [],
@@ -334,11 +323,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": [
{
@@ -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": [
@@ -417,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": ""
@@ -438,22 +430,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 +449,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 +522,10 @@ data:
},
"type": "graph",
"xaxis": {
- "show": true
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
"yaxes": [
{
@@ -583,7 +568,6 @@ data:
},
"id": 7,
"interval": null,
- "isNew": true,
"links": [],
"mappingType": 1,
"mappingTypes": [
@@ -640,22 +624,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 +643,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 +694,10 @@ data:
},
"type": "graph",
"xaxis": {
- "show": true
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
"yaxes": [
{
@@ -742,14 +719,6 @@ data:
]
},
{
- "alert": {
- "crit": {
- "op": ">"
- },
- "warn": {
- "op": ">"
- }
- },
"alerting": {},
"aliasColors": {},
"bars": false,
@@ -757,14 +726,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 +777,10 @@ data:
},
"type": "graph",
"xaxis": {
- "show": true
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
"yaxes": [
{
@@ -836,9 +802,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 +847,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: |-
{
@@ -2120,7 +2091,8 @@ data:
}
node-dashboard.json: |
{
- "dashboard": {
+ "dashboard":
+ {
"__inputs": [
{
"name": "DS_PROMETHEUS",
@@ -2133,56 +2105,47 @@ data:
],
"__requires": [
{
- "type": "panel",
- "id": "graph",
- "name": "Graph",
- "version": ""
+ "type": "grafana",
+ "id": "grafana",
+ "name": "Grafana",
+ "version": "4.1.1"
},
{
"type": "panel",
- "id": "singlestat",
- "name": "Singlestat",
+ "id": "graph",
+ "name": "Graph",
"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 +2153,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 +2198,10 @@ data:
},
"type": "graph",
"xaxis": {
- "show": true
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
"yaxes": [
{
@@ -2263,14 +2223,6 @@ data:
]
},
{
- "alert": {
- "crit": {
- "op": ">"
- },
- "warn": {
- "op": ">"
- }
- },
"alerting": {},
"aliasColors": {},
"bars": false,
@@ -2278,14 +2230,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 +2291,10 @@ data:
},
"type": "graph",
"xaxis": {
- "show": true
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
"yaxes": [
{
@@ -2367,22 +2316,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 +2335,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 +2365,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": "memory cached",
+ "metric": "",
+ "refId": "F",
+ "step": 4
+ },
+ {
+ "expr": "node_memory_MemFree{instance=\"$server\"}",
+ "intervalFactor": 2,
+ "legendFormat": "memory free",
+ "metric": "",
+ "refId": "D",
+ "step": 4
}
],
"thresholds": [],
@@ -2452,11 +2412,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 +2427,7 @@ data:
"label": null,
"logBase": 1,
"max": null,
- "min": null,
+ "min": "0",
"show": true
},
{
@@ -2499,7 +2462,6 @@ data:
},
"id": 5,
"interval": null,
- "isNew": true,
"links": [],
"mappingType": 1,
"mappingTypes": [
@@ -2535,7 +2497,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 +2518,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 +2537,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 +2610,10 @@ data:
},
"type": "graph",
"xaxis": {
- "show": true
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
"yaxes": [
{
@@ -2701,7 +2656,6 @@ data:
},
"id": 7,
"interval": null,
- "isNew": true,
"links": [],
"mappingType": 1,
"mappingTypes": [
@@ -2758,22 +2712,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 +2731,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 +2782,10 @@ data:
},
"type": "graph",
"xaxis": {
- "show": true
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
"yaxes": [
{
@@ -2860,14 +2807,6 @@ data:
]
},
{
- "alert": {
- "crit": {
- "op": ">"
- },
- "warn": {
- "op": ">"
- }
- },
"alerting": {},
"aliasColors": {},
"bars": false,
@@ -2875,14 +2814,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 +2865,10 @@ data:
},
"type": "graph",
"xaxis": {
- "show": true
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
},
"yaxes": [
{
@@ -2954,9 +2890,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,40 +2956,19 @@ 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: |
{