From 0de3c07186c45a74dbffd6bfe652b44d48dfa88a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81rmin=20Csutor=C3=A1s?= Date: Wed, 17 Jul 2024 12:04:07 +0200 Subject: [PATCH] Update grafana dashboards --- README.md | 2 +- grafana-iCON-metrics-system.json | 586 +++++++++++++++++ grafana.json => grafana-iCON-rooms.json | 836 +++++++++++++----------- 3 files changed, 1047 insertions(+), 377 deletions(-) create mode 100644 grafana-iCON-metrics-system.json rename grafana.json => grafana-iCON-rooms.json (67%) diff --git a/README.md b/README.md index cecc629..c881da3 100644 --- a/README.md +++ b/README.md @@ -144,6 +144,6 @@ Available metrics: ## Grafana dashboard This data is designed to be displayed in a [grafana dashboard](https://grafana.com/docs/grafana/latest/dashboards/). -An [example dashboard](grafana.json) is available to be [imported](https://grafana.com/docs/grafana/latest/dashboards/export-import/). +Example dashboards for the [system](grafana-iCON-metrics-system.json) and the [rooms](grafana-iCON-rooms.json) are available to be [imported](https://grafana.com/docs/grafana/latest/dashboards/export-import/). ![grafana_image](https://user-images.githubusercontent.com/6968192/164945271-5c75cd29-55b0-4057-a737-3945aad95413.png) diff --git a/grafana-iCON-metrics-system.json b/grafana-iCON-metrics-system.json new file mode 100644 index 0000000..064e9a5 --- /dev/null +++ b/grafana-iCON-metrics-system.json @@ -0,0 +1,586 @@ +{ + "__inputs": [ + { + "name": "DS_PROMETHEUS", + "label": "Prometheus", + "description": "", + "type": "datasource", + "pluginId": "prometheus", + "pluginName": "Prometheus" + } + ], + "__elements": {}, + "__requires": [ + { + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "11.1.0" + }, + { + "type": "datasource", + "id": "prometheus", + "name": "Prometheus", + "version": "1.0.0" + }, + { + "type": "panel", + "id": "stat", + "name": "Stat", + "version": "" + }, + { + "type": "panel", + "id": "timeseries", + "name": "Time series", + "version": "" + } + ], + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": { + "type": "grafana", + "uid": "-- Grafana --" + }, + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "type": "dashboard" + } + ] + }, + "description": "Details of the iCON metrics application", + "editable": true, + "fiscalYearStartMonth": 0, + "graphTooltip": 0, + "id": null, + "links": [], + "panels": [ + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 4, + "panels": [], + "title": "General", + "type": "row" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "fieldConfig": { + "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" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "decbytes" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 1 + }, + "id": 1, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "maxHeight": 600, + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "disableTextWrap": false, + "editorMode": "code", + "expr": "go_memstats_alloc_bytes", + "fullMetaSearch": false, + "includeNullMetadata": true, + "instant": false, + "legendFormat": "{{job}}", + "range": true, + "refId": "A", + "useBackend": false + } + ], + "title": "Memory usage", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "fieldConfig": { + "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" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "s" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 1 + }, + "id": 2, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "maxHeight": 600, + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "disableTextWrap": false, + "editorMode": "code", + "expr": "rate(process_cpu_seconds_total[1m])", + "fullMetaSearch": false, + "includeNullMetadata": true, + "instant": false, + "legendFormat": "{{job}}", + "range": true, + "refId": "A", + "useBackend": false + } + ], + "title": "CPU seconds ", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [ + { + "options": { + "0": { + "index": 0, + "text": "Not running" + } + }, + "type": "value" + } + ], + "noValue": "0", + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "red", + "value": null + }, + { + "color": "green", + "value": 1 + } + ] + }, + "unit": "ms" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 9 + }, + "id": 3, + "options": { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "auto", + "percentChangeColorMode": "standard", + "reduceOptions": { + "calcs": [ + "last" + ], + "fields": "", + "values": false + }, + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true + }, + "pluginVersion": "11.1.0", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "disableTextWrap": false, + "editorMode": "code", + "expr": "uptime", + "fullMetaSearch": false, + "includeNullMetadata": true, + "instant": false, + "legendFormat": "__auto", + "range": true, + "refId": "A", + "useBackend": false + } + ], + "title": "Uptime", + "type": "stat" + }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 17 + }, + "id": 5, + "panels": [], + "title": "HTTP API", + "type": "row" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "", + "fieldConfig": { + "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" + } + }, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "unit": "s" + }, + "overrides": [] + }, + "gridPos": { + "h": 6, + "w": 12, + "x": 0, + "y": 18 + }, + "id": 6, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "maxHeight": 600, + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "8.3.6", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "exemplar": true, + "expr": "sum by(sysId, name, response) (increase(icon_http_client_seconds_sum[2m])) / sum by(sysId, name, response) (increase(icon_http_client_seconds_count[2m]))", + "interval": "", + "legendFormat": "{{sysId}} {{name}} {{response}}", + "range": true, + "refId": "A" + } + ], + "title": "HTTP response time", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "", + "fieldConfig": { + "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" + } + }, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "unit": "opm" + }, + "overrides": [] + }, + "gridPos": { + "h": 6, + "w": 12, + "x": 12, + "y": 18 + }, + "id": 7, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "maxHeight": 600, + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "8.3.6", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "exemplar": true, + "expr": "sum by (name, sysId) (increase(icon_http_client_seconds_count[1m]))", + "interval": "", + "legendFormat": "{{sysId}} {{name}}", + "range": true, + "refId": "A" + } + ], + "title": "HTTP RPM", + "type": "timeseries" + } + ], + "refresh": "", + "schemaVersion": 39, + "tags": [], + "templating": { + "list": [] + }, + "time": { + "from": "now-6h", + "to": "now" + }, + "timepicker": {}, + "timezone": "browser", + "title": "iCON metrics system", + "uid": "ddry6gjfj4kjke", + "version": 7, + "weekStart": "" +} \ No newline at end of file diff --git a/grafana.json b/grafana-iCON-rooms.json similarity index 67% rename from grafana.json rename to grafana-iCON-rooms.json index 3bf9955..c6e7f50 100644 --- a/grafana.json +++ b/grafana-iCON-rooms.json @@ -11,12 +11,6 @@ ], "__elements": {}, "__requires": [ - { - "type": "panel", - "id": "bargauge", - "name": "Bar gauge", - "version": "" - }, { "type": "panel", "id": "gauge", @@ -27,7 +21,7 @@ "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "10.0.0" + "version": "11.1.0" }, { "type": "datasource", @@ -37,8 +31,8 @@ }, { "type": "panel", - "id": "timeseries", - "name": "Time series", + "id": "stat", + "name": "Stat", "version": "" } ], @@ -80,9 +74,11 @@ "x": 0, "y": 0 }, - "id": 16, + "id": 23, "panels": [], - "title": "Room", + "repeat": "sysId", + "repeatDirection": "h", + "title": "Controller $sysId", "type": "row" }, { @@ -90,80 +86,96 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "description": "", "fieldConfig": { "defaults": { "color": { "mode": "thresholds" }, - "decimals": 1, - "mappings": [], - "max": 28, - "min": 16, + "decimals": 0, + "mappings": [ + { + "options": { + "0": { + "index": 0, + "text": "No" + }, + "1": { + "index": 1, + "text": "Yes" + } + }, + "type": "value" + } + ], + "max": 1, + "min": 0, "thresholds": { "mode": "absolute", "steps": [ { - "color": "blue", + "color": "red", "value": null }, { "color": "green", - "value": 20 - }, - { - "color": "red", - "value": 27 + "value": 0.5 } ] }, - "unit": "celsius" + "unit": "none" }, "overrides": [] }, "gridPos": { "h": 6, - "w": 12, + "w": 4, "x": 0, "y": 1 }, - "id": 4, + "id": 13, "options": { - "displayMode": "basic", - "minVizHeight": 10, - "minVizWidth": 0, + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ - "lastNotNull" + "last" ], "fields": "", "values": false }, - "showUnfilled": true, - "valueMode": "color" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.0", + "pluginVersion": "11.1.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, - "expr": "icon_temperature{sysId=~\"$sysId\",room=~\"$room\"}", + "expr": "icon_controller_connected{sysId=~\"$sysId\"}", "interval": "", - "legendFormat": "{{room}}", + "legendFormat": "{{sysId}}", + "range": true, "refId": "A" } ], - "title": "Temperature", - "type": "bargauge" + "title": "Controller connected", + "type": "stat" }, { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "description": "", "fieldConfig": { "defaults": { "color": { @@ -175,14 +187,24 @@ "options": { "0": { "index": 0, - "text": "Off" + "text": "Cooling" }, "1": { "index": 1, - "text": "On" + "text": "Heating" } }, "type": "value" + }, + { + "options": { + "match": "null+nan", + "result": { + "color": "text", + "index": 2 + } + }, + "type": "special" } ], "max": 1, @@ -191,184 +213,229 @@ "mode": "absolute", "steps": [ { - "color": "#a7a7a7", + "color": "blue", "value": null }, { - "color": "semi-dark-green", - "value": 0.1 + "color": "orange", + "value": 0.5 } ] - } + }, + "unit": "none" }, "overrides": [] }, "gridPos": { "h": 6, - "w": 12, - "x": 12, + "w": 4, + "x": 4, "y": 1 }, - "id": 5, + "id": 66, "options": { - "displayMode": "basic", - "minVizHeight": 10, - "minVizWidth": 0, + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ - "lastNotNull" + "last" ], "fields": "", "values": false }, - "showUnfilled": true, - "valueMode": "color" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.0", + "pluginVersion": "11.1.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, - "expr": "icon_relay_on{sysId=~\"$sysId\",room=~\"$room\"}", + "expr": "icon_heating{sysId=~\"$sysId\"}", "interval": "", - "legendFormat": "{{room}}", + "legendFormat": "{{sysId}}", + "range": true, "refId": "A" } ], - "title": "Relay", - "type": "bargauge" + "title": "Heating or cooling", + "type": "stat" }, { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "description": "", "fieldConfig": { "defaults": { "color": { "mode": "thresholds" }, - "decimals": 1, - "mappings": [], - "max": 5, - "min": -5, + "decimals": 0, + "mappings": [ + { + "options": { + "0": { + "index": 0, + "text": "Comfort" + }, + "1": { + "index": 1, + "text": "Economy" + } + }, + "type": "value" + }, + { + "options": { + "match": "null+nan", + "result": { + "color": "text", + "index": 2 + } + }, + "type": "special" + } + ], + "max": 1, + "min": 0, "thresholds": { "mode": "absolute", "steps": [ { - "color": "dark-blue", + "color": "green", "value": null }, { - "color": "light-blue", - "value": -3 - }, - { - "color": "light-green", - "value": -1 - }, - { - "color": "light-orange", - "value": 1 - }, - { - "color": "red", - "value": 3 + "color": "#a7a7a7", + "value": 0.5 } ] }, - "unit": "celsius" + "unit": "none" }, "overrides": [] }, "gridPos": { "h": 6, - "w": 12, - "x": 0, - "y": 7 + "w": 4, + "x": 8, + "y": 1 }, - "id": 8, + "id": 67, "options": { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ - "lastNotNull" + "last" ], "fields": "", "values": false }, - "showThresholdLabels": false, - "showThresholdMarkers": true + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.0", + "pluginVersion": "11.1.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, - "expr": "icon_temperature{sysId=~\"$sysId\",room=~\"$room\"} - icon_target_temperature{sysId=~\"$sysId\",room=~\"$room\"}", + "expr": "icon_eco{sysId=~\"$sysId\"}", "interval": "", - "legendFormat": "{{room}}", + "legendFormat": "{{sysId}}", + "range": true, "refId": "A" } ], - "title": "Temperature to target", - "type": "gauge" + "title": "Eco or comfort", + "type": "stat" }, { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "description": "", "fieldConfig": { "defaults": { "color": { "mode": "thresholds" }, - "decimals": 0, - "mappings": [], - "max": 90, - "min": 10, + "decimals": 1, + "mappings": [ + { + "options": { + "match": "null+nan", + "result": { + "color": "text", + "index": 0 + } + }, + "type": "special" + } + ], + "max": 45, + "min": -15, "thresholds": { "mode": "absolute", "steps": [ { - "color": "semi-dark-blue", + "color": "blue", "value": null }, { "color": "light-blue", - "value": 30 + "value": 3 }, { - "color": "semi-dark-green", - "value": 40 + "color": "green", + "value": 16 }, { - "color": "semi-dark-orange", - "value": 60 + "color": "orange", + "value": 28 + }, + { + "color": "red", + "value": 37 } ] }, - "unit": "percent" + "unit": "celsius" }, "overrides": [] }, "gridPos": { "h": 6, - "w": 12, + "w": 4, "x": 12, - "y": 7 + "y": 1 }, - "id": 9, + "id": 11, "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "lastNotNull" @@ -376,62 +443,76 @@ "fields": "", "values": false }, - "showThresholdLabels": false, - "showThresholdMarkers": true + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.0", + "pluginVersion": "11.1.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, - "expr": "icon_humidity{sysId=~\"$sysId\",room=~\"$room\"}", + "expr": "icon_external_temperature{sysId=\"$sysId\"}", "interval": "", - "legendFormat": "{{room}}", + "legendFormat": "", + "range": true, "refId": "A" } ], - "title": "Humidity", - "type": "gauge" + "title": "External temperature", + "type": "stat" }, { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "description": "", "fieldConfig": { "defaults": { "color": { "mode": "thresholds" }, - "decimals": 1, - "mappings": [], - "max": 3, - "min": -2, + "mappings": [ + { + "options": { + "match": "null+nan", + "result": { + "color": "text", + "index": 0 + } + }, + "type": "special" + } + ], + "max": 50, + "min": 6, "thresholds": { "mode": "absolute", "steps": [ { - "color": "dark-red", + "color": "#9b9b9b", "value": null }, { - "color": "semi-dark-red", - "value": -1 + "color": "red", + "value": 0 }, { - "color": "light-blue", - "value": 0 + "color": "blue", + "value": 16 }, { - "color": "light-green", - "value": 1 + "color": "orange", + "value": 26 }, { - "color": "semi-dark-green", - "value": 2 + "color": "red", + "value": 40 } ] }, @@ -441,39 +522,61 @@ }, "gridPos": { "h": 6, - "w": 12, - "x": 0, - "y": 13 + "w": 4, + "x": 16, + "y": 1 }, - "id": 10, + "id": 7, "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ - "lastNotNull" + "last" ], "fields": "", "values": false }, - "showThresholdLabels": false, - "showThresholdMarkers": true + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.0", + "pluginVersion": "11.1.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, - "expr": "icon_temperature{sysId=~\"$sysId\",room=~\"$room\"} - icon_dew_temperature{sysId=~\"$sysId\",room=~\"$room\"}", + "expr": "icon_water_temperature{sysId=~\"$sysId\"}", "interval": "", - "legendFormat": "{{room}}", + "legendFormat": "{{sysId}}", + "range": true, "refId": "A" } ], - "title": "Temperature above dew", - "type": "gauge" + "title": "Water temperature", + "type": "stat" + }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 7 + }, + "id": 16, + "panels": [], + "repeat": "room", + "repeatDirection": "h", + "title": "Room $room", + "type": "row" }, { "datasource": { @@ -499,6 +602,16 @@ } }, "type": "value" + }, + { + "options": { + "match": "null+nan", + "result": { + "color": "text", + "index": 2 + } + }, + "type": "special" } ], "max": 1, @@ -511,7 +624,7 @@ "value": null }, { - "color": "semi-dark-green", + "color": "green", "value": 0.5 } ] @@ -521,24 +634,29 @@ }, "gridPos": { "h": 6, - "w": 12, - "x": 12, - "y": 13 + "w": 4, + "x": 0, + "y": 8 }, "id": 14, "options": { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ - "lastNotNull" + "last" ], "fields": "", "values": false }, - "showThresholdLabels": false, - "showThresholdMarkers": true + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.0", + "pluginVersion": "11.1.0", "targets": [ { "datasource": { @@ -553,27 +671,13 @@ } ], "title": "Room connected", - "type": "gauge" - }, - { - "collapsed": false, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 19 - }, - "id": 18, - "panels": [], - "title": "System", - "type": "row" + "type": "stat" }, { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "description": "", "fieldConfig": { "defaults": { "color": { @@ -585,14 +689,24 @@ "options": { "0": { "index": 0, - "text": "No" + "text": "Off" }, "1": { "index": 1, - "text": "Yes" + "text": "On" } }, "type": "value" + }, + { + "options": { + "match": "null+nan", + "result": { + "color": "text", + "index": 2 + } + }, + "type": "special" } ], "max": 1, @@ -601,7 +715,7 @@ "mode": "absolute", "steps": [ { - "color": "red", + "color": "#a7a7a7", "value": null }, { @@ -609,31 +723,35 @@ "value": 0.5 } ] - }, - "unit": "none" + } }, "overrides": [] }, "gridPos": { "h": 6, - "w": 12, - "x": 0, - "y": 20 + "w": 4, + "x": 4, + "y": 8 }, - "id": 13, + "id": 5, "options": { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ - "lastNotNull" + "last" ], "fields": "", "values": false }, - "showThresholdLabels": false, - "showThresholdMarkers": true + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.0", + "pluginVersion": "11.1.0", "targets": [ { "datasource": { @@ -641,81 +759,54 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "icon_controller_connected{sysId=~\"$sysId\"}", + "expr": "icon_relay_on{sysId=~\"$sysId\",room=~\"$room\"}", "interval": "", - "legendFormat": "{{sysId}}", + "legendFormat": "{{room}}", "refId": "A" } ], - "title": "Controller connected", - "type": "gauge" + "title": "Relay", + "type": "stat" }, { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "description": "", "fieldConfig": { "defaults": { "color": { "mode": "thresholds" }, - "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "area" + "decimals": 1, + "mappings": [ + { + "options": { + "match": "null+nan", + "result": { + "color": "text", + "index": 0 + } + }, + "type": "special" } - }, - "mappings": [], - "max": 60, + ], + "max": 36, "min": 10, "thresholds": { "mode": "absolute", "steps": [ { - "color": "#9b9b9b", + "color": "blue", "value": null }, { - "color": "red", - "value": 1 - }, - { - "color": "blue", + "color": "green", "value": 16 }, { "color": "orange", - "value": 26 - }, - { - "color": "red", - "value": 40 + "value": 30 } ] }, @@ -725,108 +816,116 @@ }, "gridPos": { "h": 6, - "w": 8, - "x": 12, - "y": 20 + "w": 4, + "x": 8, + "y": 8 }, - "id": 7, + "id": 4, "options": { - "legend": { + "minVizHeight": 75, + "minVizWidth": 75, + "orientation": "auto", + "reduceOptions": { "calcs": [ - "lastNotNull" + "last" ], - "displayMode": "list", - "placement": "bottom", - "showLegend": true + "fields": "", + "values": false }, - "tooltip": { - "mode": "single", - "sort": "none" - } + "showThresholdLabels": false, + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.2.6", + "pluginVersion": "11.1.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "editorMode": "code", "exemplar": true, - "expr": "icon_water_temperature{sysId=~\"$sysId\"}", + "expr": "icon_temperature{sysId=~\"$sysId\",room=~\"$room\"}", "interval": "", - "legendFormat": "{{sysId}}", - "range": true, + "legendFormat": "{{room}}", "refId": "A" } ], - "title": "Water temperature", - "type": "timeseries" + "title": "Temperature", + "type": "gauge" }, { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "description": "", "fieldConfig": { "defaults": { "color": { "mode": "thresholds" }, - "decimals": 1, - "mappings": [], - "max": 45, - "min": -15, + "decimals": 0, + "mappings": [ + { + "options": { + "match": "null+nan", + "result": { + "color": "text", + "index": 0 + } + }, + "type": "special" + } + ], + "max": 100, + "min": 0, "thresholds": { "mode": "absolute", "steps": [ { - "color": "semi-dark-blue", + "color": "orange", "value": null }, { - "color": "light-blue", - "value": 3 - }, - { - "color": "light-green", - "value": 17 + "color": "yellow", + "value": 20 }, { - "color": "#EAB839", - "value": 27 + "color": "green", + "value": 30 }, { - "color": "semi-dark-red", - "value": 37 + "color": "orange", + "value": 60 } ] }, - "unit": "celsius" + "unit": "percent" }, "overrides": [] }, "gridPos": { "h": 6, "w": 4, - "x": 20, - "y": 20 + "x": 12, + "y": 8 }, - "id": 11, + "id": 9, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ - "lastNotNull" + "last" ], "fields": "", "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "10.0.0", + "pluginVersion": "11.1.0", "targets": [ { "datasource": { @@ -834,13 +933,13 @@ "uid": "${DS_PROMETHEUS}" }, "exemplar": true, - "expr": "icon_external_temperature{sysId=\"$sysId\"}", + "expr": "icon_humidity{sysId=~\"$sysId\",room=~\"$room\"}", "interval": "", - "legendFormat": "", + "legendFormat": "{{room}}", "refId": "A" } ], - "title": "External temperature", + "title": "Humidity", "type": "gauge" }, { @@ -848,193 +947,178 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "description": "", "fieldConfig": { "defaults": { "color": { - "mode": "palette-classic" + "mode": "thresholds" }, - "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" + "decimals": 1, + "mappings": [ + { + "options": { + "match": "null+nan", + "result": { + "color": "text", + "index": 0 + } + }, + "type": "special" } - }, - "mappings": [], - "min": 0, + ], + "max": 5, + "min": -5, "thresholds": { "mode": "absolute", "steps": [ { - "color": "green", + "color": "blue", "value": null + }, + { + "color": "green", + "value": -1 + }, + { + "color": "orange", + "value": 1 } ] }, - "unit": "s" + "unit": "celsius" }, "overrides": [] }, "gridPos": { "h": 6, - "w": 12, - "x": 0, - "y": 26 + "w": 4, + "x": 16, + "y": 8 }, - "id": 12, + "id": 8, "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true + "minVizHeight": 75, + "minVizWidth": 75, + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "last" + ], + "fields": "", + "values": false }, - "tooltip": { - "mode": "single", - "sort": "none" - } + "showThresholdLabels": false, + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "8.3.6", + "pluginVersion": "11.1.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "editorMode": "code", "exemplar": true, - "expr": "increase(icon_http_client_seconds_sum{response!='0',sysId=\"$sysId\"}[2m]) / increase(icon_http_client_seconds_count{response!='0',sysId=\"$sysId\"}[2m])", + "expr": "icon_temperature{sysId=~\"$sysId\",room=~\"$room\"} - icon_target_temperature{sysId=~\"$sysId\",room=~\"$room\"}", "interval": "", - "legendFormat": "{{name}}", - "range": true, + "legendFormat": "{{room}}", "refId": "A" } ], - "title": "HTTP response time", - "type": "timeseries" + "title": "Temperature to target", + "type": "gauge" }, { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "description": "", "fieldConfig": { "defaults": { "color": { - "mode": "palette-classic" + "mode": "thresholds" }, - "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" + "decimals": 1, + "mappings": [ + { + "options": { + "match": "null+nan", + "result": { + "color": "text", + "index": 0 + } + }, + "type": "special" } - }, - "mappings": [], - "min": 0, + ], + "max": 3, + "min": -3, "thresholds": { "mode": "absolute", "steps": [ { - "color": "green", + "color": "dark-red", "value": null + }, + { + "color": "red", + "value": -1 + }, + { + "color": "orange", + "value": 0 + }, + { + "color": "green", + "value": 1 } ] }, - "unit": "opm" + "unit": "celsius" }, "overrides": [] }, "gridPos": { "h": 6, - "w": 12, - "x": 12, - "y": 26 + "w": 4, + "x": 20, + "y": 8 }, - "id": 19, + "id": 10, "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true + "minVizHeight": 75, + "minVizWidth": 75, + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false }, - "tooltip": { - "mode": "single", - "sort": "none" - } + "showThresholdLabels": false, + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "8.3.6", + "pluginVersion": "11.1.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "editorMode": "code", "exemplar": true, - "expr": "sum by (name) (increase(icon_http_client_seconds_count{sysId=\"$sysId\"}[1m]))", + "expr": "icon_temperature{sysId=~\"$sysId\",room=~\"$room\"} - icon_dew_temperature{sysId=~\"$sysId\",room=~\"$room\"}", "interval": "", - "legendFormat": "{{name}}", - "range": true, + "legendFormat": "{{room}}", "refId": "A" } ], - "title": "HTTP RPM", - "type": "timeseries" + "title": "Temperature above dew", + "type": "gauge" } ], "refresh": "", - "schemaVersion": 38, - "style": "dark", + "schemaVersion": 39, "tags": [], "templating": { "list": [ @@ -1100,8 +1184,8 @@ ] }, "timezone": "", - "title": "iCON thermostat", + "title": "iCON rooms", "uid": "XolQIeanz", - "version": 11, + "version": 30, "weekStart": "" } \ No newline at end of file