Merge pull request #4 from awlx/new_stuff

Iterate over all OIDs

scraper.py

@@ -51,13 +51,16 @@ class Device:
 
     @classmethod
     def from_dict(cls, device_cfg: Dict[str, str]) -> "Device":
+        oids = []
+        for entry in device_cfg["extra_oids"]:
+            oids.append(entry)
         return cls(
             hostname=device_cfg["hostname"],
             community=device_cfg["community"],
             username=device_cfg["username"],
             password=device_cfg["password"],
             ip=ip_address(device_cfg["ip"]),
-            extra_oids=device_cfg["extra_oids"],
+            extra_oids=oids,
         )
 
 
@@ -261,14 +264,18 @@ def pollExtraOIDs(session: Session, hostname: str, extra_oids: List[str]) -> boo
                     "host": hostname,
                     "oid": oid_name,
                 },
-                "time": datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%SZ"),
+                "time": datetime.datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ"),
                 "fields": {
                 },
             }
         ]
         for output in oid_output:
             dbpayload[0]["fields"][output.oid] = (int(output.value) if is_integer(output.value) else 0)
-    return upload_to_influx(dbpayload)
+        try:
+            upload_to_influx(dbpayload)
+        except:
+            return False
+    return True
 
 def pollDevice(session: Session, hostname: str) -> bool:
 
@@ -293,7 +300,7 @@ def pollDevice(session: Session, hostname: str) -> bool:
                     "interface": name,
                     "interface_description": values["_ifDescr"],
                 },
-                "time": datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%SZ"),
+                "time": datetime.datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ"),
                 "fields": {
                     "ifin": int(values["_ifHCInOctets"]),
                     "ifout": int(values["_ifHCOutOctets"]),