Sync wit upstream

4f50cc60

automations/alert-office-cabinet.yaml

+alias: Slack notification for office cabinet access
+trigger:
+  - platform: state
+    entity_id: binary_sensor.office_cabinet
+    to: "off"
+  - platform: state
+    entity_id: binary_sensor.office_cabinet_door_motion
+    to: "on"
+action:
+  service: notify.slack
+  data:
+    message: ':bellhop_bell: *Office cabinet accessed*'
+    target: '#home'

automations/apc-notification-not-online.yaml

+alias: Notify when APC not online
+trigger:
+  platform: state
+  entity_id: sensor.ups_status
+  from: "ONLINE"
+action:
+  - service: notify.jabber
+    data:
+      message: "Office APC has status \"{{ states( 'sensor.ups_status' ) }}\""
+      target: !secret jabber_recipient
+  - service: notify.slack
+    data:
+      message: ":exclamation: :battery: Office APC has status \"{{ states( 'sensor.ups_status' ) }}\""
+      target: '#home'

automations/apc-notification-online.yaml

+alias: Notify when APC online
+trigger:
+  platform: state
+  entity_id: sensor.ups_status
+  to: "ONLINE"
+action:
+  - service: notify.jabber
+    data:
+      message: 'Office APC is "ONLINE"'
+      target: !secret jabber_recipient
+  - service: notify.slack
+    data:
+      message: ':exclamation: :electric_plug: Office APC is "ONLINE"'
+      target: '#home'

automations/kitchen-nightlight-on.yaml → automations/kitchen-nightlight-on-am.yaml

-alias: Turn kitchen nightlight on
+alias: Turn kitchen nightlight on AM
 trigger:
   - platform: state
     entity_id: switch.kitchen
@@ -16,8 +16,6 @@ condition:
     - condition: state
       entity_id: sun.sun
       state: 'below_horizon'
-    - condition: time
-      after: '00:15:00'
     - condition: time
       before: '09:00:00'
     - condition: state

automations/kitchen-nightlight-on-pm.yaml

+alias: Turn kitchen nightlight on PM
+trigger:
+  - platform: state
+    entity_id: switch.kitchen
+  - platform: state
+    entity_id: light.ceiling_fan_1
+  - platform: state
+    entity_id: light.ceiling_fan_2
+  - platform: state
+    entity_id: binary_sensor.kitchen
+  - platform: state
+    entity_id: binary_sensor.lr_motion_sensor_over_utility_closet
+condition:
+  condition: and
+  conditions:
+    - condition: state
+      entity_id: sun.sun
+      state: 'below_horizon'
+    - condition: time
+      after: '21:30:00'
+    - condition: state
+      entity_id: light.ceiling_fan_1
+      state: 'off'
+    - condition: state
+      entity_id: light.ceiling_fan_2
+      state: 'off'
+    - condition: state
+      entity_id: switch.kitchen
+      state: 'off'
+action:
+  service: switch.turn_on
+  entity_id: switch.kitchen_nightlight

automations/maybe-an-earthquake.yaml

@@ -34,3 +34,11 @@ action:
   - service: notify.jabber
     data:
       message: 'MAYBE AN EARTHQUAKE?!? ALL ACCELEROMETERS ARE ACTIVE.'
+      target: !secret jabber_recipient
+  - service: notify.slack
+    data:
+      message: 'MAYBE AN EARTHQUAKE?!? ALL ACCELEROMETERS ARE ACTIVE.'
+      target:
+        - '#alerts'
+        - '#general'
+        - '#home'

automations/update-notification.yaml

@@ -3,6 +3,11 @@ trigger:
   platform: state
   entity_id: updater.updater
 action:
-  service: notify.jabber
+  - service: notify.jabber
     data:
       message: 'There is a new release of Home Assistant available.'
+      target: !secret jabber_recipient
+  - service: notify.slack
+    data:
+      message: ':exclamation: There is a new release of Home Assistant available.'
+      target: '#home'

configuration.yaml

@@ -16,7 +16,7 @@ homeassistant:
 http:
   api_password: !secret api_password
   server_port: 8123
-  ssl_certificate: /home/pi/ssl/cert
+  ssl_certificate: /home/pi/ssl/chain
   ssl_key: /home/pi/ssl/key
 
 zone:
@@ -34,15 +34,31 @@ frontend:
 
 # Set recorder options
 recorder:
-  # purge_days: 365
+  purge_days: 14
   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
+
 # Enables support for tracking state changes over time.
 history:
 
 # Discover some devices automatically
 discovery:
 
+# Logging settings
+logger:
+  default: info # default logging level
+  logs:
+    homeassistant.components.device_tracker.asuswrt: error # suppress IPv6-related warnings; see https://github.com/home-assistant/home-assistant/issues/2814
+    homeassistant.components.sensor.rest: debug
+
 # View all events in a logbook
 logbook:
 
@@ -73,6 +89,12 @@ alarm_control_panel: !include alarm-control-panel.yaml
 
 wemo: !include wemo.yaml
 
+weblink: !include weblinks.yaml
+
+panel_iframe: !include panels-iframe.yaml
+
+apcupsd:
+
 # Display
 group: !include groups.yaml
 

customizations/sensors.yaml

@@ -131,3 +131,13 @@ sensor.pws_wind_kph:
   friendly_name: Wind Speed (kph)
 sensor.pws_wind_mph:
   friendly_name: Wind Speed (mph)
+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

groups.yaml

@@ -27,15 +27,21 @@ sensor_view:
     - sensor.speedtest_download
     - sensor.speedtest_upload
     - sensor.fastcom_download
+    - sensor.pihole_queries_today
     - sun.sun
 status_view:
   name: Status
   view: yes
   icon: mdi:chip
   entities:
-    - group.sensor_pi
     - group.time_date
+    - group.sensor_pi
+    - group.sensor_apc
     - group.sensor_battery_levels
+    - sensor.pihole
+    - sensor.pihole_percent_ads_today
+    - sensor.pihole_queries_today
+    - sensor.pihole_domains_blocked
 weather_view:
   name: Weather
   view: yes
@@ -156,40 +162,41 @@ presence:
     - device_tracker.cl_samsung_s5
     - device_tracker.cl_iphone_5
     - device_tracker.green_keys
+time_date:
+  name: Time & Date
+  entities:
+    - sensor.date
+    - sensor.time
+    - sensor.time_utc
 sensor_pi:
   name: Raspberry Pi
   entities:
-    - sensor.cpu
     - sensor.cpu_use
     - sensor.disk_use_
     - sensor.disk_use_varlog
     - sensor.ram_use
     - sensor.ram_free
-#    - sensor.processor_use
     - sensor.swap_use
+    - sensor.swap_free
     - sensor.last_boot
     - sensor.since_last_boot
-    - sensor.received_eth0
-    - sensor.sent_eth0
-    # - sensor.packets_received_eth0
-    # - sensor.packets_sent_eth0
-    - sensor.ipv4_address_eth0
-    - sensor.ipv6_address_eth0
-    - sensor.received_eth1
-    - sensor.sent_eth1
-    # - sensor.packets_received_eth1
-    # - sensor.packets_sent_eth1
-    - sensor.ipv4_address_eth1
-    - sensor.ipv6_address_eth1
-time_date:
-  name: Time & Date
-  entities:
-    - sensor.time
-    - sensor.date
-    - sensor.date_time
-    - sensor.time_date
-    - sensor.time_utc
-    - sensor.beat
+    - 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_apc:
+  name: APC
+  entities:
+    - sensor.ups_status
+    - sensor.ups_load
+    - sensor.ups_time_left
+    - sensor.ups_time_on_battery
+    - sensor.ups_last_transfer
+    - sensor.ups_transfer_count
+    - sensor.ups_battery
+    - 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:
@@ -240,3 +247,4 @@ wunderground:
     - sensor.pws_visibility_mi
     - sensor.pws_uv
     - sensor.pws_solarradiation
+    - weblink.forecast

input-sliders.yaml

 brightness_da:
   name: Brightness
-  initial: 0
+  initial: 1
   min: 1
   max: 255
   step: 1
 brightness_lr:
   name: Brightness
-  initial: 0
+  initial: 1
   min: 1
   max: 255
   step: 1
 brightness_master_bath:
   name: Brightness
-  initial: 0
+  initial: 1
   min: 1
   max: 255
   step: 1

notifications.yaml

@@ -3,4 +3,8 @@
   sender: !secret jabber_sender
   password: !secret jabber_password
   recipient: !secret jabber_recipient
-  tls: True
+  tls: true
+- name: slack
+  platform: slack
+  api_key: !secret slack_api_key
+  default_channel: '#home'

panels-iframe.yaml

+pihole:
+  title: 'Pi Hole'
+  icon: 'mdi:apple-safari'
+  url: !secret pi_hole_admin
+monit:
+  title: 'Monit'
+  icon: 'mdi:autorenew'
+  url: !secret monit_admin

scenes/master-bath-dash-on.yaml

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

secrets.yaml

@@ -11,6 +11,15 @@ gravatar_chris:
 gravatar_chris_2:
 wunderground_key:
 wunderground_pws_id:
+wunderground_forecast_url:
 logentries_token:
 mysql_recorder:
-wemo_ip:
+wemo_kitchen_ip:
+slack_api_key:
+influxdb_host:
+influxdb_user:
+influxdb_password:
+influxdb_db:
+pi_hole_host:
+pi_hole_admin:
+monit_admin:

sensors/apcupsd.yaml

+platform: apcupsd
+resources:
+  - bcharge
+  - linev
+  - loadpct
+  - nominv
+  - nombattv
+  - nompower
+  - numxfers
+  - status
+  - timeleft
+  - tonbatt
+  - lastxfer

sensors/fastcom.yaml

 platform: fastdotcom
 minute:
-  - 0
-  - 15
-  - 30
-  - 45
+  - 4
+  - 19
+  - 34
+  - 49

sensors/pihole.yaml

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

sensors/speedtest.yaml

 platform: speedtest
 minute:
-  - 0
-  - 15
-  - 30
-  - 45
+  - 2
+  - 17
+  - 32
+  - 47
 monitored_conditions:
 - ping
 - download

sensors/statistics-eth1-received.yaml

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