From 986cd99fbdb754ea06dc7dd0f527b7db19ce8ea9 Mon Sep 17 00:00:00 2001 From: Nicolas Hennion Date: Thu, 16 May 2024 13:44:51 +0000 Subject: [PATCH] Update the Grafana dashboard #2780 --- conf/glances-grafana-influxql.json | 2279 +++++++++-------- glances/exports/glances_influxdb/__init__.py | 2 +- glances/exports/glances_influxdb2/__init__.py | 2 +- 3 files changed, 1168 insertions(+), 1115 deletions(-) diff --git a/conf/glances-grafana-influxql.json b/conf/glances-grafana-influxql.json index 39380285..a10c64b1 100644 --- a/conf/glances-grafana-influxql.json +++ b/conf/glances-grafana-influxql.json @@ -7,26 +7,23 @@ "type": "datasource", "pluginId": "influxdb", "pluginName": "InfluxDB" + }, + { + "name": "DS_LSAT1", + "label": "lsat1", + "description": "", + "type": "datasource", + "pluginId": "influxdb", + "pluginName": "InfluxDB" } ], + "__elements": {}, "__requires": [ { "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "7.5.3" - }, - { - "type": "panel", - "id": "graph", - "name": "Graph", - "version": "" - }, - { - "type": "panel", - "id": "heatmap", - "name": "Heatmap", - "version": "" + "version": "10.4.1" }, { "type": "datasource", @@ -36,8 +33,8 @@ }, { "type": "panel", - "id": "singlestat", - "name": "Singlestat", + "id": "stat", + "name": "Stat", "version": "" }, { @@ -45,13 +42,22 @@ "id": "text", "name": "Text", "version": "" + }, + { + "type": "panel", + "id": "timeseries", + "name": "Time series", + "version": "" } ], "annotations": { "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": { + "type": "datasource", + "uid": "grafana" + }, "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -61,35 +67,48 @@ ] }, "editable": true, - "gnetId": null, + "fiscalYearStartMonth": 0, "graphTooltip": 0, "id": null, - "iteration": 1622127318980, "links": [], "panels": [ { - "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": "${DS_GLANCES}", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": {}, - "overrides": [] + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "none" + }, + "overrides": [] }, "gridPos": { "h": 6, @@ -98,43 +117,31 @@ "y": 0 }, "id": 5, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false + "options": { + "colorMode": "none", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "mean" + ], + "fields": "", + "values": false + }, + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "tableColumn": "", + "pluginVersion": "10.4.1", "targets": [ { "column": "cpucore", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "dsType": "influxdb", "function": "mean", "groupBy": [ @@ -175,82 +182,101 @@ ] } ], - "thresholds": "", "title": "Core", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "avg" + "type": "stat" }, { - "aliasColors": {}, - "annotate": { - "enable": false + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_GLANCES}", "fieldConfig": { - "defaults": {}, + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 2, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "normal" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "short" + }, "overrides": [] }, - "fill": 1, - "fillGradient": 0, - "grid": { - "max": null, - "min": null - }, "gridPos": { "h": 6, "w": 20, "x": 2, "y": 0 }, - "hiddenSeries": false, "id": 4, - "interactive": true, - "legend": { - "alignAsTable": true, - "avg": true, - "current": false, - "max": true, - "min": true, - "rightSide": true, - "show": true, - "total": false, - "values": true - }, - "legend_counts": true, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true + "legend": { + "calcs": [ + "mean", + "max", + "min" + ], + "displayMode": "table", + "placement": "right", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } }, - "percentage": false, - "pluginVersion": "7.5.3", - "pointradius": 5, - "points": false, - "renderer": "flot", - "resolution": 100, - "scale": 1, - "seriesOverrides": [], - "spaceLength": 10, - "spyable": true, - "stack": true, - "steppedLine": false, + "pluginVersion": "10.4.1", "targets": [ { "alias": "1min", "column": "min1", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "dsType": "influxdb", "function": "mean", "groupBy": [ @@ -300,6 +326,10 @@ { "alias": "5mins", "column": "min5", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "dsType": "influxdb", "function": "mean", "groupBy": [ @@ -349,6 +379,10 @@ { "alias": "15mins", "column": "min15", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "dsType": "influxdb", "function": "mean", "groupBy": [ @@ -396,70 +430,47 @@ "target": "" } ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "timezone": "browser", "title": "Load", - "tooltip": { - "query_as_alias": true, - "shared": false, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "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 - } + "type": "timeseries" }, { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], - "datasource": "${DS_GLANCES}", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": {}, - "overrides": [] + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true + "fieldConfig": { + "defaults": { + "color": { + "fixedColor": "rgb(31, 120, 193)", + "mode": "fixed" + }, + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "none" + }, + "overrides": [] }, "gridPos": { "h": 6, @@ -468,43 +479,31 @@ "y": 0 }, "id": 18, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true + "options": { + "colorMode": "none", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "mean" + ], + "fields": "", + "values": false + }, + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "tableColumn": "", + "pluginVersion": "10.4.1", "targets": [ { "column": "total", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "dsType": "influxdb", "function": "mean", "groupBy": [ @@ -545,72 +544,97 @@ ] } ], - "thresholds": "", "title": "Processes", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "avg" + "type": "stat" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_GLANCES}", - "editable": true, - "error": false, + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "fieldConfig": { - "defaults": {}, + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "percent" + }, "overrides": [] }, - "fill": 0, - "fillGradient": 0, - "grid": {}, "gridPos": { "h": 7, "w": 12, "x": 0, "y": 6 }, - "hiddenSeries": false, "id": 6, - "legend": { - "avg": true, - "current": false, - "max": true, - "min": true, - "rightSide": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } }, - "percentage": false, - "pluginVersion": "7.5.3", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + "pluginVersion": "10.4.1", "targets": [ { "alias": "User", "column": "user", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "dsType": "influxdb", "function": "mean", "groupBy": [ @@ -659,6 +683,10 @@ { "alias": "System", "column": "system", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "dsType": "influxdb", "function": "mean", "groupBy": [ @@ -708,6 +736,10 @@ { "alias": "IoWait", "column": "iowait", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "dsType": "influxdb", "function": "mean", "groupBy": [ @@ -755,99 +787,114 @@ "target": "" } ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, "title": "CPU (%)", - "tooltip": { - "shared": false, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "percent", - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } + "type": "timeseries" }, { - "aliasColors": { - "Max": "#BF1B00" + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_GLANCES}", - "editable": true, - "error": false, "fieldConfig": { - "defaults": {}, - "overrides": [] + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "bytes" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Max" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#BF1B00", + "mode": "fixed" + } + } + ] + } + ] }, - "fill": 0, - "fillGradient": 0, - "grid": {}, "gridPos": { "h": 7, "w": 12, "x": 12, "y": 6 }, - "hiddenSeries": false, "id": 7, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } }, - "percentage": false, - "pluginVersion": "7.5.3", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + "pluginVersion": "10.4.1", "targets": [ { "alias": "Used", "column": "used", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "dsType": "influxdb", "function": "mean", "groupBy": [ @@ -897,6 +944,10 @@ { "alias": "Max", "column": "total", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "dsType": "influxdb", "function": "mean", "groupBy": [ @@ -945,104 +996,101 @@ "target": "" } ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, "title": "MEM", - "tooltip": { - "shared": false, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:2371", - "format": "bytes", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "$$hashKey": "object:2372", - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } + "type": "timeseries" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_GLANCES}", - "editable": true, - "error": false, + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "fieldConfig": { - "defaults": {}, + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 30, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "bps" + }, "overrides": [] }, - "fill": 3, - "fillGradient": 0, - "grid": {}, "gridPos": { "h": 7, "w": 12, "x": 0, "y": 13 }, - "hiddenSeries": false, "id": 9, - "legend": { - "avg": true, - "current": false, - "max": true, - "min": true, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.3", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "alias": "Tx", - "yaxis": 1 + "legend": { + "calcs": [ + "mean", + "max", + "min" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + }, + "pluginVersion": "10.4.1", "targets": [ { "alias": "In", "column": "enp0s25.rx", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "dsType": "influxdb", "function": "mean", "groupBy": [ @@ -1087,6 +1135,10 @@ { "alias": "Out", "column": "eth0.tx*-1", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "dsType": "influxdb", "function": "mean", "groupBy": [ @@ -1129,101 +1181,114 @@ "target": "" } ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, "title": "$interface network interface", - "tooltip": { - "shared": false, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:2467", - "format": "bps", - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "$$hashKey": "object:2468", - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } + "type": "timeseries" }, { - "aliasColors": { - "Max": "#BF1B00" + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_GLANCES}", - "editable": true, - "error": false, "fieldConfig": { - "defaults": {}, - "overrides": [] + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "bytes" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Max" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#BF1B00", + "mode": "fixed" + } + } + ] + } + ] }, - "fill": 0, - "fillGradient": 0, - "grid": {}, "gridPos": { "h": 7, "w": 12, "x": 12, "y": 13 }, - "hiddenSeries": false, "id": 8, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } }, - "percentage": false, - "pluginVersion": "7.5.3", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + "pluginVersion": "10.4.1", "targets": [ { "alias": "Used", "column": "used", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "dsType": "influxdb", "function": "mean", "groupBy": [ @@ -1261,6 +1326,10 @@ { "alias": "Max", "column": "total", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "dsType": "influxdb", "function": "mean", "groupBy": [ @@ -1297,104 +1366,101 @@ "target": "" } ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, "title": "SWAP", - "tooltip": { - "shared": false, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:2690", - "format": "bytes", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "$$hashKey": "object:2691", - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } + "type": "timeseries" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_GLANCES}", - "editable": true, - "error": false, + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "fieldConfig": { - "defaults": {}, + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "bytes" + }, "overrides": [] }, - "fill": 0, - "fillGradient": 0, - "grid": {}, "gridPos": { "h": 7, "w": 12, "x": 0, "y": 20 }, - "hiddenSeries": false, "id": 10, - "legend": { - "avg": true, - "current": false, - "max": true, - "min": true, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.3", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "alias": "Write", - "yaxis": 2 + "legend": { + "calcs": [ + "mean", + "max", + "min" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + }, + "pluginVersion": "10.4.1", "targets": [ { "alias": "Read", "column": "sda2.read_bytes", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "dsType": "influxdb", "function": "mean", "groupBy": [ @@ -1438,6 +1504,10 @@ { "alias": "Write", "column": "sda2.write_bytes", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "dsType": "influxdb", "function": "mean", "groupBy": [ @@ -1480,108 +1550,130 @@ "target": "" } ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, "title": "$disk disk IO", - "tooltip": { - "shared": false, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:2782", - "format": "bytes", - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "$$hashKey": "object:2783", - "format": "bytes", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } + "type": "timeseries" }, { - "aliasColors": { - "Max": "#BF1B00" + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_GLANCES}", - "editable": true, - "error": false, "fieldConfig": { - "defaults": {}, - "overrides": [] + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 3, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "bytes" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Max" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#BF1B00", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Used" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 100 + }, + { + "id": "custom.fillOpacity", + "value": 80 + } + ] + } + ] }, - "fill": 0, - "fillGradient": 0, - "grid": {}, "gridPos": { "h": 7, "w": 8, "x": 12, "y": 20 }, - "hiddenSeries": false, "id": 11, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 3, - "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.3", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "$$hashKey": "object:3095", - "alias": "Used", - "fill": 10, - "fillGradient": 8 + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + }, + "pluginVersion": "10.4.1", "targets": [ { "alias": "Used", "column": "\"/.used\"", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "dsType": "influxdb", "function": "mean", "groupBy": [ @@ -1636,6 +1728,10 @@ { "alias": "Max", "column": "\"/.size\"", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "dsType": "influxdb", "function": "mean", "groupBy": [ @@ -1689,70 +1785,50 @@ "target": "" } ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, "title": "/ Size", - "tooltip": { - "shared": false, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:2891", - "format": "bytes", - "logBase": 1, - "max": null, - "min": 0, - "show": true - }, - { - "$$hashKey": "object:2892", - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } + "type": "timeseries" }, { - "cacheTimeout": null, - "colorBackground": true, - "colorValue": false, - "colors": [ - "rgba(71, 212, 59, 0.4)", - "rgba(245, 150, 40, 0.73)", - "rgba(225, 40, 40, 0.59)" - ], - "datasource": "${DS_GLANCES}", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": {}, - "overrides": [] + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" }, - "format": "percent", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "rgba(71, 212, 59, 0.4)", + "value": null + }, + { + "color": "rgba(245, 150, 40, 0.73)", + "value": 70 + }, + { + "color": "rgba(225, 40, 40, 0.59)", + "value": 90 + } + ] + }, + "unit": "percent" + }, + "overrides": [] }, "gridPos": { "h": 7, @@ -1761,43 +1837,31 @@ "y": 20 }, "id": 16, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(193, 71, 31)", - "show": true + "options": { + "colorMode": "background", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "mean" + ], + "fields": "", + "values": false + }, + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "tableColumn": "", + "pluginVersion": "10.4.1", "targets": [ { "column": "\"/.percent\"", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "dsType": "influxdb", "function": "mean", "groupBy": [ @@ -1844,42 +1908,50 @@ ] } ], - "thresholds": "70,90", "title": "/ used", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "avg" + "type": "stat" }, { - "cacheTimeout": null, - "colorBackground": true, - "colorValue": false, - "colors": [ - "rgba(71, 212, 59, 0.4)", - "rgba(245, 150, 40, 0.73)", - "rgba(225, 40, 40, 0.59)" - ], - "datasource": "${DS_GLANCES}", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": {}, - "overrides": [] + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" }, - "format": "percent", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "rgba(71, 212, 59, 0.4)", + "value": null + }, + { + "color": "rgba(245, 150, 40, 0.73)", + "value": 70 + }, + { + "color": "rgba(225, 40, 40, 0.59)", + "value": 90 + } + ] + }, + "unit": "percent" + }, + "overrides": [] }, "gridPos": { "h": 7, @@ -1888,43 +1960,31 @@ "y": 20 }, "id": 17, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(193, 71, 31)", - "show": true + "options": { + "colorMode": "background", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "mean" + ], + "fields": "", + "values": false + }, + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "tableColumn": "", + "pluginVersion": "10.4.1", "targets": [ { "column": "\"/home.percent\"", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "dsType": "influxdb", "function": "mean", "groupBy": [ @@ -1966,24 +2026,13 @@ ] } ], - "thresholds": "70,90", "title": "/boot used", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "avg" + "type": "stat" }, { - "datasource": null, - "fieldConfig": { - "defaults": {}, - "overrides": [] + "datasource": { + "type": "influxdb", + "uid": "${DS_LSAT1}" }, "gridPos": { "h": 3, @@ -1992,52 +2041,116 @@ "y": 27 }, "id": 22, - "links": [], "options": { + "code": { + "language": "plaintext", + "showLineNumbers": false, + "showMiniMap": false + }, "content": "", "mode": "markdown" }, - "pluginVersion": "7.5.3", + "pluginVersion": "10.4.1", + "targets": [ + { + "datasource": { + "type": "influxdb", + "uid": "${DS_LSAT1}" + }, + "refId": "A" + } + ], "title": "Sensors", "type": "text" }, { - "cards": { - "cardPadding": null, - "cardRound": null + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" }, - "color": { - "cardColor": "rgb(255, 0, 0)", - "colorScale": "sqrt", - "colorScheme": "interpolateReds", - "exponent": 1, - "min": null, - "mode": "opacity" - }, - "dataFormat": "timeseries", - "datasource": "${DS_GLANCES}", + "description": "", "fieldConfig": { - "defaults": {}, + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "fieldMinMax": false, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, "overrides": [] }, "gridPos": { "h": 6, - "w": 12, + "w": 24, "x": 0, "y": 30 }, - "heatmap": {}, - "hideZeroBuckets": false, - "highlightCards": true, "id": 21, - "legend": { - "show": false + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } }, - "links": [], - "reverseYBuckets": false, + "pluginVersion": "10.4.1", "targets": [ { - "alias": "AmbientTemperature", + "alias": "$tag_label", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "dsType": "influxdb", "groupBy": [ { @@ -2046,6 +2159,12 @@ ], "type": "time" }, + { + "params": [ + "label::tag" + ], + "type": "tag" + }, { "params": [ "null" @@ -2073,161 +2192,31 @@ ] ], "tags": [ - { - "key": "label", - "operator": "=", - "value": "Ambient" - }, { "condition": "AND", "key": "hostname", "operator": "=~", "value": "/^$host$/" - } - ] - } - ], - "title": "Ambiant temperature", - "tooltip": { - "show": true, - "showHistogram": false - }, - "type": "heatmap", - "xAxis": { - "show": true - }, - "xBucketNumber": null, - "xBucketSize": null, - "yAxis": { - "decimals": null, - "format": "celsius", - "logBase": 1, - "max": null, - "min": "0", - "show": true, - "splitFactor": null - }, - "yBucketBound": "auto", - "yBucketNumber": null, - "yBucketSize": null - }, - { - "cards": { - "cardPadding": null, - "cardRound": null - }, - "color": { - "cardColor": "rgb(255, 0, 0)", - "colorScale": "sqrt", - "colorScheme": "interpolateOranges", - "exponent": 1, - "mode": "opacity" - }, - "dataFormat": "timeseries", - "datasource": "${DS_GLANCES}", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "gridPos": { - "h": 6, - "w": 12, - "x": 12, - "y": 30 - }, - "heatmap": {}, - "hideZeroBuckets": false, - "highlightCards": true, - "id": 23, - "legend": { - "show": false - }, - "links": [], - "reverseYBuckets": false, - "targets": [ - { - "alias": "CpuTemperature", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "sensors", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "label", - "operator": "=", - "value": "CPU" }, { "condition": "AND", - "key": "hostname", + "key": "type", "operator": "=~", - "value": "/^$host$/" + "value": "/^temperature_core$/" } ] } ], - "title": "CPU temperature", - "tooltip": { - "show": true, - "showHistogram": false - }, - "type": "heatmap", - "xAxis": { - "show": true - }, - "xBucketNumber": null, - "xBucketSize": null, - "yAxis": { - "decimals": null, - "format": "celsius", - "logBase": 1, - "max": null, - "min": "0", - "show": true, - "splitFactor": null - }, - "yBucketBound": "auto", - "yBucketNumber": null, - "yBucketSize": null + "title": "Temperatures", + "type": "timeseries" }, { - "datasource": null, + "datasource": { + "type": "influxdb", + "uid": "${DS_LSAT1}" + }, "editable": true, "error": false, - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, "gridPos": { "h": 3, "w": 24, @@ -2235,28 +2224,88 @@ "y": 36 }, "id": 13, - "links": [], "options": { + "code": { + "language": "plaintext", + "showLineNumbers": false, + "showMiniMap": false + }, "content": "", "mode": "markdown" }, - "pluginVersion": "7.5.3", + "pluginVersion": "10.4.1", "style": {}, + "targets": [ + { + "datasource": { + "type": "influxdb", + "uid": "${DS_LSAT1}" + }, + "refId": "A" + } + ], "title": "Containers", "type": "text" }, { - "aliasColors": { - "$host.docker.mean": "#ba43a9", - "CPU%": "#cca300", - "MEM": "#2f575e" + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_GLANCES}", "fieldConfig": { - "defaults": {}, + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 2, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "short" + }, "overrides": [ { "matcher": { @@ -2269,63 +2318,111 @@ "value": "decbytes" } ] + }, + { + "matcher": { + "id": "byName", + "options": "$host.docker.mean" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#ba43a9", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "CPU%" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#cca300", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "MEM" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#2f575e", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "MEM" + }, + "properties": [ + { + "id": "unit", + "value": "decbytes" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "MEM" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 100 + }, + { + "id": "custom.fillOpacity", + "value": 80 + } + ] } ] }, - "fill": 0, - "fillGradient": 0, "gridPos": { "h": 8, "w": 24, "x": 0, "y": 39 }, - "hiddenSeries": false, "id": 25, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "none" + } }, - "percentage": false, - "pluginVersion": "7.5.3", - "pointradius": 5, - "points": false, - "renderer": "flot", + "pluginVersion": "10.4.1", "repeat": "container", "repeatDirection": "v", - "seriesOverrides": [ - { - "$$hashKey": "object:3517", - "alias": "MEM", - "yaxis": 2 - }, - { - "$$hashKey": "object:3518", - "alias": "MEM", - "fill": 10, - "fillGradient": 8, - "steppedLine": true, - "zindex": -3 - } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, "targets": [ { "alias": "CPU%", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "groupBy": [ { "params": [ @@ -2341,7 +2438,7 @@ } ], "hide": false, - "measurement": "docker", + "measurement": "containers", "orderByTime": "ASC", "policy": "default", "query": "SELECT mean(\"cpu_percent\") FROM \"$host.docker\" WHERE $timeFilter GROUP BY time($__interval) fill(none)", @@ -2378,6 +2475,10 @@ }, { "alias": "MEM", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "groupBy": [ { "params": [ @@ -2393,7 +2494,7 @@ } ], "hide": false, - "measurement": "docker", + "measurement": "containers", "orderByTime": "ASC", "policy": "default", "query": "SELECT mean(\"cpu_percent\") FROM \"$host.docker\" WHERE $timeFilter GROUP BY time($__interval) fill(none)", @@ -2429,66 +2530,24 @@ ] } ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, "title": "$container container", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:3541", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "$$hashKey": "object:3542", - "format": "decbytes", - "label": null, - "logBase": 1, - "max": null, - "min": "0", - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } + "type": "timeseries" } ], "refresh": "5s", - "schemaVersion": 27, - "style": "dark", + "schemaVersion": 39, "tags": [], "templating": { "list": [ { - "allValue": null, "current": {}, - "datasource": "${DS_GLANCES}", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "definition": "show tag values with key=\"hostname\"", - "description": null, - "error": null, "hide": 0, "includeAll": false, - "label": null, "multi": false, "name": "host", "options": [], @@ -2498,21 +2557,19 @@ "skipUrlSync": false, "sort": 0, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false }, { - "allValue": null, "current": {}, - "datasource": "${DS_GLANCES}", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "definition": "show tag values with key=\"name\"", - "description": null, - "error": null, "hide": 0, "includeAll": true, - "label": null, "multi": true, "name": "container", "options": [], @@ -2522,21 +2579,19 @@ "skipUrlSync": false, "sort": 1, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false }, { - "allValue": null, "current": {}, - "datasource": "${DS_GLANCES}", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "definition": "show tag values with key=\"interface_name\"", - "description": null, - "error": null, "hide": 0, "includeAll": false, - "label": null, "multi": false, "name": "interface", "options": [], @@ -2546,21 +2601,19 @@ "skipUrlSync": false, "sort": 1, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false }, { - "allValue": null, "current": {}, - "datasource": "${DS_GLANCES}", + "datasource": { + "type": "influxdb", + "uid": "${DS_GLANCES}" + }, "definition": "show tag values with key=\"disk_name\"", - "description": null, - "error": null, "hide": 0, "includeAll": false, - "label": null, "multi": false, "name": "disk", "options": [], @@ -2570,7 +2623,6 @@ "skipUrlSync": false, "sort": 1, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false @@ -2615,5 +2667,6 @@ "timezone": "browser", "title": "Glances", "uid": "000000002", - "version": 4 -} + "version": 3, + "weekStart": "" +} \ No newline at end of file diff --git a/glances/exports/glances_influxdb/__init__.py b/glances/exports/glances_influxdb/__init__.py index 435038f6..b5df2708 100644 --- a/glances/exports/glances_influxdb/__init__.py +++ b/glances/exports/glances_influxdb/__init__.py @@ -18,7 +18,7 @@ from glances.exports.export import GlancesExport from influxdb import InfluxDBClient from influxdb.client import InfluxDBClientError -FIELD_TO_TAG = ['name', 'cmdline'] +FIELD_TO_TAG = ['name', 'cmdline', 'type'] class Export(GlancesExport): diff --git a/glances/exports/glances_influxdb2/__init__.py b/glances/exports/glances_influxdb2/__init__.py index 7c0af5a3..6abcfcea 100644 --- a/glances/exports/glances_influxdb2/__init__.py +++ b/glances/exports/glances_influxdb2/__init__.py @@ -17,7 +17,7 @@ from glances.exports.export import GlancesExport from influxdb_client import InfluxDBClient, WriteOptions -FIELD_TO_TAG = ['name', 'cmdline'] +FIELD_TO_TAG = ['name', 'cmdline', 'type'] class Export(GlancesExport):