Sync with upstream

d6cf76e

automations/kitchen-nightlight-on-am.yaml

@@ -13,6 +13,9 @@ trigger:
 condition:
   condition: and
   conditions:
+    - condition: state
+      entity_id: group.presence
+      state: 'home'
     - condition: state
       entity_id: sun.sun
       state: 'below_horizon'

automations/kitchen-nightlight-on-pm.yaml

@@ -13,6 +13,9 @@ trigger:
 condition:
   condition: and
   conditions:
+    - condition: state
+      entity_id: group.presence
+      state: 'home'
     - condition: state
       entity_id: sun.sun
       state: 'below_horizon'

automations/living-room-sunset-on.yaml

@@ -2,9 +2,14 @@ alias: 'Turn on living room at sunset'
 trigger:
   platform: sun
   event: sunset
-  offset: "-00:60:00"
+  offset: "-00:45:00"
 condition:
-  condition: or
+  condition: and
+  conditions:
+    - condition: state
+      entity_id: group.presence
+      state: 'home'
+    - condition: or
       conditions:
       - condition: state
         entity_id: light.endtable

configuration.yaml

@@ -38,13 +38,7 @@ recorder:
   db_url: !secret mysql_recorder
 
 # Also log states to InfluxDB
-influxdb:
-  host: !secret influxdb_host
-  database: !secret influxdb_db
-  username: !secret influxdb_user
-  password: !secret influxdb_password
-  ssl: true
-  verify_ssl: true
+influxdb: !include influxdb.yaml
 
 # Enables support for tracking state changes over time.
 history:

customizations/sensors.yaml

@@ -135,9 +135,31 @@ sensor.time:
   friendly_name: Time (PT)
 sensor.pihole:
   friendly_name: Ads Blocked
-sensor.eth1_data_received_mean:
-  friendly_name: Received eth1
-  icon: mdi:server-network
-sensor.eth1_data_sent_mean:
-  friendly_name: Sent eth1
-  icon: mdi:server-network
+sensor.pihole_2:
+  friendly_name: Ads Blocked (Backup)
+sensor.ups_status:
+  friendly_name: Status
+sensor.ups_load:
+  friendly_name: Load
+sensor.ups_time_left:
+  friendly_name: Time left
+sensor.ups_time_on_battery:
+  friendly_name: Time on battery
+sensor.ups_last_transfer:
+  friendly_name: Last transfer
+sensor.ups_transfer_count:
+  friendly_name: Transfer count
+sensor.ups_battery:
+  friendly_name: Battery level
+sensor.ups_battery_voltage:
+  friendly_name: Battery voltage
+sensor.ups_battery_nominal_voltage:
+  friendly_name: Battery nominal voltage
+sensor.ups_input_voltage:
+  friendly_name: Input voltage
+sensor.ups_nominal_input_voltage:
+  friendly_name: Nominal input voltage
+sensor.ups_nominal_output_power:
+  friendly_name: Nominal output power
+sensor.ups_load_mean:
+  friendly_name: Load mean

groups.yaml

@@ -28,6 +28,7 @@ sensor_view:
     - sensor.speedtest_upload
     - sensor.fastcom_download
     - sensor.pihole_queries_today
+    - sensor.pihole_2_queries_today
     - sun.sun
 status_view:
   name: Status
@@ -37,11 +38,14 @@ status_view:
     - group.time_date
     - group.sensor_pi
     - group.sensor_apc
-    - group.sensor_battery_levels
     - sensor.pihole
+    - sensor.pihole_2
     - sensor.pihole_percent_ads_today
+    - sensor.pihole_2_percent_ads_today
     - sensor.pihole_queries_today
+    - sensor.pihole_2_queries_today
     - sensor.pihole_domains_blocked
+    - sensor.pihole_2_domains_blocked
 weather_view:
   name: Weather
   view: yes
@@ -55,7 +59,7 @@ misc_view:
   entities:
     - group.scripts_misc
     - group.misc_misc
-    - media_player.nexus_player
+    - group.sensor_battery_levels
 locks:
   name: Locks
   entities:
@@ -161,7 +165,6 @@ presence:
     - device_tracker.eh_nexus_6
     - device_tracker.cl_samsung_s5
     - device_tracker.cl_iphone_5
-    - device_tracker.green_keys
 time_date:
   name: Time & Date
   entities:
@@ -180,8 +183,8 @@ sensor_pi:
     - sensor.swap_free
     - sensor.last_boot
     - sensor.since_last_boot
-    - sensor.eth1_data_received_mean # Stats sensor to replace sensor.received_eth1
-    - sensor.eth1_data_sent_mean # Stats sensor to replace sensor.sent_eth1
+    - sensor.received_eth1
+    - sensor.sent_eth1
 sensor_apc:
   name: APC
   entities:
@@ -192,28 +195,12 @@ sensor_apc:
     - sensor.ups_last_transfer
     - sensor.ups_transfer_count
     - sensor.ups_battery
+    - sensor.ups_battery_voltage
     - sensor.ups_battery_nominal_voltage
     - sensor.ups_input_voltage
     - sensor.ups_nominal_input_voltage
     - sensor.ups_nominal_output_power
-    - sensor.ups_output_voltage
-sensor_battery_levels:
-  name: Sensor Battery Levels
-  entities:
-    - sensor.living_room_alarm_battery_level
-    - sensor.master_bedroom_alarm_battery_level
-    - sensor.front_door_battery_level
-    - sensor.slider_battery_level
-    - sensor.master_bedroom_window_battery_level
-    - sensor.dining_area_window_battery_level
-    - sensor.office_window_battery_level
-    - sensor.motion_sensor_above_slider_battery_level
-    - sensor.motion_sensor_over_utility_closet_battery_level
-    - sensor.kitchen_motion_sensor_battery_level
-    - sensor.office_motion_sensor_near_closet_battery_level
-    - sensor.office_motion_sensor_far_wall_battery_level
-    - sensor.office_cabinet_battery_level
-    - sensor.green_keys_battery_level
+    - sensor.ups_load_mean
 scripts_misc:
   name: Lock Actions
   entities:
@@ -232,6 +219,23 @@ misc_misc:
     - scene.all_lights_off
     - script.restart_dash_button_shm
     - script.restart_dash_button_hac
+sensor_battery_levels:
+  name: Sensor Battery Levels
+  entities:
+    - sensor.living_room_alarm_battery_level
+    - sensor.master_bedroom_alarm_battery_level
+    - sensor.front_door_battery_level
+    - sensor.slider_battery_level
+    - sensor.master_bedroom_window_battery_level
+    - sensor.dining_area_window_battery_level
+    - sensor.office_window_battery_level
+    - sensor.motion_sensor_above_slider_battery_level
+    - sensor.motion_sensor_over_utility_closet_battery_level
+    - sensor.kitchen_motion_sensor_battery_level
+    - sensor.office_motion_sensor_near_closet_battery_level
+    - sensor.office_motion_sensor_far_wall_battery_level
+    - sensor.office_cabinet_battery_level
+    - sensor.green_keys_battery_level
 wunderground:
   name: Wunderground
   entities:

influxdb.yaml

+host: !secret influxdb_host
+database: !secret influxdb_db
+username: !secret influxdb_user
+password: !secret influxdb_password
+ssl: true
+verify_ssl: true
+whitelist:
+  - sensor.master_bedroom_window
+  - sensor.slider
+  - sensor.above_slider
+  - sensor.above_utility_closet
+  - sensor.front_door
+  - sensor.dining_area_window
+  - sensor.kitchen
+  - sensor.office_window
+  - sensor.office_near_closet
+  - sensor.office_far_wall
+  - sensor.office_cabinet

scenes/master-bath-dash-on.yaml

@@ -8,5 +8,5 @@ entities:
     color_temp: 450
   light.master_bath_3:
     state: off
-  automation.brightness_master_bath_sync:
-    state: off
+  # automation.brightness_master_bath_sync:
+  #  state: off

secrets.yaml

@@ -21,5 +21,6 @@ influxdb_user:
 influxdb_password:
 influxdb_db:
 pi_hole_host:
+pi_hole_backup_host:
 pi_hole_admin:
 monit_admin:

sensors/apcupsd.yaml

@@ -2,6 +2,7 @@ platform: apcupsd
 resources:
   - bcharge
   - linev
+  - battv
   - loadpct
   - nominv
   - nombattv
@@ -11,3 +12,9 @@ resources:
   - timeleft
   - tonbatt
   - lastxfer
+  - cumonbatt
+  - xonbatt
+  - xoffbatt
+  - model
+  - serialno
+  - battdate

sensors/pihole-0002-failover.yaml

+platform: pi_hole
+host: !secret pi_hole_backup_host
+ssl: true
+verify: true

sensors/statistics-eth1-received.yaml

-platform: statistics
-name: eth1 Data Received
-entity_id: sensor.received_eth1

sensors/statistics-eth1-sent.yaml → sensors/statistics-ups-load.yaml

 platform: statistics
-name: eth1 Data Sent
-entity_id: sensor.sent_eth1
+name: UPS Load
+entity_id: sensor.ups_load

sensors/template.yaml

@@ -13,3 +13,16 @@ sensors:
     friendly_name: Percent Ads Today
     unit_of_measurement: '%'
     entity_id: sensor.pihole
+  pihole_2_queries_today:
+    value_template: '{{ states.sensor.pihole_2.attributes.queries_today | round(0) }}'
+    friendly_name: DNS Queries Today (Backup)
+    entity_id: sensor.pihole_2
+  pihole_2_domains_blocked:
+    value_template: '{{ states.sensor.pihole_2.attributes.domains_blocked | round(0) }}'
+    friendly_name: Domains Blocked (Backup)
+    entity_id: sensor.pihole_2
+  pihole_2_percent_ads_today:
+    value_template: '{{ states.sensor.pihole_2.attributes.percentage_today | round(1) }}'
+    friendly_name: Percent Ads Today (Backup)
+    unit_of_measurement: '%'
+    entity_id: sensor.pihole_2