Merge pull request #4 from jdburton/master

Changes to grafana page and add timeout to scraper
twstokes · Jan 28, 2022 · 4e54d1d · 4e54d1d
2 parents 4f66ab4 + 571f013
commit 4e54d1d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/full-service/grafana_dashboards/default.json b/full-service/grafana_dashboards/default.json
@@ -495,7 +495,11 @@
               },
               {
                 "params": [],
-                "type": "mean"
+                "type": "last"
+              },
+              {
+                "params": [],
+                "type": "non_negative_difference"
               }
             ]
           ],
@@ -526,7 +530,7 @@
           "label": null,
           "logBase": 1,
           "max": null,
-          "min": null,
+	  "min": "0",
           "show": true
         },
         {
@@ -630,7 +634,11 @@
               },
               {
                 "params": [],
-                "type": "mean"
+                "type": "last"
+              },
+              {
+                "params": [],
+                "type": "non_negative_difference"
               }
             ]
           ],
@@ -661,7 +669,7 @@
           "label": null,
           "logBase": 1,
           "max": null,
-          "min": null,
+	  "min": "0",
           "show": true
         },
         {
@@ -898,4 +906,4 @@
   "title": "Modem",
   "uid": "KRgNDKwMz",
   "version": 11
-}
+}
diff --git a/scraper/downloaders.py b/scraper/downloaders.py
@@ -28,8 +28,8 @@ class RequestsDownloader(Downloader):
     """
     @staticmethod
     def download(url):
-        result = requests.get(url)
-
+        result = requests.get(url,timeout=10)
+        
         if result.status_code != 200:
             raise Exception("Received non-200 response.")