Refactor template sensor configuration for clarity

Author: markaggar

examples/water_monitor_package.yaml

@@ -75,28 +75,26 @@ input_datetime:
     has_date: true
     has_time: true
 
-###############################
-# Template Sensors (optional) #
-###############################
-sensor:
-  - platform: template
-    sensors:
-      water_monitor_any_leak_active:
-        friendly_name: Water Monitor Any Leak Active
-        unique_id: water_monitor_any_leak_active
-        value_template: >
-          {% set leaks = states.binary_sensor | selectattr('state','eq','on')
-              | selectattr('attributes.device_class','defined')
-              | selectattr('attributes.device_class','eq','problem')
-              | selectattr('entity_id','search','_low_flow_leak|_tank_refill_leak|_intelligent_leak') | list %}
-          {{ 'on' if leaks|length > 0 else 'off' }}
-        attribute_templates:
-          active_leaks: >
-            {% set leaks = states.binary_sensor | selectattr('state','eq','on')
-                | selectattr('attributes.device_class','defined')
-                | selectattr('attributes.device_class','eq','problem')
-                | selectattr('entity_id','search','_low_flow_leak|_tank_refill_leak|_intelligent_leak') | list %}
-            {{ leaks | map(attribute='entity_id') | list }}
+###################
+# Template Sensors#
+###################
+template:
+    sensor:
+      - unique_id: water_monitor_any_leak_active
+        name: Water Monitor Any Leak Active
+        state: >
+              {% set leaks = states.binary_sensor | selectattr('state','eq','on')
+                  | selectattr('attributes.device_class','defined')
+                  | selectattr('attributes.device_class','eq','problem')
+                  | selectattr('entity_id','search','_low_flow_leak|_tank_refill_leak|_intelligent_leak') | list %}
+              {{ 'on' if leaks|length > 0 else 'off' }}
+        attributes:
+              active_leaks: >
+                {% set leaks = states.binary_sensor | selectattr('state','eq','on')
+                    | selectattr('attributes.device_class','defined')
+                    | selectattr('attributes.device_class','eq','problem')
+                    | selectattr('entity_id','search','_low_flow_leak|_tank_refill_leak|_intelligent_leak') | list %}
+                {{ leaks | map(attribute='entity_id') | list }}
 
 
 #############################################