group_vars/all.yaml

@@ -11,7 +11,7 @@ trusted_ranges:
   - { v: ipv4, cidr: 185.205.52.194/32 }
   - { v: ipv6, cidr: "::1" }
   - { v: ipv6, cidr: "fe80::/10" }
-  - { v: ipv6, cidr: "2a02:166b:92::/48" }
+  - { v: ipv6, cidr: "2a02:166b:92::/64" }
 
 mqtt_internal_host: mqtt.bitlair.nl
 mqtt_public_host: bitlair.nl

roles/monitoring/templates/mqtt_exporter_config.yaml

@@ -8,7 +8,6 @@ prometheus:
 export:
   - subscribe: bitlair/#
   - subscribe: bitlair/climate/+location/#
-  - subscribe: bitlair/power/+group/#
   - subscribe: bitlair/wifi/+ssid/#
 
   - subscribe: bitlair/state

roles/mqtt-internal/tasks/main.yaml

@@ -2,11 +2,10 @@
 - name: mqtt-internal
   tags: mqtt_internal
   block:
-    - name: Install dependencies
+    - name: Install broker
       apt:
-        name:
+        name: mosquitto
-          - mosquitto
+        state: present
-          - avahi-daemon
 
     - name: Configure Mosquitto
       template:

roles/mqtt-internal/templates/public-bridge.conf

@@ -13,7 +13,6 @@ topic bitlair/music/+/state out
 topic bitlair/music/+/volume out
 topic bitlair/photos out
 topic bitlair/pos/product out
-topic bitlair/power/# out
 topic bitlair/state out
 topic bitlair/state/djo out
 topic bitlair/wifi/+/online out

roles/services/handlers/main.yaml

@@ -54,9 +54,3 @@
     name: wifi-mqtt
     state: restarted
     daemon_reload: true
-
-- name: restart power-mqtt
-  systemd:
-    name: power-mqtt
-    state: restarted
-    daemon_reload: true

roles/services/tasks/main.yaml

@@ -19,6 +19,3 @@
 
 - tags: services_wifi_mqtt
   import_tasks: wifi_mqtt.yaml
-
-- tags: services_power_mqtt
-  import_tasks: power_mqtt.yaml

roles/services/tasks/power_mqtt.yaml

@@ -1,25 +0,0 @@
-- name: Install power-mqtt
-  template:
-    src: power-mqtt.sh
-    dest: /var/lib/power-mqtt.sh
-    owner: root
-    group: root
-    mode: 0755
-  notify: restart power-mqtt
-
-- name: Install power-mqtt service
-  template:
-    src: power-mqtt.service
-    dest: /etc/systemd/system/power-mqtt.service
-    owner: root
-    group: root
-    mode: 0644
-  notify: restart power-mqtt
-
-- name: Start power-mqtt
-  systemd:
-    name: power-mqtt
-    state: started
-    enabled: yes
-    daemon_reload: true
-

roles/services/templates/power-mqtt.service

@@ -1,16 +0,0 @@
-# Managed by Ansible
-
-[Unit]
-Description=SMD630 to MQTT Probe
-After=network.target
-
-[Service]
-Type=simple
-ExecStart=/bin/bash /var/lib/power-mqtt.sh
-Restart=on-failure
-RestartSec=10s
-DynamicUser=true
-
-[Install]
-WantedBy=multi-user.target
-

roles/services/templates/power-mqtt.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# Managed by Ansible
-
-set -euo pipefail
-
-h="{{ mqtt_internal_host }}"
-
-while true; do
-    j=$(curl -s http://100.64.0.187/api/v1/data)
-
-    mqtt-simple -h $h -p bitlair/power/total_kwh -m $(echo "$j" | jq .total_power_import_kwh)
-    mqtt-simple -h $h -p bitlair/power/All/now_w -m $(echo "$j" | jq .active_power_w)
-    mqtt-simple -h $h -p bitlair/power/L1/now_w -m $(echo "$j" | jq .active_power_l1_w)
-    mqtt-simple -h $h -p bitlair/power/L2/now_w -m $(echo "$j" | jq .active_power_l2_w)
-    mqtt-simple -h $h -p bitlair/power/L3/now_w -m $(echo "$j" | jq .active_power_l3_w)
-
-    sleep 1
-done