From 0ca0c402c1c6bfa71b3707ce3e9316e6405fefb5 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Sat, 27 May 2017 12:02:23 -0700
Subject: [PATCH] Sync with upstream
bffc6a9
---
automations/alert-office-cabinet.yaml | 7 +++--
automations/apc-notification-not-online.yaml | 2 +-
automations/apc-notification-online.yaml | 2 +-
automations/balcony-sunrise-off.yaml | 2 +-
automations/dining-area-on-at-entry.yaml | 12 +++------
.../dining-area-window-opened-outside.yaml | 26 -------------------
automations/lights-off-no-one-home.yaml | 10 +++++++
automations/maybe-an-earthquake.yaml | 2 +-
automations/update-notification.yaml | 11 +++-----
.../acceleration-dining-area-window.yaml | 2 +-
binary-sensors/acceleration-front-door.yaml | 2 +-
.../acceleration-master-bedroom-window.yaml | 2 +-
.../acceleration-office-cabinet.yaml | 2 +-
.../acceleration-office-window.yaml | 2 +-
binary-sensors/acceleration-slider.yaml | 2 +-
binary-sensors/co-gas-living-room.yaml | 2 +-
binary-sensors/co-gas-master-bedroom.yaml | 2 +-
.../contact-dining-area-window.yaml | 6 ++---
binary-sensors/contact-front-door.yaml | 6 ++---
.../contact-master-bedroom-window.yaml | 6 ++---
binary-sensors/contact-office-cabinet.yaml | 6 ++---
binary-sensors/contact-office-window.yaml | 6 ++---
binary-sensors/contact-slider.yaml | 6 ++---
binary-sensors/motion-kitchen.yaml | 2 +-
binary-sensors/motion-office-far-wall.yaml | 2 +-
binary-sensors/motion-office-over-closet.yaml | 2 +-
binary-sensors/motion-over-slider.yaml | 2 +-
.../motion-over-utility-closet.yaml | 2 +-
binary-sensors/smoke-living-room.yaml | 2 +-
binary-sensors/smoke-master-bedroom.yaml | 2 +-
configuration.yaml | 12 ++++++---
customizations/lights.yaml | 2 ++
customizations/switches.yaml | 8 ++++++
groups.yaml | 1 +
influxdb.yaml | 18 -------------
notifications.yaml | 9 ++++---
secrets.yaml | 10 +++----
switches.yaml | 14 ++++++++++
38 files changed, 100 insertions(+), 114 deletions(-)
delete mode 100644 automations/dining-area-window-opened-outside.yaml
create mode 100644 automations/lights-off-no-one-home.yaml
delete mode 100644 influxdb.yaml
diff --git a/automations/alert-office-cabinet.yaml b/automations/alert-office-cabinet.yaml
index d9e2677..1383c98 100644
--- a/automations/alert-office-cabinet.yaml
+++ b/automations/alert-office-cabinet.yaml
@@ -2,12 +2,11 @@ alias: Slack notification for office cabinet access
trigger:
- platform: state
entity_id: binary_sensor.office_cabinet
- to: "off"
+ to: "on"
- platform: state
entity_id: binary_sensor.office_cabinet_door_motion
to: "on"
action:
- service: notify.slack
+ service: notify.mattermost
data:
- message: ':bellhop_bell: *Office cabinet accessed*'
- target: '#home'
+ message: ':bell: **Office cabinet accessed**'
diff --git a/automations/apc-notification-not-online.yaml b/automations/apc-notification-not-online.yaml
index 20c9ddd..9378499 100644
--- a/automations/apc-notification-not-online.yaml
+++ b/automations/apc-notification-not-online.yaml
@@ -8,7 +8,7 @@ action:
data:
message: "Office APC has status \"{{ states( 'sensor.ups_status' ) }}\""
target: !secret jabber_recipient
- - service: notify.slack
+ - service: notify.mattermost
data:
message: ":exclamation: :battery: Office APC has status \"{{ states( 'sensor.ups_status' ) }}\""
target: '#home'
diff --git a/automations/apc-notification-online.yaml b/automations/apc-notification-online.yaml
index 2f752f2..ea78dfd 100644
--- a/automations/apc-notification-online.yaml
+++ b/automations/apc-notification-online.yaml
@@ -8,7 +8,7 @@ action:
data:
message: 'Office APC is "ONLINE"'
target: !secret jabber_recipient
- - service: notify.slack
+ - service: notify.mattermost
data:
message: ':exclamation: :electric_plug: Office APC is "ONLINE"'
target: '#home'
diff --git a/automations/balcony-sunrise-off.yaml b/automations/balcony-sunrise-off.yaml
index 8a098f4..0277a47 100644
--- a/automations/balcony-sunrise-off.yaml
+++ b/automations/balcony-sunrise-off.yaml
@@ -2,7 +2,7 @@ alias: 'Turn off balcony at sunrise'
trigger:
platform: sun
event: sunrise
- offset: "+00:60:00"
+ offset: "+00:30:00"
condition:
- condition: state
entity_id: light.balcony
diff --git a/automations/dining-area-on-at-entry.yaml b/automations/dining-area-on-at-entry.yaml
index fe4ac0f..6127291 100644
--- a/automations/dining-area-on-at-entry.yaml
+++ b/automations/dining-area-on-at-entry.yaml
@@ -2,21 +2,15 @@ alias: Turn on dining area lights when front door opens
trigger:
platform: state
entity_id: binary_sensor.front_door
- to: 'off'
+ to: 'on'
condition:
condition: and
conditions:
- condition: state
- entity_id: light.ceiling_fan_1
+ entity_id: group.living_room
state: 'off'
- condition: state
- entity_id: light.ceiling_fan_2
- state: 'off'
- - condition: state
- entity_id: light.endtable
- state: 'off'
- - condition: state
- entity_id: light.corner_table
+ entity_id: group.dining_area
state: 'off'
- condition: state
entity_id: binary_sensor.lr_motion_sensor_over_slider
diff --git a/automations/dining-area-window-opened-outside.yaml b/automations/dining-area-window-opened-outside.yaml
deleted file mode 100644
index b92ebfd..0000000
--- a/automations/dining-area-window-opened-outside.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-alias: Turn on lights when dining room window opened from outside
-trigger:
- platform: state
- entity_id: binary_sensor.dining_area_window_motion
- to: 'on'
-condition:
- condition: and
- conditions:
- - condition: state
- entity_id: binary_sensor.lr_motion_sensor_over_slider
- state: 'off'
- - condition: state
- entity_id: binary_sensor.lr_motion_sensor_over_utility_closet
- state: 'off'
- - condition: state
- entity_id: binary_sensor.kitchen
- state: 'off'
-action:
- service: scene.turn_on
- entity_id:
- - scene.da_bright
- - scene.lr_bright
- - scene.office_bright
- - scene.master_bedroom_bright
- - scene.master_bath_bright
- - scene.balcony_bright
diff --git a/automations/lights-off-no-one-home.yaml b/automations/lights-off-no-one-home.yaml
new file mode 100644
index 0000000..9cd0158
--- /dev/null
+++ b/automations/lights-off-no-one-home.yaml
@@ -0,0 +1,10 @@
+alias: Turn off certain lights when no one is home
+trigger:
+ platform: state
+ entity_id: group.presence
+ from: 'home'
+ to: 'not_home'
+action:
+ service: switch.turn_off
+ entity_id:
+ - switch.lava_lamp
diff --git a/automations/maybe-an-earthquake.yaml b/automations/maybe-an-earthquake.yaml
index 803a999..0f07cf9 100644
--- a/automations/maybe-an-earthquake.yaml
+++ b/automations/maybe-an-earthquake.yaml
@@ -35,7 +35,7 @@ action:
data:
message: 'MAYBE AN EARTHQUAKE?!? ALL ACCELEROMETERS ARE ACTIVE.'
target: !secret jabber_recipient
- - service: notify.slack
+ - service: notify.mattermost
data:
message: 'MAYBE AN EARTHQUAKE?!? ALL ACCELEROMETERS ARE ACTIVE.'
target:
diff --git a/automations/update-notification.yaml b/automations/update-notification.yaml
index 45a2ada..1694ed7 100644
--- a/automations/update-notification.yaml
+++ b/automations/update-notification.yaml
@@ -3,11 +3,6 @@ trigger:
platform: state
entity_id: updater.updater
action:
- - 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'
+ service: notify.mattermost
+ data:
+ message: ':exclamation: There is a new release of Home Assistant available.'
diff --git a/binary-sensors/acceleration-dining-area-window.yaml b/binary-sensors/acceleration-dining-area-window.yaml
index b375103..73a10d8 100644
--- a/binary-sensors/acceleration-dining-area-window.yaml
+++ b/binary-sensors/acceleration-dining-area-window.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/Dining Area Window/acceleration"
name: "Dining Area Window motion"
payload_on: "active"
payload_off: "inactive"
-sensor_class: moving
+device_class: moving
diff --git a/binary-sensors/acceleration-front-door.yaml b/binary-sensors/acceleration-front-door.yaml
index 68999cc..eb93097 100644
--- a/binary-sensors/acceleration-front-door.yaml
+++ b/binary-sensors/acceleration-front-door.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/Front Door/acceleration"
name: "Front Door motion"
payload_on: "active"
payload_off: "inactive"
-sensor_class: moving
+device_class: moving
diff --git a/binary-sensors/acceleration-master-bedroom-window.yaml b/binary-sensors/acceleration-master-bedroom-window.yaml
index d278b14..74683f6 100644
--- a/binary-sensors/acceleration-master-bedroom-window.yaml
+++ b/binary-sensors/acceleration-master-bedroom-window.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/Master Bedroom Window/acceleration"
name: "Master Bedroom Window motion"
payload_on: "active"
payload_off: "inactive"
-sensor_class: moving
+device_class: moving
diff --git a/binary-sensors/acceleration-office-cabinet.yaml b/binary-sensors/acceleration-office-cabinet.yaml
index 40a9fdf..f7ac4bd 100644
--- a/binary-sensors/acceleration-office-cabinet.yaml
+++ b/binary-sensors/acceleration-office-cabinet.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/Office Cabinet/acceleration"
name: "Office Cabinet door motion"
payload_on: "active"
payload_off: "inactive"
-sensor_class: moving
+device_class: moving
diff --git a/binary-sensors/acceleration-office-window.yaml b/binary-sensors/acceleration-office-window.yaml
index ff8ad55..7de1eac 100644
--- a/binary-sensors/acceleration-office-window.yaml
+++ b/binary-sensors/acceleration-office-window.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/Office Window/acceleration"
name: "Office Window motion"
payload_on: "active"
payload_off: "inactive"
-sensor_class: moving
+device_class: moving
diff --git a/binary-sensors/acceleration-slider.yaml b/binary-sensors/acceleration-slider.yaml
index 2c14c16..2b2ad38 100644
--- a/binary-sensors/acceleration-slider.yaml
+++ b/binary-sensors/acceleration-slider.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/Slider/acceleration"
name: "Slider motion"
payload_on: "active"
payload_off: "inactive"
-sensor_class: moving
+device_class: moving
diff --git a/binary-sensors/co-gas-living-room.yaml b/binary-sensors/co-gas-living-room.yaml
index a77d947..138bf62 100644
--- a/binary-sensors/co-gas-living-room.yaml
+++ b/binary-sensors/co-gas-living-room.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/Living Room Alarm/carbonMonoxide"
name: "Living Room CO Detector"
payload_on: "detected"
payload_off: "clear"
-sensor_class: gas
+device_class: gas
diff --git a/binary-sensors/co-gas-master-bedroom.yaml b/binary-sensors/co-gas-master-bedroom.yaml
index 0a6a2ef..f077680 100644
--- a/binary-sensors/co-gas-master-bedroom.yaml
+++ b/binary-sensors/co-gas-master-bedroom.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/Master Bedroom Alarm/carbonMonoxide"
name: "Master Bedroom CO Detector"
payload_on: "detected"
payload_off: "clear"
-sensor_class: gas
+device_class: gas
diff --git a/binary-sensors/contact-dining-area-window.yaml b/binary-sensors/contact-dining-area-window.yaml
index 2f144ba..c3b7682 100644
--- a/binary-sensors/contact-dining-area-window.yaml
+++ b/binary-sensors/contact-dining-area-window.yaml
@@ -1,6 +1,6 @@
platform: mqtt
state_topic: "smartthings/Dining Area Window/contact"
name: "Dining Area Window"
-payload_on: "closed"
-payload_off: "open"
-sensor_class: opening
+payload_on: "open"
+payload_off: "closed"
+device_class: opening
diff --git a/binary-sensors/contact-front-door.yaml b/binary-sensors/contact-front-door.yaml
index a271967..39c58d9 100644
--- a/binary-sensors/contact-front-door.yaml
+++ b/binary-sensors/contact-front-door.yaml
@@ -1,6 +1,6 @@
platform: mqtt
state_topic: "smartthings/Front Door/contact"
name: "Front Door"
-payload_on: "closed"
-payload_off: "open"
-sensor_class: opening
+payload_on: "open"
+payload_off: "closed"
+device_class: opening
diff --git a/binary-sensors/contact-master-bedroom-window.yaml b/binary-sensors/contact-master-bedroom-window.yaml
index 0eed570..297b364 100644
--- a/binary-sensors/contact-master-bedroom-window.yaml
+++ b/binary-sensors/contact-master-bedroom-window.yaml
@@ -1,6 +1,6 @@
platform: mqtt
state_topic: "smartthings/Master Bedroom Window/contact"
name: "Master Bedroom Window"
-payload_on: "closed"
-payload_off: "open"
-sensor_class: opening
+payload_on: "open"
+payload_off: "closed"
+device_class: opening
diff --git a/binary-sensors/contact-office-cabinet.yaml b/binary-sensors/contact-office-cabinet.yaml
index 4105892..1ef344b 100644
--- a/binary-sensors/contact-office-cabinet.yaml
+++ b/binary-sensors/contact-office-cabinet.yaml
@@ -1,6 +1,6 @@
platform: mqtt
state_topic: "smartthings/Office Cabinet/contact"
name: "Office Cabinet"
-payload_on: "closed"
-payload_off: "open"
-sensor_class: opening
+payload_on: "open"
+payload_off: "closed"
+device_class: opening
diff --git a/binary-sensors/contact-office-window.yaml b/binary-sensors/contact-office-window.yaml
index 0671a74..1fcc8cf 100644
--- a/binary-sensors/contact-office-window.yaml
+++ b/binary-sensors/contact-office-window.yaml
@@ -1,6 +1,6 @@
platform: mqtt
state_topic: "smartthings/Office Window/contact"
name: "Office Window"
-payload_on: "closed"
-payload_off: "open"
-sensor_class: opening
+payload_on: "open"
+payload_off: "closed"
+device_class: opening
diff --git a/binary-sensors/contact-slider.yaml b/binary-sensors/contact-slider.yaml
index 14be92a..45a0b6b 100644
--- a/binary-sensors/contact-slider.yaml
+++ b/binary-sensors/contact-slider.yaml
@@ -1,6 +1,6 @@
platform: mqtt
state_topic: "smartthings/Slider/contact"
name: "Slider"
-payload_on: "closed"
-payload_off: "open"
-sensor_class: opening
+payload_on: "open"
+payload_off: "closed"
+device_class: opening
diff --git a/binary-sensors/motion-kitchen.yaml b/binary-sensors/motion-kitchen.yaml
index d54e8a4..63a24d2 100644
--- a/binary-sensors/motion-kitchen.yaml
+++ b/binary-sensors/motion-kitchen.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/Dining Area Motion Sensor near cabinets/motion"
name: "Kitchen"
payload_on: "active"
payload_off: "inactive"
-sensor_class: motion
+device_class: motion
diff --git a/binary-sensors/motion-office-far-wall.yaml b/binary-sensors/motion-office-far-wall.yaml
index bbeebd8..aebf602 100644
--- a/binary-sensors/motion-office-far-wall.yaml
+++ b/binary-sensors/motion-office-far-wall.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/Office Motion Sensor Far Wall/motion"
name: "Office Motion Sensor Far Wall"
payload_on: "active"
payload_off: "inactive"
-sensor_class: motion
+device_class: motion
diff --git a/binary-sensors/motion-office-over-closet.yaml b/binary-sensors/motion-office-over-closet.yaml
index c9f1f92..05f6249 100644
--- a/binary-sensors/motion-office-over-closet.yaml
+++ b/binary-sensors/motion-office-over-closet.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/Office Motion Sensor over Closet/motion"
name: "Office Motion Sensor over Closet"
payload_on: "active"
payload_off: "inactive"
-sensor_class: motion
+device_class: motion
diff --git a/binary-sensors/motion-over-slider.yaml b/binary-sensors/motion-over-slider.yaml
index aa3fcbb..9e1fb50 100644
--- a/binary-sensors/motion-over-slider.yaml
+++ b/binary-sensors/motion-over-slider.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/LR Motion Sensor over Slider/motion"
name: "LR Motion Sensor over Slider"
payload_on: "active"
payload_off: "inactive"
-sensor_class: motion
+device_class: motion
diff --git a/binary-sensors/motion-over-utility-closet.yaml b/binary-sensors/motion-over-utility-closet.yaml
index 39e6960..2dc01c9 100644
--- a/binary-sensors/motion-over-utility-closet.yaml
+++ b/binary-sensors/motion-over-utility-closet.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/LR Motion Sensor over Utility Closet/motion"
name: "LR Motion Sensor over Utility Closet"
payload_on: "active"
payload_off: "inactive"
-sensor_class: motion
+device_class: motion
diff --git a/binary-sensors/smoke-living-room.yaml b/binary-sensors/smoke-living-room.yaml
index ff6fb07..6fb0a6c 100644
--- a/binary-sensors/smoke-living-room.yaml
+++ b/binary-sensors/smoke-living-room.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/Living Room Alarm/smoke"
name: "Living Room Smoke Detector"
payload_on: "detected"
payload_off: "clear"
-sensor_class: smoke
+device_class: smoke
diff --git a/binary-sensors/smoke-master-bedroom.yaml b/binary-sensors/smoke-master-bedroom.yaml
index d28b075..18063fd 100644
--- a/binary-sensors/smoke-master-bedroom.yaml
+++ b/binary-sensors/smoke-master-bedroom.yaml
@@ -3,4 +3,4 @@ state_topic: "smartthings/Master Bedroom Alarm/smoke"
name: "Master Bedroom Smoke Detector"
payload_on: "detected"
payload_off: "clear"
-sensor_class: smoke
+device_class: smoke
diff --git a/configuration.yaml b/configuration.yaml
index 4912c9b..2d7029b 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -43,9 +43,6 @@ recorder:
purge_days: 14
db_url: !secret mysql_recorder
-# Also log states to InfluxDB
-influxdb: !include influxdb.yaml
-
# Enables support for tracking state changes over time.
history:
@@ -95,6 +92,15 @@ panel_iframe: !include panels-iframe.yaml
apcupsd:
+emulated_hue:
+ type: google_home
+ host_ip: !secret host_ip
+ listen_port: 80
+ expose_by_default: true
+ exposed_domains:
+ - switch
+ - light
+
# Display
group: !include groups.yaml
diff --git a/customizations/lights.yaml b/customizations/lights.yaml
index c4a7306..f0cf059 100644
--- a/customizations/lights.yaml
+++ b/customizations/lights.yaml
@@ -12,3 +12,5 @@ light.master_bath_2:
friendly_name: Vanity Center
light.master_bath_3:
friendly_name: Vanity Right
+light.balcony:
+ friendly_name: Sconce
diff --git a/customizations/switches.yaml b/customizations/switches.yaml
index 14e1f3d..01842d1 100644
--- a/customizations/switches.yaml
+++ b/customizations/switches.yaml
@@ -7,11 +7,19 @@ switch.wireless_charger:
switch.august_interior:
friendly_name: Interior Bolt
icon: mdi:key
+ emulated_hue: false
switch.august_keyed:
friendly_name: Keyed Bolt
icon: mdi:key
+ emulated_hue: false
switch.kitchen_nightlight:
icon: mdi:theme-light-dark
switch.alarm_status:
friendly_name: Alarm Status indicator
icon: mdi:security-home
+switch.balcony_christmas_lights:
+ friendly_name: Christmas Lights
+ icon: mdi:led-outline
+switch.christmas_tree:
+ friendly_name: Christmas Tree
+ icon: mdi:pine-tree
diff --git a/groups.yaml b/groups.yaml
index 05e0539..d86b1bd 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -97,6 +97,7 @@ balcony:
entities:
- light.balcony
- input_select.scene_balcony
+ - switch.balcony_outlet
other:
name: Other
entities:
diff --git a/influxdb.yaml b/influxdb.yaml
deleted file mode 100644
index 1fc81c4..0000000
--- a/influxdb.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-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
diff --git a/notifications.yaml b/notifications.yaml
index f655b61..88053d8 100644
--- a/notifications.yaml
+++ b/notifications.yaml
@@ -4,7 +4,8 @@
password: !secret jabber_password
recipient: !secret jabber_recipient
tls: true
-- name: slack
- platform: slack
- api_key: !secret slack_api_key
- default_channel: '#home'
+- name: mattermost
+ platform: rest
+ resource: !secret mattermost_webhook
+ method: POST
+ message_param_name: 'text'
diff --git a/secrets.yaml b/secrets.yaml
index 243b702..499ba70 100644
--- a/secrets.yaml
+++ b/secrets.yaml
@@ -1,3 +1,4 @@
+host_ip:
api_password:
latitude:
longitude:
@@ -15,9 +16,8 @@ wunderground_forecast_url:
logentries_token:
mysql_recorder:
wemo_kitchen_ip:
-slack_api_key:
-influxdb_host:
-influxdb_user:
-influxdb_password:
-influxdb_db:
+pi_hole_host:
+pi_hole_backup_host:
+pi_hole_admin:
monit_admin:
+mattermost_webhook:
diff --git a/switches.yaml b/switches.yaml
index 118577b..0519235 100644
--- a/switches.yaml
+++ b/switches.yaml
@@ -26,6 +26,20 @@
payload_on: "on"
payload_off: "off"
retain: true
+- platform: mqtt
+ name: "Balcony Outlet"
+ state_topic: "smartthings/Balcony Outlet/switch"
+ command_topic: "smartthings/Balcony Outlet/switch"
+ payload_on: "on"
+ payload_off: "off"
+ retain: true
+- platform: mqtt
+ name: "Christmas Tree"
+ state_topic: "smartthings/Spare Outlet/switch"
+ command_topic: "smartthings/Spare Outlet/switch"
+ payload_on: "on"
+ payload_off: "off"
+ retain: true
- platform: command_line
switches:
august_interior:
--
GitLab