diff --git a/roles/monitoring/templates/mqtt_exporter_config.yaml b/roles/monitoring/templates/mqtt_exporter_config.yaml index 2ee7944..a3a0d05 100644 --- a/roles/monitoring/templates/mqtt_exporter_config.yaml +++ b/roles/monitoring/templates/mqtt_exporter_config.yaml @@ -1,3 +1,5 @@ +log_level: INFO + mqtt: host: {{ mqtt_public_host }} port: 1883 @@ -5,6 +7,8 @@ mqtt: prometheus: port: {{ monitoring_mqtt_exporter_port }} + +# Topics must be relayed by the internal MQTT server! export: - subscribe: bitlair/# - subscribe: bitlair/climate/+location/# @@ -36,6 +40,10 @@ export: metric_name: bitlair_internet_tx value_regex: "^.+:.+:([\\d\\.]+)" + - subscribe: bitlair/collectd/apc_powerbar/snmp/current + metric_name: bitlair_powerbar_current_da + value_regex: "^.+:(\\d+)" + - subscribe: bitlair/power/shelly/+num/status/switch:0 metric_name: bitlair_power_shelly value_json: .apower diff --git a/roles/mqtt-internal/templates/public-bridge.conf b/roles/mqtt-internal/templates/public-bridge.conf index 7e392ec..fb97159 100644 --- a/roles/mqtt-internal/templates/public-bridge.conf +++ b/roles/mqtt-internal/templates/public-bridge.conf @@ -6,6 +6,7 @@ address {{ mqtt_public_host }} topic bitlair/alarm out topic bitlair/climate/# out topic bitlair/collectd/bitlair-5406/snmp/# out +topic bitlair/collectd/apc_powerbar/snmp/current out topic bitlair/doorduino/lockstate out topic bitlair/entrysensor/# out topic bitlair/lasercutter/+ out