updated dashboard

.github/workflows/docker-deploy.yaml

@@ -13,29 +13,26 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    permissions:
+    steps:
-      contents: read
+      - name: Checkout
-      packages: write
+        uses: actions/checkout@v3
-  steps:
-    - name: Checkout
-      uses: actions/checkout@v3
 
-    # Install the cosign tool except on PR
+      # Install the cosign tool except on PR
-    # https://github.com/sigstore/cosign-installer
+      # https://github.com/sigstore/cosign-installer
-    - name: Install cosign
+      # - name: Install cosign
-      if: github.event_name != 'pull_request'
+      #   if: github.event_name != 'pull_request'
-      uses: sigstore/cosign-installer@f3c664df7af409cb4873aa5068053ba9d61a57b6 #v2.6.0
+      #   uses: sigstore/cosign-installer@f3c664df7af409cb4873aa5068053ba9d61a57b6 #v2.6.0
-      with:
+      #   with:
-        cosign-release: 'v1.13.1'
+      #     cosign-release: 'v1.13.1'
 
-    - name: Set up QEMU
+      - name: Set up QEMU
-      uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v1
 
-    # Workaround: https://github.com/docker/build-push-action/issues/461
+      # Workaround: https://github.com/docker/build-push-action/issues/461
-    - name: Setup Docker buildx
+      - name: Setup Docker buildx
-      uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf
+        uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf
 
-    - name: Login to DockerHub
+      - name: Login to DockerHub
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v2
         with:
@@ -43,22 +40,27 @@ jobs:
           username: ${{ secrets.ACTION_USER }}
           password: ${{ secrets.PASSWORD }}
 
-    - name: Docker meta
+      - name: Docker meta
-      id: meta
+        id: meta
-      uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v4
-      with:
+        with:
-        images: |
+          images: |
-          ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+            git.nicktrimborn.de/nick/tasmota-power-exporter
-        tags: |
+          tags: |
-          type=ref,event=branch
+            type=ref,event=branch
-          type=ref,event=pr
+            type=ref,event=pr
-          type=semver,pattern={{version}}
+            type=semver,pattern={{version}}
-          type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}.{{minor}}
             
-    - name: Build and push
+
-      uses: docker/build-push-action@v4
+      - name: Build and push
-      with:
+        uses: docker/build-push-action@v4
-        context: .
+        with:
-        push: ${{ github.event_name != 'pull_request' }}
+          context: .
-        tags: ${{ steps.meta.outputs.tags }}
+          push: ${{ github.event_name != 'pull_request' }}
-        labels: ${{ steps.meta.outputs.labels }}          
+          tags: |
+            git.nicktrimborn.de/nick/tasmota-power-exporter:latest
+            ${{ steps.meta.outputs.tags }}
+          #tags: ${{ steps.meta.outputs.tags }}
+          #tags: git.nicktrimborn.de/nick/tasmota-power-exporter/tasmota-power-exporter:latest
+          labels: ${{ steps.meta.outputs.labels }}

metrics.py

@@ -5,14 +5,15 @@ 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')
+        logger.info("Env variable from DEVICE_NAME used is: " + self.ip)
         self.device_name = getenv("DEVICE_NAME").lower()
-        if not self.ip:
+        logger.info("Env variable from DEVICE_NAME used is: " + self.device_name)
-            self.ip = "192.168.4.1"
         self.user = getenv('USER')
         self.password = getenv('PASSWORD')
 
@@ -21,7 +22,7 @@ class TasmotaCollector(object):
         response = self.fetch()
 
         for key in response:
-            metric_name =  self.device_name +  "_" + key.lower().replace(" ", "_") 
+            metric_name = "tasmota_" + key.lower().replace(" ", "_") 
             metric = response[key].split()[0]
             unit = None
             if len(response[key].split()) > 1:
@@ -37,7 +38,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:
@@ -70,12 +71,9 @@ signal.signal(signal.SIGINT, signal_handler)
 if __name__ == '__main__':
 
     port = getenv('EXPORTER_PORT')
-    if not port:
+    logger.info("Starting HTTP server on port: " + port)
-        port = 8000
-
     start_http_server(int(port))
     REGISTRY.register(TasmotaCollector())
-
     while(True):
         sleep(1)
     

requirements.txt

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