Working Dashboard in tra

2020-12-30 22:41:28 +01:00 · 2020-12-30 22:41:28 +01:00 · 5f50328a08
parent 183964f086
commit 5f50328a08
10 changed files with 45 additions and 94 deletions
--- a/docker-compose.per.yml
+++ b/docker-compose.per.yml
@ -5,7 +5,7 @@ services:
    container_name: peek
    depends_on:
      - db_peek
-    image: wordpress:5.5.3-apache
+    image: wordpress:5.6.0-apache
    volumes:
      - /srv/docker/peekskog/wp:/var/www/html
    ports:
--- a/docker-compose.service.yml
+++ b/docker-compose.service.yml
@ -56,6 +56,7 @@ services:
    container_name: influxdb
    networks:
      - backend
+      - frontend
    restart: always
    ports:
      - "8087:80"
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -5,7 +5,7 @@ services:

  reverse-proxy:
    # The official v2.0 Traefik docker image
-    image: traefik:v2.3
+    image: traefik:v2.3.4
    container_name: "traefik"
    networks:
      - backend
@ -14,7 +14,6 @@ services:
      # The HTTP port
      - "80:80"
      - "443:443"
-      - "8080:8080"
    volumes:
      # So that Traefik can listen to the Docker events
      - /var/run/docker.sock:/var/run/docker.sock
@ -26,17 +25,6 @@ services:
    dns:
      - 8.8.8.8

-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.traefik.rule=Host(`tra.${DOMAIN}`)"
-      - "traefik.http.routers.traefik-secure.entrypoints=web-secure"
-      - "traefik.http.routers.traefik-secure.rule=Host(`tra.${DOMAIN}`)"
-      - "traefik.http.routers.traefik-secure.tls.certresolver=milvert"
-      - "traefik.http.routers.traefik-secure.tls=true"
-      - "traefik.http.services.traefik-service.loadbalancer.server.port=8080"
-      - "traefik.http.routers.traefik-secure.middlewares=traefik-auth"
-      - "traefik.http.middlewares.traefik-auth.basicauth.users=simon:$$apr1$$o3vIe.DX$$3XExiBMe8rUo3HujDSYEo0"
-
 networks:
  frontend:
    external: true
--- a/static_config.yml
+++ b/static_config.yml
@ -1,13 +1,5 @@
 http:
  routers:
-    lampa-router:
-      rule: "Host(`lampa.milvert.com`)"
-      middlewares:
-        - redirect
-      service: lampa-service
-      entryPoints:
-         - web
-
    lampa-router:
      rule: "Host(`lampa.milvert.com`)"
      service: lampa-service
@ -16,14 +8,6 @@ http:
      tls:
       certResolver: milvert

-    bitwarden-router:
-      rule: "Host(`bitwarden.milvert.com`)"
-      middlewares:
-        - redirect
-      service: bitwarden-service
-      entryPoints:
-         - web
-
    bitwarden-router:
      rule: "Host(`bitwarden.milvert.com`)"
      service: bitwarden-service
@ -32,6 +16,16 @@ http:
      tls:
       certResolver: milvert

+    dashboard:
+      rule: "Host(`tra.milvert.com`)"
+      service: api@internal
+      entryPoints:
+         - web-secure
+      tls:
+       certResolver: milvert
+      middlewares:
+        - auth
+
    redirecttohttps:
      rule: "HostRegexp(`{host:.+}`)"
      middlewares:
@ -66,4 +60,7 @@ http:
    httpsredirect:
      redirectScheme:
        scheme: https
-
+    auth:
+      basicAuth:
+        users:
+          - "admin:$apr1$iQ9pYbK/$gOLcycC6KlzqpcfJidjQC0"
--- a/traefik.yml
+++ b/traefik.yml
@ -1,5 +1,4 @@
 api:
-  insecure: true
  dashboard: true
  debug: true

@ -12,7 +11,7 @@ providers:
    watch: true

 log:
-  level: DEBUG
+  level: ERROR
  #  filePath: /etc/traefik/log.json
  # format: json

--- a/wordpress/docker-compose.yml
+++ b/wordpress/docker-compose.yml
@ -1,43 +0,0 @@
-version: '3'
-
-services:
-  postgres:
-    container_name: postgres
-    image: postgres
-    restart: always
-    networks:
-      - backend
-    environment:
-      - TZ=${TZ}
-      - POSTGRES_USER=${POSTGRES_USER}
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-    volumes:
-      - ${DIR}/postgres/data:/var/lib/postgresql/data
-      - ${DIR}/shared:/shared
-
-  pgadmin4:
-    container_name: pgadmin4
-    image: dpage/pgadmin4
-    restart: always
-    ports:
-      - "8003:80"
-    networks:
-      - backend
-    environment:
-      - PGADMIN_DEFAULT_EMAIL=${PGADMIN_DEFAULT_EMAIL}
-      - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD}
-        #- PUID=${PUID}
-        #- PGID=${PGID}
-      - TZ=${TZ}
-    volumes:
-      - ${DIR}/pgadmin4:/root/.pgadmin
-        #- ${DIR}/pgadmin4:/var/lib/pgadmin
-
-
-
-networks:
-  frontend:
-    external: true
-  backend:
-    external: false
-
--- a/zigbee_home_2/configuration_home_2.yaml
+++ b/zigbee_home_2/configuration_home_2.yaml
@ -35,13 +35,19 @@ devices:
  '0x000b57fffe9a3e5a':
    friendly_name: sovrum_jordglob
  '0xec1bbdfffeb46980':
-    friendly_name: gulrum_liten
+    friendly_name: Jul - Stjärna 1
  '0xbc33acfffea767f3':
    friendly_name: vrum_remote
  '0x14b457fffe6ae838':
    friendly_name: vrum_läslampa
  '0xbc33acfffea0d682':
    friendly_name: vrum_tak
+  '0x00158d000588bb44':
+    friendly_name: TempHum_5
+  '0x00158d00058a6526':
+    friendly_name: TempHum_6
+  '0x00158d00058a2ad5':
+    friendly_name: TempHum_7
 groups:
  '0':
    friendly_name: vrum_tak_group
--- a/zigbee_home_2/coordinator_backup.json
+++ b/zigbee_home_2/coordinator_backup.json
@ -1,6 +1,6 @@
 {
  "adapterType": "zStack",
-  "time": "Thu, 26 Nov 2020 21:14:05 GMT",
+  "time": "Wed, 30 Dec 2020 18:43:53 GMT",
  "meta": {
    "product": 1
  },
@ -28,7 +28,7 @@
      "osal": true,
      "product": -1,
      "value": [
-        21,
+        87,
        5,
        2,
        51,
@ -140,8 +140,8 @@
        0,
        0,
        0,
-        198,
-        9,
+        69,
+        25,
        0,
        0
      ],
@ -331,9 +331,9 @@
      "osal": false,
      "offset": 0,
      "value": [
-        112,
-        31,
-        2,
+        249,
+        196,
+        5,
        0,
        221,
        221,
--- a/zigbee_home_2/database.db
+++ b/zigbee_home_2/database.db
@ -1,14 +1,17 @@
 {"id":1,"type":"Coordinator","ieeeAddr":"0x00124b0021cbfbe0","nwkAddr":0,"manufId":0,"epList":[1,2,3,4,5,6,8,11,12,13,47,110,242],"endpoints":{"1":{"profId":260,"epId":1,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"2":{"profId":257,"epId":2,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"3":{"profId":261,"epId":3,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"4":{"profId":263,"epId":4,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"5":{"profId":264,"epId":5,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"6":{"profId":265,"epId":6,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"8":{"profId":260,"epId":8,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"11":{"profId":260,"epId":11,"devId":1024,"inClusterList":[1281],"outClusterList":[1280,1282],"clusters":{},"binds":[],"meta":{}},"12":{"profId":49246,"epId":12,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"13":{"profId":260,"epId":13,"devId":5,"inClusterList":[25],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"47":{"profId":260,"epId":47,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"110":{"profId":260,"epId":110,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"242":{"profId":41440,"epId":242,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}}},"interviewCompleted":true,"meta":{},"lastSeen":null}
-{"id":2,"type":"Router","ieeeAddr":"0x000b57fffe96daab","nwkAddr":38861,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E14 W op/ch 400lm","epList":[1],"endpoints":{"1":{"profId":49246,"epId":1,"devId":256,"inClusterList":[0,3,4,5,6,8,2821,4096],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E14 W op/ch 400lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":1,"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214"}}},"binds":[],"meta":{}}},"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1606425821900}
-{"id":3,"type":"Router","ieeeAddr":"0x000b57fffe915dbf","nwkAddr":15363,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E14 W op/ch 400lm","epList":[1],"endpoints":{"1":{"profId":49246,"epId":1,"devId":256,"inClusterList":[0,3,4,5,6,8,2821,4096],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E14 W op/ch 400lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":1,"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214"}}},"binds":[],"meta":{}}},"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1606425821706}
-{"id":4,"type":"Router","ieeeAddr":"0x000b57fffe96d90a","nwkAddr":3767,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E14 W op/ch 400lm","epList":[1],"endpoints":{"1":{"profId":49246,"epId":1,"devId":256,"inClusterList":[0,3,4,5,6,8,2821,4096],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E14 W op/ch 400lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":1,"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214"}}},"binds":[],"meta":{}}},"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1606425821849}
-{"id":5,"type":"Router","ieeeAddr":"0x000b57fffe9a3e5a","nwkAddr":62865,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E14 W op/ch 400lm","epList":[1],"endpoints":{"1":{"profId":49246,"epId":1,"devId":256,"inClusterList":[0,3,4,5,6,8,2821,4096],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E14 W op/ch 400lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":1,"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214"}}},"binds":[],"meta":{}}},"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1606426693625}
-{"id":6,"type":"Router","ieeeAddr":"0xec1bbdfffeb46980","nwkAddr":17062,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E14 W op/ch 400lm","epList":[1],"endpoints":{"1":{"profId":49246,"epId":1,"devId":256,"inClusterList":[0,3,4,5,6,8,2821,4096],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E14 W op/ch 400lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":1,"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214"}}},"binds":[],"meta":{}}},"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1606394134575}
-{"id":7,"type":"EndDevice","ieeeAddr":"0xbc33acfffea767f3","nwkAddr":32870,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Battery","modelId":"TRADFRI on/off switch","epList":[1],"endpoints":{"1":{"profId":260,"epId":1,"devId":2080,"inClusterList":[0,1,3,9,32,4096,64636],"outClusterList":[3,4,6,8,25,258,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI on/off switch","manufacturerName":"IKEA of Sweden","powerSource":3,"zclVersion":3,"appVersion":33,"stackVersion":98,"hwVersion":1,"dateCode":"20190723","swBuildId":"2.2.010"}},"genPowerCfg":{"attributes":{"batteryPercentageRemaining":87}}},"binds":[{"cluster":1,"type":"endpoint","deviceIeeeAddress":"0x00124b0021cbfbe0","endpointID":1}],"meta":{}}},"appVersion":33,"stackVersion":98,"hwVersion":1,"dateCode":"20190723","swBuildId":"2.2.010","zclVersion":3,"interviewCompleted":true,"meta":{"configured":1},"lastSeen":1606434346260}
-{"id":8,"type":"Router","ieeeAddr":"0x14b457fffe6ae838","nwkAddr":64261,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E27 WW clear 250lm","epList":[1,242],"endpoints":{"1":{"profId":260,"epId":1,"devId":257,"inClusterList":[0,3,4,5,6,8,4096,64636],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E27 WW clear 250lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":3,"appVersion":32,"stackVersion":99,"hwVersion":2,"dateCode":"20181203","swBuildId":"2.3.050"}}},"binds":[],"meta":{}},"242":{"profId":41440,"epId":242,"devId":97,"inClusterList":[33],"outClusterList":[33],"clusters":{},"binds":[],"meta":{}}},"appVersion":32,"stackVersion":99,"hwVersion":2,"dateCode":"20181203","swBuildId":"2.3.050","zclVersion":3,"interviewCompleted":true,"meta":{},"lastSeen":1606413738984}
-{"id":9,"type":"Router","ieeeAddr":"0xbc33acfffea0d682","nwkAddr":29811,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E27 WW 806lm","epList":[1,242],"endpoints":{"1":{"profId":260,"epId":1,"devId":257,"inClusterList":[0,3,4,5,6,8,4096,64636],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E27 WW 806lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":3,"appVersion":32,"stackVersion":99,"hwVersion":2,"dateCode":"20181203","swBuildId":"2.3.050"}}},"binds":[],"meta":{}},"242":{"profId":41440,"epId":242,"devId":97,"inClusterList":[33],"outClusterList":[33],"clusters":{},"binds":[],"meta":{}}},"appVersion":32,"stackVersion":99,"hwVersion":2,"dateCode":"20181203","swBuildId":"2.3.050","zclVersion":3,"interviewCompleted":true,"meta":{},"lastSeen":1606404957205}
+{"id":2,"type":"Router","ieeeAddr":"0x000b57fffe96daab","nwkAddr":38861,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E14 W op/ch 400lm","epList":[1],"endpoints":{"1":{"profId":49246,"epId":1,"devId":256,"inClusterList":[0,3,4,5,6,8,2821,4096],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E14 W op/ch 400lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":1,"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214"}}},"binds":[],"meta":{}}},"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1609069143431}
+{"id":3,"type":"Router","ieeeAddr":"0x000b57fffe915dbf","nwkAddr":15363,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E14 W op/ch 400lm","epList":[1],"endpoints":{"1":{"profId":49246,"epId":1,"devId":256,"inClusterList":[0,3,4,5,6,8,2821,4096],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E14 W op/ch 400lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":1,"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214"}}},"binds":[],"meta":{}}},"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1609344804981}
+{"id":4,"type":"Router","ieeeAddr":"0x000b57fffe96d90a","nwkAddr":3767,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E14 W op/ch 400lm","epList":[1],"endpoints":{"1":{"profId":49246,"epId":1,"devId":256,"inClusterList":[0,3,4,5,6,8,2821,4096],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E14 W op/ch 400lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":1,"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214"}}},"binds":[],"meta":{}}},"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1609344771113}
+{"id":5,"type":"Router","ieeeAddr":"0x000b57fffe9a3e5a","nwkAddr":62865,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E14 W op/ch 400lm","epList":[1],"endpoints":{"1":{"profId":49246,"epId":1,"devId":256,"inClusterList":[0,3,4,5,6,8,2821,4096],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E14 W op/ch 400lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":1,"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214"}}},"binds":[],"meta":{}}},"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1607521985941}
+{"id":6,"type":"Router","ieeeAddr":"0xec1bbdfffeb46980","nwkAddr":17062,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E14 W op/ch 400lm","epList":[1],"endpoints":{"1":{"profId":49246,"epId":1,"devId":256,"inClusterList":[0,3,4,5,6,8,2821,4096],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E14 W op/ch 400lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":1,"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214"}}},"binds":[],"meta":{}}},"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1608904665445}
+{"id":7,"type":"EndDevice","ieeeAddr":"0xbc33acfffea767f3","nwkAddr":32870,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Battery","modelId":"TRADFRI on/off switch","epList":[1],"endpoints":{"1":{"profId":260,"epId":1,"devId":2080,"inClusterList":[0,1,3,9,32,4096,64636],"outClusterList":[3,4,6,8,25,258,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI on/off switch","manufacturerName":"IKEA of Sweden","powerSource":3,"zclVersion":3,"appVersion":33,"stackVersion":98,"hwVersion":1,"dateCode":"20190723","swBuildId":"2.2.010"}},"genPowerCfg":{"attributes":{"batteryPercentageRemaining":74}}},"binds":[{"cluster":1,"type":"endpoint","deviceIeeeAddress":"0x00124b0021cbfbe0","endpointID":1}],"meta":{}}},"appVersion":33,"stackVersion":98,"hwVersion":1,"dateCode":"20190723","swBuildId":"2.2.010","zclVersion":3,"interviewCompleted":true,"meta":{"configured":1},"lastSeen":1609310810500}
+{"id":8,"type":"Router","ieeeAddr":"0x14b457fffe6ae838","nwkAddr":64261,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E27 WW clear 250lm","epList":[1,242],"endpoints":{"1":{"profId":260,"epId":1,"devId":257,"inClusterList":[0,3,4,5,6,8,4096,64636],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E27 WW clear 250lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":3,"appVersion":32,"stackVersion":99,"hwVersion":2,"dateCode":"20181203","swBuildId":"2.3.050"}}},"binds":[],"meta":{}},"242":{"profId":41440,"epId":242,"devId":97,"inClusterList":[33],"outClusterList":[33],"clusters":{},"binds":[],"meta":{}}},"appVersion":32,"stackVersion":99,"hwVersion":2,"dateCode":"20181203","swBuildId":"2.3.050","zclVersion":3,"interviewCompleted":true,"meta":{},"lastSeen":1609162836636}
+{"id":9,"type":"Router","ieeeAddr":"0xbc33acfffea0d682","nwkAddr":29811,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E27 WW 806lm","epList":[1,242],"endpoints":{"1":{"profId":260,"epId":1,"devId":257,"inClusterList":[0,3,4,5,6,8,4096,64636],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E27 WW 806lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":3,"appVersion":32,"stackVersion":99,"hwVersion":2,"dateCode":"20181203","swBuildId":"2.3.050"}}},"binds":[],"meta":{}},"242":{"profId":41440,"epId":242,"devId":97,"inClusterList":[33],"outClusterList":[33],"clusters":{},"binds":[],"meta":{}}},"appVersion":32,"stackVersion":99,"hwVersion":2,"dateCode":"20181203","swBuildId":"2.3.050","zclVersion":3,"interviewCompleted":true,"meta":{},"lastSeen":1609354133867}
 {"id":10,"type":"Group","groupID":1,"members":[],"meta":{}}
 {"id":11,"type":"Group","groupID":901,"members":[],"meta":{}}
 {"id":12,"type":"Coordinator","ieeeAddr":"0x00124b0021cbfbe0","nwkAddr":0,"manufId":0,"epList":[1,2,3,4,5,6,8,11,12,13,47,110,242],"endpoints":{"1":{"profId":260,"epId":1,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"2":{"profId":257,"epId":2,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"3":{"profId":261,"epId":3,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"4":{"profId":263,"epId":4,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"5":{"profId":264,"epId":5,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"6":{"profId":265,"epId":6,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"8":{"profId":260,"epId":8,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"11":{"profId":260,"epId":11,"devId":1024,"inClusterList":[1281],"outClusterList":[1280,1282],"clusters":{},"binds":[],"meta":{}},"12":{"profId":49246,"epId":12,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"13":{"profId":260,"epId":13,"devId":5,"inClusterList":[25],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"47":{"profId":260,"epId":47,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"110":{"profId":260,"epId":110,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"242":{"profId":41440,"epId":242,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}}},"interviewCompleted":true,"meta":{},"lastSeen":null}
 {"id":13,"type":"Group","groupID":0,"members":[{"deviceIeeeAddr":"0xbc33acfffea0d682","endpointID":1}],"meta":{}}
-{"id":14,"type":"Coordinator","ieeeAddr":"0x00124b0021cbfbe0","nwkAddr":0,"manufId":0,"epList":[1,2,3,4,5,6,8,11,12,13,47,110,242],"endpoints":{"1":{"profId":260,"epId":1,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"2":{"profId":257,"epId":2,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"3":{"profId":261,"epId":3,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"4":{"profId":263,"epId":4,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"5":{"profId":264,"epId":5,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"6":{"profId":265,"epId":6,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"8":{"profId":260,"epId":8,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"11":{"profId":260,"epId":11,"devId":1024,"inClusterList":[1281],"outClusterList":[1280,1282],"clusters":{},"binds":[],"meta":{}},"12":{"profId":49246,"epId":12,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"13":{"profId":260,"epId":13,"devId":5,"inClusterList":[25],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"47":{"profId":260,"epId":47,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"110":{"profId":260,"epId":110,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"242":{"profId":41440,"epId":242,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}}},"interviewCompleted":true,"meta":{},"lastSeen":null}
+{"id":14,"type":"Coordinator","ieeeAddr":"0x00124b0021cbfbe0","nwkAddr":0,"manufId":0,"epList":[1,2,3,4,5,6,8,11,12,13,47,110,242],"endpoints":{"1":{"profId":260,"epId":1,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"2":{"profId":257,"epId":2,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"3":{"profId":261,"epId":3,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"4":{"profId":263,"epId":4,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"5":{"profId":264,"epId":5,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"6":{"profId":265,"epId":6,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"8":{"profId":260,"epId":8,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"11":{"profId":260,"epId":11,"devId":1024,"inClusterList":[1281],"outClusterList":[1280,1282],"clusters":{},"binds":[],"meta":{}},"12":{"profId":49246,"epId":12,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"13":{"profId":260,"epId":13,"devId":5,"inClusterList":[25],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"47":{"profId":260,"epId":47,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"110":{"profId":260,"epId":110,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"242":{"profId":41440,"epId":242,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}}},"interviewCompleted":true,"meta":{},"lastSeen":null}
+{"id":15,"type":"EndDevice","ieeeAddr":"0x00158d000588bb44","nwkAddr":39857,"manufId":4151,"manufName":"LUMI","powerSource":"Battery","modelId":"lumi.weather","epList":[1],"endpoints":{"1":{"profId":260,"epId":1,"devId":770,"inClusterList":[0,3,65535,1026,1027,1029],"outClusterList":[0,4,65535],"clusters":{"msTemperatureMeasurement":{"attributes":{"measuredValue":2169}},"msRelativeHumidity":{"attributes":{"measuredValue":4170}},"msPressureMeasurement":{"attributes":{"16":9925,"20":-1,"measuredValue":992}},"genBasic":{"attributes":{"65281":{"1":2985,"4":17320,"5":10,"6":[0,1],"10":3767,"100":2164,"101":4163,"102":99266},"manufacturerName":"LUMI","powerSource":3,"zclVersion":1,"stackVersion":2,"hwVersion":30,"dateCode":"20191205","swBuildId":"3000-0001"}}},"binds":[],"meta":{}}},"appVersion":5,"stackVersion":2,"hwVersion":30,"dateCode":"20191205","swBuildId":"3000-0001","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1609360369653}
+{"id":16,"type":"EndDevice","ieeeAddr":"0x00158d00058a6526","nwkAddr":60898,"manufId":4151,"manufName":"LUMI","powerSource":"Battery","modelId":"lumi.weather","epList":[1],"endpoints":{"1":{"profId":260,"epId":1,"devId":770,"inClusterList":[0,3,65535,1026,1027,1029],"outClusterList":[0,4,65535],"clusters":{"msTemperatureMeasurement":{"attributes":{"measuredValue":183}},"msRelativeHumidity":{"attributes":{"measuredValue":9772}},"msPressureMeasurement":{"attributes":{"16":9926,"20":-1,"measuredValue":992}},"genBasic":{"attributes":{"65281":{"1":2935,"4":17320,"5":10,"6":[0,1],"10":15363,"100":184,"101":9756,"102":99289},"manufacturerName":"LUMI","powerSource":3,"zclVersion":1,"stackVersion":2,"hwVersion":30,"dateCode":"20191205","swBuildId":"3000-0001"}}},"binds":[],"meta":{}}},"appVersion":5,"stackVersion":2,"hwVersion":30,"dateCode":"20191205","swBuildId":"3000-0001","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1609359110711}
+{"id":17,"type":"EndDevice","ieeeAddr":"0x00158d00058a2ad5","nwkAddr":65059,"manufId":4151,"manufName":"LUMI","powerSource":"Battery","modelId":"lumi.weather","epList":[1],"endpoints":{"1":{"profId":260,"epId":1,"devId":770,"inClusterList":[0,3,65535,1026,1027,1029],"outClusterList":[0,4,65535],"clusters":{"genBasic":{"attributes":{"65281":{"1":2985,"4":17320,"5":7,"6":[0,1],"10":3767,"100":305,"101":8742,"102":99271},"manufacturerName":"LUMI","powerSource":3,"zclVersion":1,"stackVersion":2,"hwVersion":30,"dateCode":"20191205","swBuildId":"3000-0001"}},"msTemperatureMeasurement":{"attributes":{"measuredValue":307}},"msRelativeHumidity":{"attributes":{"measuredValue":8739}},"msPressureMeasurement":{"attributes":{"16":9928,"20":-1,"measuredValue":992}}},"binds":[],"meta":{}}},"appVersion":5,"stackVersion":2,"hwVersion":30,"dateCode":"20191205","swBuildId":"3000-0001","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1609360126673}
--- a/zigbee_home_2/state.json
+++ b/zigbee_home_2/state.json
@ -1 +1 @@
-{"0":{"brightness":2,"state":"OFF"},"0x000b57fffe915dbf":{"brightness":66,"state":"OFF","update_available":false},"0x000b57fffe96d90a":{"brightness":214,"state":"OFF","update_available":false},"0x000b57fffe96daab":{"brightness":28,"state":"OFF","update_available":false},"0x000b57fffe9a3e5a":{"brightness":38,"state":"OFF","update_available":false},"0x14b457fffe6ae838":{"state":"OFF","update_available":false},"0xbc33acfffea0d682":{"brightness":2,"state":"OFF","update_available":false},"0xbc33acfffea767f3":{"battery":87,"linkquality":81,"update_available":false},"0xec1bbdfffeb46980":{"brightness":102,"state":"OFF","update_available":false},"1":{"brightness":51,"state":"OFF"}}
+{"0":{"brightness":244,"state":"OFF"},"0x000b57fffe915dbf":{"brightness":66,"state":"ON","update_available":false},"0x000b57fffe96d90a":{"brightness":249,"state":"OFF","update_available":false},"0x000b57fffe96daab":{"brightness":28,"state":"OFF","update_available":false},"0x000b57fffe9a3e5a":{"brightness":38,"state":"ON","update_available":false},"0x00158d000588bb44":{"battery":91,"humidity":41.87,"linkquality":54,"pressure":992.8,"temperature":21.7,"voltage":2985},"0x00158d00058a2ad5":{"battery":91,"humidity":87.4,"linkquality":60,"pressure":992.9,"temperature":2.98,"voltage":2985},"0x00158d00058a6526":{"battery":62,"humidity":96.89,"linkquality":54,"pressure":993.2,"temperature":1.23,"voltage":2935},"0x14b457fffe6ae838":{"state":"OFF","update_available":false},"0xbc33acfffea0d682":{"brightness":244,"state":"OFF","update_available":false},"0xbc33acfffea767f3":{"battery":74,"linkquality":66,"update_available":false},"0xec1bbdfffeb46980":{"brightness":7,"state":"OFF","update_available":false},"1":{"brightness":51,"state":"OFF"}}