updated dashboard

.github/workflows/docker-deploy.yaml

@@ -0,0 +1,66 @@
+name: Docker Push
+
+on:
+  push:
+    branches:
+      - 'main'
+    tags:
+      - 'v*'
+  pull_request:
+    branches:
+      - 'main'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      # Install the cosign tool except on PR
+      # https://github.com/sigstore/cosign-installer
+      # - name: Install cosign
+      #   if: github.event_name != 'pull_request'
+      #   uses: sigstore/cosign-installer@f3c664df7af409cb4873aa5068053ba9d61a57b6 #v2.6.0
+      #   with:
+      #     cosign-release: 'v1.13.1'
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      # Workaround: https://github.com/docker/build-push-action/issues/461
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf
+
+      - name: Login to DockerHub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          registry: git.nicktrimborn.de
+          username: ${{ secrets.ACTION_USER }}
+          password: ${{ secrets.PASSWORD }}
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            git.nicktrimborn.de/nick/tasmota-power-exporter
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          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 }}

grafana.json

@@ -1,4 +1,47 @@
 {
+  "__inputs": [
+    {
+      "name": "DS_PROMETHEUS",
+      "label": "Prometheus",
+      "description": "",
+      "type": "datasource",
+      "pluginId": "prometheus",
+      "pluginName": "Prometheus"
+    }
+  ],
+  "__elements": {},
+  "__requires": [
+    {
+      "type": "panel",
+      "id": "bargauge",
+      "name": "Bar gauge",
+      "version": ""
+    },
+    {
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "9.4.3"
+    },
+    {
+      "type": "datasource",
+      "id": "prometheus",
+      "name": "Prometheus",
+      "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "stat",
+      "name": "Stat",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "timeseries",
+      "name": "Time series",
+      "version": ""
+    }
+  ],
   "annotations": {
     "list": [
       {
@@ -28,14 +71,14 @@
   "fiscalYearStartMonth": 0,
   "gnetId": 13950,
   "graphTooltip": 0,
-    "id": 9,
+  "id": null,
   "links": [],
   "liveNow": false,
   "panels": [
     {
       "datasource": {
         "type": "prometheus",
-          "uid": "XOGiKiT7k"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -95,29 +138,33 @@
         },
         "textMode": "value"
       },
-        "pluginVersion": "8.5.0",
+      "pluginVersion": "9.4.3",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
-              "uid": "XOGiKiT7k"
+            "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": true,
-            "expr": "tasmota_power_W{}",
+          "expr": "tasmota_active_power_W{job=~\"$job\"}",
           "interval": "",
           "legendFormat": "power_W",
+          "range": true,
           "refId": "A"
         },
         {
           "datasource": {
             "type": "prometheus",
-              "uid": "XOGiKiT7k"
+            "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": true,
-            "expr": "tasmota_current_A{}",
+          "expr": "tasmota_current_A{job=~\"$job\"}",
           "hide": false,
           "interval": "",
           "legendFormat": "current_A",
+          "range": true,
           "refId": "B"
         }
       ],
@@ -128,7 +175,7 @@
     {
       "datasource": {
         "type": "prometheus",
-          "uid": "XOGiKiT7k"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -187,29 +234,33 @@
         },
         "textMode": "value"
       },
-        "pluginVersion": "8.5.0",
+      "pluginVersion": "9.4.3",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
-              "uid": "XOGiKiT7k"
+            "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": true,
-            "expr": "avg_over_time(tasmota_power_W{}[$__range])",
+          "expr": "avg_over_time(tasmota_active_power_W{job=~\"$job\"}[$__range])",
           "interval": "",
           "legendFormat": "power_W",
+          "range": true,
           "refId": "A"
         },
         {
           "datasource": {
             "type": "prometheus",
-              "uid": "XOGiKiT7k"
+            "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": true,
-            "expr": "avg_over_time(tasmota_current_A{}[$__range])",
+          "expr": "avg_over_time(tasmota_current_A{job=~\"$job\"}[$__range])",
           "hide": false,
           "interval": "",
           "legendFormat": "current_A",
+          "range": true,
           "refId": "B"
         }
       ],
@@ -220,7 +271,7 @@
     {
       "datasource": {
         "type": "prometheus",
-          "uid": "XOGiKiT7k"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -263,17 +314,19 @@
         "text": {},
         "textMode": "auto"
       },
-        "pluginVersion": "8.5.0",
+      "pluginVersion": "9.4.3",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
-              "uid": "XOGiKiT7k"
+            "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": true,
-            "expr": "delta(tasmota_energy_kWh_total[$__range])",
+          "expr": "delta(tasmota_energy_kWh_total{job=~\"$job\"}[$__range])",
           "interval": "",
           "legendFormat": "",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -284,7 +337,7 @@
     {
       "datasource": {
         "type": "prometheus",
-          "uid": "XOGiKiT7k"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -332,17 +385,19 @@
         "text": {},
         "textMode": "auto"
       },
-        "pluginVersion": "8.5.0",
+      "pluginVersion": "9.4.3",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
-              "uid": "XOGiKiT7k"
+            "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": true,
-            "expr": "delta(tasmota_energy_kWh_total[$__range]) * .098",
+          "expr": "delta(tasmota_energy_kWh_total{job=~\"$job\"}[$__range]) * .276",
           "interval": "",
           "legendFormat": "",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -353,7 +408,7 @@
     {
       "datasource": {
         "type": "prometheus",
-          "uid": "XOGiKiT7k"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -396,18 +451,20 @@
         "text": {},
         "textMode": "auto"
       },
-        "pluginVersion": "8.5.0",
+      "pluginVersion": "9.4.3",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
-              "uid": "XOGiKiT7k"
+            "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": true,
-            "expr": "delta(tasmota_energy_kWh_total[$__range])",
+          "expr": "delta(tasmota_energy_kWh_total{job=~\"$job\"}[$__range])",
           "format": "time_series",
           "interval": "",
           "legendFormat": "",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -418,7 +475,7 @@
     {
       "datasource": {
         "type": "prometheus",
-          "uid": "XOGiKiT7k"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -477,17 +534,19 @@
         "text": {},
         "textMode": "value"
       },
-        "pluginVersion": "8.5.0",
+      "pluginVersion": "9.4.3",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
-              "uid": "XOGiKiT7k"
+            "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": true,
-            "expr": "delta(tasmota_energy_kWh_total[$__range])*.098",
+          "expr": "delta(tasmota_energy_kWh_total{job=~\"$job\"}[$__range])*.276",
           "interval": "",
           "legendFormat": "",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -499,7 +558,7 @@
     {
       "datasource": {
         "type": "prometheus",
-          "uid": "XOGiKiT7k"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -542,18 +601,20 @@
         "text": {},
         "textMode": "auto"
       },
-        "pluginVersion": "8.5.0",
+      "pluginVersion": "9.4.3",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
-              "uid": "XOGiKiT7k"
+            "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": true,
-            "expr": "delta(tasmota_energy_kWh_total[$__range])",
+          "expr": "delta(tasmota_energy_kWh_total{job=~\"$job\"}[$__range])",
           "format": "time_series",
           "interval": "",
           "legendFormat": "",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -564,7 +625,7 @@
     {
       "datasource": {
         "type": "prometheus",
-          "uid": "XOGiKiT7k"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -623,17 +684,19 @@
         "text": {},
         "textMode": "value"
       },
-        "pluginVersion": "8.5.0",
+      "pluginVersion": "9.4.3",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
-              "uid": "XOGiKiT7k"
+            "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": true,
-            "expr": "delta(tasmota_energy_kWh_total[$__range])*.098",
+          "expr": "delta(tasmota_energy_kWh_total{job=~\"$job\"}[$__range])*.276",
           "interval": "",
           "legendFormat": "",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -645,7 +708,7 @@
     {
       "datasource": {
         "type": "prometheus",
-          "uid": "XOGiKiT7k"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -704,29 +767,33 @@
         },
         "textMode": "value"
       },
-        "pluginVersion": "8.5.0",
+      "pluginVersion": "9.4.3",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
-              "uid": "XOGiKiT7k"
+            "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": true,
-            "expr": "max_over_time(tasmota_power_W{}[$__range])",
+          "expr": "max_over_time(tasmota_active_power_W{job=~\"$job\"}[$__range])",
           "interval": "",
           "legendFormat": "power_W",
+          "range": true,
           "refId": "A"
         },
         {
           "datasource": {
             "type": "prometheus",
-              "uid": "XOGiKiT7k"
+            "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": true,
-            "expr": "max_over_time(tasmota_current_A{}[$__range])",
+          "expr": "max_over_time(tasmota_current_A{job=~\"$job\"}[$__range])",
           "hide": false,
           "interval": "",
           "legendFormat": "current_A",
+          "range": true,
           "refId": "B"
         }
       ],
@@ -737,7 +804,7 @@
     {
       "datasource": {
         "type": "prometheus",
-          "uid": "XOGiKiT7k"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -784,17 +851,19 @@
         },
         "textMode": "auto"
       },
-        "pluginVersion": "8.5.0",
+      "pluginVersion": "9.4.3",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
-              "uid": "XOGiKiT7k"
+            "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": true,
-            "expr": "max_over_time(tasmota_voltage_V{}[$__range])",
+          "expr": "max_over_time(tasmota_voltage_V{job=~\"$job\"}[$__range])",
           "interval": "",
           "legendFormat": "",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -805,7 +874,7 @@
     {
       "datasource": {
         "type": "prometheus",
-          "uid": "XOGiKiT7k"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -851,17 +920,19 @@
         },
         "textMode": "auto"
       },
-        "pluginVersion": "8.5.0",
+      "pluginVersion": "9.4.3",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
-              "uid": "XOGiKiT7k"
+            "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": true,
-            "expr": "max_over_time(tasmota_energy_today_kWh_total{}[$__range])",
+          "expr": "max_over_time(tasmota_energy_today_kWh_total{job=~\"$job\"}[$__range])",
           "interval": "",
           "legendFormat": "",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -872,7 +943,7 @@
     {
       "datasource": {
         "type": "prometheus",
-          "uid": "XOGiKiT7k"
+        "uid": "${DS_PROMETHEUS}"
       },
       "description": "",
       "fieldConfig": {
@@ -881,6 +952,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -952,7 +1025,8 @@
         "legend": {
           "calcs": [],
           "displayMode": "list",
-            "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "single",
@@ -964,13 +1038,15 @@
         {
           "datasource": {
             "type": "prometheus",
-              "uid": "XOGiKiT7k"
+            "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": true,
-            "expr": "tasmota_power_W{}",
+          "expr": "tasmota_active_power_W{job=~\"$job\"}",
           "format": "time_series",
           "interval": "",
           "legendFormat": "{{ device }}",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -982,7 +1058,7 @@
     {
       "datasource": {
         "type": "prometheus",
-          "uid": "XOGiKiT7k"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -1033,15 +1109,16 @@
         "showUnfilled": true,
         "text": {}
       },
-        "pluginVersion": "8.5.0",
+      "pluginVersion": "9.4.3",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
-              "uid": "XOGiKiT7k"
+            "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": true,
-            "expr": "delta(tasmota_energy_kWh_total[$__range])",
+          "expr": "delta(tasmota_energy_kWh_total{job=~\"$job\"}[$__range])",
           "format": "table",
           "instant": false,
           "interval": "",
@@ -1057,7 +1134,7 @@
     {
       "datasource": {
         "type": "prometheus",
-          "uid": "XOGiKiT7k"
+        "uid": "${DS_PROMETHEUS}"
       },
       "description": "",
       "fieldConfig": {
@@ -1066,6 +1143,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1138,7 +1217,8 @@
         "legend": {
           "calcs": [],
           "displayMode": "list",
-            "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "single",
@@ -1150,7 +1230,7 @@
         {
           "datasource": {
             "type": "prometheus",
-              "uid": "XOGiKiT7k"
+            "uid": "${DS_PROMETHEUS}"
           },
           "exemplar": true,
           "expr": "tasmota_energy_today_kWh_total{}",
@@ -1168,7 +1248,7 @@
     {
       "datasource": {
         "type": "prometheus",
-          "uid": "XOGiKiT7k"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -1176,6 +1256,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1234,7 +1316,8 @@
         "legend": {
           "calcs": [],
           "displayMode": "list",
-            "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
           "mode": "single",
@@ -1246,12 +1329,14 @@
         {
           "datasource": {
             "type": "prometheus",
-              "uid": "XOGiKiT7k"
+            "uid": "${DS_PROMETHEUS}"
           },
+          "editorMode": "code",
           "exemplar": true,
-            "expr": "rate(tasmota_power_W[1h])",
+          "expr": "rate(tasmota_active_power_W{job=~\"$job\"}[1h])",
           "interval": "",
           "legendFormat": " Rate of Power",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -1260,12 +1345,38 @@
       "type": "timeseries"
     }
   ],
-    "refresh": "10s",
+  "refresh": "5s",
-    "schemaVersion": 36,
+  "revision": 1,
+  "schemaVersion": 38,
   "style": "dark",
   "tags": [],
   "templating": {
-      "list": []
+    "list": [
+      {
+        "current": {},
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${DS_PROMETHEUS}"
+        },
+        "definition": "label_values(job)",
+        "description": "variable to filter plugs by job",
+        "hide": 0,
+        "includeAll": true,
+        "label": "Job",
+        "multi": false,
+        "name": "job",
+        "options": [],
+        "query": {
+          "query": "label_values(job)",
+          "refId": "StandardVariableQuery"
+        },
+        "refresh": 1,
+        "regex": "/^tasmota-/",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      }
+    ]
   },
   "time": {
     "from": "now-30d",
@@ -1290,6 +1401,6 @@
   "timezone": "",
   "title": "Tasmota Plug Usage",
   "uid": "_nyxoAfMk3",
-    "version": 33,
+  "version": 10,
   "weekStart": ""
 }

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