Skip to content
Snippets Groups Projects
Verified Commit a7ff0785 authored by Erick Hitter's avatar Erick Hitter
Browse files

Sync with upstream

d6cf76e
parent 5bfa928c
Branches
No related tags found
No related merge requests found
...@@ -13,6 +13,9 @@ trigger: ...@@ -13,6 +13,9 @@ trigger:
condition: condition:
condition: and condition: and
conditions: conditions:
- condition: state
entity_id: group.presence
state: 'home'
- condition: state - condition: state
entity_id: sun.sun entity_id: sun.sun
state: 'below_horizon' state: 'below_horizon'
......
...@@ -13,6 +13,9 @@ trigger: ...@@ -13,6 +13,9 @@ trigger:
condition: condition:
condition: and condition: and
conditions: conditions:
- condition: state
entity_id: group.presence
state: 'home'
- condition: state - condition: state
entity_id: sun.sun entity_id: sun.sun
state: 'below_horizon' state: 'below_horizon'
......
...@@ -2,16 +2,21 @@ alias: 'Turn on living room at sunset' ...@@ -2,16 +2,21 @@ alias: 'Turn on living room at sunset'
trigger: trigger:
platform: sun platform: sun
event: sunset event: sunset
offset: "-00:60:00" offset: "-00:45:00"
condition: condition:
condition: or condition: and
conditions: conditions:
- condition: state - condition: state
entity_id: light.endtable entity_id: group.presence
state: 'off' state: 'home'
- condition: state - condition: or
entity_id: light.corner_table conditions:
state: 'off' - condition: state
entity_id: light.endtable
state: 'off'
- condition: state
entity_id: light.corner_table
state: 'off'
action: action:
service: scene.turn_on service: scene.turn_on
entity_id: scene.lr_relax entity_id: scene.lr_relax
...@@ -38,13 +38,7 @@ recorder: ...@@ -38,13 +38,7 @@ recorder:
db_url: !secret mysql_recorder db_url: !secret mysql_recorder
# Also log states to InfluxDB # Also log states to InfluxDB
influxdb: influxdb: !include influxdb.yaml
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. # Enables support for tracking state changes over time.
history: history:
......
...@@ -135,9 +135,31 @@ sensor.time: ...@@ -135,9 +135,31 @@ sensor.time:
friendly_name: Time (PT) friendly_name: Time (PT)
sensor.pihole: sensor.pihole:
friendly_name: Ads Blocked friendly_name: Ads Blocked
sensor.eth1_data_received_mean: sensor.pihole_2:
friendly_name: Received eth1 friendly_name: Ads Blocked (Backup)
icon: mdi:server-network sensor.ups_status:
sensor.eth1_data_sent_mean: friendly_name: Status
friendly_name: Sent eth1 sensor.ups_load:
icon: mdi:server-network 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
...@@ -28,6 +28,7 @@ sensor_view: ...@@ -28,6 +28,7 @@ sensor_view:
- sensor.speedtest_upload - sensor.speedtest_upload
- sensor.fastcom_download - sensor.fastcom_download
- sensor.pihole_queries_today - sensor.pihole_queries_today
- sensor.pihole_2_queries_today
- sun.sun - sun.sun
status_view: status_view:
name: Status name: Status
...@@ -37,11 +38,14 @@ status_view: ...@@ -37,11 +38,14 @@ status_view:
- group.time_date - group.time_date
- group.sensor_pi - group.sensor_pi
- group.sensor_apc - group.sensor_apc
- group.sensor_battery_levels
- sensor.pihole - sensor.pihole
- sensor.pihole_2
- sensor.pihole_percent_ads_today - sensor.pihole_percent_ads_today
- sensor.pihole_2_percent_ads_today
- sensor.pihole_queries_today - sensor.pihole_queries_today
- sensor.pihole_2_queries_today
- sensor.pihole_domains_blocked - sensor.pihole_domains_blocked
- sensor.pihole_2_domains_blocked
weather_view: weather_view:
name: Weather name: Weather
view: yes view: yes
...@@ -55,7 +59,7 @@ misc_view: ...@@ -55,7 +59,7 @@ misc_view:
entities: entities:
- group.scripts_misc - group.scripts_misc
- group.misc_misc - group.misc_misc
- media_player.nexus_player - group.sensor_battery_levels
locks: locks:
name: Locks name: Locks
entities: entities:
...@@ -161,7 +165,6 @@ presence: ...@@ -161,7 +165,6 @@ presence:
- device_tracker.eh_nexus_6 - device_tracker.eh_nexus_6
- device_tracker.cl_samsung_s5 - device_tracker.cl_samsung_s5
- device_tracker.cl_iphone_5 - device_tracker.cl_iphone_5
- device_tracker.green_keys
time_date: time_date:
name: Time & Date name: Time & Date
entities: entities:
...@@ -180,8 +183,8 @@ sensor_pi: ...@@ -180,8 +183,8 @@ sensor_pi:
- sensor.swap_free - sensor.swap_free
- sensor.last_boot - sensor.last_boot
- sensor.since_last_boot - sensor.since_last_boot
- sensor.eth1_data_received_mean # Stats sensor to replace sensor.received_eth1 - sensor.received_eth1
- sensor.eth1_data_sent_mean # Stats sensor to replace sensor.sent_eth1 - sensor.sent_eth1
sensor_apc: sensor_apc:
name: APC name: APC
entities: entities:
...@@ -192,28 +195,12 @@ sensor_apc: ...@@ -192,28 +195,12 @@ sensor_apc:
- sensor.ups_last_transfer - sensor.ups_last_transfer
- sensor.ups_transfer_count - sensor.ups_transfer_count
- sensor.ups_battery - sensor.ups_battery
- sensor.ups_battery_voltage
- sensor.ups_battery_nominal_voltage - sensor.ups_battery_nominal_voltage
- sensor.ups_input_voltage - sensor.ups_input_voltage
- sensor.ups_nominal_input_voltage - sensor.ups_nominal_input_voltage
- sensor.ups_nominal_output_power - sensor.ups_nominal_output_power
- sensor.ups_output_voltage - sensor.ups_load_mean
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
scripts_misc: scripts_misc:
name: Lock Actions name: Lock Actions
entities: entities:
...@@ -232,6 +219,23 @@ misc_misc: ...@@ -232,6 +219,23 @@ misc_misc:
- scene.all_lights_off - scene.all_lights_off
- script.restart_dash_button_shm - script.restart_dash_button_shm
- script.restart_dash_button_hac - 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: wunderground:
name: Wunderground name: Wunderground
entities: entities:
......
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
...@@ -8,5 +8,5 @@ entities: ...@@ -8,5 +8,5 @@ entities:
color_temp: 450 color_temp: 450
light.master_bath_3: light.master_bath_3:
state: off state: off
automation.brightness_master_bath_sync: # automation.brightness_master_bath_sync:
state: off # state: off
...@@ -21,5 +21,6 @@ influxdb_user: ...@@ -21,5 +21,6 @@ influxdb_user:
influxdb_password: influxdb_password:
influxdb_db: influxdb_db:
pi_hole_host: pi_hole_host:
pi_hole_backup_host:
pi_hole_admin: pi_hole_admin:
monit_admin: monit_admin:
...@@ -2,6 +2,7 @@ platform: apcupsd ...@@ -2,6 +2,7 @@ platform: apcupsd
resources: resources:
- bcharge - bcharge
- linev - linev
- battv
- loadpct - loadpct
- nominv - nominv
- nombattv - nombattv
...@@ -11,3 +12,9 @@ resources: ...@@ -11,3 +12,9 @@ resources:
- timeleft - timeleft
- tonbatt - tonbatt
- lastxfer - lastxfer
- cumonbatt
- xonbatt
- xoffbatt
- model
- serialno
- battdate
File moved
platform: pi_hole
host: !secret pi_hole_backup_host
ssl: true
verify: true
platform: statistics
name: eth1 Data Received
entity_id: sensor.received_eth1
platform: statistics platform: statistics
name: eth1 Data Sent name: UPS Load
entity_id: sensor.sent_eth1 entity_id: sensor.ups_load
...@@ -13,3 +13,16 @@ sensors: ...@@ -13,3 +13,16 @@ sensors:
friendly_name: Percent Ads Today friendly_name: Percent Ads Today
unit_of_measurement: '%' unit_of_measurement: '%'
entity_id: sensor.pihole 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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment