recorder.yaml

@@ -26,6 +26,8 @@
     entities:
       - sun.sun # Don't record sun data
       - sensor.fritzbox_device_uptime
+      - sensor.snmp_wan_in
+      - sensor.snmp_wan_out
       - sensor.time
 #    event_types:
 #      - call_service # Don't record service calls

sensors.yaml

@@ -17,16 +17,12 @@
     name: snmp_wan_in
     host: !secret router_ip
     community: !secret router_community
-    baseoid: .1.3.6.1.2.1.31.1.1.1.6.511
-    version: 2c
-    unit_of_measurement: "Octets"
+    baseoid: .1.3.6.1.2.1.2.2.1.10.511
   - platform: snmp
     name: snmp_wan_out
     host: !secret router_ip
     community: !secret router_community
-    baseoid: .1.3.6.1.2.1.31.1.1.1.10.511
-    version: 2c
-    unit_of_measurement: "Octets"
+    baseoid: .1.3.6.1.2.1.2.2.1.16.511
 
   - platform: derivative
     source: sensor.snmp_wan_in
@@ -39,6 +35,17 @@
     unit: B
     name: wan_out_derivative
 
+  - platform: template
+    sensors:
+      internet_speed_in:
+        friendly_name: 'Internet Speed IN'
+        value_template: "{{ (( states('sensor.wan_in_derivative') | float * 8 / 1000000 ) | round(2)) }}"
+        unit_of_measurement: 'Mbps'
+      internet_speed_out:
+        friendly_name: 'Internet Speed OUT'
+        value_template: "{{ (( states('sensor.wan_out_derivative') | float * 8 / 1000000 ) | round(2)) }}"
+        unit_of_measurement: 'Mbps'
+
   - platform: statistics
     name: 'WAN Traffic In'
     state_characteristic: mean

template.yaml

@@ -19,7 +19,7 @@
         {{ (total + solar - raumduft - keller - musik - bett - heimkino_sz - deko - schreibtisch - serverraum - heimkino_wz - spieleschrank) | round(1) }}
       device_class: power
       state_class: measurement
-      attributes:
+      attributes:         
         last_reset: '1970-01-01T00:00:00+00:00'
 
 # Shelly 3EM cumulative sensors (incl. PV)
@@ -36,9 +36,9 @@
         device_class: power
         state_class: measurement
         icon: mdi:transmission-tower-export
-        attributes:
+        attributes:         
           last_reset: '1970-01-01T00:00:00+00:00'
-
+        
       # Template sensor for values of power export (active_power < 0)
       - name: power_export
         unit_of_measurement: 'W'
@@ -51,7 +51,7 @@
         device_class: power
         state_class: measurement
         icon: mdi:transmission-tower-import
-        attributes:
+        attributes:         
           last_reset: '1970-01-01T00:00:00+00:00'
 
       # Template sensor for values of power consumption
@@ -60,26 +60,12 @@
         state: >
           {% if (states('sensor.power_export')|float(0)) > 0 and (states('sensor.balkonkraftwerk_power')|float(0) - states('sensor.power_export')|float(0)) < 0 %}
           {% elif (states('sensor.power_export')|float(0)) > 0 and (states('sensor.balkonkraftwerk_power')|float(0) - states('sensor.power_export')|float(0)) > 0 %}
-            {{ ((states('sensor.balkonkraftwerk_power')|float(0)) - states('sensor.power_export')|float(0)) | round(1) }}
+            {{ ((states('sensor.balkonkraftwerk_power')|float(0)) - states('sensor.power_export')|float(0)) | round(1) }}    
           {% else %}
             {{ (states('sensor.power_import')|float(0) + states('sensor.balkonkraftwerk_power')|float(0)) | round(1) }}
           {% endif %}
         device_class: power
         state_class: measurement
         icon: mdi:home-lightning-bolt
-        attributes:
-          last_reset: '1970-01-01T00:00:00+00:00'
-
-      # Internet Speed template sensor
-      - name: internet_speed_in
-        state: >
-          {{ (( states('sensor.wan_in_derivative') | float * 8 / 1000000 ) | round(2)) }}
-        unit_of_measurement: 'Mbps'
-        attributes:
-          last_reset: '1970-01-01T00:00:00+00:00'
-      - name: internet_speed_out
-        state: >
-          {{ (( states('sensor.wan_out_derivative') | float * 8 / 1000000 ) | round(2)) }}
-        unit_of_measurement: 'Mbps'
-        attributes:
+        attributes:         
           last_reset: '1970-01-01T00:00:00+00:00'

utility_meters.yaml

@@ -49,13 +49,3 @@
     source: sensor.energy_consumption_sum
     name: Energy Consumption Monthly
     cycle: monthly
-
-# Energy (Solar)
-  energy_solar_daily:
-    source: sensor.balkonkraftwerk_energy
-    name: Energy Solar Daily
-    cycle: daily
-  energy_solar_monthly:
-    source: sensor.balkonkraftwerk_energy
-    name: Energy Solar Monthly
-    cycle: monthly