diff --git a/contrib/grafana/dashboard.json b/contrib/grafana/dashboard.json index 18772c8..6d2384f 100644 --- a/contrib/grafana/dashboard.json +++ b/contrib/grafana/dashboard.json @@ -172,7 +172,7 @@ "fill": 1, "fillGradient": 0, "gridPos": { - "h": 8, + "h": 7, "w": 11, "x": 0, "y": 6 @@ -190,7 +190,7 @@ }, "lines": true, "linewidth": 1, - "nullPointMode": "null", + "nullPointMode": "connected", "options": { "alertThreshold": true }, @@ -209,7 +209,7 @@ "expr": "avg_over_time(ontvacstat_previous_day_doses_administered[3d:1d])", "interval": "", "intervalFactor": 1, - "legendFormat": "", + "legendFormat": "3d:1d Avg", "refId": "A" } ], @@ -217,7 +217,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "Vacination Rate (3d:1d Average)", + "title": "Vacination Rate", "tooltip": { "shared": true, "sort": 0, @@ -285,7 +285,7 @@ "h": 8, "w": 11, "x": 0, - "y": 14 + "y": 13 }, "id": 2, "links": [], @@ -321,6 +321,14 @@ "intervalFactor": 1, "legendFormat": "Fully Vaccinated", "refId": "B" + }, + { + "exemplar": true, + "expr": "(ontvacstat_total_doses_administered - ontvacstat_total_doses_in_fully_vaccinated_individuals + ontvacstat_total_individuals_fully_vaccinated) / (ontvacstat_eligible_population) * 100", + "hide": false, + "interval": "", + "legendFormat": "Combined", + "refId": "C" } ], "timeFrom": null, @@ -363,5 +371,5 @@ "timezone": "", "title": "Ontario Vaccination Stats", "uid": "vhnVv3lMk", - "version": 19 + "version": 23 } \ No newline at end of file diff --git a/contrib/update_dashboard/ontvacstats-snapshot.json b/contrib/update_dashboard/ontvacstats-snapshot.json index d55f0fe..c9192c6 100644 --- a/contrib/update_dashboard/ontvacstats-snapshot.json +++ b/contrib/update_dashboard/ontvacstats-snapshot.json @@ -173,7 +173,7 @@ "fill": 1, "fillGradient": 0, "gridPos": { - "h": 8, + "h": 7, "w": 11, "x": 0, "y": 6 @@ -191,7 +191,7 @@ }, "lines": true, "linewidth": 1, - "nullPointMode": "null", + "nullPointMode": "connected", "options": { "alertThreshold": true }, @@ -210,7 +210,7 @@ "expr": "avg_over_time(ontvacstat_previous_day_doses_administered[3d:1d])", "interval": "", "intervalFactor": 1, - "legendFormat": "", + "legendFormat": "3d:1d Avg", "refId": "A" } ], @@ -218,7 +218,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "Vacination Rate (3d:1d Average)", + "title": "Vacination Rate", "tooltip": { "shared": true, "sort": 0, @@ -286,7 +286,7 @@ "h": 8, "w": 11, "x": 0, - "y": 14 + "y": 13 }, "id": 2, "links": [], @@ -322,6 +322,14 @@ "intervalFactor": 1, "legendFormat": "Fully Vaccinated", "refId": "B" + }, + { + "exemplar": true, + "expr": "(ontvacstat_total_doses_administered - ontvacstat_total_doses_in_fully_vaccinated_individuals + ontvacstat_total_individuals_fully_vaccinated) / (ontvacstat_eligible_population) * 100", + "hide": false, + "interval": "", + "legendFormat": "Combined", + "refId": "C" } ], "timeFrom": null, @@ -364,7 +372,7 @@ "timezone": "", "title": "Ontario Vaccination Stats", "uid": "vhnVv3lMk", - "version": 19 + "version": 23 }, "expires": 86400, "key": "ontvacstats"