Merge branch 'current' into next

This commit is contained in:
Franck Nijhof 2023-10-25 07:14:22 +02:00
commit 8f922fbd20
No known key found for this signature in database
GPG Key ID: D62583BA8AB11CA3
21 changed files with 145 additions and 58 deletions

View File

@ -11,22 +11,26 @@
"appPort": [4000],
"onCreateCommand": "bundle install && npm install",
"containerEnv": { "DEVCONTAINER": "true" },
"extensions": [
"davidanson.vscode-markdownlint",
"editorconfig.editorconfig",
"GitHub.vscode-pull-request-github",
"mrmlnc.vscode-scss",
"rebornix.Ruby",
"streetsidesoftware.code-spell-checker",
"taichi.vscode-textlint",
"yzhang.markdown-all-in-one"
],
"settings": {
"editor.renderWhitespace": "boundary",
"editor.rulers": [80, 100, 120],
"gitlens.showWelcomeOnInstall": false,
"gitlens.showWhatsNewAfterUpgrades": false,
"terminal.integrated.shell.linux": "/usr/bin/zsh",
"workbench.startupEditor": "none"
"customizations": {
"vscode": {
"extensions": [
"davidanson.vscode-markdownlint",
"editorconfig.editorconfig",
"GitHub.vscode-pull-request-github",
"mrmlnc.vscode-scss",
"rebornix.Ruby",
"streetsidesoftware.code-spell-checker",
"taichi.vscode-textlint",
"yzhang.markdown-all-in-one"
],
"settings": {
"editor.renderWhitespace": "boundary",
"editor.rulers": [80, 100, 120],
"gitlens.showWelcomeOnInstall": false,
"gitlens.showWhatsNewAfterUpgrades": false,
"terminal.integrated.shell.linux": "/usr/bin/zsh",
"workbench.startupEditor": "none"
}
}
}
}

View File

@ -10,7 +10,7 @@ jobs:
- name: Check out files from GitHub
uses: actions/checkout@v4.1.1
- name: Setting up Node.js
uses: actions/setup-node@v3.8.1
uses: actions/setup-node@v4.0.0
with:
node-version: 16.x
cache: "npm"
@ -27,7 +27,7 @@ jobs:
- name: Check out files from GitHub
uses: actions/checkout@v4.1.1
- name: Setting up Node.js
uses: actions/setup-node@v3.8.1
uses: actions/setup-node@v4.0.0
with:
node-version: 16.x
cache: "npm"

View File

@ -20,7 +20,7 @@ Users should upgrade the firmware on all 700 series controllers to version 7.17.
</div>
- 800 series controllers
- 800 series controllers (with some caveats, see notes)
- Zooz 800 Series Z-Wave Long Range S2 Stick (ZST39 LR)
- 700 series controllers
@ -63,6 +63,15 @@ The alternative to a stick is a hub that supports Z-Wave. Home Assistant support
## Controller Notes
### 800 Series Controllers
Z-Wave JS and Z-Wave JS UI do not support the following features available on most 800 series controllers.
Unsupported:
- Long Range
- NVM Backup/Restore
### Aeotec Z-Stick
<div class='note'>

View File

@ -276,6 +276,26 @@ _All these can be extended if your usage calls for more resources._
More details can be found about the command can be found [here](https://www.virtualbox.org/manual/ch08.html#vboxmanage-storageattach).
</div>
- title: Unraid
content: |
1. Download the **.qcow2** image above and decompress it. (**Extract all** in Windows)
2. Store the image in the **isos** share on your server.
3. Make sure under **Settings** > **VM manager**, **Enable VMs** is enabled.
4. Create a new virtual machine: **VMS** > **Add VM**.
5. Select type **Linux** and give the VM a name and a description.
6. Select the CPU cores you want to let the VM use and give it some memory.
7. Under **Primary vDisk Location**, select **Manual** and then select the qcow2 image.
8. Select your keyboard language under **VM Console Keyboard**.
9. Select **br0** under **Network Source**.
10. Select **virtio** under **Network model**.
11. Select any USB-devices that you want to pass through to Home Assistant, such as Zigbee- or Z-Wave controllers.
12. Deselect **Start VM after creation**.
13. Select **Create**.
14. Select the name of your new VM and select the capacity number for your disk. Here, you can expand the disk to whatever your needs are. The default is 32&nbsp;GB.
15. Select the icon of your new VM and select **start with console (VNC)**.
{% unless page.installation_type == 'macos' %}
- title: KVM (virt-manager)
content: |

View File

@ -18,9 +18,11 @@ Integrates Adax heater into Home Assistant.
You can configure the heaters to use a local or cloud interface.
The local integrations only works with newer Adax heaters with both Bluetooth and wifi. Home Assistant uses Bluetooth to configure the heaters. For the local integration, you have to reset the heater by pressing + and OK until the display shows 'Reset'. Then press and hold the OK button on the heater until the blue LED starts blinking before pressing Submit. Configuring the heater might take some minutes. Using the local integration will disable cloud communication and the Adax app will not work.
The local integrations only works with newer Adax heaters with both Bluetooth and wifi. Home Assistant uses Bluetooth LE to configure the heaters, this means your machine running “Home Assistant” needs to have a Bluetooth adapter and the heater needs to be in range during setup. For the local integration, you have to reset the heater by pressing + and OK until the display shows 'Reset'. Then press and hold the OK button on the heater until the blue LED starts blinking before pressing Submit. Configuring the heater might take some minutes. Using the local integration will disable cloud communication and the Adax app will not work.
For the cloud integration, you'll need the Account ID (which can be found in the Adax Wifi app, pressing 'Account'). You will also need a credential, which you can create in the Adax app:
For the cloud integration, you'll need the Account ID (which can be found in the Adax Wifi app, pressing 'Account'. Which you will find as a number between the "log out" and "close account" buttons).
You will also need a credential, which you can create in the Adax app:
1. Navigate to the Account tab.
2. Go to **Third party integrations**.
@ -28,4 +30,6 @@ For the cloud integration, you'll need the Account ID (which can be found in the
4. Select **Add Credential**.
5. Give some name to the created credential (e.g. 'Home Assistant') and copy the generated password.
In the configuration popup you will need the Account ID, and the generated API password (not the account password)
{% include integrations/config_flow.md %}

View File

@ -70,6 +70,7 @@ Tested devices:
- Epson WF4820
- Epson EcoTank ET-77x0
- Epson ET-2650
- EPSON ET-2750
- Epson ET-4750
- Epson EcoTank ET-5150 (51x0)
- Epson Expression Home XP-2100

View File

@ -226,22 +226,22 @@ template:
id: "custom_event"
event_data:
sender: "no-reply@smartconnect.apc.com"
- sensor:
- name: "Previous Day Energy Use"
unit_of_measurement: "kWh"
state: >
{{ trigger.event.data["text"]
| regex_findall_index("\*Yesterday's Energy Use:\* ([0-9]+) kWh") }}
- name: "Previous Day Cost"
unit_of_measurement: "$"
state: >
sensor:
- name: "Previous Day Energy Use"
unit_of_measurement: "kWh"
state: >
{{ trigger.event.data["text"]
| regex_findall_index("\*Yesterday's estimated energy cost:\* \$([0-9.]+)") }}
- name: "Billing Cycle Total"
unit_of_measurement: "$"
state: >
{{ trigger.event.data["text"]
| regex_findall_index("\ days:\* \$([0-9.]+)") }}
| regex_findall_index("\*Yesterday's Energy Use:\* ([0-9]+) kWh") }}
- name: "Previous Day Cost"
unit_of_measurement: "$"
state: >
{{ trigger.event.data["text"]
| regex_findall_index("\*Yesterday's estimated energy cost:\* \$([0-9.]+)") }}
- name: "Billing Cycle Total"
unit_of_measurement: "$"
state: >
{{ trigger.event.data["text"]
| regex_findall_index("\ days:\* \$([0-9.]+)") }}
```
{% endraw %}

View File

@ -53,7 +53,7 @@ Home Assistant, as a Matter controller, only supports **control** of Matter devi
## Thread
Matter goes hand-in-hand with (but is not the same as) [Thread](<https://en.wikipedia.org/wiki/Thread_(network_protocol)>), which is a low power Radio mesh networking techology. Much like Zigbee, but with the key difference that it is _IP-addressable_, making it the perfect companion transport for Matter.
Matter goes hand-in-hand with (but is not the same as) [Thread](<https://en.wikipedia.org/wiki/Thread_(network_protocol)>), which is a low power radio mesh networking technology. Much like Zigbee, but with the key difference that it is _IP-addressable_, making it the perfect companion transport for Matter.
Thread devices become directly addressable by Matter controllers (such as Home Assistant) thanks to the use of so-called Thread Border Routers, which are in fact just devices that are both within your network and have a Thread chip builtin and thus act as a "router" between the Thread radio signal and your local network. These border routers (you will probably end up having multiple of them in your house) make sure that your Thread-based devices are reachable on your regular network and thus can be controlled with Matter. Examples of Thread Borders routers are the Apple TV 4K, HomePod (gen 2 or Mini), and the Google Nest Hub V2, so devices that you may already own. Besides that, all kind of other border routers are available, built-in to hardware appliances or software solutions based on OpenThread Border Router, such as the add-on we provide to use with the built-in Zigbee/Thread chip of the [Home Assistant Yellow](/yellow/) or the [Home Assistant SkyConnect](/skyconnect/) dongle.
@ -80,7 +80,7 @@ For devices where Home Assistant provides a native integration (with local API),
![image](/images/integrations/matter/matter_thread_infographic.webp)
Image taken from [this excellent article by The Verge](https://www.theverge.com/23165855/thread-smart-home-protocol-matter-apple-google-interview) about Matter that shows the landcape of Matter, Thread, Border routers and bridges in a nice visualized way.
Image taken from [this excellent article by The Verge](https://www.theverge.com/23165855/thread-smart-home-protocol-matter-apple-google-interview) about Matter that shows the landscape of Matter, Thread, Border routers and bridges in a nice visualized way.
{% include integrations/config_flow.md %}
@ -88,7 +88,7 @@ For communicating with Matter devices, the Home Assistant integration runs its o
### Supported installation types
It is recommended to run the Matter add-on on Home Assistant OS. This is currently the best-supported option.
It is recommended to run the Matter add-on on Home Assistant OS. This is currently the best-supported option.
If you run Home Assistant in a container, you can run a Docker image of the [Matter server](https://github.com/home-assistant-libs/python-matter-server). The requirements and instructions for your host setup are described on that GitHub page.
@ -212,7 +212,7 @@ The Philips Hue V2 bridge supports Matter. You can enable Matter support in the
### SwitchBot Hub 2
SwitchBot has released a (beta) firmware update to enable Matter support on their Hub 2. The SwitchBot Hub 2 is a Matter bridge device. It is bridging some of the devices, such as curtain motors, into Matter.
SwitchBot has released a (beta) firmware update to enable Matter support on their Hub 2. The SwitchBot Hub 2 is a Matter bridge device. It is bridging some of the devices, such as curtain motors, into Matter.
- To use Matter, in the SwitchBot app, enable Matter bridge support. Then, copy the code and use that to commission the Hub to Home Assistant. Another option is to use a second device to scan the QR code.
- Device support is limited. You bridge specific devices to Matter by adding them as **Secondary device** in the app. Note that not all SwitchBot devices can be bridged.
@ -235,7 +235,7 @@ Tasmota supports Matter over IP on all ESP32 based devices (in experimental phas
### General recommendations
- Using Thread-based Matter devices in Home Assistant requires Home Assistant OS version 10 and above. Not using Home Assistant OS is at your own risk. We do provide some [documentation](https://github.com/home-assistant-libs/python-matter-server/blob/main/README.md) on how to run the Matter Server as a Docker container. The documentation includes a description of the host and networking requirements.
- Using Thread-based Matter devices in Home Assistant requires Home Assistant OS version 10 and above. Not using Home Assistant OS is at your own risk. We do provide some [documentation](https://github.com/home-assistant-libs/python-matter-server/blob/main/README.md) on how to run the Matter Server as a Docker container. The documentation includes a description of the host and networking requirements.
- To use Thread devices you will need a Thread Network with at least one Thread Border Router in your network nearby the Thread device(s). Apple users need for example the Apple TV 4K or the HomePod Mini, while Google users need a Nest Hub V2. Use the Thread integration in Home Assistant to diagnose your Thread network(s).

View File

@ -18,6 +18,12 @@ The [NINA](https://www.bbk.bund.de/DE/Warnung-Vorsorge/Warn-App-NINA/warn-app-ni
For each county/city it creates warning slots that change to Unsafe when warnings are present. The text of the warning and the metadata are stored in the attributes of the slots.
<div class='note warning'>
This integration may only works with an Internet connection that supports IPv4.
</div>
{% include integrations/config_flow.md %}
### Filter

View File

@ -31,7 +31,7 @@ There are two common representations for encoding an IRK - base64 encoding or he
If you are trying to get the IRK for your iPhone or Apple Watch, you must be logged in to the Mac with the same iCloud account on those devices. This procedure should also work for devices that you pair with macOS.
1. Start the **Keychain Acess** application.
1. Start the **Keychain Access** application.
2. In the left sidebar, make sure iCloud is selected.
3. In the search bar in the upper right, type Bluetooth.
4. A list of GUIDs is shown.

View File

@ -211,7 +211,20 @@ In this section you find some real-life examples of how to use this sensor.
### JSON attributes topic configuration
The example sensor below shows a configuration example which uses a JSON dict: `{"ClientName": <string>, "IP": <string>, "MAC": <string>, "RSSI": <string>, "HostName": <string>, "ConnectedSSID": <string>}` in a separate topic `home/sensor1/attributes` to add extra attributes. It also makes use of the `availability` topic.
The example sensor below shows a configuration example which uses the following separate topic and JSON structure to add extra attributes.
Topic: `home/sensor1/attributes`
```json
{
"ClientName": <string>,
"IP": <string>,
"MAC": <string>,
"RSSI": <string>,
"HostName": <string>,
"ConnectedSSID": <string>
}
```
It also makes use of the `availability` topic.
Extra attributes will be displayed in the frontend and can also be extracted in [Templates](/docs/configuration/templating/#attributes). For example, to extract the `ClientName` attribute from the sensor below, use a template similar to: {% raw %}`{{ state_attr('sensor.bs_rssi', 'ClientName') }}`{% endraw %}.
@ -236,7 +249,22 @@ mqtt:
### JSON attributes template configuration
The example sensor below shows a configuration example which uses a JSON dict: `{"Timer1":{"Arm": <status>, "Time": <time>}, "Timer2":{"Arm": <status>, "Time": <time>}}` on topic `tele/sonoff/sensor` with a template to add `Timer1.Arm` and `Timer1.Time` as extra attributes. To instead only add `Timer1.Arm`as an extra attribute, change `json_attributes_template` to: {% raw %}`"{{ {'Arm': value_json.Timer1} | tojson }}"`{% endraw %}.
The example sensor below shows a configuration example which uses the following topic and JSON structure with a template to add `Timer1.Arm` and `Timer1.Time` as extra attributes.
Topic: `tele/sonoff/sensor`
```json
{
"Timer1": {
"Arm": <status>,
"Time": <time>
},
"Timer2": {
"Arm": <status>,
"Time": <time>
}
}
```
To instead only add `Timer1.Arm`as an extra attribute, change `json_attributes_template` to: {% raw %}`"{{ {'Arm': value_json.Timer1} | tojson }}"`{% endraw %}.
Extra attributes will be displayed in the frontend and can also be extracted in [Templates](/docs/configuration/templating/#attributes). For example, to extract the `Arm` attribute from the sensor below, use a template similar to: {% raw %}`{{ state_attr('sensor.timer1', 'Arm') }}`{% endraw %}.
@ -289,8 +317,18 @@ mqtt:
If you are using the [OwnTracks](/integrations/owntracks) and enable the reporting of the battery level then you can use an MQTT sensor to keep track of your battery. A regular MQTT message from OwnTracks looks like this:
```bash
owntracks/tablet/tablet {"_type":"location","lon":7.21,"t":"u","batt":92,"tst":144995643,"tid":"ta","acc":27,"lat":46.12}
Topic: `owntracks/tablet/tablet`
```json
{
"_type": "location",
"lon": 7.21,
"t": "u",
"batt": 92,
"tst": 144995643,
"tid": "ta",
"acc": 27,
"lat": 46.12
}
```
Thus the trick is extracting the battery level from the payload.
@ -313,8 +351,8 @@ mqtt:
If you are using a DHT sensor and a NodeMCU board (esp8266), you can retrieve temperature and humidity with a MQTT sensor. A code example can be found [here](https://github.com/mertenats/open-home-automation/tree/master/ha_mqtt_sensor_dht22). A regular MQTT message from this example looks like this:
Topic: `office/sensor1`
```json
office/sensor1
{
"temperature": 23.20,
"humidity": 43.70

View File

@ -6,16 +6,21 @@ description: "Instructions to get Home Assistant configured."
Alright, you made it here. The tough part is done.
- As the last step of the [installation procedure](/installation/) specific to your device, you entered the Home Assistant device's address in your browser's address bar.
- Typically, this is `http://homeassistant.local:8123/`
- Typically, this is `http://homeassistant.local:8123/`.
- If you are running an older Windows version or have a stricter network configuration, you might need to access Home Assistant at <a href="http://homeassistant:8123" target="_blank">homeassistant:8123</a> or `http://X.X.X.X:8123` (replace X.X.X.X with your device's IP address).
- **Result**: You now see the welcome screen. Depending on your hardware, preparation may take a while.
![Home Assistant preparation](/images/getting-started/onboarding_preparing_01_.png)
- Depending on the preinstalled software version, you might see a slightly different version of the welcome screen.
- To view the log files, select the pulsing blue dot.
![Home Assistant preparation](/images/getting-started/onboarding_preparing_01.png)
With Home Assistant installed, it's time to set up the basics.
In this step, you will create the owner's account of Home Assistant. This account is an administrator account. It will always be able to change everything.
We will now create the owner's account of Home Assistant. This account is an administrator account. It will always be able to change everything.
1. If you want to restore from a backup of a previous installation, select **Restore from backup**.
- Continue with the procedure on [restoring from backup](/common-tasks/os/#restoring-a-backup).

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 77 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 625 KiB

After

Width:  |  Height:  |  Size: 3.1 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

View File

@ -39,8 +39,8 @@ If Raspberry Pi Imager is not supported by your platform, you can use [Balena Et
1. Download and install the Raspberry Pi Imager on your computer as described under [https://www.raspberrypi.com/software/](https://www.raspberrypi.com/software/).
![Install Raspberry Pi Imager](/images/installation/rpi_imager.png)
2. Open the Raspberry Pi Imager.
![Open Raspberry Pi Imager](/images/installation/rpi-imager-start.png)
2. Open the Raspberry Pi Imager and select your Raspberry Pi device.
![Open Raspberry Pi Imager](/images/installation/rpi_imager_start.png)
3. Choose the operating system:
1. Select **Choose OS**.
2. Select **Other specific-purpose OS** > **Home assistants and home automation** > **Home Assistant**.
@ -51,9 +51,9 @@ If Raspberry Pi Imager is not supported by your platform, you can use [Balena Et
2. Select your SD card.
![Select the storage](/images/installation/rpi-select-sd-card.png)
5. Write the installer onto the SD card:
1. To start the process, select **Write**.
1. To start the process, select **Next**.
2. Wait for the Home Assistant OS to be written to the SD card.
![Select write](/images/installation/rpi-select-write.png)
![Select write](/images/installation/rpi_choose_next.png)
6. Eject the SD card.
### Start up your Raspberry Pi

View File

@ -65,28 +65,28 @@ The following is a list of past security advisories that have been published by
**2023-10-19: Actions expression injection in `helpers/version/action.yml`**
Severity: _Low (This is an internal project)_
Detailed information: _[Security advisory](https://github.com/home-assistant/core/security/advisories/GHSA-jff5-5j3g-vhqc)_
Discovered by: _[jorgectf](https://github.com/jorgectf), [p-](https://github.com/p-) ([GitHub Security Lab](https://securitylab.github.com/))_
Discovered by: _[Jorge Rosillo](https://github.com/jorgectf), [Peter Stöckli](https://github.com/p-) ([GitHub Security Lab](https://securitylab.github.com/))_
Fixed in: _Home Assistant GitHub Actions released on September 5, 2023_
**2023-10-19: Arbitrary URL load in Android WebView in `MyActivity.kt`**
Severity: _High (CVSS: 8.6)_
Detailed information: _[Security advisory](https://github.com/home-assistant/core/security/advisories/GHSA-jvpm-q3hq-86rg)_
Assigned CVE: _[CVE-2023-41898](https://nvd.nist.gov/vuln/detail/CVE-2023-41898)_
Discovered by: _[atorralba](https://github.com/atorralba) ([GitHub Security Lab](https://securitylab.github.com/))_
Discovered by: _[Tony Torralba](https://github.com/atorralba) ([GitHub Security Lab](https://securitylab.github.com/))_
Fixed in: _Home Assistant for Android 2023.9.2_
**2023-10-19: Partial Server-Side Request Forgery in Core**
Severity: _Low_
Detailed information: _[Security advisory](https://github.com/home-assistant/core/security/advisories/GHSA-4r74-h49q-rr3h)_
Assigned CVE: _[CVE-2023-41899](https://nvd.nist.gov/vuln/detail/CVE-2023-41899)_
Discovered by: _[pwntester](https://github.com/pwntester) ([GitHub Security Lab](https://securitylab.github.com/))_
Discovered by: _[Alvaro Muñoz](https://github.com/pwntester) ([GitHub Security Lab](https://securitylab.github.com/))_
Fixed in: _Home Assistant Core 2023.9_
**2023-10-19: Client-Side Request Forgery in iOS/macOS native Apps**
Severity: _High (CVSS: 8.6)_
Detailed information: _[Security advisory](https://github.com/home-assistant/core/security/advisories/GHSA-h2jp-7grc-9xpp)_
Assigned CVE: _[CVE-2023-44385](https://nvd.nist.gov/vuln/detail/CVE-2023-44385)_
Discovered by: _[pwntester](https://github.com/pwntester) ([GitHub Security Lab](https://securitylab.github.com/))_
Discovered by: _[Alvaro Muñoz](https://github.com/pwntester) ([GitHub Security Lab](https://securitylab.github.com/))_
Fixed in: _Home Assistant for iOS 2023.7_
**2023-10-19: Account takeover via auth_callback login**