From 1f62993d05386c7f6dacd3e70d829e86092c7e67 Mon Sep 17 00:00:00 2001 From: Gitouche <26656-gitouche@users.noreply.framagit.org> Date: Mon, 30 Jan 2023 20:53:10 +0100 Subject: [PATCH] Update grafana dashboard --- grafana_dashboard_teleinfo.json | 497 +++++++++++++++++++++++++++++++- 1 file changed, 483 insertions(+), 14 deletions(-) mode change 100755 => 100644 grafana_dashboard_teleinfo.json diff --git a/grafana_dashboard_teleinfo.json b/grafana_dashboard_teleinfo.json old mode 100755 new mode 100644 index 88d02b6..c00353a --- a/grafana_dashboard_teleinfo.json +++ b/grafana_dashboard_teleinfo.json @@ -7,10 +7,22 @@ "type": "datasource", "pluginId": "influxdb", "pluginName": "InfluxDB" + }, + { + "name": "DS_EXPRESSION", + "label": "Expression", + "description": "", + "type": "datasource", + "pluginId": "__expr__" } ], "__elements": {}, "__requires": [ + { + "type": "datasource", + "id": "__expr__", + "version": "1.0.0" + }, { "type": "panel", "id": "barchart", @@ -33,7 +45,7 @@ "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "9.3.0" + "version": "9.3.2" }, { "type": "datasource", @@ -146,7 +158,7 @@ }, "textMode": "auto" }, - "pluginVersion": "9.3.0", + "pluginVersion": "9.3.2", "targets": [ { "datasource": { @@ -229,7 +241,7 @@ }, "textMode": "auto" }, - "pluginVersion": "9.3.0", + "pluginVersion": "9.3.2", "targets": [ { "datasource": { @@ -325,7 +337,7 @@ "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "9.3.0", + "pluginVersion": "9.3.2", "targets": [ { "datasource": { @@ -361,7 +373,7 @@ }, { "params": [], - "type": "mean" + "type": "last" } ] ], @@ -425,7 +437,7 @@ "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "9.3.0", + "pluginVersion": "9.3.2", "targets": [ { "datasource": { @@ -446,9 +458,12 @@ "type": "fill" } ], - "measurement": "IRMS1", + "hide": true, + "measurement": "SINSTS", "orderByTime": "ASC", "policy": "default", + "query": "SELECT last(\"value\") FROM \"SINSTS\" WHERE $timeFilter GROUP BY time($__interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -461,11 +476,62 @@ }, { "params": [], - "type": "mean" + "type": "last" } ] ], "tags": [] + }, + { + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB_TELEINFO}" + }, + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": true, + "measurement": "URMS1", + "orderByTime": "ASC", + "policy": "default", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], + "tags": [] + }, + { + "datasource": { + "type": "__expr__", + "uid": "${DS_EXPRESSION}" + }, + "expression": "$A/$B", + "hide": false, + "refId": "C", + "type": "math" } ], "title": "Intensité Efficace", @@ -523,7 +589,7 @@ }, "showUnfilled": true }, - "pluginVersion": "9.3.0", + "pluginVersion": "9.3.2", "targets": [ { "datasource": { @@ -559,7 +625,7 @@ }, { "params": [], - "type": "mean" + "type": "last" } ] ], @@ -830,6 +896,8 @@ } }, "mappings": [], + "max": 250, + "min": 210, "thresholds": { "mode": "absolute", "steps": [ @@ -912,7 +980,7 @@ "groupBy": [ { "params": [ - "$__interval" + "$interval" ], "type": "time" }, @@ -953,7 +1021,7 @@ "groupBy": [ { "params": [ - "$__interval" + "$interval" ], "type": "time" }, @@ -994,7 +1062,7 @@ "groupBy": [ { "params": [ - "$__interval" + "$interval" ], "type": "time" }, @@ -1235,6 +1303,407 @@ "timeFrom": "2d", "title": "Énergie Active Soutirée (par heure)", "type": "barchart" + }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 26 + }, + "id": 25, + "panels": [], + "title": "Historique", + "type": "row" + }, + { + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB_TELEINFO}" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "fillOpacity": 80, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineWidth": 1, + "scaleDistribution": { + "type": "linear" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "unit": "watth" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "EASF01.difference" + }, + "properties": [ + { + "id": "displayName", + "value": "Heures Creuses" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "EASF02.difference" + }, + "properties": [ + { + "id": "displayName", + "value": "Heures Pleines" + } + ] + } + ] + }, + "gridPos": { + "h": 7, + "w": 24, + "x": 0, + "y": 27 + }, + "hideTimeOverride": false, + "id": 23, + "interval": "1d", + "options": { + "barRadius": 0, + "barWidth": 0.85, + "groupWidth": 0.7, + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "orientation": "auto", + "showValue": "auto", + "stacking": "normal", + "tooltip": { + "mode": "single", + "sort": "none" + }, + "xTickLabelRotation": 0, + "xTickLabelSpacing": 0 + }, + "targets": [ + { + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB_TELEINFO}" + }, + "groupBy": [ + { + "params": [ + "1d" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "EASF01", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [], + "type": "difference" + } + ] + ], + "tags": [] + }, + { + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB_TELEINFO}" + }, + "groupBy": [ + { + "params": [ + "1d" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "EASF02", + "orderByTime": "ASC", + "policy": "default", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [], + "type": "difference" + } + ] + ], + "tags": [] + } + ], + "timeFrom": "31d", + "title": "Énergie Consommée (par jour / 1 mois)", + "type": "barchart" + }, + { + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB_TELEINFO}" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "fillOpacity": 80, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineWidth": 1, + "scaleDistribution": { + "type": "linear" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "unit": "watth" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "EASF01.difference" + }, + "properties": [ + { + "id": "displayName", + "value": "Heures Creuses" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "EASF02.difference" + }, + "properties": [ + { + "id": "displayName", + "value": "Heures Pleines" + } + ] + } + ] + }, + "gridPos": { + "h": 7, + "w": 24, + "x": 0, + "y": 34 + }, + "hideTimeOverride": false, + "id": 26, + "interval": "1M", + "options": { + "barRadius": 0, + "barWidth": 0.85, + "groupWidth": 0.7, + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "orientation": "auto", + "showValue": "auto", + "stacking": "normal", + "tooltip": { + "mode": "single", + "sort": "none" + }, + "xTickLabelRotation": 0, + "xTickLabelSpacing": 0 + }, + "targets": [ + { + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB_TELEINFO}" + }, + "groupBy": [ + { + "params": [ + "30d" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "EASF01", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [], + "type": "difference" + } + ] + ], + "tags": [] + }, + { + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB_TELEINFO}" + }, + "groupBy": [ + { + "params": [ + "30d" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "EASF02", + "orderByTime": "ASC", + "policy": "default", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [], + "type": "difference" + } + ] + ], + "tags": [] + } + ], + "timeFrom": "12M", + "title": "Énergie Consommée (par mois / 1 an)", + "type": "barchart" } ], "refresh": false, @@ -1252,6 +1721,6 @@ "timezone": "Europe/Paris", "title": "Suivi compteur Enedis", "uid": "52WtJBpVk", - "version": 38, + "version": 49, "weekStart": "" } \ No newline at end of file