From 5e5e7491cf36dec68666a31ee807d3367001e56b Mon Sep 17 00:00:00 2001 From: Ray Slakinski Date: Mon, 26 Jul 2021 14:13:58 -0400 Subject: [PATCH] update dashboard --- contrib/grafana/dashboard.json | 152 +++++++++--------- .../ontvacstats-snapshot.json | 152 +++++++++--------- 2 files changed, 144 insertions(+), 160 deletions(-) diff --git a/contrib/grafana/dashboard.json b/contrib/grafana/dashboard.json index 56c6753..d67c3b6 100644 --- a/contrib/grafana/dashboard.json +++ b/contrib/grafana/dashboard.json @@ -388,150 +388,142 @@ "title": "At Least One Dose by Age", "type": "gauge" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, "datasource": null, "description": "", "fieldConfig": { - "defaults": {}, + "defaults": { + "color": { + "mode": "thresholds" + }, + "decimals": 1, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [{ + "color": "dark-red", + "value": null + }, { + "color": "semi-dark-red", + "value": 40 + }, { + "color": "light-red", + "value": 50 + }, { + "color": "semi-dark-yellow", + "value": 60 + }, { + "color": "light-yellow", + "value": 70 + }, { + "color": "light-green", + "value": 80 + }, { + "color": "semi-dark-green", + "value": 90 + }] + }, + "unit": "percent" + }, "overrides": [] }, - "fill": 0, - "fillGradient": 0, "gridPos": { "h": 8, "w": 10, "x": 0, "y": 24 }, - "hiddenSeries": false, - "id": 20, - "legend": { - "avg": false, - "current": false, - "hideZero": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, + "id": 21, "links": [], - "nullPointMode": "connected", "options": { - "alertThreshold": true + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "showThresholdLabels": false, + "showThresholdMarkers": true, + "text": {} }, - "percentage": false, "pluginVersion": "7.5.1", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, "targets": [{ "exemplar": true, - "expr": "increase(ontvacstat_age_12_17yrs_percent_at_least_one_dose[1d]) != 0", + "expr": "ontvacstat_age_12_17yrs_percent_fully_vaccinated * 100", "format": "time_series", - "hide": false, "interval": "", "intervalFactor": 1, "legendFormat": "12-17", "refId": "A" }, { "exemplar": true, - "expr": "increase(ontvacstat_age_18_29yrs_percent_at_least_one_dose[1d]) != 0", + "expr": "ontvacstat_age_18_29yrs_percent_fully_vaccinated * 100", "hide": false, "interval": "", "legendFormat": "18-29", "refId": "B" }, { "exemplar": true, - "expr": "increase(ontvacstat_age_30_39yrs_percent_at_least_one_dose[1d]) != 0", + "expr": "ontvacstat_age_30_39yrs_percent_fully_vaccinated * 100", "hide": false, "interval": "", "legendFormat": "30-39", "refId": "C" }, { "exemplar": true, - "expr": "increase(ontvacstat_age_40_49yrs_percent_at_least_one_dose[1d]) != 0", + "expr": "ontvacstat_age_40_49yrs_percent_fully_vaccinated * 100", "hide": false, "interval": "", "legendFormat": "40-49", "refId": "D" }, { "exemplar": true, - "expr": "increase(ontvacstat_age_50_59yrs_percent_at_least_one_dose[1d]) != 0", + "expr": "ontvacstat_age_50_59yrs_percent_fully_vaccinated * 100", "hide": false, "interval": "", "legendFormat": "50-59", "refId": "E" }, { "exemplar": true, - "expr": "increase(ontvacstat_age_60_69yrs_percent_at_least_one_dose[1d]) != 0", + "expr": "ontvacstat_age_60_69yrs_percent_fully_vaccinated * 100", "hide": false, "interval": "", "legendFormat": "60-69", "refId": "F" }, { "exemplar": true, - "expr": "increase(ontvacstat_age_70_79yrs_percent_at_least_one_dose[1d]) != 0", + "expr": "ontvacstat_age_70_79yrs_percent_fully_vaccinated * 100", "hide": false, "interval": "", "legendFormat": "70-79", "refId": "G" }, { "exemplar": true, - "expr": "increase(ontvacstat_age_80_plus_percent_at_least_one_dose[1d]) != 0", + "expr": "ontvacstat_age_80_plus_percent_fully_vaccinated * 100", "hide": false, "interval": "", "legendFormat": "80+", "refId": "H" - }], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Vaccination Rate (Least One Dose by Age)", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [{ - "$$hashKey": "object:161", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true }, { - "$$hashKey": "object:162", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true + "exemplar": true, + "expr": "ontvacstat_age_adult_18_plus_percent_fully_vaccinated * 100", + "hide": false, + "interval": "", + "legendFormat": "18+", + "refId": "I" + }, { + "exemplar": true, + "expr": "(ontvacstat_total_individuals_fully_vaccinated) / (ontvacstat_eligible_population) * 100", + "hide": false, + "interval": "", + "legendFormat": "12 +", + "refId": "J" }], - "yaxis": { - "align": false, - "alignLevel": null - } + "timeFrom": null, + "timeShift": null, + "title": "Fully Vaccincated by Age", + "type": "gauge" }], "refresh": "1h", "schemaVersion": 27, @@ -541,7 +533,7 @@ "list": [] }, "time": { - "from": "now-5m", + "from": "now-3d", "to": "now" }, "timepicker": { @@ -567,5 +559,5 @@ "timezone": "", "title": "Ontario Vaccination Stats", "uid": "vhnVv3lMk", - "version": 80 + "version": 82 } \ No newline at end of file diff --git a/contrib/update_dashboard/ontvacstats-snapshot.json b/contrib/update_dashboard/ontvacstats-snapshot.json index 108f76e..f1c12f2 100644 --- a/contrib/update_dashboard/ontvacstats-snapshot.json +++ b/contrib/update_dashboard/ontvacstats-snapshot.json @@ -389,150 +389,142 @@ "title": "At Least One Dose by Age", "type": "gauge" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, "datasource": null, "description": "", "fieldConfig": { - "defaults": {}, + "defaults": { + "color": { + "mode": "thresholds" + }, + "decimals": 1, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [{ + "color": "dark-red", + "value": null + }, { + "color": "semi-dark-red", + "value": 40 + }, { + "color": "light-red", + "value": 50 + }, { + "color": "semi-dark-yellow", + "value": 60 + }, { + "color": "light-yellow", + "value": 70 + }, { + "color": "light-green", + "value": 80 + }, { + "color": "semi-dark-green", + "value": 90 + }] + }, + "unit": "percent" + }, "overrides": [] }, - "fill": 0, - "fillGradient": 0, "gridPos": { "h": 8, "w": 10, "x": 0, "y": 24 }, - "hiddenSeries": false, - "id": 20, - "legend": { - "avg": false, - "current": false, - "hideZero": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, + "id": 21, "links": [], - "nullPointMode": "connected", "options": { - "alertThreshold": true + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "showThresholdLabels": false, + "showThresholdMarkers": true, + "text": {} }, - "percentage": false, "pluginVersion": "7.5.1", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, "targets": [{ "exemplar": true, - "expr": "increase(ontvacstat_age_12_17yrs_percent_at_least_one_dose[1d]) != 0", + "expr": "ontvacstat_age_12_17yrs_percent_fully_vaccinated * 100", "format": "time_series", - "hide": false, "interval": "", "intervalFactor": 1, "legendFormat": "12-17", "refId": "A" }, { "exemplar": true, - "expr": "increase(ontvacstat_age_18_29yrs_percent_at_least_one_dose[1d]) != 0", + "expr": "ontvacstat_age_18_29yrs_percent_fully_vaccinated * 100", "hide": false, "interval": "", "legendFormat": "18-29", "refId": "B" }, { "exemplar": true, - "expr": "increase(ontvacstat_age_30_39yrs_percent_at_least_one_dose[1d]) != 0", + "expr": "ontvacstat_age_30_39yrs_percent_fully_vaccinated * 100", "hide": false, "interval": "", "legendFormat": "30-39", "refId": "C" }, { "exemplar": true, - "expr": "increase(ontvacstat_age_40_49yrs_percent_at_least_one_dose[1d]) != 0", + "expr": "ontvacstat_age_40_49yrs_percent_fully_vaccinated * 100", "hide": false, "interval": "", "legendFormat": "40-49", "refId": "D" }, { "exemplar": true, - "expr": "increase(ontvacstat_age_50_59yrs_percent_at_least_one_dose[1d]) != 0", + "expr": "ontvacstat_age_50_59yrs_percent_fully_vaccinated * 100", "hide": false, "interval": "", "legendFormat": "50-59", "refId": "E" }, { "exemplar": true, - "expr": "increase(ontvacstat_age_60_69yrs_percent_at_least_one_dose[1d]) != 0", + "expr": "ontvacstat_age_60_69yrs_percent_fully_vaccinated * 100", "hide": false, "interval": "", "legendFormat": "60-69", "refId": "F" }, { "exemplar": true, - "expr": "increase(ontvacstat_age_70_79yrs_percent_at_least_one_dose[1d]) != 0", + "expr": "ontvacstat_age_70_79yrs_percent_fully_vaccinated * 100", "hide": false, "interval": "", "legendFormat": "70-79", "refId": "G" }, { "exemplar": true, - "expr": "increase(ontvacstat_age_80_plus_percent_at_least_one_dose[1d]) != 0", + "expr": "ontvacstat_age_80_plus_percent_fully_vaccinated * 100", "hide": false, "interval": "", "legendFormat": "80+", "refId": "H" - }], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Vaccination Rate (Least One Dose by Age)", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [{ - "$$hashKey": "object:161", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true }, { - "$$hashKey": "object:162", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true + "exemplar": true, + "expr": "ontvacstat_age_adult_18_plus_percent_fully_vaccinated * 100", + "hide": false, + "interval": "", + "legendFormat": "18+", + "refId": "I" + }, { + "exemplar": true, + "expr": "(ontvacstat_total_individuals_fully_vaccinated) / (ontvacstat_eligible_population) * 100", + "hide": false, + "interval": "", + "legendFormat": "12 +", + "refId": "J" }], - "yaxis": { - "align": false, - "alignLevel": null - } + "timeFrom": null, + "timeShift": null, + "title": "Fully Vaccincated by Age", + "type": "gauge" }], "refresh": "1h", "schemaVersion": 27, @@ -542,7 +534,7 @@ "list": [] }, "time": { - "from": "now-5m", + "from": "now-3d", "to": "now" }, "timepicker": { @@ -568,7 +560,7 @@ "timezone": "", "title": "Ontario Vaccination Stats", "uid": "vhnVv3lMk", - "version": 80 + "version": 82 }, "expires": 86400, "key": "ontvacstats"