From 082d0bee23b542207bbadcd5f3f1ebe0e58e30a0 Mon Sep 17 00:00:00 2001 From: Facu de la Cruz Date: Thu, 29 Oct 2020 02:58:30 -0300 Subject: [PATCH 01/12] Working in Improvements to pass kubescore --- kubernetes/ISP-Checker-deploy.MD5 | 2 +- kubernetes/ISP-Checker-deploy.SHA512 | 2 +- kubernetes/ISP-Checker-deploy.yaml | 6187 ++++++++++++----------- kubernetes/yaml/create-manifest.sh | 1 + kubernetes/yaml/cronJob.yaml | 10 +- kubernetes/yaml/daemonSet.yaml | 10 +- kubernetes/yaml/deployment.yaml | 28 +- kubernetes/yaml/pdb.yaml | 35 + kubernetes/yaml/podSecurityPolicy.yaml | 39 + kubernetes/yaml/raspberryDashboard.yaml | 6060 +++++++++++----------- kubernetes/yaml/serviceAccount.yaml | 6 + 11 files changed, 6574 insertions(+), 5806 deletions(-) create mode 100644 kubernetes/yaml/pdb.yaml create mode 100644 kubernetes/yaml/podSecurityPolicy.yaml create mode 100644 kubernetes/yaml/serviceAccount.yaml diff --git a/kubernetes/ISP-Checker-deploy.MD5 b/kubernetes/ISP-Checker-deploy.MD5 index 89798ce..c2cd0f7 100644 --- a/kubernetes/ISP-Checker-deploy.MD5 +++ b/kubernetes/ISP-Checker-deploy.MD5 @@ -1 +1 @@ -MD5 (../ISP-Checker-deploy.yaml) = 4e5b561cbf506637e17c43a19de50710 +MD5 (../ISP-Checker-deploy.yaml) = 4b01d4ee98b79e7723406bb7f50603c1 diff --git a/kubernetes/ISP-Checker-deploy.SHA512 b/kubernetes/ISP-Checker-deploy.SHA512 index 1e58dfa..4cb79bb 100644 --- a/kubernetes/ISP-Checker-deploy.SHA512 +++ b/kubernetes/ISP-Checker-deploy.SHA512 @@ -1 +1 @@ -SHA512 (../ISP-Checker-deploy.yaml) = d0affaa95716db6581893ede162d12fe040b5fb81af3cc415e075d110586a0fe606743ff3e2b99c9025e5af4e20af814be9e4c52baa4488de7d05e6ca13ef1e5 +SHA512 (../ISP-Checker-deploy.yaml) = 019e4d21b9643a2a0db6a68c049f574568dbc36218fb81e87e792a252cc4273b09705aa16bf269e0bde79f6cbf2fe064f4e2a9455e08594e2e879a395818057d diff --git a/kubernetes/ISP-Checker-deploy.yaml b/kubernetes/ISP-Checker-deploy.yaml index f5fa9f1..8317bfc 100644 --- a/kubernetes/ISP-Checker-deploy.yaml +++ b/kubernetes/ISP-Checker-deploy.yaml @@ -4374,20 +4374,21 @@ data: "annotations": { "list": [ { - "builtIn": 1, - "datasource": "-- Grafana --", + "builtIn": 1, + "datasource": "-- Grafana --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", "name": "Annotations & Alerts", "type": "dashboard" - }] - }, + } + ] + }, "description": "Raspberry Pi Monitoring", "editable": true, "gnetId": 10578, "graphTooltip": 1, - "iteration": 1603435375490, + "iteration": 1603949953221, "links": [], "panels": [ { @@ -4398,22 +4399,22 @@ data: "w": 24, "x": 0, "y": 0 + }, + "id": 61987, + "panels": [], + "repeat": null, + "title": "Quick overview", + "type": "row" }, - "id": 61987, - "panels": [], - "repeat": null, - "title": "Quick overview", - "type": "row" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], "datasource": "InfluxDB", "decimals": 1, "editable": true, @@ -4421,9 +4422,9 @@ data: "fieldConfig": { "defaults": { "custom": {} - }, + }, "overrides": [] - }, + }, "format": "s", "gauge": { "maxValue": 100, @@ -4431,13 +4432,13 @@ data: "show": false, "thresholdLabels": false, "thresholdMarkers": true - }, + }, "gridPos": { "h": 4, "w": 2, "x": 0, "y": 1 - }, + }, "height": "150", "id": 61858, "interval": null, @@ -4447,12 +4448,12 @@ data: { "name": "value to text", "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], + }, + { + "name": "range to text", + "value": 2 + } + ], "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, @@ -4465,14 +4466,14 @@ data: "from": "null", "text": "N/A", "to": "null" - } - ], + } + ], "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", "full": false, "lineColor": "rgb(31, 120, 193)", "show": false - }, + }, "tableColumn": "", "targets": [ { @@ -4481,16 +4482,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "system", "policy": "default", "refId": "A", @@ -4500,24 +4501,24 @@ data: { "params": [ "uptime" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - } - ] - } - ], + } + ] + } + ], "thresholds": "", "title": "Uptime", "type": "singlestat", @@ -4527,66 +4528,66 @@ data: "op": "=", "text": "N/A", "value": "null" - } - ], + } + ], "valueName": "current" - }, - { - "cacheTimeout": null, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": { - "custom": {}, - "mappings": [ - { - "id": 0, - "op": "=", - "text": "N/A", - "type": 1, - "value": "null" - } - ], - "noValue": "N/A", - "nullValueMode": "connected", - "thresholds": { - "mode": "percentage", - "steps": [ - { - "color": "super-light-green", - "value": null - }, - { - "color": "light-green", - "value": 20 - }, - { - "color": "semi-dark-green", - "value": 40 - }, - { - "color": "#EAB839", - "value": 60 - }, - { - "color": "light-orange", - "value": 80 - }, - { - "color": "dark-red", - "value": 90 + }, + { + "cacheTimeout": null, + "datasource": "InfluxDB", + "fieldConfig": { + "defaults": { + "custom": {}, + "mappings": [ + { + "id": 0, + "op": "=", + "text": "N/A", + "type": 1, + "value": "null" } - ] + ], + "noValue": "N/A", + "nullValueMode": "connected", + "thresholds": { + "mode": "percentage", + "steps": [ + { + "color": "super-light-green", + "value": null + }, + { + "color": "light-green", + "value": 20 + }, + { + "color": "semi-dark-green", + "value": 40 + }, + { + "color": "#EAB839", + "value": 60 + }, + { + "color": "light-orange", + "value": 80 + }, + { + "color": "dark-red", + "value": 90 + } + ] + }, + "unit": "rothz" }, - "unit": "rothz" + "overrides": [] }, - "overrides": [] - }, "gridPos": { "h": 4, "w": 2, "x": 2, "y": 1 - }, + }, "id": 61998, "interval": null, "links": [], @@ -4596,13 +4597,13 @@ data: "reduceOptions": { "calcs": [ "last" - ], - "fields": "/^last$/", - "values": false - }, + ], + "fields": "/^last$/", + "values": false + }, "showThresholdLabels": false, "showThresholdMarkers": true - }, + }, "pluginVersion": "7.2.1", "targets": [ { @@ -4611,16 +4612,16 @@ data: { "params": [ "1m" - ], - "type": "time" - }, - { - "params": [ - "previous" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "previous" + ], + "type": "fill" + } + ], "measurement": "cpu_frequency", "orderByTime": "ASC", "policy": "default", @@ -4633,44 +4634,44 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [ - " /1000" - ], + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [ + " /1000" + ], "type": "math" - } - ] - ], + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - } - ] - } - ], + } + ] + } + ], "title": "CPU Frequency", "type": "gauge" - }, - { - "cacheTimeout": null, - "colorBackground": true, - "colorPostfix": false, - "colorPrefix": false, - "colorValue": false, - "colors": [ - "#37872D", - "#FA6400", - "#C4162A" - ], + }, + { + "cacheTimeout": null, + "colorBackground": true, + "colorPostfix": false, + "colorPrefix": false, + "colorValue": false, + "colors": [ + "#37872D", + "#FA6400", + "#C4162A" + ], "datasource": "InfluxDB", "decimals": 1, "editable": true, @@ -4678,9 +4679,9 @@ data: "fieldConfig": { "defaults": { "custom": {} - }, + }, "overrides": [] - }, + }, "format": "celsius", "gauge": { "maxValue": 100, @@ -4688,13 +4689,13 @@ data: "show": false, "thresholdLabels": false, "thresholdMarkers": true - }, + }, "gridPos": { "h": 4, "w": 2, "x": 4, "y": 1 - }, + }, "height": "150", "id": 61997, "interval": null, @@ -4704,12 +4705,12 @@ data: { "name": "value to text", "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], + }, + { + "name": "range to text", + "value": 2 + } + ], "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, @@ -4722,14 +4723,14 @@ data: "from": "null", "text": "N/A", "to": "null" - } - ], + } + ], "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", "full": false, "lineColor": "rgb(31, 120, 193)", "show": false - }, + }, "tableColumn": "", "targets": [ { @@ -4738,16 +4739,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "cpu_temperature", "orderByTime": "ASC", "policy": "default", @@ -4758,30 +4759,30 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [ - " / 1000" - ], + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [ + " / 1000" + ], "type": "math" - } - ] - ], + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - } - ] - } - ], + } + ] + } + ], "thresholds": "75,85", "title": "CPU Temperature", "type": "singlestat", @@ -4791,19 +4792,19 @@ data: "op": "=", "text": "N/A", "value": "null" - } - ], + } + ], "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "rgba(50, 172, 45, 0.97)", + "rgba(237, 129, 40, 0.89)", + "rgba(245, 54, 54, 0.9)" + ], "datasource": "InfluxDB", "decimals": 1, "editable": true, @@ -4811,9 +4812,9 @@ data: "fieldConfig": { "defaults": { "custom": {} - }, + }, "overrides": [] - }, + }, "format": "none", "gauge": { "maxValue": 100, @@ -4821,13 +4822,13 @@ data: "show": false, "thresholdLabels": false, "thresholdMarkers": true - }, + }, "gridPos": { "h": 4, "w": 2, "x": 6, "y": 1 - }, + }, "height": "150", "id": 61859, "interval": null, @@ -4837,12 +4838,12 @@ data: { "name": "value to text", "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], + }, + { + "name": "range to text", + "value": 2 + } + ], "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, @@ -4855,14 +4856,14 @@ data: "from": "null", "text": "N/A", "to": "null" - } - ], + } + ], "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", "full": false, "lineColor": "rgb(31, 120, 193)", "show": true - }, + }, "tableColumn": "", "targets": [ { @@ -4871,16 +4872,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "system", "orderByTime": "ASC", "policy": "default", @@ -4891,24 +4892,24 @@ data: { "params": [ "load5" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - } - ] - } - ], + } + ] + } + ], "thresholds": "4,8,12", "title": "LA medium", "type": "singlestat", @@ -4918,19 +4919,19 @@ data: "op": "=", "text": "N/A", "value": "null" - } - ], + } + ], "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "rgba(50, 172, 45, 0.97)", + "rgba(237, 129, 40, 0.89)", + "rgba(245, 54, 54, 0.9)" + ], "datasource": "InfluxDB", "decimals": 0, "editable": true, @@ -4938,9 +4939,9 @@ data: "fieldConfig": { "defaults": { "custom": {} - }, + }, "overrides": [] - }, + }, "format": "none", "gauge": { "maxValue": 100, @@ -4948,13 +4949,13 @@ data: "show": false, "thresholdLabels": false, "thresholdMarkers": true - }, + }, "gridPos": { "h": 4, "w": 2, "x": 8, "y": 1 - }, + }, "height": "150", "id": 61862, "interval": null, @@ -4964,12 +4965,12 @@ data: { "name": "value to text", "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], + }, + { + "name": "range to text", + "value": 2 + } + ], "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, @@ -4982,14 +4983,14 @@ data: "from": "null", "text": "N/A", "to": "null" - } - ], + } + ], "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", "full": false, "lineColor": "rgb(31, 120, 193)", "show": false - }, + }, "tableColumn": "", "targets": [ { @@ -4998,16 +4999,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "processes", "orderByTime": "ASC", "policy": "default", @@ -5018,24 +5019,24 @@ data: { "params": [ "zombies" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - } - ] - } - ], + } + ] + } + ], "thresholds": "1,5,10", "title": "Zombies", "type": "singlestat", @@ -5045,19 +5046,19 @@ data: "op": "=", "text": "N/A", "value": "null" - } - ], + } + ], "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "rgba(50, 172, 45, 0.97)", + "rgba(237, 129, 40, 0.89)", + "rgba(245, 54, 54, 0.9)" + ], "datasource": "InfluxDB", "decimals": 0, "editable": true, @@ -5065,9 +5066,9 @@ data: "fieldConfig": { "defaults": { "custom": {} - }, + }, "overrides": [] - }, + }, "format": "none", "gauge": { "maxValue": 100, @@ -5075,13 +5076,13 @@ data: "show": false, "thresholdLabels": false, "thresholdMarkers": true - }, + }, "gridPos": { "h": 4, "w": 2, "x": 10, "y": 1 - }, + }, "height": "150", "id": 61864, "interval": null, @@ -5091,12 +5092,12 @@ data: { "name": "value to text", "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], + }, + { + "name": "range to text", + "value": 2 + } + ], "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, @@ -5109,14 +5110,14 @@ data: "from": "null", "text": "N/A", "to": "null" - } - ], + } + ], "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", "full": false, "lineColor": "rgb(31, 120, 193)", "show": true - }, + }, "tableColumn": "", "targets": [ { @@ -5125,16 +5126,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "processes", "policy": "default", "refId": "A", @@ -5144,24 +5145,24 @@ data: { "params": [ "total" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - } - ] - } - ], + } + ] + } + ], "thresholds": "1,5,10", "title": "Processes", "type": "singlestat", @@ -5171,19 +5172,19 @@ data: "op": "=", "text": "N/A", "value": "null" - } - ], + } + ], "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "rgba(50, 172, 45, 0.97)", + "rgba(237, 129, 40, 0.89)", + "rgba(245, 54, 54, 0.9)" + ], "datasource": "InfluxDB", "decimals": 0, "editable": true, @@ -5191,9 +5192,9 @@ data: "fieldConfig": { "defaults": { "custom": {} - }, + }, "overrides": [] - }, + }, "format": "none", "gauge": { "maxValue": 100, @@ -5201,13 +5202,13 @@ data: "show": false, "thresholdLabels": false, "thresholdMarkers": true - }, + }, "gridPos": { "h": 4, "w": 2, "x": 12, "y": 1 - }, + }, "height": "150", "id": 61865, "interval": null, @@ -5217,12 +5218,12 @@ data: { "name": "value to text", "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], + }, + { + "name": "range to text", + "value": 2 + } + ], "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, @@ -5235,14 +5236,14 @@ data: "from": "null", "text": "N/A", "to": "null" - } - ], + } + ], "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", "full": false, "lineColor": "rgb(31, 120, 193)", "show": true - }, + }, "tableColumn": "", "targets": [ { @@ -5251,16 +5252,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "processes", "policy": "default", "refId": "A", @@ -5270,24 +5271,24 @@ data: { "params": [ "total_threads" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - } - ] - } - ], + } + ] + } + ], "thresholds": "1,5,10", "title": "Threads", "type": "singlestat", @@ -5297,28 +5298,28 @@ data: "op": "=", "text": "N/A", "value": "null" - } - ], + } + ], "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "rgba(50, 172, 45, 0.97)", + "rgba(237, 129, 40, 0.89)", + "rgba(245, 54, 54, 0.9)" + ], "datasource": "InfluxDB", "editable": true, "error": false, "fieldConfig": { "defaults": { "custom": {} - }, + }, "overrides": [] - }, + }, "format": "percent", "gauge": { "maxValue": 100, @@ -5326,13 +5327,13 @@ data: "show": true, "thresholdLabels": false, "thresholdMarkers": true - }, + }, "gridPos": { "h": 4, "w": 2, "x": 14, "y": 1 - }, + }, "height": "150", "id": 61861, "interval": null, @@ -5342,12 +5343,12 @@ data: { "name": "value to text", "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], + }, + { + "name": "range to text", + "value": 2 + } + ], "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, @@ -5361,14 +5362,14 @@ data: "from": "null", "text": "N/A", "to": "null" - } - ], + } + ], "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", "full": false, "lineColor": "rgb(31, 120, 193)", "show": false - }, + }, "tableColumn": "", "targets": [ { @@ -5377,16 +5378,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "cpu", "orderByTime": "ASC", "policy": "default", @@ -5397,36 +5398,36 @@ data: { "params": [ "usage_idle" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [ - "* -1 + 100" - ], + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [ + "* -1 + 100" + ], "type": "math" - } - ] - ], + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - }, - { - "condition": "AND", - "key": "cpu", - "operator": "=", - "value": "cpu-total" - } - ] - } - ], + }, + { + "condition": "AND", + "key": "cpu", + "operator": "=", + "value": "cpu-total" + } + ] + } + ], "thresholds": "70,80,90", "title": "CPU usage", "type": "singlestat", @@ -5436,28 +5437,28 @@ data: "op": "=", "text": "N/A", "value": "null" - } - ], + } + ], "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "rgba(50, 172, 45, 0.97)", + "rgba(237, 129, 40, 0.89)", + "rgba(245, 54, 54, 0.9)" + ], "datasource": "InfluxDB", "editable": true, "error": false, "fieldConfig": { "defaults": { "custom": {} - }, + }, "overrides": [] - }, + }, "format": "percent", "gauge": { "maxValue": 100, @@ -5465,13 +5466,13 @@ data: "show": true, "thresholdLabels": false, "thresholdMarkers": true - }, + }, "gridPos": { "h": 4, "w": 2, "x": 16, "y": 1 - }, + }, "height": "150", "id": 61860, "interval": null, @@ -5481,12 +5482,12 @@ data: { "name": "value to text", "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], + }, + { + "name": "range to text", + "value": 2 + } + ], "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, @@ -5499,14 +5500,14 @@ data: "from": "null", "text": "N/A", "to": "null" - } - ], + } + ], "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", "full": false, "lineColor": "rgb(31, 120, 193)", "show": false - }, + }, "tableColumn": "", "targets": [ { @@ -5515,16 +5516,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "mem", "policy": "default", "refId": "A", @@ -5534,24 +5535,24 @@ data: { "params": [ "used_percent" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - } - ] - } - ], + } + ] + } + ], "thresholds": "70,80,90", "title": "RAM usage", "type": "singlestat", @@ -5561,19 +5562,19 @@ data: "op": "=", "text": "N/A", "value": "null" - } - ], + } + ], "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "rgba(50, 172, 45, 0.97)", + "rgba(237, 129, 40, 0.89)", + "rgba(245, 54, 54, 0.9)" + ], "datasource": "InfluxDB", "decimals": 0, "editable": true, @@ -5581,9 +5582,9 @@ data: "fieldConfig": { "defaults": { "custom": {} - }, + }, "overrides": [] - }, + }, "format": "percent", "gauge": { "maxValue": 100, @@ -5591,13 +5592,13 @@ data: "show": true, "thresholdLabels": false, "thresholdMarkers": true - }, + }, "gridPos": { "h": 4, "w": 2, "x": 18, "y": 1 - }, + }, "height": "150", "id": 61863, "interval": null, @@ -5607,12 +5608,12 @@ data: { "name": "value to text", "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], + }, + { + "name": "range to text", + "value": 2 + } + ], "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, @@ -5625,14 +5626,14 @@ data: "from": "null", "text": "N/A", "to": "null" - } - ], + } + ], "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", "full": false, "lineColor": "rgb(31, 120, 193)", "show": false - }, + }, "tableColumn": "", "targets": [ { @@ -5641,16 +5642,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "swap", "policy": "default", "refId": "A", @@ -5660,24 +5661,24 @@ data: { "params": [ "used_percent" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - } - ] - } - ], + } + ] + } + ], "thresholds": "50,70,90", "title": "Swap usage", "type": "singlestat", @@ -5687,19 +5688,19 @@ data: "op": "=", "text": "N/A", "value": "null" - } - ], + } + ], "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "rgba(50, 172, 45, 0.97)", + "rgba(237, 129, 40, 0.89)", + "rgba(245, 54, 54, 0.9)" + ], "datasource": "InfluxDB", "decimals": 0, "editable": true, @@ -5707,9 +5708,9 @@ data: "fieldConfig": { "defaults": { "custom": {} - }, + }, "overrides": [] - }, + }, "format": "percent", "gauge": { "maxValue": 100, @@ -5717,13 +5718,13 @@ data: "show": true, "thresholdLabels": false, "thresholdMarkers": true - }, + }, "gridPos": { "h": 4, "w": 2, "x": 20, "y": 1 - }, + }, "height": "150", "id": 61866, "interval": null, @@ -5733,12 +5734,12 @@ data: { "name": "value to text", "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], + }, + { + "name": "range to text", + "value": 2 + } + ], "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, @@ -5751,14 +5752,14 @@ data: "from": "null", "text": "N/A", "to": "null" - } - ], + } + ], "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", "full": false, "lineColor": "rgb(31, 120, 193)", "show": false - }, + }, "tableColumn": "", "targets": [ { @@ -5767,16 +5768,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "disk", "policy": "default", "refId": "A", @@ -5786,30 +5787,30 @@ data: { "params": [ "used_percent" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - }, - { - "condition": "AND", - "key": "path", - "operator": "=", - "value": "/" - } - ] - } - ], + }, + { + "condition": "AND", + "key": "path", + "operator": "=", + "value": "/" + } + ] + } + ], "thresholds": "70,80,90", "title": "RootFS used", "type": "singlestat", @@ -5819,19 +5820,19 @@ data: "op": "=", "text": "N/A", "value": "null" - } - ], + } + ], "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], "datasource": "InfluxDB", "decimals": 2, "editable": true, @@ -5839,9 +5840,9 @@ data: "fieldConfig": { "defaults": { "custom": {} - }, + }, "overrides": [] - }, + }, "format": "percent", "gauge": { "maxValue": 100, @@ -5849,13 +5850,13 @@ data: "show": false, "thresholdLabels": false, "thresholdMarkers": true - }, + }, "gridPos": { "h": 4, "w": 2, "x": 22, "y": 1 - }, + }, "height": "150", "id": 61867, "interval": null, @@ -5865,12 +5866,12 @@ data: { "name": "value to text", "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], + }, + { + "name": "range to text", + "value": 2 + } + ], "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, @@ -5883,14 +5884,14 @@ data: "from": "null", "text": "N/A", "to": "null" - } - ], + } + ], "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", "full": false, "lineColor": "rgb(31, 120, 193)", "show": true - }, + }, "tableColumn": "", "targets": [ { @@ -5899,16 +5900,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "cpu", "policy": "default", "query": "SELECT non_negative_derivative(mean(\"usage_iowait\"), 1s) FROM \"cpu\" WHERE \"host\" =~ /^$server$/ AND \"cpu\" = 'cpu-total' AND $timeFilter GROUP BY time($interval) fill(null)", @@ -5920,30 +5921,30 @@ data: { "params": [ "usage_iowait" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - }, - { - "condition": "AND", - "key": "cpu", - "operator": "=", - "value": "cpu-total" - } - ] - } - ], + }, + { + "condition": "AND", + "key": "cpu", + "operator": "=", + "value": "cpu-total" + } + ] + } + ], "thresholds": "30,40,50", "title": "IOWait", "type": "singlestat", @@ -5953,140 +5954,311 @@ data: "op": "=", "text": "N/A", "value": "null" - } - ], + } + ], "valueName": "current" - }, - { - "collapsed": false, - "datasource": null, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 5 }, + { + "collapsed": false, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 5 + }, "id": 61989, "panels": [], "repeat": null, "title": "CPU", "type": "row" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] }, - "fill": 1, - "fillGradient": 0, - "grid": {}, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 4, + "fillGradient": 1, "gridPos": { "h": 8, "w": 12, "x": 0, "y": 6 - }, - "height": "300", + }, "hiddenSeries": false, - "id": 28239, - "interval": "$inter", + "id": 62012, "legend": { "alignAsTable": true, "avg": true, - "current": true, - "hideEmpty": true, - "hideZero": true, + "current": false, "max": true, "min": true, - "rightSide": false, "show": true, - "sort": "current", - "sortDesc": true, "total": false, "values": true - }, + }, "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", + "linewidth": 1, + "nullPointMode": "null", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", - "pointradius": 5, + "pointradius": 2, "points": false, "renderer": "flot", + "repeat": "server", + "scopedVars": { + "server": { + "selected": true, + "text": "node1", + "value": "node1" + } + }, "seriesOverrides": [], "spaceLength": 10, "stack": false, "steppedLine": false, "targets": [ { - "alias": "$tag_host: $col", - "dsType": "influxdb", - "function": "mean", + "alias": "$server", "groupBy": [ { - "interval": "auto", "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - } - ], - "hide": false, - "measurement": "cpu_percentageBusy", + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "linear" + ], + "type": "fill" + } + ], + "measurement": "cpu_temperature", "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(usage_user) as \"user\", mean(usage_system) as \"system\", mean(usage_softirq) as \"softirq\", mean(usage_steal) as \"steal\", mean(usage_nice) as \"nice\", mean(usage_irq) as \"irq\", mean(usage_iowait) as \"iowait\", mean(usage_guest) as \"guest\", mean(usage_guest_nice) as \"guest_nice\" FROM \"cpu\" WHERE \"host\" =~ /$server$/ and cpu = 'cpu-total' AND $timeFilter GROUP BY time($interval), *", - "rawQuery": true, - "refId": "B", + "refId": "A", "resultFormat": "time_series", "select": [ [ { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [ + " / 1000" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/^$server$/" } ] + } ], - "tags": [] - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "CPU usage", + "thresholds": [ + { + "$$hashKey": "object:401", + "colorMode": "critical", + "fill": true, + "line": true, + "op": "gt", + "value": 70, + "yaxis": "left" + }, + { + "$$hashKey": "object:407", + "colorMode": "warning", + "fill": true, + "line": true, + "op": "gt", + "value": 60, + "yaxis": "left" + }, + { + "$$hashKey": "object:413", + "colorMode": "ok", + "fill": false, + "line": false, + "op": "lt", + "value": 60, + "yaxis": "left" + } + ], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "CPU Temperature", "tooltip": { - "msResolution": false, "shared": true, "sort": 0, - "value_type": "cumulative" + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:357", + "format": "celsius", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "$$hashKey": "object:358", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": true, + "alignLevel": null + } }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "fieldConfig": { + "defaults": { + "custom": {}, + "unit": "rothz" + }, + "overrides": [] + }, + "fill": 4, + "fillGradient": 1, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 6 + }, + "hiddenSeries": false, + "id": 62025, + "legend": { + "alignAsTable": true, + "avg": true, + "current": false, + "max": false, + "min": true, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.2.1", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "alias": "$server", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "linear" + ], + "type": "fill" + } + ], + "measurement": "cpu_frequency", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [ + " * 1000" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/^$server$/" + } + ] + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "CPU Frequency", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, "type": "graph", "xaxis": { "buckets": null, @@ -6094,7 +6266,155 @@ data: "name": null, "show": true, "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:357", + "format": "rothz", + "label": null, + "logBase": 1, + "max": null, + "min": "0", + "show": true + }, + { + "$$hashKey": "object:358", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": true, + "alignLevel": null + } }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "grid": {}, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 14 + }, + "height": "300", + "hiddenSeries": false, + "id": 28239, + "interval": "$inter", + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "hideEmpty": true, + "hideZero": true, + "max": true, + "min": true, + "rightSide": false, + "show": true, + "sort": "current", + "sortDesc": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.2.1", + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "alias": "$tag_host: $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + } + ], + "hide": false, + "measurement": "cpu_percentageBusy", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(usage_user) as \"user\", mean(usage_system) as \"system\", mean(usage_softirq) as \"softirq\", mean(usage_steal) as \"steal\", mean(usage_nice) as \"nice\", mean(usage_irq) as \"irq\", mean(usage_iowait) as \"iowait\", mean(usage_guest) as \"guest\", mean(usage_guest_nice) as \"guest_nice\" FROM \"cpu\" WHERE \"host\" =~ /$server$/ and cpu = 'cpu-total' AND $timeFilter GROUP BY time($interval), *", + "rawQuery": true, + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "CPU usage", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 0, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, "yaxes": [ { "format": "percent", @@ -6103,34 +6423,34 @@ data: "max": 100, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -6138,8 +6458,8 @@ data: "h": 8, "w": 12, "x": 12, - "y": 6 - }, + "y": 14 + }, "height": "400", "hiddenSeries": false, "id": 12054, @@ -6155,14 +6475,14 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -6174,8 +6494,8 @@ data: "color": "#BF1B00", "fill": 0, "linewidth": 2 - } - ], + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, @@ -6189,17 +6509,17 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - } - ], + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "mem_inactive", "orderByTime": "ASC", "policy": "default", @@ -6212,18 +6532,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -6234,7 +6554,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -6242,50 +6562,50 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "bytes", "logBase": 1, "max": null, - "min": 0, + "min": 0, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { "h": 9, "w": 12, "x": 0, - "y": 14 - }, + "y": 22 + }, "height": "350", "hiddenSeries": false, "id": 61852, @@ -6301,14 +6621,14 @@ data: "show": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -6326,16 +6646,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "processes", "policy": "default", "query": "SELECT mean(running) as running, mean(blocked) as blocked, mean(sleeping) as sleeping, mean(stopped) as stopped, mean(zombies) as zombies, mean(paging) as paging, mean(unknown) as unknown FROM \"processes\" WHERE host =~ /$server$/ AND $timeFilter GROUP BY time($interval), host ORDER BY asc", @@ -6347,24 +6667,24 @@ data: { "params": [ "blocked" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - } - ] - } - ], + } + ] + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -6375,7 +6695,7 @@ data: "shared": true, "sort": 0, "value_type": "individual" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -6383,7 +6703,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "short", @@ -6392,35 +6712,35 @@ data: "max": null, "min": null, "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 0, "fillGradient": 0, "grid": {}, @@ -6428,8 +6748,8 @@ data: "h": 9, "w": 12, "x": 12, - "y": 14 - }, + "y": 22 + }, "height": "350", "hiddenSeries": false, "id": 54694, @@ -6443,14 +6763,14 @@ data: "show": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -6470,17 +6790,17 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - } - ], + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "system_load1", "policy": "default", "query": "SELECT mean(load1) as short,mean(load5) as medium,mean(load15) as long FROM \"system\" WHERE host =~ /$server$/ AND $timeFilter GROUP BY time($interval), * ORDER BY asc", @@ -6492,18 +6812,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -6514,7 +6834,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -6522,7 +6842,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "short", @@ -6530,42 +6850,42 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { "h": 10, "w": 12, "x": 0, - "y": 23 - }, + "y": 31 + }, "height": "", "hiddenSeries": false, "id": 61855, @@ -6579,14 +6899,14 @@ data: "show": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -6604,45 +6924,45 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "processes", "policy": "default", "query": "SELECT non_negative_derivative(mean(context_switches),1s)as \"context switches\" FROM \"kernel\" WHERE host =~ /$server$/ AND $timeFilter GROUP BY time($interval), host ORDER BY asc", "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "blocked" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "blocked" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - } - ] - } - ], + } + ] + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -6653,7 +6973,7 @@ data: "shared": true, "sort": 0, "value_type": "individual" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -6661,7 +6981,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "ops", @@ -6670,43 +6990,43 @@ data: "max": null, "min": null, "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { "h": 10, "w": 12, "x": 12, - "y": 23 - }, + "y": 31 + }, "height": "", "hiddenSeries": false, "id": 61960, @@ -6720,14 +7040,14 @@ data: "show": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -6745,16 +7065,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "kernel", "orderByTime": "ASC", "policy": "default", @@ -6767,24 +7087,24 @@ data: { "params": [ "processes_forked" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - } - ] - } - ], + } + ] + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -6795,7 +7115,7 @@ data: "shared": true, "sort": 0, "value_type": "individual" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -6803,7 +7123,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "ops", @@ -6812,30 +7132,30 @@ data: "max": null, "min": null, "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "collapsed": false, - "datasource": null, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 33 + } }, + { + "collapsed": false, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 41 + }, "id": 61990, "panels": [], "repeat": "netif", @@ -6844,25 +7164,25 @@ data: "selected": false, "text": "eth0", "value": "eth0" - } - }, + } + }, "title": "Network interface stats for $netif", "type": "row" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -6870,8 +7190,8 @@ data: "h": 7, "w": 12, "x": 0, - "y": 34 - }, + "y": 42 + }, "hiddenSeries": false, "id": 42026, "interval": "$inter", @@ -6885,14 +7205,14 @@ data: "show": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 2, "links": [], "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -6903,22 +7223,22 @@ data: "selected": false, "text": "eth0", "value": "eth0" - } - }, + } + }, "seriesOverrides": [ { "alias": "/ out$/", "transform": "negative-Y" - }, - { - "alias": "/ in$/", - "color": "#7EB26D" - }, - { - "alias": "/ out$/", - "color": "#BF1B00" - } - ], + }, + { + "alias": "/ in$/", + "color": "#7EB26D" + }, + { + "alias": "/ out$/", + "color": "#BF1B00" + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, @@ -6932,24 +7252,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "interface", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "interface", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "net_bytes_recv", "orderByTime": "ASC", "policy": "default", @@ -6962,44 +7282,44 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - }, - { - "alias": "$tag_host: $tag_interface: $col", - "dsType": "influxdb", - "function": "derivative", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" }, { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "interface", - "params": [ - "tag" - ], + "alias": "$tag_host: $tag_interface: $col", + "dsType": "influxdb", + "function": "derivative", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], "type": "tag" - } - ], + }, + { + "key": "interface", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "net_bytes_recv", "orderByTime": "ASC", "policy": "default", @@ -7012,18 +7332,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -7034,7 +7354,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -7042,7 +7362,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "bps", @@ -7050,34 +7370,34 @@ data: "max": null, "min": null, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": true, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": true, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -7085,8 +7405,8 @@ data: "h": 7, "w": 12, "x": 12, - "y": 34 - }, + "y": 42 + }, "hiddenSeries": false, "id": 28572, "interval": "$inter", @@ -7100,14 +7420,14 @@ data: "show": true, "total": false, "values": true - }, + }, "lines": false, "linewidth": 1, "links": [], "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -7118,14 +7438,14 @@ data: "selected": false, "text": "eth0", "value": "eth0" - } - }, + } + }, "seriesOverrides": [ { "alias": "/ in$/", "transform": "negative-Y" - } - ], + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, @@ -7139,24 +7459,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "interface", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "interface", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "net_bytes_recv", "orderByTime": "ASC", "policy": "default", @@ -7169,44 +7489,44 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - }, - { - "alias": "$tag_host: $tag_interface: $col", - "dsType": "influxdb", - "function": "derivative", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" }, { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "interface", - "params": [ - "tag" - ], + "alias": "$tag_host: $tag_interface: $col", + "dsType": "influxdb", + "function": "derivative", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], "type": "tag" - } - ], + }, + { + "key": "interface", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "net_bytes_recv", "orderByTime": "ASC", "policy": "default", @@ -7219,18 +7539,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -7241,7 +7561,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -7249,7 +7569,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "pps", @@ -7258,35 +7578,35 @@ data: "max": null, "min": null, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": true, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "decimals": 1, - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": true, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "decimals": 1, + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -7294,8 +7614,8 @@ data: "h": 7, "w": 12, "x": 0, - "y": 41 - }, + "y": 49 + }, "hiddenSeries": false, "id": 58901, "interval": "$inter", @@ -7309,14 +7629,14 @@ data: "show": true, "total": false, "values": true - }, + }, "lines": false, "linewidth": 1, "links": [], "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -7327,8 +7647,8 @@ data: "selected": false, "text": "eth0", "value": "eth0" - } - }, + } + }, "seriesOverrides": [], "spaceLength": 10, "stack": false, @@ -7340,27 +7660,27 @@ data: "function": "derivative", "groupBy": [ { - "interval": "auto", + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "interface", - "params": [ - "tag" + "tag" + ], + "type": "tag" + }, + { + "key": "interface", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "net_bytes_recv", "policy": "default", "query": "SELECT non_negative_derivative(mean(drop_in), 1s) as \"in\" FROM \"net\" WHERE host =~ /$server/ AND interface =~ /$netif/ AND $timeFilter GROUP BY time($interval), host,interface fill(none)", @@ -7372,44 +7692,44 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - }, - { - "alias": "$tag_host: $tag_interface: $col", - "dsType": "influxdb", - "function": "derivative", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" }, { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "interface", - "params": [ - "tag" - ], + "alias": "$tag_host: $tag_interface: $col", + "dsType": "influxdb", + "function": "derivative", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], "type": "tag" - } - ], + }, + { + "key": "interface", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "net_bytes_recv", "policy": "default", "query": "SELECT non_negative_derivative(mean(drop_out), 1s) as \"out\" FROM \"net\" WHERE host =~ /$server/ AND interface =~ /$netif/ AND $timeFilter GROUP BY time($interval), host,interface fill(none)", @@ -7421,18 +7741,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -7443,7 +7763,7 @@ data: "shared": true, "sort": 0, "value_type": "individual" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -7451,7 +7771,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "pps", @@ -7460,34 +7780,34 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": true, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": true, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -7495,8 +7815,8 @@ data: "h": 7, "w": 12, "x": 12, - "y": 41 - }, + "y": 49 + }, "hiddenSeries": false, "id": 50643, "interval": "$inter", @@ -7510,14 +7830,14 @@ data: "show": true, "total": false, "values": true - }, + }, "lines": false, "linewidth": 2, "links": [], "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -7528,8 +7848,8 @@ data: "selected": false, "text": "eth0", "value": "eth0" - } - }, + } + }, "seriesOverrides": [], "spaceLength": 10, "stack": false, @@ -7544,24 +7864,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "interface", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "interface", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "net_bytes_recv", "policy": "default", "query": "SELECT non_negative_derivative(mean(err_in), 1s) as \"in\" FROM \"net\" WHERE host =~ /$server/ AND interface =~ /$netif/ AND $timeFilter GROUP BY time($interval), host,interface fill(none)", @@ -7573,44 +7893,44 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - }, - { - "alias": "$tag_host: $tag_interface: $col", - "dsType": "influxdb", - "function": "derivative", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" }, { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "interface", - "params": [ - "tag" - ], + "alias": "$tag_host: $tag_interface: $col", + "dsType": "influxdb", + "function": "derivative", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], "type": "tag" - } - ], + }, + { + "key": "interface", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "net_bytes_recv", "policy": "default", "query": "SELECT non_negative_derivative(mean(err_out), 1s) as \"out\" FROM \"net\" WHERE host =~ /$server/ AND interface =~ /$netif/ AND $timeFilter GROUP BY time($interval), host,interface fill(none)", @@ -7622,18 +7942,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -7644,7 +7964,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -7652,7 +7972,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "short", @@ -7660,50 +7980,50 @@ data: "logBase": 1, "max": null, "min": 0, - "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "collapsed": false, - "datasource": null, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 48 + } }, + { + "collapsed": false, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 56 + }, "id": 61991, "panels": [], "repeat": null, "title": "Swap", "type": "row" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -7711,8 +8031,8 @@ data: "h": 7, "w": 12, "x": 0, - "y": 49 - }, + "y": 57 + }, "hiddenSeries": false, "id": 26024, "interval": "$inter", @@ -7727,14 +8047,14 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -7744,8 +8064,8 @@ data: { "alias": "/in/", "transform": "negative-Y" - } - ], + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, @@ -7759,17 +8079,17 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - } - ], + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "swap_in", "policy": "default", "query": "SELECT non_negative_derivative(mean(\"in\")) as \"in\", non_negative_derivative(mean(\"out\")) as \"out\" FROM \"swap\" WHERE host =~ /$server$/ AND $timeFilter GROUP BY time($interval), host ORDER BY asc", @@ -7781,18 +8101,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -7803,7 +8123,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -7811,7 +8131,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "bytes", @@ -7819,34 +8139,34 @@ data: "max": null, "min": null, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -7854,8 +8174,8 @@ data: "h": 7, "w": 12, "x": 12, - "y": 49 - }, + "y": 57 + }, "hiddenSeries": false, "id": 61850, "interval": "$inter", @@ -7870,14 +8190,14 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -7888,8 +8208,8 @@ data: "alias": "/total/", "color": "#890F02", "fill": 0 - } - ], + } + ], "spaceLength": 10, "stack": false, "steppedLine": true, @@ -7903,17 +8223,17 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - } - ], + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "swap_in", "policy": "default", "query": "SELECT mean(used) as \"used\", mean(total) as \"total\" FROM \"swap\" WHERE host =~ /$server$/ AND $timeFilter GROUP BY time($interval), host ORDER BY asc", @@ -7925,18 +8245,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -7947,7 +8267,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -7955,7 +8275,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "bytes", @@ -7963,49 +8283,49 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "collapsed": false, - "datasource": null, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 56 + } }, + { + "collapsed": false, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 64 + }, "id": 61992, "panels": [], "repeat": "disk", "title": "Disk IOPS for /dev/$disk", "type": "row" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -8013,8 +8333,8 @@ data: "h": 7, "w": 8, "x": 0, - "y": 57 - }, + "y": 65 + }, "hiddenSeries": false, "id": 13782, "interval": "$inter", @@ -8031,7 +8351,7 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], @@ -8039,7 +8359,7 @@ data: "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -8050,8 +8370,8 @@ data: { "alias": "/.*write$/", "transform": "negative-Y" - } - ], + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, @@ -8065,24 +8385,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "io_reads", "policy": "default", "query": "SELECT non_negative_derivative(mean(reads),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$server$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($interval), *", @@ -8094,44 +8414,44 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - }, - { - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" }, { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], + "alias": "$tag_host: $tag_name: $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], "type": "tag" - } - ], + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "io_reads", "policy": "default", "query": "SELECT non_negative_derivative(mean(writes),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$server$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($interval), *", @@ -8143,18 +8463,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -8165,7 +8485,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -8173,7 +8493,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "iops", @@ -8181,34 +8501,34 @@ data: "max": null, "min": null, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -8216,8 +8536,8 @@ data: "h": 7, "w": 8, "x": 8, - "y": 57 - }, + "y": 65 + }, "hiddenSeries": false, "id": 60200, "interval": "$inter", @@ -8234,7 +8554,7 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], @@ -8242,7 +8562,7 @@ data: "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -8253,8 +8573,8 @@ data: { "alias": "/.*write$/", "transform": "negative-Y" - } - ], + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, @@ -8268,24 +8588,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "io_reads", "policy": "default", "query": "SELECT non_negative_derivative(mean(read_bytes),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$server$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($interval), *", @@ -8297,44 +8617,44 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - }, - { - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" }, { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], + "alias": "$tag_host: $tag_name: $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], "type": "tag" - } - ], + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "io_reads", "policy": "default", "query": "SELECT non_negative_derivative(mean(write_bytes),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$server$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($interval), *", @@ -8346,18 +8666,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -8368,7 +8688,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -8376,42 +8696,42 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { - "format": "bytes", + "format": "bytes", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", "logBase": 1, "max": null, "min": null, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -8419,8 +8739,8 @@ data: "h": 7, "w": 8, "x": 16, - "y": 57 - }, + "y": 65 + }, "hiddenSeries": false, "id": 56720, "interval": "$inter", @@ -8437,7 +8757,7 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], @@ -8445,7 +8765,7 @@ data: "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -8456,8 +8776,8 @@ data: { "alias": "/.*write$/", "transform": "negative-Y" - } - ], + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, @@ -8471,24 +8791,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "io_reads", "policy": "default", "query": "SELECT non_negative_derivative(mean(read_time),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$server$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($interval), *", @@ -8500,44 +8820,44 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - }, - { - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" }, { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], + "alias": "$tag_host: $tag_name: $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], "type": "tag" - } - ], + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "io_reads", "policy": "default", "query": "SELECT non_negative_derivative(mean(write_time),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$server$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($interval), *", @@ -8549,18 +8869,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -8571,7 +8891,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -8579,7 +8899,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "ms", @@ -8587,29 +8907,29 @@ data: "max": null, "min": null, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "collapsed": false, - "datasource": null, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 64 + } }, + { + "collapsed": false, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 72 + }, "id": 61993, "panels": [], "repeat": "mountpoint", @@ -8618,25 +8938,25 @@ data: "selected": false, "text": "/dev/termination-log", "value": "/dev/termination-log" - } - }, + } + }, "title": "Disk space usage for $mountpoint", "type": "row" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -8644,8 +8964,8 @@ data: "h": 7, "w": 12, "x": 0, - "y": 65 - }, + "y": 73 + }, "hiddenSeries": false, "id": 52240, "interval": "$inter", @@ -8660,7 +8980,7 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], @@ -8668,7 +8988,7 @@ data: "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -8680,8 +9000,8 @@ data: "selected": false, "text": "/dev/termination-log", "value": "/dev/termination-log" - } - }, + } + }, "seriesOverrides": [ { "alias": "/total/", @@ -8689,8 +9009,8 @@ data: "fill": 0, "linewidth": 2, "zindex": 3 - } - ], + } + ], "spaceLength": 10, "stack": false, "steppedLine": true, @@ -8704,24 +9024,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "disk_total", "policy": "default", "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -8733,18 +9053,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -8755,7 +9075,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -8763,7 +9083,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "bytes", @@ -8771,34 +9091,34 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": true, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": true, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -8806,8 +9126,8 @@ data: "h": 7, "w": 12, "x": 12, - "y": 65 - }, + "y": 73 + }, "hiddenSeries": false, "id": 33458, "interval": "$inter", @@ -8822,7 +9142,7 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": false, "linewidth": 1, "links": [], @@ -8830,7 +9150,7 @@ data: "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -8842,23 +9162,23 @@ data: "selected": false, "text": "/dev/termination-log", "value": "/dev/termination-log" - } - }, + } + }, "seriesOverrides": [ { "alias": "/used/", "color": "#447EBC", "zindex": 3 - }, - { - "alias": "/total/", - "bars": false, - "color": "#BF1B00", - "fill": 0, - "lines": true, - "linewidth": 1 - } - ], + }, + { + "alias": "/total/", + "bars": false, + "color": "#BF1B00", + "fill": 0, + "lines": true, + "linewidth": 1 + } + ], "spaceLength": 10, "stack": false, "steppedLine": true, @@ -8872,24 +9192,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "disk_inodes_free", "policy": "default", "query": "SELECT mean(inodes_used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/ AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -8901,44 +9221,44 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - }, - { - "alias": "$tag_host: mountpoint $tag_path - $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" }, { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], + "alias": "$tag_host: mountpoint $tag_path - $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], "type": "tag" - } - ], + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "disk_inodes_free", "policy": "default", "query": "SELECT mean(inodes_free) + mean(inodes_used) as \"total\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/ AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -8950,18 +9270,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -8972,7 +9292,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -8980,7 +9300,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "short", @@ -8988,57 +9308,57 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "collapsed": false, - "datasource": null, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 72 + } }, - "id": 61999, + { + "collapsed": false, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 80 + }, + "id": 62026, "panels": [], - "repeatIteration": 1603435375490, + "repeatIteration": 1603949953221, "repeatPanelId": 61993, "scopedVars": { "mountpoint": { "selected": false, "text": "/etc/hostname", "value": "/etc/hostname" - } - }, + } + }, "title": "Disk space usage for $mountpoint", "type": "row" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -9046,10 +9366,10 @@ data: "h": 7, "w": 12, "x": 0, - "y": 73 - }, + "y": 81 + }, "hiddenSeries": false, - "id": 62000, + "id": 62027, "interval": "$inter", "legend": { "alignAsTable": true, @@ -9062,7 +9382,7 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], @@ -9070,14 +9390,14 @@ data: "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, "points": false, "renderer": "flot", "repeat": null, - "repeatIteration": 1603435375490, + "repeatIteration": 1603949953221, "repeatPanelId": 52240, "repeatedByRow": true, "scopedVars": { @@ -9085,8 +9405,8 @@ data: "selected": false, "text": "/etc/hostname", "value": "/etc/hostname" - } - }, + } + }, "seriesOverrides": [ { "alias": "/total/", @@ -9094,8 +9414,8 @@ data: "fill": 0, "linewidth": 2, "zindex": 3 - } - ], + } + ], "spaceLength": 10, "stack": false, "steppedLine": true, @@ -9106,27 +9426,27 @@ data: "function": "mean", "groupBy": [ { - "interval": "auto", + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "disk_total", "policy": "default", "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -9138,18 +9458,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -9160,7 +9480,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -9168,7 +9488,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "bytes", @@ -9176,34 +9496,34 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": true, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": true, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -9211,10 +9531,10 @@ data: "h": 7, "w": 12, "x": 12, - "y": 73 - }, + "y": 81 + }, "hiddenSeries": false, - "id": 62001, + "id": 62028, "interval": "$inter", "legend": { "alignAsTable": true, @@ -9227,7 +9547,7 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": false, "linewidth": 1, "links": [], @@ -9235,14 +9555,14 @@ data: "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, "points": false, "renderer": "flot", "repeat": null, - "repeatIteration": 1603435375490, + "repeatIteration": 1603949953221, "repeatPanelId": 33458, "repeatedByRow": true, "scopedVars": { @@ -9250,23 +9570,23 @@ data: "selected": false, "text": "/etc/hostname", "value": "/etc/hostname" - } - }, + } + }, "seriesOverrides": [ { "alias": "/used/", "color": "#447EBC", "zindex": 3 - }, - { - "alias": "/total/", - "bars": false, - "color": "#BF1B00", - "fill": 0, - "lines": true, - "linewidth": 1 - } - ], + }, + { + "alias": "/total/", + "bars": false, + "color": "#BF1B00", + "fill": 0, + "lines": true, + "linewidth": 1 + } + ], "spaceLength": 10, "stack": false, "steppedLine": true, @@ -9280,24 +9600,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "disk_inodes_free", "policy": "default", "query": "SELECT mean(inodes_used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/ AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -9309,44 +9629,44 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - }, - { - "alias": "$tag_host: mountpoint $tag_path - $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" }, { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], + "alias": "$tag_host: mountpoint $tag_path - $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], "type": "tag" - } - ], + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "disk_inodes_free", "policy": "default", "query": "SELECT mean(inodes_free) + mean(inodes_used) as \"total\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/ AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -9358,18 +9678,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -9380,7 +9700,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -9388,7 +9708,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "short", @@ -9396,57 +9716,57 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "collapsed": false, - "datasource": null, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 80 + } }, - "id": 62002, + { + "collapsed": false, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 88 + }, + "id": 62029, "panels": [], - "repeatIteration": 1603435375490, + "repeatIteration": 1603949953221, "repeatPanelId": 61993, "scopedVars": { "mountpoint": { "selected": false, "text": "/etc/hosts", "value": "/etc/hosts" - } - }, + } + }, "title": "Disk space usage for $mountpoint", "type": "row" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] }, - "overrides": [] - }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -9454,10 +9774,10 @@ data: "h": 7, "w": 12, "x": 0, - "y": 81 - }, + "y": 89 + }, "hiddenSeries": false, - "id": 62003, + "id": 62030, "interval": "$inter", "legend": { "alignAsTable": true, @@ -9470,7 +9790,7 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], @@ -9478,14 +9798,14 @@ data: "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, "points": false, "renderer": "flot", "repeat": null, - "repeatIteration": 1603435375490, + "repeatIteration": 1603949953221, "repeatPanelId": 52240, "repeatedByRow": true, "scopedVars": { @@ -9493,8 +9813,8 @@ data: "selected": false, "text": "/etc/hosts", "value": "/etc/hosts" - } - }, + } + }, "seriesOverrides": [ { "alias": "/total/", @@ -9502,8 +9822,8 @@ data: "fill": 0, "linewidth": 2, "zindex": 3 - } - ], + } + ], "spaceLength": 10, "stack": false, "steppedLine": true, @@ -9517,24 +9837,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "disk_total", "policy": "default", "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -9546,18 +9866,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -9568,7 +9888,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -9576,7 +9896,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "bytes", @@ -9584,34 +9904,34 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": true, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": true, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -9619,10 +9939,10 @@ data: "h": 7, "w": 12, "x": 12, - "y": 81 - }, + "y": 89 + }, "hiddenSeries": false, - "id": 62004, + "id": 62031, "interval": "$inter", "legend": { "alignAsTable": true, @@ -9635,7 +9955,7 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": false, "linewidth": 1, "links": [], @@ -9643,14 +9963,14 @@ data: "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, "points": false, "renderer": "flot", "repeat": null, - "repeatIteration": 1603435375490, + "repeatIteration": 1603949953221, "repeatPanelId": 33458, "repeatedByRow": true, "scopedVars": { @@ -9658,23 +9978,23 @@ data: "selected": false, "text": "/etc/hosts", "value": "/etc/hosts" - } - }, + } + }, "seriesOverrides": [ { "alias": "/used/", "color": "#447EBC", "zindex": 3 - }, - { - "alias": "/total/", - "bars": false, - "color": "#BF1B00", - "fill": 0, - "lines": true, - "linewidth": 1 - } - ], + }, + { + "alias": "/total/", + "bars": false, + "color": "#BF1B00", + "fill": 0, + "lines": true, + "linewidth": 1 + } + ], "spaceLength": 10, "stack": false, "steppedLine": true, @@ -9688,24 +10008,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "disk_inodes_free", "policy": "default", "query": "SELECT mean(inodes_used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/ AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -9717,44 +10037,44 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - }, - { - "alias": "$tag_host: mountpoint $tag_path - $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" }, { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], + "alias": "$tag_host: mountpoint $tag_path - $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], "type": "tag" - } - ], + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "disk_inodes_free", "policy": "default", "query": "SELECT mean(inodes_free) + mean(inodes_used) as \"total\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/ AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -9766,18 +10086,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -9788,7 +10108,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -9796,7 +10116,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "short", @@ -9804,57 +10124,57 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "collapsed": false, - "datasource": null, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 88 + "align": false, + "alignLevel": null + } }, - "id": 62005, + { + "collapsed": false, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 96 + }, + "id": 62032, "panels": [], - "repeatIteration": 1603435375490, + "repeatIteration": 1603949953221, "repeatPanelId": 61993, "scopedVars": { "mountpoint": { "selected": false, "text": "/etc/resolv.conf", "value": "/etc/resolv.conf" - } - }, + } + }, "title": "Disk space usage for $mountpoint", "type": "row" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -9862,10 +10182,10 @@ data: "h": 7, "w": 12, "x": 0, - "y": 89 - }, + "y": 97 + }, "hiddenSeries": false, - "id": 62006, + "id": 62033, "interval": "$inter", "legend": { "alignAsTable": true, @@ -9878,7 +10198,7 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], @@ -9886,14 +10206,14 @@ data: "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, "points": false, "renderer": "flot", "repeat": null, - "repeatIteration": 1603435375490, + "repeatIteration": 1603949953221, "repeatPanelId": 52240, "repeatedByRow": true, "scopedVars": { @@ -9901,8 +10221,8 @@ data: "selected": false, "text": "/etc/resolv.conf", "value": "/etc/resolv.conf" - } - }, + } + }, "seriesOverrides": [ { "alias": "/total/", @@ -9910,8 +10230,8 @@ data: "fill": 0, "linewidth": 2, "zindex": 3 - } - ], + } + ], "spaceLength": 10, "stack": false, "steppedLine": true, @@ -9925,24 +10245,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "disk_total", "policy": "default", "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -9954,18 +10274,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -9976,7 +10296,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -9984,7 +10304,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "bytes", @@ -9992,34 +10312,34 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": true, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": true, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -10027,10 +10347,10 @@ data: "h": 7, "w": 12, "x": 12, - "y": 89 - }, + "y": 97 + }, "hiddenSeries": false, - "id": 62007, + "id": 62034, "interval": "$inter", "legend": { "alignAsTable": true, @@ -10043,7 +10363,7 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": false, "linewidth": 1, "links": [], @@ -10051,14 +10371,14 @@ data: "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, "points": false, "renderer": "flot", "repeat": null, - "repeatIteration": 1603435375490, + "repeatIteration": 1603949953221, "repeatPanelId": 33458, "repeatedByRow": true, "scopedVars": { @@ -10066,23 +10386,23 @@ data: "selected": false, "text": "/etc/resolv.conf", "value": "/etc/resolv.conf" - } - }, + } + }, "seriesOverrides": [ { "alias": "/used/", "color": "#447EBC", "zindex": 3 - }, - { - "alias": "/total/", - "bars": false, - "color": "#BF1B00", - "fill": 0, - "lines": true, - "linewidth": 1 - } - ], + }, + { + "alias": "/total/", + "bars": false, + "color": "#BF1B00", + "fill": 0, + "lines": true, + "linewidth": 1 + } + ], "spaceLength": 10, "stack": false, "steppedLine": true, @@ -10096,24 +10416,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "disk_inodes_free", "policy": "default", "query": "SELECT mean(inodes_used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/ AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -10125,44 +10445,44 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - }, - { - "alias": "$tag_host: mountpoint $tag_path - $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" }, { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], + "alias": "$tag_host: mountpoint $tag_path - $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], "type": "tag" - } - ], + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "disk_inodes_free", "policy": "default", "query": "SELECT mean(inodes_free) + mean(inodes_used) as \"total\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/ AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -10174,18 +10494,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -10196,7 +10516,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -10204,7 +10524,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "short", @@ -10212,57 +10532,57 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "collapsed": false, - "datasource": null, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 96 + } }, - "id": 62008, + { + "collapsed": false, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 104 + }, + "id": 62035, "panels": [], - "repeatIteration": 1603435375490, + "repeatIteration": 1603949953221, "repeatPanelId": 61993, "scopedVars": { "mountpoint": { "selected": false, "text": "/etc/telegraf", "value": "/etc/telegraf" - } - }, + } + }, "title": "Disk space usage for $mountpoint", "type": "row" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -10270,10 +10590,10 @@ data: "h": 7, "w": 12, "x": 0, - "y": 97 - }, + "y": 105 + }, "hiddenSeries": false, - "id": 62009, + "id": 62036, "interval": "$inter", "legend": { "alignAsTable": true, @@ -10286,7 +10606,7 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], @@ -10294,14 +10614,14 @@ data: "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, "points": false, "renderer": "flot", "repeat": null, - "repeatIteration": 1603435375490, + "repeatIteration": 1603949953221, "repeatPanelId": 52240, "repeatedByRow": true, "scopedVars": { @@ -10309,8 +10629,8 @@ data: "selected": false, "text": "/etc/telegraf", "value": "/etc/telegraf" - } - }, + } + }, "seriesOverrides": [ { "alias": "/total/", @@ -10318,8 +10638,8 @@ data: "fill": 0, "linewidth": 2, "zindex": 3 - } - ], + } + ], "spaceLength": 10, "stack": false, "steppedLine": true, @@ -10333,24 +10653,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "disk_total", "policy": "default", "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -10362,18 +10682,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -10384,7 +10704,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -10392,7 +10712,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "bytes", @@ -10400,34 +10720,34 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": true, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": true, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -10435,10 +10755,10 @@ data: "h": 7, "w": 12, "x": 12, - "y": 97 - }, + "y": 105 + }, "hiddenSeries": false, - "id": 62010, + "id": 62037, "interval": "$inter", "legend": { "alignAsTable": true, @@ -10451,7 +10771,7 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": false, "linewidth": 1, "links": [], @@ -10459,14 +10779,14 @@ data: "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, "points": false, "renderer": "flot", "repeat": null, - "repeatIteration": 1603435375490, + "repeatIteration": 1603949953221, "repeatPanelId": 33458, "repeatedByRow": true, "scopedVars": { @@ -10474,23 +10794,23 @@ data: "selected": false, "text": "/etc/telegraf", "value": "/etc/telegraf" - } - }, + } + }, "seriesOverrides": [ { "alias": "/used/", "color": "#447EBC", "zindex": 3 - }, - { - "alias": "/total/", - "bars": false, - "color": "#BF1B00", - "fill": 0, - "lines": true, - "linewidth": 1 - } - ], + }, + { + "alias": "/total/", + "bars": false, + "color": "#BF1B00", + "fill": 0, + "lines": true, + "linewidth": 1 + } + ], "spaceLength": 10, "stack": false, "steppedLine": true, @@ -10504,24 +10824,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "disk_inodes_free", "policy": "default", "query": "SELECT mean(inodes_used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/ AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -10533,44 +10853,44 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - }, - { - "alias": "$tag_host: mountpoint $tag_path - $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" }, { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], + "alias": "$tag_host: mountpoint $tag_path - $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], "type": "tag" - } - ], + } + ], "measurement": "disk_inodes_free", "policy": "default", "query": "SELECT mean(inodes_free) + mean(inodes_used) as \"total\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/ AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -10582,18 +10902,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -10604,7 +10924,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -10612,7 +10932,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "short", @@ -10620,21 +10940,21 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null + } } - } - ], + ], "refresh": "1m", "schemaVersion": 26, "style": "dark", @@ -10643,7 +10963,7 @@ data: "telegraf", "raspberrypi", "pi4" - ], + ], "templating": { "list": [ { @@ -10652,124 +10972,124 @@ data: "selected": false, "text": "InfluxDB", "value": "InfluxDB" - }, - "datasource": "InfluxDB telegraf", - "hide": 0, - "includeAll": false, - "label": "", - "multi": false, - "name": "datasource", - "options": [], - "query": "influxdb", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "type": "datasource" - }, - { - "auto": true, - "auto_count": 100, - "auto_min": "30s", - "current": { - "selected": false, - "text": "30s", - "value": "30s" - }, - "datasource": null, - "hide": 0, - "includeAll": false, - "label": "Sampling", - "multi": false, - "name": "inter", - "options": [ - { - "selected": false, - "text": "auto", - "value": "$__auto_interval_inter" + }, + "datasource": "InfluxDB telegraf", + "hide": 0, + "includeAll": false, + "label": "", + "multi": false, + "name": "datasource", + "options": [], + "query": "influxdb", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" }, { - "selected": false, - "text": "10s", - "value": "10s" - }, - { - "selected": true, + "auto": true, + "auto_count": 100, + "auto_min": "30s", + "current": { + "selected": false, "text": "30s", "value": "30s" }, - { - "selected": false, - "text": "1m", - "value": "1m" - }, - { - "selected": false, - "text": "2m", - "value": "2m" - }, - { - "selected": false, - "text": "5m", - "value": "5m" - }, - { + "datasource": null, + "hide": 0, + "includeAll": false, + "label": "Sampling", + "multi": false, + "name": "inter", + "options": [ + { + "selected": false, + "text": "auto", + "value": "$__auto_interval_inter" + }, + { + "selected": false, + "text": "10s", + "value": "10s" + }, + { + "selected": true, + "text": "30s", + "value": "30s" + }, + { + "selected": false, + "text": "1m", + "value": "1m" + }, + { + "selected": false, + "text": "2m", + "value": "2m" + }, + { + "selected": false, + "text": "5m", + "value": "5m" + }, + { + "selected": false, + "text": "10m", + "value": "10m" + }, + { + "selected": false, + "text": "30m", + "value": "30m" + }, + { + "selected": false, + "text": "1h", + "value": "1h" + } + ], + "query": "10s,30s,1m,2m,5m,10m,30m,1h", + "refresh": 2, + "skipUrlSync": false, + "type": "interval" + }, + { + "allValue": null, + "current": { "selected": false, - "text": "10m", - "value": "10m" + "text": "node1", + "value": "node1" }, - { + "datasource": "InfluxDB", + "definition": "", + "hide": 0, + "includeAll": false, + "label": "Server", + "multi": false, + "name": "server", + "options": [], + "query": "SHOW TAG VALUES FROM system WITH KEY=host", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 0, + "tagValuesQuery": null, + "tags": [], + "tagsQuery": null, + "type": "query", + "useTags": false + }, + { + "allValue": null, + "current": { "selected": false, - "text": "30m", - "value": "30m" + "text": [ + "All" + ], + "value": [ + "$__all" + ] }, - { - "selected": false, - "text": "1h", - "value": "1h" - } - ], - "query": "10s,30s,1m,2m,5m,10m,30m,1h", - "refresh": 2, - "skipUrlSync": false, - "type": "interval" - }, - { - "allValue": null, - "current": { - "selected": false, - "text": "node3", - "value": "node3" - }, - "datasource": "InfluxDB", - "definition": "", - "hide": 0, - "includeAll": false, - "label": "Server", - "multi": false, - "name": "server", - "options": [], - "query": "SHOW TAG VALUES FROM system WITH KEY=host", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": null, - "tags": [], - "tagsQuery": null, - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": { - "selected": true, - "text": [ - "All" - ], - "value": [ - "$__all" - ] - }, "datasource": "$datasource", "definition": "", "hide": 0, @@ -10788,18 +11108,18 @@ data: "tagsQuery": null, "type": "query", "useTags": false - }, - { - "allValue": null, - "current": { - "selected": true, - "text": [ - "All" - ], - "value": [ - "$__all" - ] }, + { + "allValue": null, + "current": { + "selected": false, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, "datasource": "$datasource", "definition": "", "hide": 0, @@ -10818,18 +11138,18 @@ data: "tagsQuery": null, "type": "query", "useTags": false - }, - { - "allValue": null, - "current": { - "selected": true, - "text": [ - "All" - ], - "value": [ - "$__all" - ] }, + { + "allValue": null, + "current": { + "selected": false, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, "datasource": "$datasource", "definition": "", "hide": 0, @@ -10848,18 +11168,18 @@ data: "tagsQuery": null, "type": "query", "useTags": false - }, - { - "allValue": null, - "current": { - "selected": true, - "text": [ - "All" - ], - "value": [ - "$__all" - ] }, + { + "allValue": null, + "current": { + "selected": false, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, "datasource": "$datasource", "definition": "", "hide": 0, @@ -10878,13 +11198,13 @@ data: "tagsQuery": null, "type": "query", "useTags": false - } - ] - }, + } + ] + }, "time": { "from": "now-30m", "to": "now" - }, + }, "timepicker": { "refresh_intervals": [ "5s", @@ -10897,7 +11217,7 @@ data: "1h", "2h", "1d" - ], + ], "time_options": [ "5m", "15m", @@ -10908,14 +11228,49 @@ data: "2d", "7d", "30d" - ] - }, + ] + }, "timezone": "browser", "title": "Raspberry Pi Monitoring", "uid": "sF7d-FHZz", - "version": 1 + "version": 2 } --- +apiVersion: policy/v1beta1 +kind: PodDisruptionBudget +metadata: + name: telegraf-pdb + namespace: monitoring +spec: + minAvailable: 2 + selector: + matchLabels: + app: telegraf + +--- +apiVersion: policy/v1beta1 +kind: PodDisruptionBudget +metadata: + name: telegraf-pdb + namespace: monitoring +spec: + minAvailable: 1 + selector: + matchLabels: + app: grafana + +--- +apiVersion: policy/v1beta1 +kind: PodDisruptionBudget +metadata: + name: influxdb + namespace: monitoring +spec: + minAvailable: 1 + selector: + matchLabels: + app: grafana +--- apiVersion: apps/v1 kind: DaemonSet metadata: @@ -10939,12 +11294,12 @@ spec: spec: securityContext: runAsNonRoot: true - runAsUser: 472 - fsGroup: 472 + runAsUser: 65534 + fsGroup: 65534 containers: - name: telegraf image: tty0/isp_telegraf:1.15.3 - imagePullPolicy: IfNotPresent + imagePullPolicy: Always envFrom: - secretRef: name: isp-checker-secrets-rw @@ -10985,6 +11340,10 @@ spec: - name: wait-for-influxdb image: curlimages/curl:7.72.0 command: ['sh', '-c', "until curl -XGET http://influxdb-svc.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local:8086/; do echo Waiting\ for\ InfluxDB; sleep 2; done"] + resources: + limits: + memory: "30Mi" + cpu: "0.01" terminationGracePeriodSeconds: 30 volumes: - name: telegraf-config-volume @@ -11053,24 +11412,24 @@ spec: containers: - name: influxdb image: influxdb:1.8.3 - imagePullPolicy: IfNotPresent + imagePullPolicy: Always + lifecycle: + preStop: + exec: + # Introduce a delay to the shutdown sequence to wait for the + # pod eviction event to propagate. + command: ["sh", "-c", "sleep 5"] envFrom: - secretRef: name: isp-checker-secrets-rw ports: - containerPort: 8086 readinessProbe: - httpGet: - path: /ping - port: 8086 initialDelaySeconds: 30 periodSeconds: 30 - livenessProbe: httpGet: path: /ping port: 8086 - initialDelaySeconds: 30 - periodSeconds: 30 volumeMounts: - mountPath: /var/lib/influxdb name: var-lib-influxdb @@ -11124,7 +11483,13 @@ spec: containers: - name: grafana image: grafana/grafana:7.2.1 - imagePullPolicy: IfNotPresent + imagePullPolicy: Always + lifecycle: + preStop: + exec: + # Introduce a delay to the shutdown sequence to wait for the + # pod eviction event to propagate. + command: ["sh", "-c", "sleep 5"] envFrom: - secretRef: name: isp-checker-secrets-ro @@ -11154,17 +11519,15 @@ spec: - name: GF_INSTALL_PLUGINS value: https://grafana.com/api/plugins/gowee-traceroutemap-panel/versions/0.2.3/download;gowee-traceroutemap-panel readinessProbe: + initialDelaySeconds: 5 + periodSeconds: 30 httpGet: path: /api/health port: 3000 - initialDelaySeconds: 5 - periodSeconds: 30 livenessProbe: httpGet: path: / port: 3000 - initialDelaySeconds: 5 - periodSeconds: 30 resources: requests: memory: "200Mi" @@ -11216,12 +11579,11 @@ spec: spec: securityContext: runAsNonRoot: true - runAsUser: 472 - fsGroup: 472 + runAsUser: 65534 containers: - name: telegraf-mtr image: tty0/isp_telegraf:1.15.3 - imagePullPolicy: IfNotPresent + imagePullPolicy: Always command: ['sh', '-c', "/usr/bin/telegraf --config /etc/telegraf/telegraf-mtr.conf --once"] envFrom: - secretRef: @@ -11274,12 +11636,11 @@ spec: spec: securityContext: runAsNonRoot: true - runAsUser: 10000 - fsGroup: 10000 + runAsUser: 65534 containers: - name: telegraf-speedtest image: tty0/isp_telegraf:1.15.3 - imagePullPolicy: IfNotPresent + imagePullPolicy: Always command: ['sh', '-c', "/usr/bin/telegraf --config /etc/telegraf/telegraf-speedtest.conf --once"] envFrom: - secretRef: diff --git a/kubernetes/yaml/create-manifest.sh b/kubernetes/yaml/create-manifest.sh index 6b72b37..a560b12 100755 --- a/kubernetes/yaml/create-manifest.sh +++ b/kubernetes/yaml/create-manifest.sh @@ -8,6 +8,7 @@ cat namespace.yaml \ secrets.yaml \ networkDashboard.yaml \ raspberryDashboard.yaml \ + pdb.yaml \ daemonSet.yaml \ services.yaml \ deployment.yaml \ diff --git a/kubernetes/yaml/cronJob.yaml b/kubernetes/yaml/cronJob.yaml index 08bb576..5700104 100644 --- a/kubernetes/yaml/cronJob.yaml +++ b/kubernetes/yaml/cronJob.yaml @@ -21,12 +21,11 @@ spec: spec: securityContext: runAsNonRoot: true - runAsUser: 472 - fsGroup: 472 + runAsUser: 65534 containers: - name: telegraf-mtr image: tty0/isp_telegraf:1.15.3 - imagePullPolicy: IfNotPresent + imagePullPolicy: Always command: ['sh', '-c', "/usr/bin/telegraf --config /etc/telegraf/telegraf-mtr.conf --once"] envFrom: - secretRef: @@ -79,12 +78,11 @@ spec: spec: securityContext: runAsNonRoot: true - runAsUser: 10000 - fsGroup: 10000 + runAsUser: 65534 containers: - name: telegraf-speedtest image: tty0/isp_telegraf:1.15.3 - imagePullPolicy: IfNotPresent + imagePullPolicy: Always command: ['sh', '-c', "/usr/bin/telegraf --config /etc/telegraf/telegraf-speedtest.conf --once"] envFrom: - secretRef: diff --git a/kubernetes/yaml/daemonSet.yaml b/kubernetes/yaml/daemonSet.yaml index 01470ed..e30056a 100644 --- a/kubernetes/yaml/daemonSet.yaml +++ b/kubernetes/yaml/daemonSet.yaml @@ -22,12 +22,12 @@ spec: spec: securityContext: runAsNonRoot: true - runAsUser: 472 - fsGroup: 472 + runAsUser: 65534 + fsGroup: 65534 containers: - name: telegraf image: tty0/isp_telegraf:1.15.3 - imagePullPolicy: IfNotPresent + imagePullPolicy: Always envFrom: - secretRef: name: isp-checker-secrets-rw @@ -68,6 +68,10 @@ spec: - name: wait-for-influxdb image: curlimages/curl:7.72.0 command: ['sh', '-c', "until curl -XGET http://influxdb-svc.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local:8086/; do echo Waiting\ for\ InfluxDB; sleep 2; done"] + resources: + limits: + memory: "30Mi" + cpu: "0.01" terminationGracePeriodSeconds: 30 volumes: - name: telegraf-config-volume diff --git a/kubernetes/yaml/deployment.yaml b/kubernetes/yaml/deployment.yaml index a57a336..ec64468 100644 --- a/kubernetes/yaml/deployment.yaml +++ b/kubernetes/yaml/deployment.yaml @@ -26,24 +26,24 @@ spec: containers: - name: influxdb image: influxdb:1.8.3 - imagePullPolicy: IfNotPresent + imagePullPolicy: Always + lifecycle: + preStop: + exec: + # Introduce a delay to the shutdown sequence to wait for the + # pod eviction event to propagate. + command: ["sh", "-c", "sleep 5"] envFrom: - secretRef: name: isp-checker-secrets-rw ports: - containerPort: 8086 readinessProbe: - httpGet: - path: /ping - port: 8086 initialDelaySeconds: 30 periodSeconds: 30 - livenessProbe: httpGet: path: /ping port: 8086 - initialDelaySeconds: 30 - periodSeconds: 30 volumeMounts: - mountPath: /var/lib/influxdb name: var-lib-influxdb @@ -97,7 +97,13 @@ spec: containers: - name: grafana image: grafana/grafana:7.2.1 - imagePullPolicy: IfNotPresent + imagePullPolicy: Always + lifecycle: + preStop: + exec: + # Introduce a delay to the shutdown sequence to wait for the + # pod eviction event to propagate. + command: ["sh", "-c", "sleep 5"] envFrom: - secretRef: name: isp-checker-secrets-ro @@ -127,17 +133,15 @@ spec: - name: GF_INSTALL_PLUGINS value: https://grafana.com/api/plugins/gowee-traceroutemap-panel/versions/0.2.3/download;gowee-traceroutemap-panel readinessProbe: + initialDelaySeconds: 5 + periodSeconds: 30 httpGet: path: /api/health port: 3000 - initialDelaySeconds: 5 - periodSeconds: 30 livenessProbe: httpGet: path: / port: 3000 - initialDelaySeconds: 5 - periodSeconds: 30 resources: requests: memory: "200Mi" diff --git a/kubernetes/yaml/pdb.yaml b/kubernetes/yaml/pdb.yaml new file mode 100644 index 0000000..858cd5e --- /dev/null +++ b/kubernetes/yaml/pdb.yaml @@ -0,0 +1,35 @@ +--- +apiVersion: policy/v1beta1 +kind: PodDisruptionBudget +metadata: + name: telegraf-pdb + namespace: monitoring +spec: + minAvailable: 2 + selector: + matchLabels: + app: telegraf + +--- +apiVersion: policy/v1beta1 +kind: PodDisruptionBudget +metadata: + name: telegraf-pdb + namespace: monitoring +spec: + minAvailable: 1 + selector: + matchLabels: + app: grafana + +--- +apiVersion: policy/v1beta1 +kind: PodDisruptionBudget +metadata: + name: influxdb + namespace: monitoring +spec: + minAvailable: 1 + selector: + matchLabels: + app: grafana diff --git a/kubernetes/yaml/podSecurityPolicy.yaml b/kubernetes/yaml/podSecurityPolicy.yaml new file mode 100644 index 0000000..18d0875 --- /dev/null +++ b/kubernetes/yaml/podSecurityPolicy.yaml @@ -0,0 +1,39 @@ +apiVersion: policy/v1beta1 +kind: PodSecurityPolicy +metadata: + name: restricted + annotations: + seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'docker/default,runtime/default' + apparmor.security.beta.kubernetes.io/allowedProfileNames: 'runtime/default' + seccomp.security.alpha.kubernetes.io/defaultProfileName: 'runtime/default' + apparmor.security.beta.kubernetes.io/defaultProfileName: 'runtime/default' +spec: + privileged: false + allowPrivilegeEscalation: false + requiredDropCapabilities: + - ALL + volumes: + - 'configMap' + - 'emptyDir' + - 'projected' + - 'secret' + - 'downwardAPI' + - 'persistentVolumeClaim' + hostNetwork: false + hostIPC: false + hostPID: false + runAsUser: + rule: 'MustRunAsNonRoot' + seLinux: + rule: 'RunAsAny' + supplementalGroups: + rule: 'MustRunAs' + ranges: + - min: 1 + max: 65535 + fsGroup: + rule: 'MustRunAs' + ranges: + - min: 1 + max: 65535 + readOnlyRootFilesystem: true diff --git a/kubernetes/yaml/raspberryDashboard.yaml b/kubernetes/yaml/raspberryDashboard.yaml index e4c7488..0010962 100644 --- a/kubernetes/yaml/raspberryDashboard.yaml +++ b/kubernetes/yaml/raspberryDashboard.yaml @@ -13,20 +13,21 @@ data: "annotations": { "list": [ { - "builtIn": 1, - "datasource": "-- Grafana --", + "builtIn": 1, + "datasource": "-- Grafana --", "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", "name": "Annotations & Alerts", "type": "dashboard" - }] - }, + } + ] + }, "description": "Raspberry Pi Monitoring", "editable": true, "gnetId": 10578, "graphTooltip": 1, - "iteration": 1603435375490, + "iteration": 1603949953221, "links": [], "panels": [ { @@ -37,22 +38,22 @@ data: "w": 24, "x": 0, "y": 0 + }, + "id": 61987, + "panels": [], + "repeat": null, + "title": "Quick overview", + "type": "row" }, - "id": 61987, - "panels": [], - "repeat": null, - "title": "Quick overview", - "type": "row" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], "datasource": "InfluxDB", "decimals": 1, "editable": true, @@ -60,9 +61,9 @@ data: "fieldConfig": { "defaults": { "custom": {} - }, + }, "overrides": [] - }, + }, "format": "s", "gauge": { "maxValue": 100, @@ -70,13 +71,13 @@ data: "show": false, "thresholdLabels": false, "thresholdMarkers": true - }, + }, "gridPos": { "h": 4, "w": 2, "x": 0, "y": 1 - }, + }, "height": "150", "id": 61858, "interval": null, @@ -86,12 +87,12 @@ data: { "name": "value to text", "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], + }, + { + "name": "range to text", + "value": 2 + } + ], "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, @@ -104,14 +105,14 @@ data: "from": "null", "text": "N/A", "to": "null" - } - ], + } + ], "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", "full": false, "lineColor": "rgb(31, 120, 193)", "show": false - }, + }, "tableColumn": "", "targets": [ { @@ -120,16 +121,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "system", "policy": "default", "refId": "A", @@ -139,24 +140,24 @@ data: { "params": [ "uptime" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - } - ] - } - ], + } + ] + } + ], "thresholds": "", "title": "Uptime", "type": "singlestat", @@ -166,66 +167,66 @@ data: "op": "=", "text": "N/A", "value": "null" - } - ], + } + ], "valueName": "current" - }, - { - "cacheTimeout": null, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": { - "custom": {}, - "mappings": [ - { - "id": 0, - "op": "=", - "text": "N/A", - "type": 1, - "value": "null" - } - ], - "noValue": "N/A", - "nullValueMode": "connected", - "thresholds": { - "mode": "percentage", - "steps": [ - { - "color": "super-light-green", - "value": null - }, - { - "color": "light-green", - "value": 20 - }, - { - "color": "semi-dark-green", - "value": 40 - }, - { - "color": "#EAB839", - "value": 60 - }, - { - "color": "light-orange", - "value": 80 - }, + }, + { + "cacheTimeout": null, + "datasource": "InfluxDB", + "fieldConfig": { + "defaults": { + "custom": {}, + "mappings": [ { - "color": "dark-red", - "value": 90 + "id": 0, + "op": "=", + "text": "N/A", + "type": 1, + "value": "null" } - ] + ], + "noValue": "N/A", + "nullValueMode": "connected", + "thresholds": { + "mode": "percentage", + "steps": [ + { + "color": "super-light-green", + "value": null + }, + { + "color": "light-green", + "value": 20 + }, + { + "color": "semi-dark-green", + "value": 40 + }, + { + "color": "#EAB839", + "value": 60 + }, + { + "color": "light-orange", + "value": 80 + }, + { + "color": "dark-red", + "value": 90 + } + ] + }, + "unit": "rothz" }, - "unit": "rothz" + "overrides": [] }, - "overrides": [] - }, "gridPos": { "h": 4, "w": 2, "x": 2, "y": 1 - }, + }, "id": 61998, "interval": null, "links": [], @@ -235,13 +236,13 @@ data: "reduceOptions": { "calcs": [ "last" - ], - "fields": "/^last$/", - "values": false - }, + ], + "fields": "/^last$/", + "values": false + }, "showThresholdLabels": false, "showThresholdMarkers": true - }, + }, "pluginVersion": "7.2.1", "targets": [ { @@ -250,16 +251,16 @@ data: { "params": [ "1m" - ], - "type": "time" - }, - { - "params": [ - "previous" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "previous" + ], + "type": "fill" + } + ], "measurement": "cpu_frequency", "orderByTime": "ASC", "policy": "default", @@ -272,44 +273,44 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [ - " /1000" - ], + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [ + " /1000" + ], "type": "math" - } - ] - ], + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - } - ] - } - ], + } + ] + } + ], "title": "CPU Frequency", "type": "gauge" - }, - { - "cacheTimeout": null, - "colorBackground": true, - "colorPostfix": false, - "colorPrefix": false, - "colorValue": false, - "colors": [ - "#37872D", - "#FA6400", - "#C4162A" - ], + }, + { + "cacheTimeout": null, + "colorBackground": true, + "colorPostfix": false, + "colorPrefix": false, + "colorValue": false, + "colors": [ + "#37872D", + "#FA6400", + "#C4162A" + ], "datasource": "InfluxDB", "decimals": 1, "editable": true, @@ -317,9 +318,9 @@ data: "fieldConfig": { "defaults": { "custom": {} - }, + }, "overrides": [] - }, + }, "format": "celsius", "gauge": { "maxValue": 100, @@ -327,13 +328,13 @@ data: "show": false, "thresholdLabels": false, "thresholdMarkers": true - }, + }, "gridPos": { "h": 4, "w": 2, "x": 4, "y": 1 - }, + }, "height": "150", "id": 61997, "interval": null, @@ -343,12 +344,12 @@ data: { "name": "value to text", "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], + }, + { + "name": "range to text", + "value": 2 + } + ], "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, @@ -361,14 +362,14 @@ data: "from": "null", "text": "N/A", "to": "null" - } - ], + } + ], "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", "full": false, "lineColor": "rgb(31, 120, 193)", "show": false - }, + }, "tableColumn": "", "targets": [ { @@ -377,16 +378,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "cpu_temperature", "orderByTime": "ASC", "policy": "default", @@ -397,30 +398,30 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [ - " / 1000" - ], + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [ + " / 1000" + ], "type": "math" - } - ] - ], + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - } - ] - } - ], + } + ] + } + ], "thresholds": "75,85", "title": "CPU Temperature", "type": "singlestat", @@ -430,19 +431,19 @@ data: "op": "=", "text": "N/A", "value": "null" - } - ], + } + ], "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "rgba(50, 172, 45, 0.97)", + "rgba(237, 129, 40, 0.89)", + "rgba(245, 54, 54, 0.9)" + ], "datasource": "InfluxDB", "decimals": 1, "editable": true, @@ -450,9 +451,9 @@ data: "fieldConfig": { "defaults": { "custom": {} - }, + }, "overrides": [] - }, + }, "format": "none", "gauge": { "maxValue": 100, @@ -460,13 +461,13 @@ data: "show": false, "thresholdLabels": false, "thresholdMarkers": true - }, + }, "gridPos": { "h": 4, "w": 2, "x": 6, "y": 1 - }, + }, "height": "150", "id": 61859, "interval": null, @@ -476,12 +477,12 @@ data: { "name": "value to text", "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], + }, + { + "name": "range to text", + "value": 2 + } + ], "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, @@ -494,14 +495,14 @@ data: "from": "null", "text": "N/A", "to": "null" - } - ], + } + ], "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", "full": false, "lineColor": "rgb(31, 120, 193)", "show": true - }, + }, "tableColumn": "", "targets": [ { @@ -510,16 +511,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "system", "orderByTime": "ASC", "policy": "default", @@ -530,24 +531,24 @@ data: { "params": [ "load5" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - } - ] - } - ], + } + ] + } + ], "thresholds": "4,8,12", "title": "LA medium", "type": "singlestat", @@ -557,29 +558,29 @@ data: "op": "=", "text": "N/A", "value": "null" - } - ], + } + ], "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], - "datasource": "InfluxDB", - "decimals": 0, + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "rgba(50, 172, 45, 0.97)", + "rgba(237, 129, 40, 0.89)", + "rgba(245, 54, 54, 0.9)" + ], + "datasource": "InfluxDB", + "decimals": 0, "editable": true, "error": false, "fieldConfig": { "defaults": { "custom": {} - }, + }, "overrides": [] - }, + }, "format": "none", "gauge": { "maxValue": 100, @@ -587,13 +588,13 @@ data: "show": false, "thresholdLabels": false, "thresholdMarkers": true - }, + }, "gridPos": { "h": 4, "w": 2, "x": 8, "y": 1 - }, + }, "height": "150", "id": 61862, "interval": null, @@ -603,12 +604,12 @@ data: { "name": "value to text", "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], + }, + { + "name": "range to text", + "value": 2 + } + ], "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, @@ -621,14 +622,14 @@ data: "from": "null", "text": "N/A", "to": "null" - } - ], + } + ], "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", "full": false, "lineColor": "rgb(31, 120, 193)", "show": false - }, + }, "tableColumn": "", "targets": [ { @@ -637,16 +638,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "processes", "orderByTime": "ASC", "policy": "default", @@ -657,24 +658,24 @@ data: { "params": [ "zombies" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - } - ] - } - ], + } + ] + } + ], "thresholds": "1,5,10", "title": "Zombies", "type": "singlestat", @@ -684,19 +685,19 @@ data: "op": "=", "text": "N/A", "value": "null" - } - ], + } + ], "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "rgba(50, 172, 45, 0.97)", + "rgba(237, 129, 40, 0.89)", + "rgba(245, 54, 54, 0.9)" + ], "datasource": "InfluxDB", "decimals": 0, "editable": true, @@ -704,9 +705,9 @@ data: "fieldConfig": { "defaults": { "custom": {} - }, + }, "overrides": [] - }, + }, "format": "none", "gauge": { "maxValue": 100, @@ -714,13 +715,13 @@ data: "show": false, "thresholdLabels": false, "thresholdMarkers": true - }, + }, "gridPos": { "h": 4, "w": 2, "x": 10, "y": 1 - }, + }, "height": "150", "id": 61864, "interval": null, @@ -730,12 +731,12 @@ data: { "name": "value to text", "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], + }, + { + "name": "range to text", + "value": 2 + } + ], "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, @@ -748,14 +749,14 @@ data: "from": "null", "text": "N/A", "to": "null" - } - ], + } + ], "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", "full": false, "lineColor": "rgb(31, 120, 193)", "show": true - }, + }, "tableColumn": "", "targets": [ { @@ -764,16 +765,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "processes", "policy": "default", "refId": "A", @@ -783,24 +784,24 @@ data: { "params": [ "total" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - } - ] - } - ], + } + ] + } + ], "thresholds": "1,5,10", "title": "Processes", "type": "singlestat", @@ -810,19 +811,19 @@ data: "op": "=", "text": "N/A", "value": "null" - } - ], + } + ], "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "rgba(50, 172, 45, 0.97)", + "rgba(237, 129, 40, 0.89)", + "rgba(245, 54, 54, 0.9)" + ], "datasource": "InfluxDB", "decimals": 0, "editable": true, @@ -830,9 +831,9 @@ data: "fieldConfig": { "defaults": { "custom": {} - }, + }, "overrides": [] - }, + }, "format": "none", "gauge": { "maxValue": 100, @@ -840,13 +841,13 @@ data: "show": false, "thresholdLabels": false, "thresholdMarkers": true - }, + }, "gridPos": { "h": 4, "w": 2, "x": 12, "y": 1 - }, + }, "height": "150", "id": 61865, "interval": null, @@ -856,12 +857,12 @@ data: { "name": "value to text", "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], + }, + { + "name": "range to text", + "value": 2 + } + ], "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, @@ -874,14 +875,14 @@ data: "from": "null", "text": "N/A", "to": "null" - } - ], + } + ], "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", "full": false, "lineColor": "rgb(31, 120, 193)", "show": true - }, + }, "tableColumn": "", "targets": [ { @@ -890,16 +891,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "processes", "policy": "default", "refId": "A", @@ -909,24 +910,24 @@ data: { "params": [ "total_threads" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - } - ] - } - ], + } + ] + } + ], "thresholds": "1,5,10", "title": "Threads", "type": "singlestat", @@ -936,28 +937,28 @@ data: "op": "=", "text": "N/A", "value": "null" - } - ], + } + ], "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "rgba(50, 172, 45, 0.97)", + "rgba(237, 129, 40, 0.89)", + "rgba(245, 54, 54, 0.9)" + ], "datasource": "InfluxDB", "editable": true, "error": false, "fieldConfig": { "defaults": { "custom": {} - }, + }, "overrides": [] - }, + }, "format": "percent", "gauge": { "maxValue": 100, @@ -965,13 +966,13 @@ data: "show": true, "thresholdLabels": false, "thresholdMarkers": true - }, + }, "gridPos": { "h": 4, "w": 2, "x": 14, "y": 1 - }, + }, "height": "150", "id": 61861, "interval": null, @@ -981,12 +982,12 @@ data: { "name": "value to text", "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], + }, + { + "name": "range to text", + "value": 2 + } + ], "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, @@ -1000,14 +1001,14 @@ data: "from": "null", "text": "N/A", "to": "null" - } - ], + } + ], "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", "full": false, "lineColor": "rgb(31, 120, 193)", "show": false - }, + }, "tableColumn": "", "targets": [ { @@ -1016,16 +1017,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "cpu", "orderByTime": "ASC", "policy": "default", @@ -1036,36 +1037,36 @@ data: { "params": [ "usage_idle" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [ - "* -1 + 100" - ], + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [ + "* -1 + 100" + ], "type": "math" - } - ] - ], + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - }, - { - "condition": "AND", - "key": "cpu", - "operator": "=", - "value": "cpu-total" - } - ] - } - ], + }, + { + "condition": "AND", + "key": "cpu", + "operator": "=", + "value": "cpu-total" + } + ] + } + ], "thresholds": "70,80,90", "title": "CPU usage", "type": "singlestat", @@ -1075,28 +1076,28 @@ data: "op": "=", "text": "N/A", "value": "null" - } - ], + } + ], "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "rgba(50, 172, 45, 0.97)", + "rgba(237, 129, 40, 0.89)", + "rgba(245, 54, 54, 0.9)" + ], "datasource": "InfluxDB", "editable": true, "error": false, "fieldConfig": { "defaults": { "custom": {} - }, + }, "overrides": [] - }, + }, "format": "percent", "gauge": { "maxValue": 100, @@ -1104,13 +1105,13 @@ data: "show": true, "thresholdLabels": false, "thresholdMarkers": true - }, + }, "gridPos": { "h": 4, "w": 2, "x": 16, "y": 1 - }, + }, "height": "150", "id": 61860, "interval": null, @@ -1120,13 +1121,13 @@ data: { "name": "value to text", "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, "postfix": "", @@ -1138,14 +1139,14 @@ data: "from": "null", "text": "N/A", "to": "null" - } - ], + } + ], "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", "full": false, "lineColor": "rgb(31, 120, 193)", "show": false - }, + }, "tableColumn": "", "targets": [ { @@ -1154,16 +1155,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "mem", "policy": "default", "refId": "A", @@ -1173,24 +1174,24 @@ data: { "params": [ "used_percent" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - } - ] - } - ], + } + ] + } + ], "thresholds": "70,80,90", "title": "RAM usage", "type": "singlestat", @@ -1200,19 +1201,19 @@ data: "op": "=", "text": "N/A", "value": "null" - } - ], + } + ], "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "rgba(50, 172, 45, 0.97)", + "rgba(237, 129, 40, 0.89)", + "rgba(245, 54, 54, 0.9)" + ], "datasource": "InfluxDB", "decimals": 0, "editable": true, @@ -1220,9 +1221,9 @@ data: "fieldConfig": { "defaults": { "custom": {} - }, + }, "overrides": [] - }, + }, "format": "percent", "gauge": { "maxValue": 100, @@ -1230,13 +1231,13 @@ data: "show": true, "thresholdLabels": false, "thresholdMarkers": true - }, + }, "gridPos": { "h": 4, "w": 2, "x": 18, "y": 1 - }, + }, "height": "150", "id": 61863, "interval": null, @@ -1246,12 +1247,12 @@ data: { "name": "value to text", "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], + }, + { + "name": "range to text", + "value": 2 + } + ], "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, @@ -1264,14 +1265,14 @@ data: "from": "null", "text": "N/A", "to": "null" - } - ], + } + ], "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", "full": false, "lineColor": "rgb(31, 120, 193)", "show": false - }, + }, "tableColumn": "", "targets": [ { @@ -1280,16 +1281,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "swap", "policy": "default", "refId": "A", @@ -1299,24 +1300,24 @@ data: { "params": [ "used_percent" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - } - ] - } - ], + } + ] + } + ], "thresholds": "50,70,90", "title": "Swap usage", "type": "singlestat", @@ -1326,19 +1327,19 @@ data: "op": "=", "text": "N/A", "value": "null" - } - ], + } + ], "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "rgba(50, 172, 45, 0.97)", + "rgba(237, 129, 40, 0.89)", + "rgba(245, 54, 54, 0.9)" + ], "datasource": "InfluxDB", "decimals": 0, "editable": true, @@ -1346,9 +1347,9 @@ data: "fieldConfig": { "defaults": { "custom": {} - }, + }, "overrides": [] - }, + }, "format": "percent", "gauge": { "maxValue": 100, @@ -1356,13 +1357,13 @@ data: "show": true, "thresholdLabels": false, "thresholdMarkers": true - }, + }, "gridPos": { "h": 4, "w": 2, "x": 20, "y": 1 - }, + }, "height": "150", "id": 61866, "interval": null, @@ -1372,12 +1373,12 @@ data: { "name": "value to text", "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], + }, + { + "name": "range to text", + "value": 2 + } + ], "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, @@ -1390,14 +1391,14 @@ data: "from": "null", "text": "N/A", "to": "null" - } - ], + } + ], "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", "full": false, "lineColor": "rgb(31, 120, 193)", "show": false - }, + }, "tableColumn": "", "targets": [ { @@ -1406,16 +1407,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "disk", "policy": "default", "refId": "A", @@ -1425,30 +1426,30 @@ data: { "params": [ "used_percent" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - }, - { - "condition": "AND", - "key": "path", - "operator": "=", - "value": "/" - } - ] - } - ], + }, + { + "condition": "AND", + "key": "path", + "operator": "=", + "value": "/" + } + ] + } + ], "thresholds": "70,80,90", "title": "RootFS used", "type": "singlestat", @@ -1458,19 +1459,19 @@ data: "op": "=", "text": "N/A", "value": "null" - } - ], + } + ], "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], "datasource": "InfluxDB", "decimals": 2, "editable": true, @@ -1478,9 +1479,9 @@ data: "fieldConfig": { "defaults": { "custom": {} - }, + }, "overrides": [] - }, + }, "format": "percent", "gauge": { "maxValue": 100, @@ -1488,13 +1489,13 @@ data: "show": false, "thresholdLabels": false, "thresholdMarkers": true - }, + }, "gridPos": { "h": 4, "w": 2, "x": 22, "y": 1 - }, + }, "height": "150", "id": 61867, "interval": null, @@ -1504,12 +1505,12 @@ data: { "name": "value to text", "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], + }, + { + "name": "range to text", + "value": 2 + } + ], "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, @@ -1522,14 +1523,14 @@ data: "from": "null", "text": "N/A", "to": "null" - } - ], + } + ], "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", "full": false, "lineColor": "rgb(31, 120, 193)", "show": true - }, + }, "tableColumn": "", "targets": [ { @@ -1538,16 +1539,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "cpu", "policy": "default", "query": "SELECT non_negative_derivative(mean(\"usage_iowait\"), 1s) FROM \"cpu\" WHERE \"host\" =~ /^$server$/ AND \"cpu\" = 'cpu-total' AND $timeFilter GROUP BY time($interval) fill(null)", @@ -1559,30 +1560,30 @@ data: { "params": [ "usage_iowait" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - }, - { - "condition": "AND", - "key": "cpu", - "operator": "=", - "value": "cpu-total" - } - ] - } - ], + }, + { + "condition": "AND", + "key": "cpu", + "operator": "=", + "value": "cpu-total" + } + ] + } + ], "thresholds": "30,40,50", "title": "IOWait", "type": "singlestat", @@ -1592,74 +1593,393 @@ data: "op": "=", "text": "N/A", "value": "null" - } - ], + } + ], "valueName": "current" - }, - { - "collapsed": false, - "datasource": null, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 5 }, + { + "collapsed": false, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 5 + }, "id": 61989, "panels": [], "repeat": null, "title": "CPU", "type": "row" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] }, - "fill": 1, - "fillGradient": 0, - "grid": {}, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 4, + "fillGradient": 1, "gridPos": { "h": 8, "w": 12, "x": 0, "y": 6 - }, - "height": "300", + }, "hiddenSeries": false, - "id": 28239, - "interval": "$inter", + "id": 62012, "legend": { "alignAsTable": true, "avg": true, - "current": true, - "hideEmpty": true, - "hideZero": true, + "current": false, "max": true, "min": true, - "rightSide": false, "show": true, - "sort": "current", - "sortDesc": true, "total": false, "values": true - }, + }, "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", + "linewidth": 1, + "nullPointMode": "null", "options": { "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.2.1", + "pointradius": 2, + "points": false, + "renderer": "flot", + "repeat": "server", + "scopedVars": { + "server": { + "selected": true, + "text": "node1", + "value": "node1" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "alias": "$server", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "linear" + ], + "type": "fill" + } + ], + "measurement": "cpu_temperature", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [ + " / 1000" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/^$server$/" + } + ] + } + ], + "thresholds": [ + { + "$$hashKey": "object:401", + "colorMode": "critical", + "fill": true, + "line": true, + "op": "gt", + "value": 70, + "yaxis": "left" + }, + { + "$$hashKey": "object:407", + "colorMode": "warning", + "fill": true, + "line": true, + "op": "gt", + "value": 60, + "yaxis": "left" + }, + { + "$$hashKey": "object:413", + "colorMode": "ok", + "fill": false, + "line": false, + "op": "lt", + "value": 60, + "yaxis": "left" + } + ], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "CPU Temperature", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:357", + "format": "celsius", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "$$hashKey": "object:358", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": true, + "alignLevel": null + } }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "fieldConfig": { + "defaults": { + "custom": {}, + "unit": "rothz" + }, + "overrides": [] + }, + "fill": 4, + "fillGradient": 1, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 6 + }, + "hiddenSeries": false, + "id": 62025, + "legend": { + "alignAsTable": true, + "avg": true, + "current": false, + "max": false, + "min": true, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.2.1", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "alias": "$server", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "linear" + ], + "type": "fill" + } + ], + "measurement": "cpu_frequency", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [ + " * 1000" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/^$server$/" + } + ] + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "CPU Frequency", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:357", + "format": "rothz", + "label": null, + "logBase": 1, + "max": null, + "min": "0", + "show": true + }, + { + "$$hashKey": "object:358", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": true, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "grid": {}, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 14 + }, + "height": "300", + "hiddenSeries": false, + "id": 28239, + "interval": "$inter", + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "hideEmpty": true, + "hideZero": true, + "max": true, + "min": true, + "rightSide": false, + "show": true, + "sort": "current", + "sortDesc": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "options": { + "alertThreshold": true + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -1679,17 +1999,17 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - } - ], + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + } + ], "hide": false, "measurement": "cpu_percentageBusy", "orderByTime": "ASC", @@ -1703,18 +2023,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -1725,7 +2045,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -1733,7 +2053,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "percent", @@ -1742,34 +2062,34 @@ data: "max": 100, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -1777,8 +2097,8 @@ data: "h": 8, "w": 12, "x": 12, - "y": 6 - }, + "y": 14 + }, "height": "400", "hiddenSeries": false, "id": 12054, @@ -1794,14 +2114,14 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -1813,8 +2133,8 @@ data: "color": "#BF1B00", "fill": 0, "linewidth": 2 - } - ], + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, @@ -1828,17 +2148,17 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - } - ], + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "mem_inactive", "orderByTime": "ASC", "policy": "default", @@ -1851,18 +2171,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -1873,7 +2193,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -1881,7 +2201,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "bytes", @@ -1889,42 +2209,42 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { "h": 9, "w": 12, "x": 0, - "y": 14 - }, + "y": 22 + }, "height": "350", "hiddenSeries": false, "id": 61852, @@ -1940,14 +2260,14 @@ data: "show": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -1965,16 +2285,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "processes", "policy": "default", "query": "SELECT mean(running) as running, mean(blocked) as blocked, mean(sleeping) as sleeping, mean(stopped) as stopped, mean(zombies) as zombies, mean(paging) as paging, mean(unknown) as unknown FROM \"processes\" WHERE host =~ /$server$/ AND $timeFilter GROUP BY time($interval), host ORDER BY asc", @@ -1986,24 +2306,24 @@ data: { "params": [ "blocked" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - } - ] - } - ], + } + ] + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -2014,7 +2334,7 @@ data: "shared": true, "sort": 0, "value_type": "individual" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -2022,7 +2342,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "short", @@ -2031,35 +2351,35 @@ data: "max": null, "min": null, "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 0, "fillGradient": 0, "grid": {}, @@ -2067,8 +2387,8 @@ data: "h": 9, "w": 12, "x": 12, - "y": 14 - }, + "y": 22 + }, "height": "350", "hiddenSeries": false, "id": 54694, @@ -2082,14 +2402,14 @@ data: "show": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -2108,18 +2428,18 @@ data: { "interval": "auto", "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - } - ], + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "system_load1", "policy": "default", "query": "SELECT mean(load1) as short,mean(load5) as medium,mean(load15) as long FROM \"system\" WHERE host =~ /$server$/ AND $timeFilter GROUP BY time($interval), * ORDER BY asc", @@ -2131,18 +2451,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -2153,7 +2473,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -2161,7 +2481,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "short", @@ -2169,42 +2489,42 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { "h": 10, "w": 12, "x": 0, - "y": 23 - }, + "y": 31 + }, "height": "", "hiddenSeries": false, "id": 61855, @@ -2218,14 +2538,14 @@ data: "show": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -2243,16 +2563,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "processes", "policy": "default", "query": "SELECT non_negative_derivative(mean(context_switches),1s)as \"context switches\" FROM \"kernel\" WHERE host =~ /$server$/ AND $timeFilter GROUP BY time($interval), host ORDER BY asc", @@ -2264,24 +2584,24 @@ data: { "params": [ "blocked" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - } - ] - } - ], + } + ] + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -2292,7 +2612,7 @@ data: "shared": true, "sort": 0, "value_type": "individual" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -2300,7 +2620,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "ops", @@ -2309,43 +2629,43 @@ data: "max": null, "min": null, "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { "h": 10, "w": 12, "x": 12, - "y": 23 - }, + "y": 31 + }, "height": "", "hiddenSeries": false, "id": 61960, @@ -2359,14 +2679,14 @@ data: "show": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -2384,16 +2704,16 @@ data: { "params": [ "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], "measurement": "kernel", "orderByTime": "ASC", "policy": "default", @@ -2406,24 +2726,24 @@ data: { "params": [ "processes_forked" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$server$/" - } - ] - } - ], + } + ] + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -2434,7 +2754,7 @@ data: "shared": true, "sort": 0, "value_type": "individual" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -2442,7 +2762,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "ops", @@ -2451,30 +2771,30 @@ data: "max": null, "min": null, "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "collapsed": false, - "datasource": null, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 33 + } }, + { + "collapsed": false, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 41 + }, "id": 61990, "panels": [], "repeat": "netif", @@ -2483,25 +2803,25 @@ data: "selected": false, "text": "eth0", "value": "eth0" - } - }, + } + }, "title": "Network interface stats for $netif", "type": "row" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -2509,8 +2829,8 @@ data: "h": 7, "w": 12, "x": 0, - "y": 34 - }, + "y": 42 + }, "hiddenSeries": false, "id": 42026, "interval": "$inter", @@ -2524,14 +2844,14 @@ data: "show": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 2, "links": [], "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -2542,22 +2862,22 @@ data: "selected": false, "text": "eth0", "value": "eth0" - } - }, + } + }, "seriesOverrides": [ { "alias": "/ out$/", "transform": "negative-Y" - }, - { - "alias": "/ in$/", - "color": "#7EB26D" - }, - { - "alias": "/ out$/", - "color": "#BF1B00" - } - ], + }, + { + "alias": "/ in$/", + "color": "#7EB26D" + }, + { + "alias": "/ out$/", + "color": "#BF1B00" + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, @@ -2571,24 +2891,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "interface", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "interface", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "net_bytes_recv", "orderByTime": "ASC", "policy": "default", @@ -2601,44 +2921,44 @@ data: { "params": [ "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + }, + { + "alias": "$tag_host: $tag_interface: $col", + "dsType": "influxdb", + "function": "derivative", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - }, - { - "alias": "$tag_host: $tag_interface: $col", - "dsType": "influxdb", - "function": "derivative", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "interface", - "params": [ - "tag" - ], "type": "tag" - } - ], + }, + { + "key": "interface", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "net_bytes_recv", "orderByTime": "ASC", "policy": "default", @@ -2651,18 +2971,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -2673,7 +2993,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -2681,7 +3001,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "bps", @@ -2689,34 +3009,34 @@ data: "max": null, "min": null, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": true, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": true, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -2724,8 +3044,8 @@ data: "h": 7, "w": 12, "x": 12, - "y": 34 - }, + "y": 42 + }, "hiddenSeries": false, "id": 28572, "interval": "$inter", @@ -2739,14 +3059,14 @@ data: "show": true, "total": false, "values": true - }, + }, "lines": false, "linewidth": 1, "links": [], "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -2757,14 +3077,14 @@ data: "selected": false, "text": "eth0", "value": "eth0" - } - }, + } + }, "seriesOverrides": [ { "alias": "/ in$/", "transform": "negative-Y" - } - ], + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, @@ -2778,24 +3098,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "interface", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "interface", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "net_bytes_recv", "orderByTime": "ASC", "policy": "default", @@ -2808,44 +3128,44 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - }, - { - "alias": "$tag_host: $tag_interface: $col", - "dsType": "influxdb", - "function": "derivative", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" }, { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "interface", - "params": [ - "tag" - ], + "alias": "$tag_host: $tag_interface: $col", + "dsType": "influxdb", + "function": "derivative", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], "type": "tag" - } - ], + }, + { + "key": "interface", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "net_bytes_recv", "orderByTime": "ASC", "policy": "default", @@ -2858,18 +3178,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -2880,7 +3200,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -2888,7 +3208,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "pps", @@ -2897,35 +3217,35 @@ data: "max": null, "min": null, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": true, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "decimals": 1, - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": true, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "decimals": 1, + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -2933,8 +3253,8 @@ data: "h": 7, "w": 12, "x": 0, - "y": 41 - }, + "y": 49 + }, "hiddenSeries": false, "id": 58901, "interval": "$inter", @@ -2948,14 +3268,14 @@ data: "show": true, "total": false, "values": true - }, + }, "lines": false, "linewidth": 1, "links": [], "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -2966,8 +3286,8 @@ data: "selected": false, "text": "eth0", "value": "eth0" - } - }, + } + }, "seriesOverrides": [], "spaceLength": 10, "stack": false, @@ -2982,24 +3302,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "interface", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "interface", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "net_bytes_recv", "policy": "default", "query": "SELECT non_negative_derivative(mean(drop_in), 1s) as \"in\" FROM \"net\" WHERE host =~ /$server/ AND interface =~ /$netif/ AND $timeFilter GROUP BY time($interval), host,interface fill(none)", @@ -3011,44 +3331,44 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - }, - { - "alias": "$tag_host: $tag_interface: $col", - "dsType": "influxdb", - "function": "derivative", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" }, { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "interface", - "params": [ - "tag" - ], + "alias": "$tag_host: $tag_interface: $col", + "dsType": "influxdb", + "function": "derivative", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], "type": "tag" - } - ], + }, + { + "key": "interface", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "net_bytes_recv", "policy": "default", "query": "SELECT non_negative_derivative(mean(drop_out), 1s) as \"out\" FROM \"net\" WHERE host =~ /$server/ AND interface =~ /$netif/ AND $timeFilter GROUP BY time($interval), host,interface fill(none)", @@ -3060,18 +3380,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -3082,7 +3402,7 @@ data: "shared": true, "sort": 0, "value_type": "individual" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -3090,7 +3410,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "pps", @@ -3099,34 +3419,34 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": true, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": true, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -3134,8 +3454,8 @@ data: "h": 7, "w": 12, "x": 12, - "y": 41 - }, + "y": 49 + }, "hiddenSeries": false, "id": 50643, "interval": "$inter", @@ -3149,14 +3469,14 @@ data: "show": true, "total": false, "values": true - }, + }, "lines": false, "linewidth": 2, "links": [], "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -3167,8 +3487,8 @@ data: "selected": false, "text": "eth0", "value": "eth0" - } - }, + } + }, "seriesOverrides": [], "spaceLength": 10, "stack": false, @@ -3183,24 +3503,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "interface", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "interface", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "net_bytes_recv", "policy": "default", "query": "SELECT non_negative_derivative(mean(err_in), 1s) as \"in\" FROM \"net\" WHERE host =~ /$server/ AND interface =~ /$netif/ AND $timeFilter GROUP BY time($interval), host,interface fill(none)", @@ -3212,44 +3532,44 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - }, - { - "alias": "$tag_host: $tag_interface: $col", - "dsType": "influxdb", - "function": "derivative", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" }, { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "interface", - "params": [ - "tag" - ], + "alias": "$tag_host: $tag_interface: $col", + "dsType": "influxdb", + "function": "derivative", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], "type": "tag" - } - ], + }, + { + "key": "interface", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "net_bytes_recv", "policy": "default", "query": "SELECT non_negative_derivative(mean(err_out), 1s) as \"out\" FROM \"net\" WHERE host =~ /$server/ AND interface =~ /$netif/ AND $timeFilter GROUP BY time($interval), host,interface fill(none)", @@ -3261,18 +3581,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -3283,7 +3603,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -3291,7 +3611,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "short", @@ -3300,49 +3620,49 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "collapsed": false, - "datasource": null, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 48 + } }, + { + "collapsed": false, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 56 + }, "id": 61991, "panels": [], "repeat": null, "title": "Swap", "type": "row" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -3350,8 +3670,8 @@ data: "h": 7, "w": 12, "x": 0, - "y": 49 - }, + "y": 57 + }, "hiddenSeries": false, "id": 26024, "interval": "$inter", @@ -3366,14 +3686,14 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -3383,8 +3703,8 @@ data: { "alias": "/in/", "transform": "negative-Y" - } - ], + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, @@ -3398,17 +3718,17 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - } - ], + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "swap_in", "policy": "default", "query": "SELECT non_negative_derivative(mean(\"in\")) as \"in\", non_negative_derivative(mean(\"out\")) as \"out\" FROM \"swap\" WHERE host =~ /$server$/ AND $timeFilter GROUP BY time($interval), host ORDER BY asc", @@ -3420,18 +3740,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -3442,7 +3762,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -3450,7 +3770,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "bytes", @@ -3458,34 +3778,34 @@ data: "max": null, "min": null, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -3493,8 +3813,8 @@ data: "h": 7, "w": 12, "x": 12, - "y": 49 - }, + "y": 57 + }, "hiddenSeries": false, "id": 61850, "interval": "$inter", @@ -3509,14 +3829,14 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -3527,8 +3847,8 @@ data: "alias": "/total/", "color": "#890F02", "fill": 0 - } - ], + } + ], "spaceLength": 10, "stack": false, "steppedLine": true, @@ -3542,17 +3862,17 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - } - ], + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "swap_in", "policy": "default", "query": "SELECT mean(used) as \"used\", mean(total) as \"total\" FROM \"swap\" WHERE host =~ /$server$/ AND $timeFilter GROUP BY time($interval), host ORDER BY asc", @@ -3564,18 +3884,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -3586,7 +3906,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -3594,7 +3914,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "bytes", @@ -3602,49 +3922,49 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "collapsed": false, - "datasource": null, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 56 + } }, + { + "collapsed": false, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 64 + }, "id": 61992, "panels": [], "repeat": "disk", "title": "Disk IOPS for /dev/$disk", "type": "row" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -3652,8 +3972,8 @@ data: "h": 7, "w": 8, "x": 0, - "y": 57 - }, + "y": 65 + }, "hiddenSeries": false, "id": 13782, "interval": "$inter", @@ -3670,7 +3990,7 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], @@ -3678,7 +3998,7 @@ data: "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -3689,8 +4009,8 @@ data: { "alias": "/.*write$/", "transform": "negative-Y" - } - ], + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, @@ -3704,24 +4024,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "io_reads", "policy": "default", "query": "SELECT non_negative_derivative(mean(reads),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$server$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($interval), *", @@ -3733,44 +4053,44 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - }, - { - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" }, { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], + "alias": "$tag_host: $tag_name: $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], "type": "tag" - } - ], + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "io_reads", "policy": "default", "query": "SELECT non_negative_derivative(mean(writes),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$server$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($interval), *", @@ -3782,18 +4102,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -3804,7 +4124,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -3812,7 +4132,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "iops", @@ -3820,34 +4140,34 @@ data: "max": null, "min": null, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -3855,8 +4175,8 @@ data: "h": 7, "w": 8, "x": 8, - "y": 57 - }, + "y": 65 + }, "hiddenSeries": false, "id": 60200, "interval": "$inter", @@ -3873,7 +4193,7 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], @@ -3881,7 +4201,7 @@ data: "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -3892,8 +4212,8 @@ data: { "alias": "/.*write$/", "transform": "negative-Y" - } - ], + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, @@ -3907,24 +4227,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "io_reads", "policy": "default", "query": "SELECT non_negative_derivative(mean(read_bytes),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$server$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($interval), *", @@ -3936,44 +4256,44 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - }, - { - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" }, { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], + "alias": "$tag_host: $tag_name: $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], "type": "tag" - } - ], + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "io_reads", "policy": "default", "query": "SELECT non_negative_derivative(mean(write_bytes),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$server$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($interval), *", @@ -3985,18 +4305,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -4007,7 +4327,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -4015,7 +4335,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "bytes", @@ -4023,34 +4343,34 @@ data: "max": null, "min": null, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -4058,8 +4378,8 @@ data: "h": 7, "w": 8, "x": 16, - "y": 57 - }, + "y": 65 + }, "hiddenSeries": false, "id": 56720, "interval": "$inter", @@ -4076,7 +4396,7 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], @@ -4084,7 +4404,7 @@ data: "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -4095,8 +4415,8 @@ data: { "alias": "/.*write$/", "transform": "negative-Y" - } - ], + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, @@ -4110,24 +4430,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "io_reads", "policy": "default", "query": "SELECT non_negative_derivative(mean(read_time),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$server$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($interval), *", @@ -4139,44 +4459,44 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - }, - { - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" }, { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], + "alias": "$tag_host: $tag_name: $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], "type": "tag" - } - ], + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "io_reads", "policy": "default", "query": "SELECT non_negative_derivative(mean(write_time),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$server$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($interval), *", @@ -4188,18 +4508,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -4210,7 +4530,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -4218,7 +4538,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "ms", @@ -4226,29 +4546,29 @@ data: "max": null, "min": null, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "collapsed": false, - "datasource": null, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 64 + } }, + { + "collapsed": false, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 72 + }, "id": 61993, "panels": [], "repeat": "mountpoint", @@ -4257,25 +4577,25 @@ data: "selected": false, "text": "/dev/termination-log", "value": "/dev/termination-log" - } - }, + } + }, "title": "Disk space usage for $mountpoint", "type": "row" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -4283,8 +4603,8 @@ data: "h": 7, "w": 12, "x": 0, - "y": 65 - }, + "y": 73 + }, "hiddenSeries": false, "id": 52240, "interval": "$inter", @@ -4299,7 +4619,7 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], @@ -4307,7 +4627,7 @@ data: "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -4319,8 +4639,8 @@ data: "selected": false, "text": "/dev/termination-log", "value": "/dev/termination-log" - } - }, + } + }, "seriesOverrides": [ { "alias": "/total/", @@ -4328,8 +4648,8 @@ data: "fill": 0, "linewidth": 2, "zindex": 3 - } - ], + } + ], "spaceLength": 10, "stack": false, "steppedLine": true, @@ -4343,24 +4663,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "disk_total", "policy": "default", "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -4372,18 +4692,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -4394,7 +4714,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -4402,7 +4722,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "bytes", @@ -4410,34 +4730,34 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": true, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": true, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -4445,8 +4765,8 @@ data: "h": 7, "w": 12, "x": 12, - "y": 65 - }, + "y": 73 + }, "hiddenSeries": false, "id": 33458, "interval": "$inter", @@ -4461,7 +4781,7 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": false, "linewidth": 1, "links": [], @@ -4469,7 +4789,7 @@ data: "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, @@ -4481,23 +4801,23 @@ data: "selected": false, "text": "/dev/termination-log", "value": "/dev/termination-log" - } - }, + } + }, "seriesOverrides": [ { "alias": "/used/", "color": "#447EBC", "zindex": 3 - }, - { - "alias": "/total/", - "bars": false, - "color": "#BF1B00", - "fill": 0, - "lines": true, - "linewidth": 1 - } - ], + }, + { + "alias": "/total/", + "bars": false, + "color": "#BF1B00", + "fill": 0, + "lines": true, + "linewidth": 1 + } + ], "spaceLength": 10, "stack": false, "steppedLine": true, @@ -4511,24 +4831,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "disk_inodes_free", "policy": "default", "query": "SELECT mean(inodes_used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/ AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -4537,47 +4857,47 @@ data: "resultFormat": "time_series", "select": [ [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - }, - { - "alias": "$tag_host: mountpoint $tag_path - $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" }, { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], + "alias": "$tag_host: mountpoint $tag_path - $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], "type": "tag" - } - ], + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "disk_inodes_free", "policy": "default", "query": "SELECT mean(inodes_free) + mean(inodes_used) as \"total\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/ AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -4589,18 +4909,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -4611,7 +4931,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -4619,7 +4939,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "short", @@ -4627,57 +4947,57 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "collapsed": false, - "datasource": null, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 72 + } }, - "id": 61999, + { + "collapsed": false, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 80 + }, + "id": 62026, "panels": [], - "repeatIteration": 1603435375490, + "repeatIteration": 1603949953221, "repeatPanelId": 61993, "scopedVars": { "mountpoint": { "selected": false, "text": "/etc/hostname", "value": "/etc/hostname" - } - }, + } + }, "title": "Disk space usage for $mountpoint", "type": "row" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -4685,10 +5005,10 @@ data: "h": 7, "w": 12, "x": 0, - "y": 73 - }, + "y": 81 + }, "hiddenSeries": false, - "id": 62000, + "id": 62027, "interval": "$inter", "legend": { "alignAsTable": true, @@ -4701,7 +5021,7 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], @@ -4709,14 +5029,14 @@ data: "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, "points": false, "renderer": "flot", "repeat": null, - "repeatIteration": 1603435375490, + "repeatIteration": 1603949953221, "repeatPanelId": 52240, "repeatedByRow": true, "scopedVars": { @@ -4724,8 +5044,8 @@ data: "selected": false, "text": "/etc/hostname", "value": "/etc/hostname" - } - }, + } + }, "seriesOverrides": [ { "alias": "/total/", @@ -4733,8 +5053,8 @@ data: "fill": 0, "linewidth": 2, "zindex": 3 - } - ], + } + ], "spaceLength": 10, "stack": false, "steppedLine": true, @@ -4748,24 +5068,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "disk_total", "policy": "default", "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -4777,18 +5097,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -4799,7 +5119,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -4807,7 +5127,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "bytes", @@ -4815,34 +5135,34 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": true, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": true, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -4850,10 +5170,10 @@ data: "h": 7, "w": 12, "x": 12, - "y": 73 - }, + "y": 81 + }, "hiddenSeries": false, - "id": 62001, + "id": 62028, "interval": "$inter", "legend": { "alignAsTable": true, @@ -4866,7 +5186,7 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": false, "linewidth": 1, "links": [], @@ -4874,14 +5194,14 @@ data: "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, "points": false, "renderer": "flot", "repeat": null, - "repeatIteration": 1603435375490, + "repeatIteration": 1603949953221, "repeatPanelId": 33458, "repeatedByRow": true, "scopedVars": { @@ -4889,23 +5209,23 @@ data: "selected": false, "text": "/etc/hostname", "value": "/etc/hostname" - } - }, + } + }, "seriesOverrides": [ { "alias": "/used/", "color": "#447EBC", "zindex": 3 - }, - { - "alias": "/total/", - "bars": false, - "color": "#BF1B00", - "fill": 0, - "lines": true, - "linewidth": 1 - } - ], + }, + { + "alias": "/total/", + "bars": false, + "color": "#BF1B00", + "fill": 0, + "lines": true, + "linewidth": 1 + } + ], "spaceLength": 10, "stack": false, "steppedLine": true, @@ -4919,24 +5239,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "disk_inodes_free", "policy": "default", "query": "SELECT mean(inodes_used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/ AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -4948,44 +5268,44 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - }, - { - "alias": "$tag_host: mountpoint $tag_path - $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" }, { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], + "alias": "$tag_host: mountpoint $tag_path - $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], "type": "tag" - } - ], + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "disk_inodes_free", "policy": "default", "query": "SELECT mean(inodes_free) + mean(inodes_used) as \"total\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/ AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -4997,18 +5317,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - } - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -5019,7 +5339,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -5027,7 +5347,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "short", @@ -5035,57 +5355,57 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "collapsed": false, - "datasource": null, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 80 + } }, - "id": 62002, + { + "collapsed": false, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 88 + }, + "id": 62029, "panels": [], - "repeatIteration": 1603435375490, + "repeatIteration": 1603949953221, "repeatPanelId": 61993, "scopedVars": { "mountpoint": { "selected": false, "text": "/etc/hosts", "value": "/etc/hosts" - } - }, + } + }, "title": "Disk space usage for $mountpoint", "type": "row" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -5093,10 +5413,10 @@ data: "h": 7, "w": 12, "x": 0, - "y": 81 - }, + "y": 89 + }, "hiddenSeries": false, - "id": 62003, + "id": 62030, "interval": "$inter", "legend": { "alignAsTable": true, @@ -5109,7 +5429,7 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], @@ -5117,14 +5437,14 @@ data: "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, "points": false, "renderer": "flot", "repeat": null, - "repeatIteration": 1603435375490, + "repeatIteration": 1603949953221, "repeatPanelId": 52240, "repeatedByRow": true, "scopedVars": { @@ -5132,8 +5452,8 @@ data: "selected": false, "text": "/etc/hosts", "value": "/etc/hosts" - } - }, + } + }, "seriesOverrides": [ { "alias": "/total/", @@ -5141,8 +5461,8 @@ data: "fill": 0, "linewidth": 2, "zindex": 3 - } - ], + } + ], "spaceLength": 10, "stack": false, "steppedLine": true, @@ -5156,24 +5476,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "disk_total", "policy": "default", "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -5185,18 +5505,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -5207,7 +5527,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -5215,7 +5535,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "bytes", @@ -5223,34 +5543,34 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": true, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": true, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -5258,10 +5578,10 @@ data: "h": 7, "w": 12, "x": 12, - "y": 81 - }, + "y": 89 + }, "hiddenSeries": false, - "id": 62004, + "id": 62031, "interval": "$inter", "legend": { "alignAsTable": true, @@ -5274,7 +5594,7 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": false, "linewidth": 1, "links": [], @@ -5282,14 +5602,14 @@ data: "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, "points": false, "renderer": "flot", "repeat": null, - "repeatIteration": 1603435375490, + "repeatIteration": 1603949953221, "repeatPanelId": 33458, "repeatedByRow": true, "scopedVars": { @@ -5297,23 +5617,23 @@ data: "selected": false, "text": "/etc/hosts", "value": "/etc/hosts" - } - }, + } + }, "seriesOverrides": [ { "alias": "/used/", "color": "#447EBC", "zindex": 3 - }, - { - "alias": "/total/", - "bars": false, - "color": "#BF1B00", - "fill": 0, - "lines": true, - "linewidth": 1 - } - ], + }, + { + "alias": "/total/", + "bars": false, + "color": "#BF1B00", + "fill": 0, + "lines": true, + "linewidth": 1 + } + ], "spaceLength": 10, "stack": false, "steppedLine": true, @@ -5327,24 +5647,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "disk_inodes_free", "policy": "default", "query": "SELECT mean(inodes_used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/ AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -5356,44 +5676,44 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - }, - { - "alias": "$tag_host: mountpoint $tag_path - $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" }, { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], + "alias": "$tag_host: mountpoint $tag_path - $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], "type": "tag" - } - ], + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "disk_inodes_free", "policy": "default", "query": "SELECT mean(inodes_free) + mean(inodes_used) as \"total\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/ AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -5405,18 +5725,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -5427,7 +5747,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -5435,7 +5755,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "short", @@ -5443,57 +5763,57 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "collapsed": false, - "datasource": null, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 88 + } }, - "id": 62005, + { + "collapsed": false, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 96 + }, + "id": 62032, "panels": [], - "repeatIteration": 1603435375490, + "repeatIteration": 1603949953221, "repeatPanelId": 61993, "scopedVars": { "mountpoint": { "selected": false, "text": "/etc/resolv.conf", "value": "/etc/resolv.conf" - } - }, + } + }, "title": "Disk space usage for $mountpoint", "type": "row" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -5501,10 +5821,10 @@ data: "h": 7, "w": 12, "x": 0, - "y": 89 - }, + "y": 97 + }, "hiddenSeries": false, - "id": 62006, + "id": 62033, "interval": "$inter", "legend": { "alignAsTable": true, @@ -5517,7 +5837,7 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], @@ -5525,14 +5845,14 @@ data: "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, "points": false, "renderer": "flot", "repeat": null, - "repeatIteration": 1603435375490, + "repeatIteration": 1603949953221, "repeatPanelId": 52240, "repeatedByRow": true, "scopedVars": { @@ -5540,8 +5860,8 @@ data: "selected": false, "text": "/etc/resolv.conf", "value": "/etc/resolv.conf" - } - }, + } + }, "seriesOverrides": [ { "alias": "/total/", @@ -5549,8 +5869,8 @@ data: "fill": 0, "linewidth": 2, "zindex": 3 - } - ], + } + ], "spaceLength": 10, "stack": false, "steppedLine": true, @@ -5564,24 +5884,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "disk_total", "policy": "default", "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -5593,18 +5913,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -5615,7 +5935,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -5623,7 +5943,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "bytes", @@ -5631,34 +5951,34 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": true, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": true, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -5666,10 +5986,10 @@ data: "h": 7, "w": 12, "x": 12, - "y": 89 - }, + "y": 97 + }, "hiddenSeries": false, - "id": 62007, + "id": 62034, "interval": "$inter", "legend": { "alignAsTable": true, @@ -5682,7 +6002,7 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": false, "linewidth": 1, "links": [], @@ -5690,14 +6010,14 @@ data: "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, "points": false, "renderer": "flot", "repeat": null, - "repeatIteration": 1603435375490, + "repeatIteration": 1603949953221, "repeatPanelId": 33458, "repeatedByRow": true, "scopedVars": { @@ -5705,23 +6025,23 @@ data: "selected": false, "text": "/etc/resolv.conf", "value": "/etc/resolv.conf" - } - }, + } + }, "seriesOverrides": [ { "alias": "/used/", "color": "#447EBC", "zindex": 3 - }, - { - "alias": "/total/", - "bars": false, - "color": "#BF1B00", - "fill": 0, - "lines": true, - "linewidth": 1 - } - ], + }, + { + "alias": "/total/", + "bars": false, + "color": "#BF1B00", + "fill": 0, + "lines": true, + "linewidth": 1 + } + ], "spaceLength": 10, "stack": false, "steppedLine": true, @@ -5735,24 +6055,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "disk_inodes_free", "policy": "default", "query": "SELECT mean(inodes_used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/ AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -5764,44 +6084,44 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - }, - { - "alias": "$tag_host: mountpoint $tag_path - $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" }, { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], + "alias": "$tag_host: mountpoint $tag_path - $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], "type": "tag" - } - ], + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "disk_inodes_free", "policy": "default", "query": "SELECT mean(inodes_free) + mean(inodes_used) as \"total\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/ AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -5813,18 +6133,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -5835,7 +6155,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -5843,7 +6163,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "short", @@ -5851,57 +6171,57 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "collapsed": false, - "datasource": null, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 96 + } }, - "id": 62008, + { + "collapsed": false, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 104 + }, + "id": 62035, "panels": [], - "repeatIteration": 1603435375490, + "repeatIteration": 1603949953221, "repeatPanelId": 61993, "scopedVars": { "mountpoint": { "selected": false, "text": "/etc/telegraf", "value": "/etc/telegraf" - } - }, + } + }, "title": "Disk space usage for $mountpoint", "type": "row" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -5909,10 +6229,10 @@ data: "h": 7, "w": 12, "x": 0, - "y": 97 - }, + "y": 105 + }, "hiddenSeries": false, - "id": 62009, + "id": 62036, "interval": "$inter", "legend": { "alignAsTable": true, @@ -5925,7 +6245,7 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": true, "linewidth": 1, "links": [], @@ -5933,14 +6253,14 @@ data: "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, "points": false, "renderer": "flot", "repeat": null, - "repeatIteration": 1603435375490, + "repeatIteration": 1603949953221, "repeatPanelId": 52240, "repeatedByRow": true, "scopedVars": { @@ -5948,8 +6268,8 @@ data: "selected": false, "text": "/etc/telegraf", "value": "/etc/telegraf" - } - }, + } + }, "seriesOverrides": [ { "alias": "/total/", @@ -5957,8 +6277,8 @@ data: "fill": 0, "linewidth": 2, "zindex": 3 - } - ], + } + ], "spaceLength": 10, "stack": false, "steppedLine": true, @@ -5972,24 +6292,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "disk_total", "policy": "default", "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -6001,18 +6321,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -6023,7 +6343,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -6031,7 +6351,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "bytes", @@ -6039,34 +6359,34 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": true, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + } }, + { + "aliasColors": {}, + "bars": true, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -6074,10 +6394,10 @@ data: "h": 7, "w": 12, "x": 12, - "y": 97 - }, + "y": 105 + }, "hiddenSeries": false, - "id": 62010, + "id": 62037, "interval": "$inter", "legend": { "alignAsTable": true, @@ -6090,7 +6410,7 @@ data: "sortDesc": true, "total": false, "values": true - }, + }, "lines": false, "linewidth": 1, "links": [], @@ -6098,14 +6418,14 @@ data: "nullPointMode": "connected", "options": { "alertThreshold": true - }, + }, "percentage": false, "pluginVersion": "7.2.1", "pointradius": 5, "points": false, "renderer": "flot", "repeat": null, - "repeatIteration": 1603435375490, + "repeatIteration": 1603949953221, "repeatPanelId": 33458, "repeatedByRow": true, "scopedVars": { @@ -6113,23 +6433,23 @@ data: "selected": false, "text": "/etc/telegraf", "value": "/etc/telegraf" - } - }, + } + }, "seriesOverrides": [ { "alias": "/used/", "color": "#447EBC", "zindex": 3 - }, - { - "alias": "/total/", - "bars": false, - "color": "#BF1B00", - "fill": 0, - "lines": true, - "linewidth": 1 - } - ], + }, + { + "alias": "/total/", + "bars": false, + "color": "#BF1B00", + "fill": 0, + "lines": true, + "linewidth": 1 + } + ], "spaceLength": 10, "stack": false, "steppedLine": true, @@ -6143,24 +6463,24 @@ data: "interval": "auto", "params": [ "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "tag" - } - ], "measurement": "disk_inodes_free", "policy": "default", "query": "SELECT mean(inodes_used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/ AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -6172,44 +6492,44 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - }, - { - "alias": "$tag_host: mountpoint $tag_path - $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" }, { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], + "alias": "$tag_host: mountpoint $tag_path - $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], "type": "tag" - } - ], + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } + ], "measurement": "disk_inodes_free", "policy": "default", "query": "SELECT mean(inodes_free) + mean(inodes_used) as \"total\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" =~ /^$mountpoint$/ AND $timeFilter GROUP BY time($interval), \"host\", \"path\"", @@ -6221,18 +6541,18 @@ data: { "params": [ "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [] - } - ], + } + ], "thresholds": [], "timeFrom": null, "timeRegions": [], @@ -6243,7 +6563,7 @@ data: "shared": true, "sort": 0, "value_type": "cumulative" - }, + }, "type": "graph", "xaxis": { "buckets": null, @@ -6251,7 +6571,7 @@ data: "name": null, "show": true, "values": [] - }, + }, "yaxes": [ { "format": "short", @@ -6259,21 +6579,21 @@ data: "max": null, "min": 0, "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], "yaxis": { "align": false, "alignLevel": null + } } - } - ], + ], "refresh": "1m", "schemaVersion": 26, "style": "dark", @@ -6282,7 +6602,7 @@ data: "telegraf", "raspberrypi", "pi4" - ], + ], "templating": { "list": [ { @@ -6291,124 +6611,124 @@ data: "selected": false, "text": "InfluxDB", "value": "InfluxDB" - }, - "datasource": "InfluxDB telegraf", - "hide": 0, - "includeAll": false, - "label": "", - "multi": false, - "name": "datasource", - "options": [], - "query": "influxdb", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "type": "datasource" - }, - { - "auto": true, - "auto_count": 100, - "auto_min": "30s", - "current": { - "selected": false, - "text": "30s", - "value": "30s" - }, - "datasource": null, - "hide": 0, - "includeAll": false, - "label": "Sampling", - "multi": false, - "name": "inter", - "options": [ - { - "selected": false, - "text": "auto", - "value": "$__auto_interval_inter" + }, + "datasource": "InfluxDB telegraf", + "hide": 0, + "includeAll": false, + "label": "", + "multi": false, + "name": "datasource", + "options": [], + "query": "influxdb", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" }, { - "selected": false, - "text": "10s", - "value": "10s" - }, - { - "selected": true, + "auto": true, + "auto_count": 100, + "auto_min": "30s", + "current": { + "selected": false, "text": "30s", "value": "30s" }, - { - "selected": false, - "text": "1m", - "value": "1m" - }, - { - "selected": false, - "text": "2m", - "value": "2m" - }, - { - "selected": false, - "text": "5m", - "value": "5m" - }, - { + "datasource": null, + "hide": 0, + "includeAll": false, + "label": "Sampling", + "multi": false, + "name": "inter", + "options": [ + { + "selected": false, + "text": "auto", + "value": "$__auto_interval_inter" + }, + { + "selected": false, + "text": "10s", + "value": "10s" + }, + { + "selected": true, + "text": "30s", + "value": "30s" + }, + { + "selected": false, + "text": "1m", + "value": "1m" + }, + { + "selected": false, + "text": "2m", + "value": "2m" + }, + { + "selected": false, + "text": "5m", + "value": "5m" + }, + { + "selected": false, + "text": "10m", + "value": "10m" + }, + { + "selected": false, + "text": "30m", + "value": "30m" + }, + { + "selected": false, + "text": "1h", + "value": "1h" + } + ], + "query": "10s,30s,1m,2m,5m,10m,30m,1h", + "refresh": 2, + "skipUrlSync": false, + "type": "interval" + }, + { + "allValue": null, + "current": { "selected": false, - "text": "10m", - "value": "10m" + "text": "node1", + "value": "node1" }, - { + "datasource": "InfluxDB", + "definition": "", + "hide": 0, + "includeAll": false, + "label": "Server", + "multi": false, + "name": "server", + "options": [], + "query": "SHOW TAG VALUES FROM system WITH KEY=host", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 0, + "tagValuesQuery": null, + "tags": [], + "tagsQuery": null, + "type": "query", + "useTags": false + }, + { + "allValue": null, + "current": { "selected": false, - "text": "30m", - "value": "30m" + "text": [ + "All" + ], + "value": [ + "$__all" + ] }, - { - "selected": false, - "text": "1h", - "value": "1h" - } - ], - "query": "10s,30s,1m,2m,5m,10m,30m,1h", - "refresh": 2, - "skipUrlSync": false, - "type": "interval" - }, - { - "allValue": null, - "current": { - "selected": false, - "text": "node3", - "value": "node3" - }, - "datasource": "InfluxDB", - "definition": "", - "hide": 0, - "includeAll": false, - "label": "Server", - "multi": false, - "name": "server", - "options": [], - "query": "SHOW TAG VALUES FROM system WITH KEY=host", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": null, - "tags": [], - "tagsQuery": null, - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": { - "selected": true, - "text": [ - "All" - ], - "value": [ - "$__all" - ] - }, "datasource": "$datasource", "definition": "", "hide": 0, @@ -6427,18 +6747,18 @@ data: "tagsQuery": null, "type": "query", "useTags": false - }, - { - "allValue": null, - "current": { - "selected": true, - "text": [ - "All" - ], - "value": [ - "$__all" - ] }, + { + "allValue": null, + "current": { + "selected": false, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, "datasource": "$datasource", "definition": "", "hide": 0, @@ -6457,18 +6777,18 @@ data: "tagsQuery": null, "type": "query", "useTags": false - }, - { - "allValue": null, - "current": { - "selected": true, - "text": [ - "All" - ], - "value": [ - "$__all" - ] }, + { + "allValue": null, + "current": { + "selected": false, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, "datasource": "$datasource", "definition": "", "hide": 0, @@ -6487,18 +6807,18 @@ data: "tagsQuery": null, "type": "query", "useTags": false - }, - { - "allValue": null, - "current": { - "selected": true, - "text": [ - "All" - ], - "value": [ - "$__all" - ] }, + { + "allValue": null, + "current": { + "selected": false, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, "datasource": "$datasource", "definition": "", "hide": 0, @@ -6517,13 +6837,13 @@ data: "tagsQuery": null, "type": "query", "useTags": false - } - ] - }, + } + ] + }, "time": { "from": "now-30m", "to": "now" - }, + }, "timepicker": { "refresh_intervals": [ "5s", @@ -6536,7 +6856,7 @@ data: "1h", "2h", "1d" - ], + ], "time_options": [ "5m", "15m", @@ -6547,10 +6867,10 @@ data: "2d", "7d", "30d" - ] - }, + ] + }, "timezone": "browser", "title": "Raspberry Pi Monitoring", "uid": "sF7d-FHZz", - "version": 1 + "version": 2 } diff --git a/kubernetes/yaml/serviceAccount.yaml b/kubernetes/yaml/serviceAccount.yaml new file mode 100644 index 0000000..91f765f --- /dev/null +++ b/kubernetes/yaml/serviceAccount.yaml @@ -0,0 +1,6 @@ +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: isp-checker-sa + namespace: monitoring From bd2b89d64fa51fb91affe88f515db297fe136977 Mon Sep 17 00:00:00 2001 From: Facu de la Cruz Date: Thu, 29 Oct 2020 03:03:52 -0300 Subject: [PATCH 02/12] Updating tests --- .github/workflows/docker-build.yml | 21 ++++++++----------- .../{yamllint.yaml => lint-score.yaml} | 17 +++++++-------- 2 files changed, 17 insertions(+), 21 deletions(-) rename .github/workflows/{yamllint.yaml => lint-score.yaml} (70%) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index bbe9ebf..d719572 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -1,37 +1,34 @@ -name: Build - +name: Build and Push image on: push: branches: - master - develop - defaults: run: shell: bash - jobs: build: runs-on: ubuntu-latest steps: - name: Checkout Code uses: actions/checkout@v2 - - name: Install Docker Buildx id: buildx uses: crazy-max/ghaction-docker-buildx@v1 with: buildx-version: latest - + - name: Hadolint Action + uses: brpaz/hadolint-action@v1.1.0 + with: + dockerfile: ./docker-compose/telegraf/ - name: hub.docker.com Login run: | echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin - - name: Build the multi-arch image run: | docker buildx build \ - --push \ - --tag tty0/isp_telegraf:1.15.3 \ - --tag tty0/isp_telegraf:latest \ - --platform linux/amd64,linux/arm/v7,linux/arm64 ./docker-compose/telegraf/ - + --push \ + --tag tty0/isp_telegraf:1.15.3 \ + --tag tty0/isp_telegraf:latest \ + --platform linux/amd64,linux/arm/v7,linux/arm64 ./docker-compose/telegraf/ diff --git a/.github/workflows/yamllint.yaml b/.github/workflows/lint-score.yaml similarity index 70% rename from .github/workflows/yamllint.yaml rename to .github/workflows/lint-score.yaml index 2f54f75..dd7e97d 100644 --- a/.github/workflows/yamllint.yaml +++ b/.github/workflows/lint-score.yaml @@ -1,19 +1,19 @@ -name: YAML Lint -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] +name: Lint and validate +on: [ pull_request, push ] jobs: build: runs-on: ubuntu-latest steps: + - name: Hadolint Action + uses: brpaz/hadolint-action@v1.1.0 + with: + dockerfile: ./docker-compose/telegraf/ - uses: actions/checkout@v2 - name: YAML Lint uses: ibiqlik/action-yamllint@v1.0.0 with: - file_or_dir: ./kubernetes/yaml/ - config_file: ./.yamllint + file_or_dir: ./kubernetes/yaml/ + config_file: ./.yamllint - name: kube-score check uses: piraces/kube-score-ga@v0.1.1 with: @@ -27,4 +27,3 @@ jobs: ignore_missing_schemas: true comment: true token: ${{ secrets.GH_TOKEN }} - From 71da5ced716be1a1ac44d33cb77aaebcdbe5df5f Mon Sep 17 00:00:00 2001 From: Facu de la Cruz Date: Thu, 29 Oct 2020 03:15:14 -0300 Subject: [PATCH 03/12] Update lint-score.yaml --- .github/workflows/lint-score.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-score.yaml b/.github/workflows/lint-score.yaml index dd7e97d..797caca 100644 --- a/.github/workflows/lint-score.yaml +++ b/.github/workflows/lint-score.yaml @@ -7,7 +7,7 @@ jobs: - name: Hadolint Action uses: brpaz/hadolint-action@v1.1.0 with: - dockerfile: ./docker-compose/telegraf/ + dockerfile: ./docker-compose/telegraf/Dockerfile - uses: actions/checkout@v2 - name: YAML Lint uses: ibiqlik/action-yamllint@v1.0.0 From 034f60f378638843d92908058d1dd3933b6698c1 Mon Sep 17 00:00:00 2001 From: Facu de la Cruz Date: Thu, 29 Oct 2020 03:18:55 -0300 Subject: [PATCH 04/12] Update lint-score.yaml --- .github/workflows/lint-score.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-score.yaml b/.github/workflows/lint-score.yaml index 797caca..df7a307 100644 --- a/.github/workflows/lint-score.yaml +++ b/.github/workflows/lint-score.yaml @@ -4,11 +4,11 @@ jobs: build: runs-on: ubuntu-latest steps: + - uses: actions/checkout@v2 - name: Hadolint Action uses: brpaz/hadolint-action@v1.1.0 with: dockerfile: ./docker-compose/telegraf/Dockerfile - - uses: actions/checkout@v2 - name: YAML Lint uses: ibiqlik/action-yamllint@v1.0.0 with: From bae236a4c3a3841fb3668cf482c954d376a83d91 Mon Sep 17 00:00:00 2001 From: Facu de la Cruz Date: Thu, 29 Oct 2020 03:24:21 -0300 Subject: [PATCH 05/12] Update lint-score.yaml --- .github/workflows/docker-build.yml | 1 + .github/workflows/lint-score.yaml | 7 ++++++- kubernetes/{yaml => base}/configmap.yaml | 0 kubernetes/{yaml => base}/create-manifest.sh | 0 kubernetes/{yaml => base}/cronJob.yaml | 0 kubernetes/{yaml => base}/daemonSet.yaml | 0 kubernetes/{yaml => base}/deployment.yaml | 0 kubernetes/base/kustomization.yaml | 15 +++++++++++++++ kubernetes/{yaml => base}/namespace.yaml | 0 kubernetes/{yaml => base}/networkDashboard.yaml | 0 kubernetes/{yaml => base}/pdb.yaml | 6 +++--- kubernetes/{yaml => base}/podSecurityPolicy.yaml | 0 kubernetes/{yaml => base}/pvc.yaml | 0 kubernetes/{yaml => base}/raspberryDashboard.yaml | 0 kubernetes/{yaml => base}/secrets.yaml | 0 kubernetes/{yaml => base}/serviceAccount.yaml | 0 kubernetes/{yaml => base}/services.yaml | 0 kubernetes/kustomization.yaml | 4 ++++ 18 files changed, 29 insertions(+), 4 deletions(-) rename kubernetes/{yaml => base}/configmap.yaml (100%) rename kubernetes/{yaml => base}/create-manifest.sh (100%) rename kubernetes/{yaml => base}/cronJob.yaml (100%) rename kubernetes/{yaml => base}/daemonSet.yaml (100%) rename kubernetes/{yaml => base}/deployment.yaml (100%) create mode 100644 kubernetes/base/kustomization.yaml rename kubernetes/{yaml => base}/namespace.yaml (100%) rename kubernetes/{yaml => base}/networkDashboard.yaml (100%) rename kubernetes/{yaml => base}/pdb.yaml (86%) rename kubernetes/{yaml => base}/podSecurityPolicy.yaml (100%) rename kubernetes/{yaml => base}/pvc.yaml (100%) rename kubernetes/{yaml => base}/raspberryDashboard.yaml (100%) rename kubernetes/{yaml => base}/secrets.yaml (100%) rename kubernetes/{yaml => base}/serviceAccount.yaml (100%) rename kubernetes/{yaml => base}/services.yaml (100%) create mode 100644 kubernetes/kustomization.yaml diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index d719572..c6a8b18 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -4,6 +4,7 @@ on: branches: - master - develop + workflow_dispatch: defaults: run: shell: bash diff --git a/.github/workflows/lint-score.yaml b/.github/workflows/lint-score.yaml index df7a307..416c87f 100644 --- a/.github/workflows/lint-score.yaml +++ b/.github/workflows/lint-score.yaml @@ -1,5 +1,10 @@ name: Lint and validate -on: [ pull_request, push ] +on: + push: + branches: + - master + pull_request: + workflow_dispatch: jobs: build: runs-on: ubuntu-latest diff --git a/kubernetes/yaml/configmap.yaml b/kubernetes/base/configmap.yaml similarity index 100% rename from kubernetes/yaml/configmap.yaml rename to kubernetes/base/configmap.yaml diff --git a/kubernetes/yaml/create-manifest.sh b/kubernetes/base/create-manifest.sh similarity index 100% rename from kubernetes/yaml/create-manifest.sh rename to kubernetes/base/create-manifest.sh diff --git a/kubernetes/yaml/cronJob.yaml b/kubernetes/base/cronJob.yaml similarity index 100% rename from kubernetes/yaml/cronJob.yaml rename to kubernetes/base/cronJob.yaml diff --git a/kubernetes/yaml/daemonSet.yaml b/kubernetes/base/daemonSet.yaml similarity index 100% rename from kubernetes/yaml/daemonSet.yaml rename to kubernetes/base/daemonSet.yaml diff --git a/kubernetes/yaml/deployment.yaml b/kubernetes/base/deployment.yaml similarity index 100% rename from kubernetes/yaml/deployment.yaml rename to kubernetes/base/deployment.yaml diff --git a/kubernetes/base/kustomization.yaml b/kubernetes/base/kustomization.yaml new file mode 100644 index 0000000..f183262 --- /dev/null +++ b/kubernetes/base/kustomization.yaml @@ -0,0 +1,15 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- configmap.yaml +- cronJob.yaml +- daemonSet.yaml +- deployment.yaml +- namespace.yaml +- networkDashboard.yaml +- podSecurityPolicy.yaml +- pvc.yaml +- raspberryDashboard.yaml +- secrets.yaml +- serviceAccount.yaml +- services.yaml diff --git a/kubernetes/yaml/namespace.yaml b/kubernetes/base/namespace.yaml similarity index 100% rename from kubernetes/yaml/namespace.yaml rename to kubernetes/base/namespace.yaml diff --git a/kubernetes/yaml/networkDashboard.yaml b/kubernetes/base/networkDashboard.yaml similarity index 100% rename from kubernetes/yaml/networkDashboard.yaml rename to kubernetes/base/networkDashboard.yaml diff --git a/kubernetes/yaml/pdb.yaml b/kubernetes/base/pdb.yaml similarity index 86% rename from kubernetes/yaml/pdb.yaml rename to kubernetes/base/pdb.yaml index 858cd5e..de2c5f6 100644 --- a/kubernetes/yaml/pdb.yaml +++ b/kubernetes/base/pdb.yaml @@ -2,7 +2,7 @@ apiVersion: policy/v1beta1 kind: PodDisruptionBudget metadata: - name: telegraf-pdb + name: isp-telegraf-pdb namespace: monitoring spec: minAvailable: 2 @@ -14,7 +14,7 @@ spec: apiVersion: policy/v1beta1 kind: PodDisruptionBudget metadata: - name: telegraf-pdb + name: isp-telegraf-pdb namespace: monitoring spec: minAvailable: 1 @@ -26,7 +26,7 @@ spec: apiVersion: policy/v1beta1 kind: PodDisruptionBudget metadata: - name: influxdb + name: isp-influxdb-pdb namespace: monitoring spec: minAvailable: 1 diff --git a/kubernetes/yaml/podSecurityPolicy.yaml b/kubernetes/base/podSecurityPolicy.yaml similarity index 100% rename from kubernetes/yaml/podSecurityPolicy.yaml rename to kubernetes/base/podSecurityPolicy.yaml diff --git a/kubernetes/yaml/pvc.yaml b/kubernetes/base/pvc.yaml similarity index 100% rename from kubernetes/yaml/pvc.yaml rename to kubernetes/base/pvc.yaml diff --git a/kubernetes/yaml/raspberryDashboard.yaml b/kubernetes/base/raspberryDashboard.yaml similarity index 100% rename from kubernetes/yaml/raspberryDashboard.yaml rename to kubernetes/base/raspberryDashboard.yaml diff --git a/kubernetes/yaml/secrets.yaml b/kubernetes/base/secrets.yaml similarity index 100% rename from kubernetes/yaml/secrets.yaml rename to kubernetes/base/secrets.yaml diff --git a/kubernetes/yaml/serviceAccount.yaml b/kubernetes/base/serviceAccount.yaml similarity index 100% rename from kubernetes/yaml/serviceAccount.yaml rename to kubernetes/base/serviceAccount.yaml diff --git a/kubernetes/yaml/services.yaml b/kubernetes/base/services.yaml similarity index 100% rename from kubernetes/yaml/services.yaml rename to kubernetes/base/services.yaml diff --git a/kubernetes/kustomization.yaml b/kubernetes/kustomization.yaml new file mode 100644 index 0000000..bf1e4f0 --- /dev/null +++ b/kubernetes/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- ./base From c939e60b1743ef6f7df448c64f7fc36a37c06b8e Mon Sep 17 00:00:00 2001 From: Facu de la Cruz Date: Sat, 31 Oct 2020 18:20:00 -0300 Subject: [PATCH 06/12] Updating FailedJobHistory --- kubernetes/base/cronJob.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes/base/cronJob.yaml b/kubernetes/base/cronJob.yaml index 5700104..7e550f1 100644 --- a/kubernetes/base/cronJob.yaml +++ b/kubernetes/base/cronJob.yaml @@ -7,8 +7,8 @@ metadata: spec: schedule: "*/10 * * * *" startingDeadlineSeconds: 100 - successfulJobsHistoryLimit: 3 - failedJobsHistoryLimit: 2 + successfulJobsHistoryLimit: 1 + failedJobsHistoryLimit: 1 concurrencyPolicy: "Forbid" jobTemplate: spec: From 555cd2baf22c76865ca48cce9a6592c9c7b9124c Mon Sep 17 00:00:00 2001 From: Facu de la Cruz Date: Sat, 31 Oct 2020 18:23:32 -0300 Subject: [PATCH 07/12] Updating Grafana replicas --- kubernetes/base/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/base/deployment.yaml b/kubernetes/base/deployment.yaml index ec64468..17b9166 100644 --- a/kubernetes/base/deployment.yaml +++ b/kubernetes/base/deployment.yaml @@ -72,7 +72,7 @@ metadata: labels: app: grafana spec: - replicas: 1 + replicas: 3 progressDeadlineSeconds: 600 selector: matchLabels: From b0ae392d3d170daafddb2fd1f86c4e7757781640 Mon Sep 17 00:00:00 2001 From: Facu de la Cruz Date: Sun, 1 Nov 2020 00:29:18 -0300 Subject: [PATCH 08/12] Reverting number of Grafana replicas --- kubernetes/base/cronJob.yaml | 4 ++-- kubernetes/base/deployment.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kubernetes/base/cronJob.yaml b/kubernetes/base/cronJob.yaml index 7e550f1..9b85f0d 100644 --- a/kubernetes/base/cronJob.yaml +++ b/kubernetes/base/cronJob.yaml @@ -64,8 +64,8 @@ metadata: spec: schedule: "*/10 * * * *" startingDeadlineSeconds: 100 - successfulJobsHistoryLimit: 3 - failedJobsHistoryLimit: 2 + successfulJobsHistoryLimit: 1 + failedJobsHistoryLimit: 1 concurrencyPolicy: "Forbid" jobTemplate: spec: diff --git a/kubernetes/base/deployment.yaml b/kubernetes/base/deployment.yaml index 17b9166..5c141d4 100644 --- a/kubernetes/base/deployment.yaml +++ b/kubernetes/base/deployment.yaml @@ -72,7 +72,7 @@ metadata: labels: app: grafana spec: - replicas: 3 + replicas: 1 progressDeadlineSeconds: 600 selector: matchLabels: @@ -131,7 +131,7 @@ spec: - name: GF_DASHBOARDS_DEFAULT_HOME_DASHBOARD_PATH value: /var/lib/grafana/dashboards/network-dashboard.json - name: GF_INSTALL_PLUGINS - value: https://grafana.com/api/plugins/gowee-traceroutemap-panel/versions/0.2.3/download;gowee-traceroutemap-panel + value: "https://grafana.com/api/plugins/gowee-traceroutemap-panel/versions/0.2.3/download;gowee-traceroutemap-panel,grafana-piechart-panel 1.6.1" readinessProbe: initialDelaySeconds: 5 periodSeconds: 30 From 1c3abe4d0e4f07ca5c40010502393fb7d4b59f65 Mon Sep 17 00:00:00 2001 From: Facu de la Cruz Date: Sun, 1 Nov 2020 01:37:07 -0300 Subject: [PATCH 09/12] Updating Grafana limtis to support more dashboards --- kubernetes/base/deployment.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kubernetes/base/deployment.yaml b/kubernetes/base/deployment.yaml index 5c141d4..55e2497 100644 --- a/kubernetes/base/deployment.yaml +++ b/kubernetes/base/deployment.yaml @@ -72,7 +72,7 @@ metadata: labels: app: grafana spec: - replicas: 1 + replicas: 3 progressDeadlineSeconds: 600 selector: matchLabels: @@ -144,11 +144,11 @@ spec: port: 3000 resources: requests: - memory: "200Mi" - cpu: "0.25" + memory: "300Mi" + cpu: "0.35" limits: - memory: "500Mi" - cpu: "0.4" + memory: "1000Mi" + cpu: "0.5" volumes: # Grafana configuration PVC - name: grafana-volume From 126a77a55f106cfb685dca5aa65319565829fbf9 Mon Sep 17 00:00:00 2001 From: Facu de la Cruz Date: Sun, 1 Nov 2020 03:03:36 -0300 Subject: [PATCH 10/12] Updating grafana requests and limits --- kubernetes/base/deployment.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kubernetes/base/deployment.yaml b/kubernetes/base/deployment.yaml index 55e2497..88edb84 100644 --- a/kubernetes/base/deployment.yaml +++ b/kubernetes/base/deployment.yaml @@ -72,7 +72,7 @@ metadata: labels: app: grafana spec: - replicas: 3 + replicas: 1 progressDeadlineSeconds: 600 selector: matchLabels: @@ -144,11 +144,11 @@ spec: port: 3000 resources: requests: - memory: "300Mi" - cpu: "0.35" + memory: "100Mi" + cpu: "0.10" limits: - memory: "1000Mi" - cpu: "0.5" + memory: "400Mi" + cpu: "0.25" volumes: # Grafana configuration PVC - name: grafana-volume From 91be4c25591ca5e9a449592fb3ad2eafde2a16d1 Mon Sep 17 00:00:00 2001 From: Facu de la Cruz Date: Sun, 1 Nov 2020 03:34:19 -0300 Subject: [PATCH 11/12] Testing with more grafana replicas --- kubernetes/base/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/base/deployment.yaml b/kubernetes/base/deployment.yaml index 88edb84..52420ab 100644 --- a/kubernetes/base/deployment.yaml +++ b/kubernetes/base/deployment.yaml @@ -72,7 +72,7 @@ metadata: labels: app: grafana spec: - replicas: 1 + replicas: 3 progressDeadlineSeconds: 600 selector: matchLabels: From 9e0e6b2a0f34269902a923f5b6ad8314a73ded4a Mon Sep 17 00:00:00 2001 From: Facu de la Cruz Date: Thu, 12 Nov 2020 22:09:48 -0300 Subject: [PATCH 12/12] Updating RestartPolicy --- kubernetes/ISP-Checker-deploy.MD5 | 2 +- kubernetes/ISP-Checker-deploy.SHA512 | 2 +- kubernetes/ISP-Checker-deploy.yaml | 78 ++++++++++++------------- kubernetes/base/configmap.yaml | 10 ++-- kubernetes/base/cronJob.yaml | 12 ++-- kubernetes/base/daemonSet.yaml | 4 +- kubernetes/base/deployment.yaml | 8 +-- kubernetes/base/namespace.yaml | 2 +- kubernetes/base/networkDashboard.yaml | 4 +- kubernetes/base/pdb.yaml | 6 +- kubernetes/base/pvc.yaml | 4 +- kubernetes/base/raspberryDashboard.yaml | 6 +- kubernetes/base/secrets.yaml | 8 +-- kubernetes/base/serviceAccount.yaml | 2 +- kubernetes/base/services.yaml | 2 +- kubernetes/kustomization.yaml | 1 + 16 files changed, 76 insertions(+), 75 deletions(-) diff --git a/kubernetes/ISP-Checker-deploy.MD5 b/kubernetes/ISP-Checker-deploy.MD5 index c2cd0f7..2be8169 100644 --- a/kubernetes/ISP-Checker-deploy.MD5 +++ b/kubernetes/ISP-Checker-deploy.MD5 @@ -1 +1 @@ -MD5 (../ISP-Checker-deploy.yaml) = 4b01d4ee98b79e7723406bb7f50603c1 +MD5 (../ISP-Checker-deploy.yaml) = 6d939c17c2a1f53cce3589bb1648f696 diff --git a/kubernetes/ISP-Checker-deploy.SHA512 b/kubernetes/ISP-Checker-deploy.SHA512 index 4cb79bb..8887d3a 100644 --- a/kubernetes/ISP-Checker-deploy.SHA512 +++ b/kubernetes/ISP-Checker-deploy.SHA512 @@ -1 +1 @@ -SHA512 (../ISP-Checker-deploy.yaml) = 019e4d21b9643a2a0db6a68c049f574568dbc36218fb81e87e792a252cc4273b09705aa16bf269e0bde79f6cbf2fe064f4e2a9455e08594e2e879a395818057d +SHA512 (../ISP-Checker-deploy.yaml) = edf8f35cf0be4d2399f3bbb351af181005177d2a7f23c520ee111991fe8ee330a6de308d8e8c53db7b2b631a3524c3d49792ffec5a957999fb6f5df2fd36d2c8 diff --git a/kubernetes/ISP-Checker-deploy.yaml b/kubernetes/ISP-Checker-deploy.yaml index 8317bfc..afc9b56 100644 --- a/kubernetes/ISP-Checker-deploy.yaml +++ b/kubernetes/ISP-Checker-deploy.yaml @@ -2,12 +2,12 @@ apiVersion: v1 kind: Namespace metadata: - name: monitoring + name: isp-checker --- apiVersion: v1 kind: PersistentVolumeClaim metadata: - namespace: monitoring + namespace: isp-checker labels: app: influxdb app.kubernetes.io/app: influxdb @@ -24,7 +24,7 @@ spec: apiVersion: v1 kind: PersistentVolumeClaim metadata: - namespace: monitoring + namespace: isp-checker labels: app: grafana app.kubernetes.io/app: grafana @@ -40,7 +40,7 @@ spec: apiVersion: v1 kind: ConfigMap metadata: - namespace: monitoring + namespace: isp-checker name: grafana-dashboard-provisioner labels: app.kubernetes.io/app: grafana @@ -63,7 +63,7 @@ data: apiVersion: v1 kind: ConfigMap metadata: - namespace: monitoring + namespace: isp-checker name: telegraf-config labels: app.kubernetes.io/app: grafana @@ -86,7 +86,7 @@ data: quiet = true [[outputs.influxdb]] - urls = ["http://influxdb-svc.monitoring.svc.cluster.local:8086/"] + urls = ["http://influxdb-svc.isp-checker.svc.cluster.local:8086/"] database = "$INFLUXDB_DB" timeout = "60s" username = "$INFLUXDB_ADMIN_USER" @@ -192,7 +192,7 @@ data: quiet = true [[outputs.influxdb]] - urls = ["http://influxdb-svc.monitoring.svc.cluster.local:8086/"] + urls = ["http://influxdb-svc.isp-checker.svc.cluster.local:8086/"] database = "$INFLUXDB_DB" timeout = "60s" username = "$INFLUXDB_ADMIN_USER" @@ -227,7 +227,7 @@ data: quiet = true [[outputs.influxdb]] - urls = ["http://influxdb-svc.monitoring.svc.cluster.local:8086/"] + urls = ["http://influxdb-svc.isp-checker.svc.cluster.local:8086/"] database = "$INFLUXDB_DB" timeout = "60s" username = "$INFLUXDB_ADMIN_USER" @@ -248,7 +248,7 @@ data: apiVersion: v1 kind: Secret metadata: - namespace: monitoring + namespace: isp-checker name: isp-checker-secrets-rw type: Opaque stringData: @@ -260,7 +260,7 @@ stringData: apiVersion: v1 kind: Secret metadata: - namespace: monitoring + namespace: isp-checker name: isp-checker-secrets-ro labels: app.kubernetes.io/app: influxdb @@ -275,7 +275,7 @@ stringData: apiVersion: v1 kind: Secret metadata: - namespace: monitoring + namespace: isp-checker name: influxdb-datasource-provisioner labels: app.kubernetes.io/app: grafana @@ -287,7 +287,7 @@ stringData: type: influxdb access: proxy orgId: 1 - url: http://influxdb-svc.monitoring.svc.cluster.local:8086/ + url: http://influxdb-svc.isp-checker.svc.cluster.local:8086/ user: grafana database: telegraf isDefault: true @@ -296,7 +296,7 @@ stringData: apiVersion: v1 kind: ConfigMap metadata: - namespace: monitoring + namespace: isp-checker name: network-dashboard labels: app.kubernetes.io/app: grafana @@ -4261,7 +4261,7 @@ data: "style": "dark", "tags": [ "networking", - "monitoring", + "isp-checker", "telegraf", "influxdb", "isp", @@ -4363,7 +4363,7 @@ data: apiVersion: v1 kind: ConfigMap metadata: - namespace: monitoring + namespace: isp-checker name: raspberry-dashboard labels: app.kubernetes.io/app: grafana @@ -4384,7 +4384,7 @@ data: } ] }, - "description": "Raspberry Pi Monitoring", + "description": "Raspberry Pi isp-checker", "editable": true, "gnetId": 10578, "graphTooltip": 1, @@ -11231,7 +11231,7 @@ data: ] }, "timezone": "browser", - "title": "Raspberry Pi Monitoring", + "title": "Raspberry Pi isp-checker", "uid": "sF7d-FHZz", "version": 2 } @@ -11239,8 +11239,8 @@ data: apiVersion: policy/v1beta1 kind: PodDisruptionBudget metadata: - name: telegraf-pdb - namespace: monitoring + name: isp-telegraf-pdb + namespace: isp-checker spec: minAvailable: 2 selector: @@ -11251,8 +11251,8 @@ spec: apiVersion: policy/v1beta1 kind: PodDisruptionBudget metadata: - name: telegraf-pdb - namespace: monitoring + name: isp-telegraf-pdb + namespace: isp-checker spec: minAvailable: 1 selector: @@ -11263,8 +11263,8 @@ spec: apiVersion: policy/v1beta1 kind: PodDisruptionBudget metadata: - name: influxdb - namespace: monitoring + name: isp-influxdb-pdb + namespace: isp-checker spec: minAvailable: 1 selector: @@ -11274,7 +11274,7 @@ spec: apiVersion: apps/v1 kind: DaemonSet metadata: - namespace: monitoring + namespace: isp-checker name: telegraf spec: updateStrategy: @@ -11373,7 +11373,7 @@ metadata: app.kubernetes.io/app: influxdb app.kubernetes.io/project: isp-checker name: influxdb-svc - namespace: monitoring + namespace: isp-checker spec: clusterIP: 10.43.37.100 ports: @@ -11388,7 +11388,7 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - namespace: monitoring + namespace: isp-checker name: influxdb labels: app: influxdb @@ -11453,12 +11453,12 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - namespace: monitoring + namespace: isp-checker name: grafana labels: app: grafana spec: - replicas: 1 + replicas: 3 progressDeadlineSeconds: 600 selector: matchLabels: @@ -11517,7 +11517,7 @@ spec: - name: GF_DASHBOARDS_DEFAULT_HOME_DASHBOARD_PATH value: /var/lib/grafana/dashboards/network-dashboard.json - name: GF_INSTALL_PLUGINS - value: https://grafana.com/api/plugins/gowee-traceroutemap-panel/versions/0.2.3/download;gowee-traceroutemap-panel + value: "https://grafana.com/api/plugins/gowee-traceroutemap-panel/versions/0.2.3/download;gowee-traceroutemap-panel,grafana-piechart-panel 1.6.1" readinessProbe: initialDelaySeconds: 5 periodSeconds: 30 @@ -11530,11 +11530,11 @@ spec: port: 3000 resources: requests: - memory: "200Mi" - cpu: "0.25" + memory: "100Mi" + cpu: "0.10" limits: - memory: "500Mi" - cpu: "0.4" + memory: "400Mi" + cpu: "0.25" volumes: # Grafana configuration PVC - name: grafana-volume @@ -11561,12 +11561,12 @@ apiVersion: batch/v1beta1 kind: CronJob metadata: name: telefraf-mtr - namespace: monitoring + namespace: isp-checker spec: schedule: "*/10 * * * *" startingDeadlineSeconds: 100 - successfulJobsHistoryLimit: 3 - failedJobsHistoryLimit: 2 + successfulJobsHistoryLimit: 1 + failedJobsHistoryLimit: 1 concurrencyPolicy: "Forbid" jobTemplate: spec: @@ -11618,12 +11618,12 @@ apiVersion: batch/v1beta1 kind: CronJob metadata: name: telefraf-speedtest - namespace: monitoring + namespace: isp-checker spec: schedule: "*/10 * * * *" startingDeadlineSeconds: 100 - successfulJobsHistoryLimit: 3 - failedJobsHistoryLimit: 2 + successfulJobsHistoryLimit: 1 + failedJobsHistoryLimit: 1 concurrencyPolicy: "Forbid" jobTemplate: spec: diff --git a/kubernetes/base/configmap.yaml b/kubernetes/base/configmap.yaml index cbde8d4..ce8d865 100644 --- a/kubernetes/base/configmap.yaml +++ b/kubernetes/base/configmap.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: - namespace: monitoring + namespace: isp-checker name: grafana-dashboard-provisioner labels: app.kubernetes.io/app: grafana @@ -25,7 +25,7 @@ data: apiVersion: v1 kind: ConfigMap metadata: - namespace: monitoring + namespace: isp-checker name: telegraf-config labels: app.kubernetes.io/app: grafana @@ -48,7 +48,7 @@ data: quiet = true [[outputs.influxdb]] - urls = ["http://influxdb-svc.monitoring.svc.cluster.local:8086/"] + urls = ["http://influxdb-svc.isp-checker.svc.cluster.local:8086/"] database = "$INFLUXDB_DB" timeout = "60s" username = "$INFLUXDB_ADMIN_USER" @@ -154,7 +154,7 @@ data: quiet = true [[outputs.influxdb]] - urls = ["http://influxdb-svc.monitoring.svc.cluster.local:8086/"] + urls = ["http://influxdb-svc.isp-checker.svc.cluster.local:8086/"] database = "$INFLUXDB_DB" timeout = "60s" username = "$INFLUXDB_ADMIN_USER" @@ -189,7 +189,7 @@ data: quiet = true [[outputs.influxdb]] - urls = ["http://influxdb-svc.monitoring.svc.cluster.local:8086/"] + urls = ["http://influxdb-svc.isp-checker.svc.cluster.local:8086/"] database = "$INFLUXDB_DB" timeout = "60s" username = "$INFLUXDB_ADMIN_USER" diff --git a/kubernetes/base/cronJob.yaml b/kubernetes/base/cronJob.yaml index 9b85f0d..8a88835 100644 --- a/kubernetes/base/cronJob.yaml +++ b/kubernetes/base/cronJob.yaml @@ -3,7 +3,7 @@ apiVersion: batch/v1beta1 kind: CronJob metadata: name: telefraf-mtr - namespace: monitoring + namespace: isp-checker spec: schedule: "*/10 * * * *" startingDeadlineSeconds: 100 @@ -25,7 +25,7 @@ spec: containers: - name: telegraf-mtr image: tty0/isp_telegraf:1.15.3 - imagePullPolicy: Always + imagePullPolicy: IfNotPresent command: ['sh', '-c', "/usr/bin/telegraf --config /etc/telegraf/telegraf-mtr.conf --once"] envFrom: - secretRef: @@ -46,7 +46,7 @@ spec: - name: telegraf-config-volume mountPath: /etc/telegraf/ readOnly: true - restartPolicy: Never + restartPolicy: OnFailure volumes: - name: telegraf-config-volume configMap: @@ -60,7 +60,7 @@ apiVersion: batch/v1beta1 kind: CronJob metadata: name: telefraf-speedtest - namespace: monitoring + namespace: isp-checker spec: schedule: "*/10 * * * *" startingDeadlineSeconds: 100 @@ -82,7 +82,7 @@ spec: containers: - name: telegraf-speedtest image: tty0/isp_telegraf:1.15.3 - imagePullPolicy: Always + imagePullPolicy: IfNotPresent command: ['sh', '-c', "/usr/bin/telegraf --config /etc/telegraf/telegraf-speedtest.conf --once"] envFrom: - secretRef: @@ -103,7 +103,7 @@ spec: - name: telegraf-config-volume mountPath: /etc/telegraf/ readOnly: true - restartPolicy: Never + restartPolicy: OnFailure volumes: - name: telegraf-config-volume configMap: diff --git a/kubernetes/base/daemonSet.yaml b/kubernetes/base/daemonSet.yaml index e30056a..f6d6f94 100644 --- a/kubernetes/base/daemonSet.yaml +++ b/kubernetes/base/daemonSet.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: DaemonSet metadata: - namespace: monitoring + namespace: isp-checker name: telegraf spec: updateStrategy: @@ -27,7 +27,7 @@ spec: containers: - name: telegraf image: tty0/isp_telegraf:1.15.3 - imagePullPolicy: Always + imagePullPolicy: IfNotPresent envFrom: - secretRef: name: isp-checker-secrets-rw diff --git a/kubernetes/base/deployment.yaml b/kubernetes/base/deployment.yaml index 52420ab..bc23fde 100644 --- a/kubernetes/base/deployment.yaml +++ b/kubernetes/base/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - namespace: monitoring + namespace: isp-checker name: influxdb labels: app: influxdb @@ -26,7 +26,7 @@ spec: containers: - name: influxdb image: influxdb:1.8.3 - imagePullPolicy: Always + imagePullPolicy: IfNotPresent lifecycle: preStop: exec: @@ -67,7 +67,7 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - namespace: monitoring + namespace: isp-checker name: grafana labels: app: grafana @@ -97,7 +97,7 @@ spec: containers: - name: grafana image: grafana/grafana:7.2.1 - imagePullPolicy: Always + imagePullPolicy: IfNotPresent lifecycle: preStop: exec: diff --git a/kubernetes/base/namespace.yaml b/kubernetes/base/namespace.yaml index ff7ae1b..7a501c1 100644 --- a/kubernetes/base/namespace.yaml +++ b/kubernetes/base/namespace.yaml @@ -2,4 +2,4 @@ apiVersion: v1 kind: Namespace metadata: - name: monitoring + name: isp-checker diff --git a/kubernetes/base/networkDashboard.yaml b/kubernetes/base/networkDashboard.yaml index 030b8a4..ac2d4b2 100644 --- a/kubernetes/base/networkDashboard.yaml +++ b/kubernetes/base/networkDashboard.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: - namespace: monitoring + namespace: isp-checker name: network-dashboard labels: app.kubernetes.io/app: grafana @@ -3967,7 +3967,7 @@ data: "style": "dark", "tags": [ "networking", - "monitoring", + "isp-checker", "telegraf", "influxdb", "isp", diff --git a/kubernetes/base/pdb.yaml b/kubernetes/base/pdb.yaml index de2c5f6..1fd206d 100644 --- a/kubernetes/base/pdb.yaml +++ b/kubernetes/base/pdb.yaml @@ -3,7 +3,7 @@ apiVersion: policy/v1beta1 kind: PodDisruptionBudget metadata: name: isp-telegraf-pdb - namespace: monitoring + namespace: isp-checker spec: minAvailable: 2 selector: @@ -15,7 +15,7 @@ apiVersion: policy/v1beta1 kind: PodDisruptionBudget metadata: name: isp-telegraf-pdb - namespace: monitoring + namespace: isp-checker spec: minAvailable: 1 selector: @@ -27,7 +27,7 @@ apiVersion: policy/v1beta1 kind: PodDisruptionBudget metadata: name: isp-influxdb-pdb - namespace: monitoring + namespace: isp-checker spec: minAvailable: 1 selector: diff --git a/kubernetes/base/pvc.yaml b/kubernetes/base/pvc.yaml index 66cfcab..9564649 100644 --- a/kubernetes/base/pvc.yaml +++ b/kubernetes/base/pvc.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: - namespace: monitoring + namespace: isp-checker labels: app: influxdb app.kubernetes.io/app: influxdb @@ -19,7 +19,7 @@ spec: apiVersion: v1 kind: PersistentVolumeClaim metadata: - namespace: monitoring + namespace: isp-checker labels: app: grafana app.kubernetes.io/app: grafana diff --git a/kubernetes/base/raspberryDashboard.yaml b/kubernetes/base/raspberryDashboard.yaml index 0010962..6808634 100644 --- a/kubernetes/base/raspberryDashboard.yaml +++ b/kubernetes/base/raspberryDashboard.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: - namespace: monitoring + namespace: isp-checker name: raspberry-dashboard labels: app.kubernetes.io/app: grafana @@ -23,7 +23,7 @@ data: } ] }, - "description": "Raspberry Pi Monitoring", + "description": "Raspberry Pi isp-checker", "editable": true, "gnetId": 10578, "graphTooltip": 1, @@ -6870,7 +6870,7 @@ data: ] }, "timezone": "browser", - "title": "Raspberry Pi Monitoring", + "title": "Raspberry Pi isp-checker", "uid": "sF7d-FHZz", "version": 2 } diff --git a/kubernetes/base/secrets.yaml b/kubernetes/base/secrets.yaml index 0babca3..6ab0f11 100644 --- a/kubernetes/base/secrets.yaml +++ b/kubernetes/base/secrets.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Secret metadata: - namespace: monitoring + namespace: isp-checker name: isp-checker-secrets-rw type: Opaque stringData: @@ -14,7 +14,7 @@ stringData: apiVersion: v1 kind: Secret metadata: - namespace: monitoring + namespace: isp-checker name: isp-checker-secrets-ro labels: app.kubernetes.io/app: influxdb @@ -29,7 +29,7 @@ stringData: apiVersion: v1 kind: Secret metadata: - namespace: monitoring + namespace: isp-checker name: influxdb-datasource-provisioner labels: app.kubernetes.io/app: grafana @@ -41,7 +41,7 @@ stringData: type: influxdb access: proxy orgId: 1 - url: http://influxdb-svc.monitoring.svc.cluster.local:8086/ + url: http://influxdb-svc.isp-checker.svc.cluster.local:8086/ user: grafana database: telegraf isDefault: true diff --git a/kubernetes/base/serviceAccount.yaml b/kubernetes/base/serviceAccount.yaml index 91f765f..9240920 100644 --- a/kubernetes/base/serviceAccount.yaml +++ b/kubernetes/base/serviceAccount.yaml @@ -3,4 +3,4 @@ apiVersion: v1 kind: ServiceAccount metadata: name: isp-checker-sa - namespace: monitoring + namespace: isp-checker diff --git a/kubernetes/base/services.yaml b/kubernetes/base/services.yaml index 3f6a25e..c71c64c 100644 --- a/kubernetes/base/services.yaml +++ b/kubernetes/base/services.yaml @@ -7,7 +7,7 @@ metadata: app.kubernetes.io/app: influxdb app.kubernetes.io/project: isp-checker name: influxdb-svc - namespace: monitoring + namespace: isp-checker spec: clusterIP: 10.43.37.100 ports: diff --git a/kubernetes/kustomization.yaml b/kubernetes/kustomization.yaml index bf1e4f0..f91a818 100644 --- a/kubernetes/kustomization.yaml +++ b/kubernetes/kustomization.yaml @@ -1,4 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization +namespace: isp-checker resources: - ./base