updated to match fork

metrics.py

@@ -5,14 +5,13 @@ from os import getenv
 from time import sleep
 from prometheus_client.core import GaugeMetricFamily, REGISTRY, CounterMetricFamily
 from prometheus_client import start_http_server
+from loguru import logger
 
 
 class TasmotaCollector(object):
     def __init__(self):
         self.ip = getenv('DEVICE_IP')
         self.device_name = getenv("DEVICE_NAME").lower()
-        if not self.ip:
-            self.ip = "192.168.4.1"
         self.user = getenv('USER')
         self.password = getenv('PASSWORD')
 
@@ -37,7 +36,7 @@ class TasmotaCollector(object):
     def fetch(self):
 
         url = 'http://' + self.ip + '/?m=1'
-
+        logger.info("Getting Metrics from: " + url)
         session = requests.Session()
         
         if self.user and self.password:
@@ -50,16 +49,9 @@ class TasmotaCollector(object):
 
         string_values = str(page.text).split("{s}")
         for i in range(1,len(string_values)):
-            try:
-                label = string_values[i].split("{m}")[0]
-                value = string_values[i].split("{m}")[1].split("{e}")[0]
-                if "<td" in value:
-                    value = value.replace("</td><td style='text-align:left'>", "")
-                    value = value.replace("</td><td>&nbsp;</td><td>", "")
-
-                values[label] = value
-            except IndexError:
-                continue
+            label = string_values[i].split("{m}")[0]
+            value = string_values[i].split("{m}")[1].split("{e}")[0]
+            values[label] = value
         return values
 
 def signal_handler(signal, frame):
@@ -70,12 +62,9 @@ signal.signal(signal.SIGINT, signal_handler)
 if __name__ == '__main__':
 
     port = getenv('EXPORTER_PORT')
-    if not port:
-        port = 8000
-
+    logger.info("Starting HTTP server on port: " + url)
     start_http_server(int(port))
     REGISTRY.register(TasmotaCollector())
-
     while(True):
         sleep(1)
     

requirements.txt

@@ -1,2 +1,3 @@
 prometheus_client
 requests
+loguru