diff --git a/helm/Chart.yaml b/helm/Chart.yaml index e4e1f79..28c0463 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.2.7 +version: 0.2.8 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/helm/dashboards/econet-exporter.json b/helm/dashboards/econet-exporter.json index 04ca9d7..38fe577 100644 --- a/helm/dashboards/econet-exporter.json +++ b/helm/dashboards/econet-exporter.json @@ -676,7 +676,9 @@ "fieldConfig": { "defaults": { "color": { - "mode": "palette-classic" + "fixedColor": "text", + "mode": "fixed", + "seriesBy": "last" }, "custom": { "axisBorderShow": false, @@ -687,7 +689,7 @@ "barAlignment": 0, "barWidthFactor": 0.6, "drawStyle": "line", - "fillOpacity": 20, + "fillOpacity": 8, "gradientMode": "opacity", "hideFrom": { "legend": false, @@ -695,8 +697,8 @@ "viz": false }, "insertNulls": false, - "lineInterpolation": "smooth", - "lineWidth": 2, + "lineInterpolation": "stepBefore", + "lineWidth": 5, "pointSize": 5, "scaleDistribution": { "type": "linear" @@ -709,21 +711,29 @@ "mode": "none" }, "thresholdsStyle": { - "mode": "off" + "mode": "dashed+area" } }, "mappings": [], - "max": 100, + "max": 101, "min": 0, "thresholds": { "mode": "absolute", "steps": [ { - "color": "green", + "color": "dark-red", "value": 0 }, { - "color": "red", + "color": "dark-orange", + "value": 15 + }, + { + "color": "#EAB839", + "value": 48 + }, + { + "color": "green", "value": 80 } ] @@ -739,11 +749,14 @@ "y": 6 }, "id": 12, + "interval": "1m", + "maxDataPoints": 100, "options": { "legend": { "calcs": [ "lastNotNull", - "min" + "min", + "mean" ], "displayMode": "table", "placement": "bottom", @@ -762,8 +775,10 @@ "type": "prometheus", "uid": "${datasource}" }, - "expr": "avg by (econet_friendly_name) (econet_hot_water_availability_percent{econet_friendly_name=~\"$device\"})", + "editorMode": "code", + "expr": "min by (econet_friendly_name) (econet_hot_water_availability_percent{econet_friendly_name=~\"$device\"})[$__interval]", "legendFormat": "{{econet_friendly_name}}", + "range": true, "refId": "A" } ],