diff --git a/contrib/grafana/dashboard.json b/contrib/grafana/dashboard.json index 9bef58e..07b07db 100644 --- a/contrib/grafana/dashboard.json +++ b/contrib/grafana/dashboard.json @@ -22,95 +22,6 @@ [], "panels": [ - { - "cacheTimeout": null, - "datasource": null, - "description": "~Days left until everyone 12+ Is partially vaccinated.\n\nThis divides the remaining population without any vaccination by the average doses administered over the past 3 days.", - "fieldConfig": - { - "defaults": - { - "mappings": - [ - { - "id": 0, - "op": "=", - "text": "N/A", - "type": 1, - "value": "null" - } - ], - "thresholds": - { - "mode": "absolute", - "steps": - [ - { - "color": "green", - "value": null - }, - { - "color": "#EAB839", - "value": 80 - }, - { - "color": "red", - "value": 100 - } - ] - }, - "unit": "none" - }, - "overrides": - [] - }, - "gridPos": - { - "h": 6, - "w": 5, - "x": 0, - "y": 0 - }, - "id": 8, - "interval": null, - "links": - [], - "maxDataPoints": 100, - "options": - { - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto", - "orientation": "horizontal", - "reduceOptions": - { - "calcs": - [ - "lastNotNull" - ], - "fields": "/^{instance=\"127.0.0.1:8080\", job=\"ontvacstat\"}$/", - "values": false - }, - "text": - {}, - "textMode": "auto" - }, - "pluginVersion": "7.5.1", - "targets": - [ - { - "exemplar": true, - "expr": "((ontvacstat_eligible_population - ontvacstat_total_individuals_fully_vaccinated) - (ontvacstat_total_doses_administered - ontvacstat_total_doses_in_fully_vaccinated_individuals)) / avg_over_time(ontvacstat_previous_day_doses_administered[7d])", - "format": "time_series", - "interval": "", - "intervalFactor": 1, - "legendFormat": "", - "refId": "A" - } - ], - "title": "~ Days Left", - "type": "stat" - }, { "datasource": null, "fieldConfig": @@ -144,9 +55,9 @@ }, "gridPos": { - "h": 6, - "w": 6, - "x": 5, + "h": 8, + "w": 5, + "x": 0, "y": 0 }, "id": 4, @@ -155,7 +66,7 @@ "options": { "colorMode": "value", - "graphMode": "area", + "graphMode": "none", "justifyMode": "auto", "orientation": "auto", "reduceOptions": @@ -196,6 +107,7 @@ "dashLength": 10, "dashes": false, "datasource": null, + "description": "", "fieldConfig": { "defaults": @@ -207,10 +119,140 @@ "fillGradient": 0, "gridPos": { - "h": 7, - "w": 11, + "h": 8, + "w": 9, + "x": 5, + "y": 0 + }, + "hiddenSeries": false, + "id": 14, + "legend": + { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": + { + "alertThreshold": false + }, + "percentage": false, + "pluginVersion": "7.5.1", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": + [], + "spaceLength": 10, + "stack": true, + "steppedLine": false, + "targets": + [ + { + "exemplar": true, + "expr": "ontvacstat_previous_day_doses_administered", + "hide": true, + "interval": "", + "legendFormat": "Does Administered", + "refId": "A" + }, + { + "exemplar": true, + "expr": "ontvacstat_previous_day_at_least_one", + "hide": false, + "interval": "", + "legendFormat": "At Least One", + "refId": "B" + }, + { + "exemplar": true, + "expr": "ontvacstat_previous_day_fully_vaccinated", + "hide": false, + "interval": "", + "legendFormat": "Fully Vaccinated", + "refId": "C" + } + ], + "thresholds": + [], + "timeFrom": null, + "timeRegions": + [], + "timeShift": null, + "title": "Doses Administered Yesterday", + "tooltip": + { + "shared": true, + "sort": 0, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": + { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": + [] + }, + "yaxes": + [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": + { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": + {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": null, + "description": "", + "fieldConfig": + { + "defaults": + { + "unit": "short" + }, + "overrides": + [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": + { + "h": 8, + "w": 5, "x": 0, - "y": 6 + "y": 8 }, "hiddenSeries": false, "id": 10, @@ -229,7 +271,7 @@ "nullPointMode": "connected", "options": { - "alertThreshold": true + "alertThreshold": false }, "percentage": false, "pluginVersion": "7.5.1", @@ -245,11 +287,27 @@ [ { "exemplar": true, - "expr": "avg_over_time(ontvacstat_previous_day_doses_administered[3d:1d])", + "expr": "avg_over_time(ontvacstat_previous_day_doses_administered[3d])", "interval": "", "intervalFactor": 1, - "legendFormat": "3d:1d Avg", + "legendFormat": "Combined", "refId": "A" + }, + { + "exemplar": true, + "expr": "avg_over_time(ontvacstat_previous_day_at_least_one[3d])", + "hide": false, + "interval": "", + "legendFormat": "At Least One", + "refId": "B" + }, + { + "exemplar": true, + "expr": "avg_over_time(ontvacstat_previous_day_fully_vaccinated[3d])", + "hide": false, + "interval": "", + "legendFormat": "Fully Vaccinated", + "refId": "C" } ], "thresholds": @@ -258,10 +316,10 @@ "timeRegions": [], "timeShift": null, - "title": "Vacination Rate", + "title": "Vacination Rate (3 day avg )", "tooltip": { - "shared": true, + "shared": false, "sort": 0, "value_type": "individual" }, @@ -353,9 +411,9 @@ "gridPos": { "h": 8, - "w": 11, - "x": 0, - "y": 13 + "w": 9, + "x": 5, + "y": 8 }, "id": 2, "links": @@ -400,7 +458,7 @@ }, { "exemplar": true, - "expr": "(ontvacstat_total_doses_administered - ontvacstat_total_doses_in_fully_vaccinated_individuals + ontvacstat_total_individuals_fully_vaccinated) / (ontvacstat_eligible_population) * 100", + "expr": "(ontvacstat_total_individuals_at_least_one) / (ontvacstat_eligible_population) * 100", "hide": false, "interval": "", "legendFormat": "Combined", @@ -454,5 +512,5 @@ "timezone": "", "title": "Ontario Vaccination Stats", "uid": "vhnVv3lMk", - "version": 40 + "version": 49 } \ No newline at end of file diff --git a/contrib/update_dashboard/ontvacstats-snapshot.json b/contrib/update_dashboard/ontvacstats-snapshot.json index 30ba263..5e1881b 100644 --- a/contrib/update_dashboard/ontvacstats-snapshot.json +++ b/contrib/update_dashboard/ontvacstats-snapshot.json @@ -24,95 +24,6 @@ [], "panels": [ - { - "cacheTimeout": null, - "datasource": null, - "description": "~Days left until everyone 12+ Is partially vaccinated.\n\nThis divides the remaining population without any vaccination by the average doses administered over the past 3 days.", - "fieldConfig": - { - "defaults": - { - "mappings": - [ - { - "id": 0, - "op": "=", - "text": "N/A", - "type": 1, - "value": "null" - } - ], - "thresholds": - { - "mode": "absolute", - "steps": - [ - { - "color": "green", - "value": null - }, - { - "color": "#EAB839", - "value": 80 - }, - { - "color": "red", - "value": 100 - } - ] - }, - "unit": "none" - }, - "overrides": - [] - }, - "gridPos": - { - "h": 6, - "w": 5, - "x": 0, - "y": 0 - }, - "id": 8, - "interval": null, - "links": - [], - "maxDataPoints": 100, - "options": - { - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto", - "orientation": "horizontal", - "reduceOptions": - { - "calcs": - [ - "lastNotNull" - ], - "fields": "/^{instance=\"127.0.0.1:8080\", job=\"ontvacstat\"}$/", - "values": false - }, - "text": - {}, - "textMode": "auto" - }, - "pluginVersion": "7.5.1", - "targets": - [ - { - "exemplar": true, - "expr": "((ontvacstat_eligible_population - ontvacstat_total_individuals_fully_vaccinated) - (ontvacstat_total_doses_administered - ontvacstat_total_doses_in_fully_vaccinated_individuals)) / avg_over_time(ontvacstat_previous_day_doses_administered[7d])", - "format": "time_series", - "interval": "", - "intervalFactor": 1, - "legendFormat": "", - "refId": "A" - } - ], - "title": "~ Days Left", - "type": "stat" - }, { "datasource": null, "fieldConfig": @@ -146,9 +57,9 @@ }, "gridPos": { - "h": 6, - "w": 6, - "x": 5, + "h": 8, + "w": 5, + "x": 0, "y": 0 }, "id": 4, @@ -157,7 +68,7 @@ "options": { "colorMode": "value", - "graphMode": "area", + "graphMode": "none", "justifyMode": "auto", "orientation": "auto", "reduceOptions": @@ -198,6 +109,7 @@ "dashLength": 10, "dashes": false, "datasource": null, + "description": "", "fieldConfig": { "defaults": @@ -209,10 +121,140 @@ "fillGradient": 0, "gridPos": { - "h": 7, - "w": 11, + "h": 8, + "w": 9, + "x": 5, + "y": 0 + }, + "hiddenSeries": false, + "id": 14, + "legend": + { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": + { + "alertThreshold": false + }, + "percentage": false, + "pluginVersion": "7.5.1", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": + [], + "spaceLength": 10, + "stack": true, + "steppedLine": false, + "targets": + [ + { + "exemplar": true, + "expr": "ontvacstat_previous_day_doses_administered", + "hide": true, + "interval": "", + "legendFormat": "Does Administered", + "refId": "A" + }, + { + "exemplar": true, + "expr": "ontvacstat_previous_day_at_least_one", + "hide": false, + "interval": "", + "legendFormat": "At Least One", + "refId": "B" + }, + { + "exemplar": true, + "expr": "ontvacstat_previous_day_fully_vaccinated", + "hide": false, + "interval": "", + "legendFormat": "Fully Vaccinated", + "refId": "C" + } + ], + "thresholds": + [], + "timeFrom": null, + "timeRegions": + [], + "timeShift": null, + "title": "Doses Administered Yesterday", + "tooltip": + { + "shared": true, + "sort": 0, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": + { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": + [] + }, + "yaxes": + [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": + { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": + {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": null, + "description": "", + "fieldConfig": + { + "defaults": + { + "unit": "short" + }, + "overrides": + [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": + { + "h": 8, + "w": 5, "x": 0, - "y": 6 + "y": 8 }, "hiddenSeries": false, "id": 10, @@ -231,7 +273,7 @@ "nullPointMode": "connected", "options": { - "alertThreshold": true + "alertThreshold": false }, "percentage": false, "pluginVersion": "7.5.1", @@ -247,11 +289,27 @@ [ { "exemplar": true, - "expr": "avg_over_time(ontvacstat_previous_day_doses_administered[3d:1d])", + "expr": "avg_over_time(ontvacstat_previous_day_doses_administered[3d])", "interval": "", "intervalFactor": 1, - "legendFormat": "3d:1d Avg", + "legendFormat": "Combined", "refId": "A" + }, + { + "exemplar": true, + "expr": "avg_over_time(ontvacstat_previous_day_at_least_one[3d])", + "hide": false, + "interval": "", + "legendFormat": "At Least One", + "refId": "B" + }, + { + "exemplar": true, + "expr": "avg_over_time(ontvacstat_previous_day_fully_vaccinated[3d])", + "hide": false, + "interval": "", + "legendFormat": "Fully Vaccinated", + "refId": "C" } ], "thresholds": @@ -260,10 +318,10 @@ "timeRegions": [], "timeShift": null, - "title": "Vacination Rate", + "title": "Vacination Rate (3 day avg )", "tooltip": { - "shared": true, + "shared": false, "sort": 0, "value_type": "individual" }, @@ -355,9 +413,9 @@ "gridPos": { "h": 8, - "w": 11, - "x": 0, - "y": 13 + "w": 9, + "x": 5, + "y": 8 }, "id": 2, "links": @@ -402,7 +460,7 @@ }, { "exemplar": true, - "expr": "(ontvacstat_total_doses_administered - ontvacstat_total_doses_in_fully_vaccinated_individuals + ontvacstat_total_individuals_fully_vaccinated) / (ontvacstat_eligible_population) * 100", + "expr": "(ontvacstat_total_individuals_at_least_one) / (ontvacstat_eligible_population) * 100", "hide": false, "interval": "", "legendFormat": "Combined", @@ -456,7 +514,7 @@ "timezone": "", "title": "Ontario Vaccination Stats", "uid": "vhnVv3lMk", - "version": 40 + "version": 49 }, "expires": 86400, "key": "ontvacstats"