Merge branch 'main' into nginx-role-rework

roles/monitoring/tasks/mqtt_exporter.yaml

@@ -10,6 +10,7 @@
 - name: Install apt dependencies
   ansible.builtin.apt:
     name:
+      - jq
       - python3-paho-mqtt
       - python3-prometheus-client
       - python3-yaml

roles/monitoring/templates/mqtt_exporter_config.yaml

@@ -56,3 +56,29 @@ export:
   - subscribe: bitlair/power/shelly/+num/status/switch:0
     metric_name: bitlair_power_shelly
     value_json: .apower
+
+  - subscribe: bambulab/device/+serial/report
+    metric_name: bambulab_nozzle_temperature
+    value_json: .print.nozzle_temper
+  - subscribe: bambulab/device/+serial/report
+    metric_name: bambulab_nozzle_target_temperature
+    value_json: .print.nozzle_target_temper
+  - subscribe: bambulab/device/+serial/report
+    metric_name: bambulab_bed_temperature
+    value_json: .print.bed_temper
+  - subscribe: bambulab/device/+serial/report
+    metric_name: bambulab_bed_target_temperature
+    value_json: .print.bed_target_temper
+  - subscribe: bambulab/device/+serial/report
+    metric_name: bambulab_chamber_temperature
+    value_json: .print.chamber_temper
+  - subscribe: bambulab/device/+serial/report
+    metric_name: bambulab_ams_humidity
+    value_json: .print.ams.ams[0].humidity
+  - subscribe: bambulab/device/+serial/report
+    metric_name: bambulab_print_progress
+    value_json: .print.mc_percent
+  - subscribe: bambulab/device/+serial/report
+    metric_name: bambulab_print_status
+    metric_type: info
+    value_json: .print.gcode_state

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

@@ -3,6 +3,7 @@
 connection public-bridge
 address {{ mqtt_public_host }}
 
+topic bambulab/# out
 topic bitlair/alarm out
 topic bitlair/climate/# out
 topic bitlair/collectd/bitlair-5406/snmp/# out