rays/OntVacStat
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed formatting and updated the dashboard again

Browse Source
This commit is contained in:
Ray Slakinski 2021-06-03 11:47:20 -04:00
parent 51f2d0b677
commit a4ebeca3b7
3 changed files with 459 additions and 393 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/grafana/dashboard.json
View File

@ -259,7 +259,7 @@
"description": "% of Ontario Population partially or Fully Vaccinated.", "description": "% of Ontario Population partially or Fully Vaccinated.",
"fieldConfig": { "fieldConfig": {
"defaults": { "defaults": {
"decimals": 0, "decimals": 1,
"mappings": [], "mappings": [],
"thresholds": { "thresholds": {
"mode": "absolute", "mode": "absolute",
@ -388,5 +388,5 @@
"timezone": "", "timezone": "",
"title": "Ontario Vaccination Stats", "title": "Ontario Vaccination Stats",
"uid": "vhnVv3lMk", "uid": "vhnVv3lMk",
"version": 38 "version": 40
} }

207
contrib/update_dashboard/ontvacstats-snapshot.json
View File

@ -1,7 +1,10 @@
{ {
"dashboard": { "dashboard":
"annotations": { {
"list": [ "annotations":
{
"list":
[
{ {
"builtIn": 1, "builtIn": 1,
"datasource": "-- Grafana --", "datasource": "-- Grafana --",
@ -17,15 +20,20 @@
"gnetId": null, "gnetId": null,
"graphTooltip": 0, "graphTooltip": 0,
"id": 25, "id": 25,
"links": [], "links":
"panels": [ [],
"panels":
[
{ {
"cacheTimeout": null, "cacheTimeout": null,
"datasource": 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.", "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": { "fieldConfig":
"defaults": { {
"mappings": [ "defaults":
{
"mappings":
[
{ {
"id": 0, "id": 0,
"op": "=", "op": "=",
@ -34,9 +42,11 @@
"value": "null" "value": "null"
} }
], ],
"thresholds": { "thresholds":
{
"mode": "absolute", "mode": "absolute",
"steps": [ "steps":
[
{ {
"color": "green", "color": "green",
"value": null "value": null
@ -53,9 +63,11 @@
}, },
"unit": "none" "unit": "none"
}, },
"overrides": [] "overrides":
[]
}, },
"gridPos": { "gridPos":
{
"h": 6, "h": 6,
"w": 5, "w": 5,
"x": 0, "x": 0,
@ -63,25 +75,31 @@
}, },
"id": 8, "id": 8,
"interval": null, "interval": null,
"links": [], "links":
[],
"maxDataPoints": 100, "maxDataPoints": 100,
"options": { "options":
{
"colorMode": "value", "colorMode": "value",
"graphMode": "area", "graphMode": "area",
"justifyMode": "auto", "justifyMode": "auto",
"orientation": "horizontal", "orientation": "horizontal",
"reduceOptions": { "reduceOptions":
"calcs": [ {
"calcs":
[
"lastNotNull" "lastNotNull"
], ],
"fields": "/^{instance=\"127.0.0.1:8080\", job=\"ontvacstat\"}$/", "fields": "/^{instance=\"127.0.0.1:8080\", job=\"ontvacstat\"}$/",
"values": false "values": false
}, },
"text": {}, "text":
{},
"textMode": "auto" "textMode": "auto"
}, },
"pluginVersion": "7.5.1", "pluginVersion": "7.5.1",
"targets": [ "targets":
[
{ {
"exemplar": true, "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])", "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])",
@ -97,12 +115,17 @@
}, },
{ {
"datasource": null, "datasource": null,
"fieldConfig": { "fieldConfig":
"defaults": { {
"mappings": [], "defaults":
"thresholds": { {
"mappings":
[],
"thresholds":
{
"mode": "absolute", "mode": "absolute",
"steps": [ "steps":
[
{ {
"color": "red", "color": "red",
"value": null "value": null
@ -118,33 +141,41 @@
] ]
} }
}, },
"overrides": [] "overrides":
[]
}, },
"gridPos": { "gridPos":
{
"h": 6, "h": 6,
"w": 6, "w": 6,
"x": 5, "x": 5,
"y": 0 "y": 0
}, },
"id": 4, "id": 4,
"links": [], "links":
"options": { [],
"options":
{
"colorMode": "value", "colorMode": "value",
"graphMode": "area", "graphMode": "area",
"justifyMode": "auto", "justifyMode": "auto",
"orientation": "auto", "orientation": "auto",
"reduceOptions": { "reduceOptions":
"calcs": [ {
"calcs":
[
"lastNotNull" "lastNotNull"
], ],
"fields": "", "fields": "",
"values": false "values": false
}, },
"text": {}, "text":
{},
"textMode": "auto" "textMode": "auto"
}, },
"pluginVersion": "7.5.1", "pluginVersion": "7.5.1",
"targets": [ "targets":
[
{ {
"exemplar": true, "exemplar": true,
"expr": "ontvacstat_previous_day_doses_administered", "expr": "ontvacstat_previous_day_doses_administered",
@ -161,18 +192,23 @@
"type": "stat" "type": "stat"
}, },
{ {
"aliasColors": {}, "aliasColors":
{},
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": null, "datasource": null,
"fieldConfig": { "fieldConfig":
"defaults": {}, {
"overrides": [] "defaults":
{},
"overrides":
[]
}, },
"fill": 1, "fill": 1,
"fillGradient": 0, "fillGradient": 0,
"gridPos": { "gridPos":
{
"h": 7, "h": 7,
"w": 11, "w": 11,
"x": 0, "x": 0,
@ -180,7 +216,8 @@
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 10, "id": 10,
"legend": { "legend":
{
"avg": false, "avg": false,
"current": false, "current": false,
"max": false, "max": false,
@ -192,7 +229,8 @@
"lines": true, "lines": true,
"linewidth": 1, "linewidth": 1,
"nullPointMode": "connected", "nullPointMode": "connected",
"options": { "options":
{
"alertThreshold": true "alertThreshold": true
}, },
"percentage": false, "percentage": false,
@ -200,11 +238,13 @@
"pointradius": 2, "pointradius": 2,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
"seriesOverrides": [], "seriesOverrides":
[],
"spaceLength": 10, "spaceLength": 10,
"stack": false, "stack": false,
"steppedLine": false, "steppedLine": false,
"targets": [ "targets":
[
{ {
"exemplar": true, "exemplar": true,
"expr": "avg_over_time(ontvacstat_previous_day_doses_administered[3d:1d])", "expr": "avg_over_time(ontvacstat_previous_day_doses_administered[3d:1d])",
@ -214,25 +254,31 @@
"refId": "A" "refId": "A"
} }
], ],
"thresholds": [], "thresholds":
[],
"timeFrom": null, "timeFrom": null,
"timeRegions": [], "timeRegions":
[],
"timeShift": null, "timeShift": null,
"title": "Vacination Rate", "title": "Vacination Rate",
"tooltip": { "tooltip":
{
"shared": true, "shared": true,
"sort": 0, "sort": 0,
"value_type": "individual" "value_type": "individual"
}, },
"type": "graph", "type": "graph",
"xaxis": { "xaxis":
{
"buckets": null, "buckets": null,
"mode": "time", "mode": "time",
"name": null, "name": null,
"show": true, "show": true,
"values": [] "values":
[]
}, },
"yaxes": [ "yaxes":
[
{ {
"format": "short", "format": "short",
"label": null, "label": null,
@ -250,7 +296,8 @@
"show": true "show": true
} }
], ],
"yaxis": { "yaxis":
{
"align": false, "align": false,
"alignLevel": null "alignLevel": null
} }
@ -258,13 +305,18 @@
{ {
"datasource": null, "datasource": null,
"description": "% of Ontario Population partially or Fully Vaccinated.", "description": "% of Ontario Population partially or Fully Vaccinated.",
"fieldConfig": { "fieldConfig":
"defaults": { {
"decimals": 0, "defaults":
"mappings": [], {
"thresholds": { "decimals": 1,
"mappings":
[],
"thresholds":
{
"mode": "absolute", "mode": "absolute",
"steps": [ "steps":
[
{ {
"color": "dark-red", "color": "dark-red",
"value": null "value": null
@ -297,31 +349,39 @@
}, },
"unit": "percent" "unit": "percent"
}, },
"overrides": [] "overrides":
[]
}, },
"gridPos": { "gridPos":
{
"h": 8, "h": 8,
"w": 11, "w": 11,
"x": 0, "x": 0,
"y": 13 "y": 13
}, },
"id": 2, "id": 2,
"links": [], "links":
"options": { [],
"options":
{
"displayMode": "lcd", "displayMode": "lcd",
"orientation": "horizontal", "orientation": "horizontal",
"reduceOptions": { "reduceOptions":
"calcs": [ {
"calcs":
[
"lastNotNull" "lastNotNull"
], ],
"fields": "", "fields": "",
"values": false "values": false
}, },
"showUnfilled": true, "showUnfilled": true,
"text": {} "text":
{}
}, },
"pluginVersion": "7.5.1", "pluginVersion": "7.5.1",
"targets": [ "targets":
[
{ {
"exemplar": true, "exemplar": true,
"expr": "(ontvacstat_total_doses_administered - ontvacstat_total_doses_in_fully_vaccinated_individuals) / (ontvacstat_eligible_population) * 100", "expr": "(ontvacstat_total_doses_administered - ontvacstat_total_doses_in_fully_vaccinated_individuals) / (ontvacstat_eligible_population) * 100",
@ -358,23 +418,30 @@
"refresh": "15m", "refresh": "15m",
"schemaVersion": 27, "schemaVersion": 27,
"style": "dark", "style": "dark",
"tags": [], "tags":
"templating": { [],
"list": [] "templating":
{
"list":
[]
}, },
"time": { "time":
{
"from": "now-3d", "from": "now-3d",
"to": "now" "to": "now"
}, },
"timepicker": { "timepicker":
"refresh_intervals": [ {
"refresh_intervals":
[
"15m", "15m",
"30m", "30m",
"1h", "1h",
"2h", "2h",
"1d" "1d"
], ],
"time_options": [ "time_options":
[
"5m", "5m",
"15m", "15m",
"1h", "1h",
@ -389,8 +456,8 @@
"timezone": "", "timezone": "",
"title": "Ontario Vaccination Stats", "title": "Ontario Vaccination Stats",
"uid": "vhnVv3lMk", "uid": "vhnVv3lMk",
"version": 38 "version": 40
}, },
"expires": 86400, "expires": 86400,
"key": "ontvacstats" "key": "ontvacstats"
} }

1
main.go
View File

@ -88,7 +88,6 @@ func updateMetrics() {
return return
} }
records.PreviousDayDosesAdministered().Set(float64(data.Result.Records[0].PreviousDayDosesAdministered)) records.PreviousDayDosesAdministered().Set(float64(data.Result.Records[0].PreviousDayDosesAdministered))
records.PreviousDayAtLeastOne().Set(float64(data.Result.Records[0].PreviousDayAtLeastOne)) records.PreviousDayAtLeastOne().Set(float64(data.Result.Records[0].PreviousDayAtLeastOne))
records.PreviousDayFullyVaccinated().Set(float64(data.Result.Records[0].PreviousDayFullyVaccinated)) records.PreviousDayFullyVaccinated().Set(float64(data.Result.Records[0].PreviousDayFullyVaccinated))