MQTT Changes for 2022.6

config/packages/modules/network.yaml

@@ -220,29 +220,27 @@ binary_sensor:
     payload_off: "disabled"
     value_template: '{{ value_json.status }}'
 
-sensor:
-  - platform: mqtt
-    name: "Zigbee2MQTT Networkmap"
-    # if you change base_topic of Zigbee2mqtt, change state_topic accordingly
-    state_topic: "z2m_deconz/bridge/networkmap/raw"
-    value_template: "{{ now().strftime('%Y-%m-%d %H:%M:%S') }}"
-    # again, if you change base_topic of Zigbee2mqtt, change json_attributes_topic accordingly
-    json_attributes_topic: z2m_deconz/bridge/networkmap/raw
+mqtt:
+  sensor:
+    - name: "Zigbee2MQTT Networkmap"
+      # if you change base_topic of Zigbee2mqtt, change state_topic accordingly
+      state_topic: "z2m_deconz/bridge/networkmap/raw"
+      value_template: "{{ now().strftime('%Y-%m-%d %H:%M:%S') }}"
+      # again, if you change base_topic of Zigbee2mqtt, change json_attributes_topic accordingly
+      json_attributes_topic: z2m_deconz/bridge/networkmap/raw
 
-  - platform: mqtt
-    name: "Zigbee2MQTT Devices count"
-    availability_topic: "z2m_deconz/bridge/state"
-    state_topic: "z2m_deconz/bridge/config/devices"
-    value_template: "{{ value_json | count }}"
-    icon: "mdi:counter"
+    - name: "Zigbee2MQTT Devices count"
+      availability_topic: "z2m_deconz/bridge/state"
+      state_topic: "z2m_deconz/bridge/config/devices"
+      value_template: "{{ value_json | count }}"
+      icon: "mdi:counter"
 
-  - platform: mqtt
-    name: "Router 1 LQI"
-    state_topic: "z2m_deconz/router_1"
-    availability_topic: "z2m_deconz/bridge/state"
-    unit_of_measurement: "lqi"
-    device_class: "signal_strength"
-    value_template: "{{ value_json.linkquality }}"
+    - name: "Router 1 LQI"
+      state_topic: "z2m_deconz/router_1"
+      availability_topic: "z2m_deconz/bridge/state"
+      unit_of_measurement: "lqi"
+      device_class: "signal_strength"
+      value_template: "{{ value_json.linkquality }}"
 
 script:
   zigbee2mqtt_get_device_count: