From 2119b2bbb5319ab0a2233e8f9a257a588e8b2713 Mon Sep 17 00:00:00 2001
From: Ray Slakinski <ray.slakinski@gmail.com>
Date: Mon, 10 May 2021 09:59:19 -0400
Subject: [PATCH] updated dashboard

---
 contrib/grafana/dashboard.json | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/contrib/grafana/dashboard.json b/contrib/grafana/dashboard.json
index 6d2384f..e5294fe 100644
--- a/contrib/grafana/dashboard.json
+++ b/contrib/grafana/dashboard.json
@@ -66,7 +66,7 @@
             "maxDataPoints": 100,
             "options": {
                 "colorMode": "value",
-                "graphMode": "none",
+                "graphMode": "area",
                 "justifyMode": "auto",
                 "orientation": "horizontal",
                 "reduceOptions": {
@@ -83,7 +83,7 @@
             "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[3d])",
+                    "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,
@@ -129,7 +129,7 @@
             "links": [],
             "options": {
                 "colorMode": "value",
-                "graphMode": "none",
+                "graphMode": "area",
                 "justifyMode": "auto",
                 "orientation": "auto",
                 "reduceOptions": {
@@ -259,6 +259,7 @@
             "description": "% of Ontario Population partially or Fully Vaccinated.",
             "fieldConfig": {
                 "defaults": {
+                    "decimals": 0,
                     "mappings": [],
                     "thresholds": {
                         "mode": "absolute",
@@ -306,7 +307,7 @@
             "targets": [
                 {
                     "exemplar": true,
-                    "expr": "(ontvacstat_total_doses_administered - ontvacstat_total_doses_in_fully_vaccinated_individuals) / (ontvacstat_eligible_population - ontvacstat_total_individuals_fully_vaccinated) * 100",
+                    "expr": "(ontvacstat_total_doses_administered - ontvacstat_total_doses_in_fully_vaccinated_individuals) / (ontvacstat_eligible_population) * 100",
                     "format": "time_series",
                     "interval": "",
                     "intervalFactor": 1,
@@ -337,7 +338,7 @@
             "type": "bargauge"
         }
     ],
-    "refresh": false,
+    "refresh": "1h",
     "schemaVersion": 27,
     "style": "dark",
     "tags": [],
@@ -345,7 +346,7 @@
         "list": []
     },
     "time": {
-        "from": "now-7d",
+        "from": "now-3d",
         "to": "now"
     },
     "timepicker": {
@@ -371,5 +372,5 @@
     "timezone": "",
     "title": "Ontario Vaccination Stats",
     "uid": "vhnVv3lMk",
-    "version": 23
+    "version": 30
 }
\ No newline at end of file