Merge branch 'current' into next

This commit is contained in:
Fabian Affolter 2017-04-21 08:04:05 +02:00
commit 810a0a7dfc
No known key found for this signature in database
GPG key ID: DDF3D6F44AAB1336
15 changed files with 464 additions and 254 deletions

View file

@ -16,6 +16,8 @@ The `alert` component is designed to notify you when problematic issues arise. F
Alerts will add an entity to the front end only when they are firing. This entity allows you to silence an alert until it is resolved.
When using the `alert` component it is important that the timezone used for Home Assistant and the underlying operating system match. Failing to do so may result in multiple alerts being sent at the same time (such as when Home Assistant is set to the `America/Detroit` timezone but the operating system uses `UTC`).
### {% linkable_title Basic Example %}
The `alert` component makes use of any of the `notifications` components. To setup the `alert` component, first, you must setup a `notification` component. Then, add the following to your configuration file:
@ -83,12 +85,12 @@ binary_sensor:
alert:
motion_battery:
- name: Motion Battery is Low
entity_id: binary_sensor.motion_battery_low
repeat: 30
notifiers:
- ryans_phone
- kristens_phone
name: Motion Battery is Low
entity_id: binary_sensor.motion_battery_low
repeat: 30
notifiers:
- ryans_phone
- kristens_phone
```
This example will begin firing as soon as the entity `sensor.motion`'s `battery` attribute falls below 15. It will continue to fire until the battery attribute raises above 15 or the alert is acknowledged on the frontend.

View file

@ -53,7 +53,7 @@ Configuration variables:
- **payload_medium_speed** (*Optional*): The payload that represents the fan's medium speed.
- **payload_high_speed** (*Optional*): The payload that represents the fan's high speed.
- **speed_value_template** (*Optional*): Defines a [template](/topics/templating/) to extract a value from the speed payload.
- **speeds** array (*Optional*): Valid entries for the list are `off`, `low`, `med`, and `high`.
- **speeds** array (*Optional*): Valid entries for the list are `off`, `low`, `medium`, and `high`.
<p class='note warning'>
Make sure that your topic is an exact match. `some-topic/` and `some-topic` are different topics.

View file

@ -68,8 +68,8 @@ data:
homeassistant.components.media_player.yamaha: debug
```
The log information are stored in the [configuration directory](/docs/configuration/) as `home-assistant.log` and you can read it with the command-line tool `cat` or follow it dynamicly with `tail -f`. If you are a Rasbian user then like the example below:
The log information are stored in the [configuration directory](/docs/configuration/) as `home-assistant.log` and you can read it with the command-line tool `cat` or follow it dynamically with `tail -f`. If you are a Hassbian user you can use the example below:
```bash
$ tail -f /home/pi/.homeassistant/home-assistant.log
$ tail -f /home/homeassistant/.homeassistant/home-assistant.log
```

View file

@ -63,13 +63,13 @@ telegram_webhooks:
### {% linkable_title Configuration samples %}
Telegram webhooks raise an event `telegram.command` with a payload.
Telegram webhooks raise an event `telegram_command` with a payload.
```json
{
'command': '/thecommand'
'args': 'strings after command'
'user_id': 12345
"command": "/thecommand",
"args": "strings after command",
"user_id": "12345"
}
```
@ -80,7 +80,7 @@ alias: 'telegram bot that reply pong to ping'
hide_entity: true
trigger:
platform: event
event_type: telegram.command
event_type: telegram_command
event_data:
command: '/ping'
action:
@ -94,7 +94,7 @@ Example that show keyboard interaction with `notify.telegram`
```yaml
trigger:
platform: event
event_type: telegram.command
event_type: telegram_command
event_data:
command: '/start'
action:
@ -112,7 +112,7 @@ and an automation to trigger a related command "/siren".
```yaml
trigger:
platform: event
event_type: telegram.command
event_type: telegram_command
event_data:
command: '/siren'
action: