Update to 1.15.0 release (#427)

* Updated to 1.15.0
* Updated pairing to specify the new frontend

zigbee2mqtt-edge/CHANGELOG.md

@@ -1,3 +1,2 @@
 ## Changes
-- Support for [Experimental Frontend](https://github.com/Koenkk/zigbee2mqtt/issues/4266) using `ingress`
 - Tracks latest Zigbee2mqtt [`dev branch`](https://github.com/Koenkk/zigbee2mqtt/commits/dev)

zigbee2mqtt-edge/README.md

@@ -26,16 +26,4 @@ To update the `edge` version of the add-on, you will need to uninstall and re-in
 - Uninstall: **Supervisor → Dashboard → Zigbee2mqtt Edge → Uninstall**
 - Refresh repo: **Supervisor → Add-on store → ⋮ → Reload**
 - Re-install: **Supervisor → Add-on store → Zigbee2mqtt Edge → Install**
-- Restore config to: **Supervisor → Dashboard → Zigbee2mqtt Edge → Configuration**
-
-### Enabling the integrated Frontend (experimental)
-
-**Steps**
-- Update config: **Supervisor → Dashboard → Zigbee2mqtt Edge → Configuration**
-
-```yaml
-experimental:
-  new_api: true
-  frontend: true
-```
-- Enable `ingress`: **Supervisor → Dashboard → Zigbee2mqtt Edge → Show in sidebar**
+- Restore config to: **Supervisor → Dashboard → Zigbee2mqtt Edge → Configuration**

zigbee2mqtt/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.15.0
+- Updated Zigbee2mqtt to version [`1.15.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.15.0)
+- Added support for a [built-in frontend](https://github.com/Koenkk/zigbee2mqtt/issues/4266) using `ingress`
+
 ## 1.14.4.2
 - Added readme for Edge version
 - Added logo on both Edge and Stable version

zigbee2mqtt/DOCS.md

@@ -1,10 +1,10 @@
 # Home Assistant Add-on: Zigbee2mqtt
 
 # Pairing
+By default the add-on has `permit_join` set to `false`. To allow devices to join you need to activate this after the add-on has started. You can now use the [built-in frontend](https://www.zigbee2mqtt.io/information/frontend.html) to achieve this. For details on how to enable the built-in frontent see the next section.
 
-The suggested way to pair your devices is to enable zigbee2mqtt's `permit_join` option from within Home Assistant using MQTT rather than through the add-on's user interface.
-
-You can use [Zigbee2MqttAssistant](https://github.com/yllibed/Zigbee2MqttAssistant) if you don't want to use MQTT directly.
+### Enabling the built-in Frontend
+Enable `ingress` to have the frontend available in your UI: **Supervisor → Dashboard → Zigbee2mqtt Edge → Show in sidebar**. You can find more details about the feature on the [Zigbee2mqtt documentation](https://www.zigbee2mqtt.io/information/frontend.html).
 
 # Configuration
 The configuration closely mirrors that of `zigbee2mqtt` itself, with a couple of key differences:

zigbee2mqtt/Dockerfile

@@ -4,7 +4,7 @@ FROM $BUILD_FROM
 # Add env
 ENV LANG C.UTF-8
 
-ENV ZIGBEE2MQTT_VERSION=1.14.4
+ENV ZIGBEE2MQTT_VERSION=1.15.0
 ENV ARCHIVE=zigbee2mqtt-$ZIGBEE2MQTT_VERSION
 
 RUN apk add --update --no-cache curl jq nodejs npm socat \

zigbee2mqtt/config.json

@@ -1,6 +1,6 @@
 {
   "name": "Zigbee2mqtt",
-  "version": "1.14.4.2",
+  "version": "1.15.0",
   "slug": "zigbee2mqtt",
   "description": "Zigbee to MQTT Bridge",
   "auto_uart": true,
@@ -14,6 +14,8 @@
     "i386"
   ],
   "boot": "auto",
+  "ingress": true,
+  "panel_icon": "mdi:zigbee",
   "map": [
     "share:rw",
     "config:rw"
@@ -52,7 +54,12 @@
     "blocklist": [],
     "passlist": [],
     "queue": {},
-    "experimental": {},
+    "frontend": {
+      "port": 8099
+    },
+    "experimental": {
+      "new_api": true
+    },
     "socat": {
       "enabled": false,
       "master": "pty,raw,echo=0,link=/dev/ttyZ2M,mode=777",
@@ -146,7 +153,11 @@
     },
     "experimental": {
       "transmit_power": "int?",
-      "output": "str?"
+      "output": "str?",
+      "new_api": "bool?"
+    },
+    "frontend": {
+      "port": "int?"
     },
     "socat": {
       "enabled": "bool?",