From e81a4f0b9d30bd119e3183da2212454104ebc454 Mon Sep 17 00:00:00 2001 From: Florian Brinker Date: Sun, 3 Feb 2019 00:16:33 +0100 Subject: [PATCH] Added mqtt slave, new lamps --- alexa.yaml | 4 ++++ configuration.yaml | 32 ++++++++++++++++++++++++-------- lovelace-views/humidity.yaml | 8 ++++++++ lovelace-views/kitchen.yaml | 9 ++++++--- lovelace-views/livingroom.yaml | 2 ++ sensors/hygrometer.yaml | 8 -------- sensors/misc.yaml | 32 ++++++++++++++++---------------- sensors/social.yaml | 25 +++++++++++++++++++++++-- 8 files changed, 83 insertions(+), 37 deletions(-) delete mode 100644 sensors/hygrometer.yaml diff --git a/alexa.yaml b/alexa.yaml index 477e982..f320012 100644 --- a/alexa.yaml +++ b/alexa.yaml @@ -7,6 +7,7 @@ include_entities: - light.ambilight - light.kuchen_theke + - light.esstisch - switch.livingroom_stimmungslicht - switch.livingroom_music - switch.livingroom_netflix @@ -29,6 +30,9 @@ light.kuchen_theke: name: Theke description: Küche - Theken-Lichter + light.esstisch: + name: Esstisch + description: Küche - Esstisch-Lampen light.stimmungslicht: name: Stimmungslicht description: Wohnzimmer - Stimmungslicht diff --git a/configuration.yaml b/configuration.yaml index d000130..fe9a7a3 100644 --- a/configuration.yaml +++ b/configuration.yaml @@ -9,6 +9,8 @@ homeassistant: whitelist_external_dirs: - /backuplogs +frontend: + http: ip_ban_enabled: true login_attempts_threshold: 5 @@ -34,19 +36,26 @@ config: updater: -map: - #discovery: +conversation: + +tts: + - platform: google + history: logbook: +map: + recorder: influxdb: host: !secret influxdb database: home_assistant + username: !secret influxdb_user + password: !secret influxdb_password max_retries: 3 include: entities: @@ -54,12 +63,9 @@ influxdb: - sensor.attic_heatIndex - sensor.attic_humidity - sensor.attic_temperature -# - sensor.bathroom_hygrometer_battery -# - sensor.bathroom_hygrometer_humidity -# - sensor.bathroom_hygrometer_temperature -# - sensor.livingroom_heatindex -# - sensor.livingroom_humidity -# - sensor.livingroom_temperature + - sensor.bathroom_hygrometer_battery + - sensor.bathroom_hygrometer_humidity + - sensor.bathroom_hygrometer_temperature # Youtube - sensor.youtube_beauty - sensor.youtube_beauty_videos @@ -68,6 +74,9 @@ influxdb: - sensor.youtube_mtb_videos - sensor.youtube_mtb_views # Bitly + - sensor.bitly_blog_bb + - sensor.bitly_instagram_bb + - sensor.bitly_impressum_bb - sensor.bitly_youtube_bb # Instagram - sensor.instagram_beauty @@ -97,6 +106,13 @@ mqtt: username: !secret mqtt_username password: !secret mqtt_password +mqtt_eventstream: + publish_topic: homeassistant/master + subscribe_topic: homeassistant-slaves/# + ignore_event: + - call_service + - state_changed + telegram_bot: - platform: broadcast api_key: !secret telegram_bot diff --git a/lovelace-views/humidity.yaml b/lovelace-views/humidity.yaml index bbd0b3c..913417d 100644 --- a/lovelace-views/humidity.yaml +++ b/lovelace-views/humidity.yaml @@ -1,6 +1,14 @@ icon: mdi:water-percent path: humidity cards: + - type: history-graph + title: 'Badezimmer' + refresh_interval: 30 + entities: + - entity: sensor.bathroom_hygrometer_temperature + name: Temperatur + - entity: sensor.bathroom_hygrometer_humidity + name: Luftfeuchtigkeit - type: history-graph title: 'Dachboden' refresh_interval: 30 diff --git a/lovelace-views/kitchen.yaml b/lovelace-views/kitchen.yaml index 2f6239f..87c91dc 100644 --- a/lovelace-views/kitchen.yaml +++ b/lovelace-views/kitchen.yaml @@ -2,6 +2,9 @@ title: Küche path: kitchen cards: # Lights - - type: light - entity: light.kuchen_theke - name: Küchen-Theke \ No newline at end of file + - type: entities + entities: + - entity: light.kuchen_theke + name: Küchen-Theke + - entity: light.esstisch + name: Esstisch \ No newline at end of file diff --git a/lovelace-views/livingroom.yaml b/lovelace-views/livingroom.yaml index aa7beb2..996eef3 100644 --- a/lovelace-views/livingroom.yaml +++ b/lovelace-views/livingroom.yaml @@ -8,6 +8,8 @@ cards: entities: - entity: light.kuchen_theke name: Küchen-Theke + - entity: light.esstisch + name: Esstisch - entity: light.stimmungslicht name: Stimmungslicht icon: mdi:lightbulb diff --git a/sensors/hygrometer.yaml b/sensors/hygrometer.yaml deleted file mode 100644 index f5af14b..0000000 --- a/sensors/hygrometer.yaml +++ /dev/null @@ -1,8 +0,0 @@ -#- platform: mitemp_bt -# name: Bathroom Hygrometer -# mac: "4C:65:A8:DC:4D:B2" -# monitored_conditions: -# - temperature -# - humidity -# - battery - diff --git a/sensors/misc.yaml b/sensors/misc.yaml index 507c9d4..9036941 100644 --- a/sensors/misc.yaml +++ b/sensors/misc.yaml @@ -1,18 +1,18 @@ - - platform: time_date - display_options: - - 'time' - - 'date' - - 'date_time' - - 'time_date' - - 'time_utc' - - 'beat' +- platform: time_date + display_options: + - 'time' + - 'date' + - 'date_time' + - 'time_date' + - 'time_utc' + - 'beat' - - platform: dnsip +- platform: dnsip - - platform: deutsche_bahn - from: "Salzbergen" - to: "Münster HBF" - - platform: template - sensors: - salzbergen_to_munster_hbf_ontime: - value_template: '{{ states.sensor.salzbergen_to_munster_hbf.attributes.ontime }}' \ No newline at end of file +- platform: deutsche_bahn + from: "Salzbergen" + to: "Münster HBF" +- platform: template + sensors: + salzbergen_to_munster_hbf_ontime: + value_template: '{{ states.sensor.salzbergen_to_munster_hbf.attributes.ontime }}' \ No newline at end of file diff --git a/sensors/social.yaml b/sensors/social.yaml index ec2211a..22e4793 100644 --- a/sensors/social.yaml +++ b/sensors/social.yaml @@ -42,11 +42,32 @@ force_update: true # Bit.ly + # http://bit.ly/blog-jbb + - platform: rest + scan_interval: 300 + name: bitly_blog_bb + resource: !secret bitly_blog_bb + value_template: '{{ value_json.data.link_clicks }}' + force_update: true + # http://bit.ly/insta-jbb + - platform: rest + scan_interval: 300 + name: bitly_instagram_bb + resource: !secret bitly_instagram_bb + value_template: '{{ value_json.data.link_clicks }}' + force_update: true + #http://bit.ly/impressum-jbb + - platform: rest + scan_interval: 300 + name: bitly_impressum_bb + resource: !secret bitly_impressum_bb + value_template: '{{ value_json.data.link_clicks }}' + force_update: true # http://bit.ly/youtube-bb - platform: rest scan_interval: 300 - name: bitly_youtube-bb - resource: !secret bitly_youtube-bb + name: bitly_youtube_bb + resource: !secret bitly_youtube_bb value_template: '{{ value_json.data.link_clicks }}' force_update: true