diff --git a/contrib/grafana/dashboard.json b/contrib/grafana/dashboard.json index 07b07db..75ebfca 100644 --- a/contrib/grafana/dashboard.json +++ b/contrib/grafana/dashboard.json @@ -55,7 +55,7 @@ }, "gridPos": { - "h": 8, + "h": 3, "w": 5, "x": 0, "y": 0 @@ -91,7 +91,7 @@ "format": "time_series", "interval": "", "intervalFactor": 1, - "legendFormat": "Previous Day Doses Administered", + "legendFormat": "Yesterday", "refId": "A" } ], @@ -119,7 +119,7 @@ "fillGradient": 0, "gridPos": { - "h": 8, + "h": 6, "w": 9, "x": 5, "y": 0 @@ -228,6 +228,162 @@ "alignLevel": null } }, + { + "datasource": null, + "fieldConfig": + { + "defaults": + { + "mappings": + [], + "thresholds": + { + "mode": "absolute", + "steps": + [ + { + "color": "red", + "value": null + }, + { + "color": "#EAB839", + "value": 10000 + }, + { + "color": "green", + "value": 110000 + } + ] + } + }, + "overrides": + [] + }, + "gridPos": + { + "h": 3, + "w": 5, + "x": 0, + "y": 3 + }, + "id": 18, + "links": + [], + "options": + { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": + { + "calcs": + [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "text": + {}, + "textMode": "auto" + }, + "pluginVersion": "7.5.1", + "targets": + [ + { + "exemplar": true, + "expr": "max_over_time(ontvacstat_previous_day_doses_administered[1y]) != 0", + "format": "time_series", + "interval": "", + "intervalFactor": 1, + "legendFormat": "Most Doses Given in a Day", + "refId": "A" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Most Doses Given in a Day", + "type": "stat" + }, + { + "datasource": null, + "fieldConfig": + { + "defaults": + { + "mappings": + [], + "thresholds": + { + "mode": "absolute", + "steps": + [ + { + "color": "red", + "value": null + }, + { + "color": "#EAB839", + "value": 10000 + }, + { + "color": "green", + "value": 110000 + } + ] + } + }, + "overrides": + [] + }, + "gridPos": + { + "h": 3, + "w": 5, + "x": 0, + "y": 6 + }, + "id": 19, + "links": + [], + "options": + { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": + { + "calcs": + [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "text": + {}, + "textMode": "auto" + }, + "pluginVersion": "7.5.1", + "targets": + [ + { + "exemplar": true, + "expr": "min_over_time(ontvacstat_previous_day_doses_administered[1y]) != 0", + "format": "time_series", + "interval": "", + "intervalFactor": 1, + "legendFormat": "Least Doses Given in a Day", + "refId": "A" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Least Doses Given in a Day", + "type": "stat" + }, { "aliasColors": {}, @@ -249,10 +405,10 @@ "fillGradient": 0, "gridPos": { - "h": 8, - "w": 5, - "x": 0, - "y": 8 + "h": 6, + "w": 9, + "x": 5, + "y": 6 }, "hiddenSeries": false, "id": 10, @@ -358,6 +514,84 @@ "alignLevel": null } }, + { + "datasource": null, + "fieldConfig": + { + "defaults": + { + "mappings": + [], + "thresholds": + { + "mode": "absolute", + "steps": + [ + { + "color": "red", + "value": null + }, + { + "color": "#EAB839", + "value": 10000 + }, + { + "color": "green", + "value": 110000 + } + ] + } + }, + "overrides": + [] + }, + "gridPos": + { + "h": 3, + "w": 5, + "x": 0, + "y": 9 + }, + "id": 17, + "links": + [], + "options": + { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": + { + "calcs": + [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "text": + {}, + "textMode": "auto" + }, + "pluginVersion": "7.5.1", + "targets": + [ + { + "exemplar": true, + "expr": "avg_over_time(ontvacstat_previous_day_doses_administered[1y]) != 0", + "format": "time_series", + "interval": "", + "intervalFactor": 1, + "legendFormat": "Avg Doses Given/Day", + "refId": "A" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Avg Doses Given/Day", + "type": "stat" + }, { "datasource": null, "description": "% of Ontario Population partially or Fully Vaccinated.", @@ -411,9 +645,9 @@ "gridPos": { "h": 8, - "w": 9, - "x": 5, - "y": 8 + "w": 14, + "x": 0, + "y": 12 }, "id": 2, "links": @@ -512,5 +746,5 @@ "timezone": "", "title": "Ontario Vaccination Stats", "uid": "vhnVv3lMk", - "version": 49 + "version": 51 } \ No newline at end of file diff --git a/contrib/update_dashboard/ontvacstats-snapshot.json b/contrib/update_dashboard/ontvacstats-snapshot.json index 5e1881b..ef2766b 100644 --- a/contrib/update_dashboard/ontvacstats-snapshot.json +++ b/contrib/update_dashboard/ontvacstats-snapshot.json @@ -57,7 +57,7 @@ }, "gridPos": { - "h": 8, + "h": 3, "w": 5, "x": 0, "y": 0 @@ -93,7 +93,7 @@ "format": "time_series", "interval": "", "intervalFactor": 1, - "legendFormat": "Previous Day Doses Administered", + "legendFormat": "Yesterday", "refId": "A" } ], @@ -121,7 +121,7 @@ "fillGradient": 0, "gridPos": { - "h": 8, + "h": 6, "w": 9, "x": 5, "y": 0 @@ -230,6 +230,162 @@ "alignLevel": null } }, + { + "datasource": null, + "fieldConfig": + { + "defaults": + { + "mappings": + [], + "thresholds": + { + "mode": "absolute", + "steps": + [ + { + "color": "red", + "value": null + }, + { + "color": "#EAB839", + "value": 10000 + }, + { + "color": "green", + "value": 110000 + } + ] + } + }, + "overrides": + [] + }, + "gridPos": + { + "h": 3, + "w": 5, + "x": 0, + "y": 3 + }, + "id": 18, + "links": + [], + "options": + { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": + { + "calcs": + [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "text": + {}, + "textMode": "auto" + }, + "pluginVersion": "7.5.1", + "targets": + [ + { + "exemplar": true, + "expr": "max_over_time(ontvacstat_previous_day_doses_administered[1y]) != 0", + "format": "time_series", + "interval": "", + "intervalFactor": 1, + "legendFormat": "Most Doses Given in a Day", + "refId": "A" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Most Doses Given in a Day", + "type": "stat" + }, + { + "datasource": null, + "fieldConfig": + { + "defaults": + { + "mappings": + [], + "thresholds": + { + "mode": "absolute", + "steps": + [ + { + "color": "red", + "value": null + }, + { + "color": "#EAB839", + "value": 10000 + }, + { + "color": "green", + "value": 110000 + } + ] + } + }, + "overrides": + [] + }, + "gridPos": + { + "h": 3, + "w": 5, + "x": 0, + "y": 6 + }, + "id": 19, + "links": + [], + "options": + { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": + { + "calcs": + [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "text": + {}, + "textMode": "auto" + }, + "pluginVersion": "7.5.1", + "targets": + [ + { + "exemplar": true, + "expr": "min_over_time(ontvacstat_previous_day_doses_administered[1y]) != 0", + "format": "time_series", + "interval": "", + "intervalFactor": 1, + "legendFormat": "Least Doses Given in a Day", + "refId": "A" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Least Doses Given in a Day", + "type": "stat" + }, { "aliasColors": {}, @@ -251,10 +407,10 @@ "fillGradient": 0, "gridPos": { - "h": 8, - "w": 5, - "x": 0, - "y": 8 + "h": 6, + "w": 9, + "x": 5, + "y": 6 }, "hiddenSeries": false, "id": 10, @@ -360,6 +516,84 @@ "alignLevel": null } }, + { + "datasource": null, + "fieldConfig": + { + "defaults": + { + "mappings": + [], + "thresholds": + { + "mode": "absolute", + "steps": + [ + { + "color": "red", + "value": null + }, + { + "color": "#EAB839", + "value": 10000 + }, + { + "color": "green", + "value": 110000 + } + ] + } + }, + "overrides": + [] + }, + "gridPos": + { + "h": 3, + "w": 5, + "x": 0, + "y": 9 + }, + "id": 17, + "links": + [], + "options": + { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": + { + "calcs": + [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "text": + {}, + "textMode": "auto" + }, + "pluginVersion": "7.5.1", + "targets": + [ + { + "exemplar": true, + "expr": "avg_over_time(ontvacstat_previous_day_doses_administered[1y]) != 0", + "format": "time_series", + "interval": "", + "intervalFactor": 1, + "legendFormat": "Avg Doses Given/Day", + "refId": "A" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Avg Doses Given/Day", + "type": "stat" + }, { "datasource": null, "description": "% of Ontario Population partially or Fully Vaccinated.", @@ -413,9 +647,9 @@ "gridPos": { "h": 8, - "w": 9, - "x": 5, - "y": 8 + "w": 14, + "x": 0, + "y": 12 }, "id": 2, "links": @@ -514,7 +748,7 @@ "timezone": "", "title": "Ontario Vaccination Stats", "uid": "vhnVv3lMk", - "version": 49 + "version": 51 }, "expires": 86400, "key": "ontvacstats"