Merge remote-tracking branch 'upstream/master' into HEAD

# Conflicts: # .github/workflows/main.yml # docs/Containers/Blynk_server.md # docs/Containers/Home-Assistant.md # docs/Containers/Node-RED.md # docs/Containers/Prometheus.md
SensorsIot · Feb 24, 2022 · 383d213 · 383d213
2 parents c614c20 + d1155e1
commit 383d213
Show file tree

Hide file tree

Showing 35 changed files with 172 additions and 321 deletions.
diff --git a/.native/hassio_supervisor.sh b/.native/hassio_supervisor.sh
diff --git a/.templates/deconz/hardware_list.yml b/.templates/deconz/hardware_list.yml
diff --git a/.templates/env.yml b/.templates/env.yml
diff --git a/.templates/example_template/example_service.yml b/.templates/example_template/example_service.yml
diff --git a/.templates/home_assistant/service.yml b/.templates/home_assistant/service.yml
@@ -8,4 +8,9 @@ home_assistant:
   volumes:
     - /etc/localtime:/etc/localtime:ro
     - ./volumes/home_assistant:/config
-
+    - /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket
+  devices:
+    - "/dev/ttyAMA0:/dev/ttyAMA0"
+    - "/dev/vcio:/dev/vcio"
+    - "/dev/gpiomem:/dev/gpiomem"
+  privileged: true
diff --git a/.templates/influxdb/terminal.sh b/.templates/influxdb/terminal.sh
@@ -12,4 +12,4 @@ echo "to exit type: EXIT"
 echo ""
 echo "docker exec -it influxdb influx"
 
-docker exec -it influxdb influx
+docker exec -it influxdb influx "$@"
diff --git a/.templates/nodered/addons.yml b/.templates/nodered/addons.yml
diff --git a/.templates/prometheus-cadvisor/service.yml b/.templates/prometheus-cadvisor/service.yml
@@ -1,5 +1,5 @@
 prometheus-cadvisor:
-  container_name: cadvisor
+  container_name: prometheus-cadvisor
   image: zcube/cadvisor:latest
   restart: unless-stopped
   ports:

diff --git a/.templates/prometheus-nodeexporter/service.yml b/.templates/prometheus-nodeexporter/service.yml
@@ -1,5 +1,5 @@
 prometheus-nodeexporter:
-  container_name: nodeexporter
+  container_name: prometheus-nodeexporter
   image: prom/node-exporter:latest
   restart: unless-stopped
   expose:

diff --git a/.templates/prometheus/service.yml b/.templates/prometheus/service.yml
@@ -18,6 +18,6 @@ prometheus:
     #    - --web.console.libraries=/usr/share/prometheus/console_libraries
     #    - --web.console.templates=/usr/share/prometheus/consoles
   depends_on:
-    - cadvisor
-    - nodeexporter
+    - prometheus-cadvisor
+    - prometheus-nodeexporter
 
diff --git a/.templates/webthings_gateway/local.json b/.templates/webthings_gateway/local.json
diff --git a/.templates/zigbee2mqtt_assistant/service.yml b/.templates/zigbee2mqtt_assistant/service.yml
diff --git a/docs/Basic_setup/Backup-and-Restore.md b/docs/Basic_setup/Backup-and-Restore.md
diff --git a/docs/Basic_setup/Default-Configs.md b/docs/Basic_setup/Default-Configs.md
diff --git a/docs/Basic_setup/Updates/New-Menu-Release-Notes.md b/docs/Basic_setup/Updates/New-Menu-Release-Notes.md
diff --git a/docs/Containers/Blynk_server.md b/docs/Containers/Blynk_server.md
@@ -115,7 +115,7 @@ The remaining instructions in the *Dockerfile* customise the ***base image*** to
 
 The ***local image*** is instantiated to become your running container.
 
-When you run the `docker images` command after Blynk Server has been built, you will see two rows that are relevant:
+When you run the `docker images` command after Blynk Server has been built, you *may* see two rows that are relevant:
 
 ```bash
 $ docker images
@@ -127,7 +127,9 @@ ubuntu                  latest   897590a6c564   7 days ago      49.8MB
 * `ubuntu ` is the ***base image***; and
 * `iotstack_blynk_server ` is the ***local image***.
 
-You will see the same pattern in *Portainer*, which reports the ***base image*** as "unused". You should not remove the ***base*** image, even though it appears to be unused.
+You *may* see the same pattern in *Portainer*, which reports the ***base image*** as "unused". You should not remove the ***base*** image, even though it appears to be unused.
+
+> Whether you see one or two rows depends on the version of `docker-compose` you are using and how your version of `docker-compose` builds local images.
 
 ## Logging
 
@@ -216,6 +218,8 @@ At the time of writing, version 0.41.16 was the most up-to-date. Suppose that ve
 		$ docker system prune -f
 		```
 
+		The second `prune` will only be needed if there is an old *base image* and that, in turn, depends on the version of `docker-compose` you are using and how your version of `docker-compose` builds local images.
+
 ## Using Blynk Server
 
 See the [References](#references) for documentation links.

diff --git a/docs/Containers/Dozzle.md b/docs/Containers/Dozzle.md
@@ -0,0 +1,12 @@
+# Dozzle
+
+## Reference
+* [Dozzle GitHub](https://github.com/amir20/dozzle)
+
+## Webinterface
+Webninterface is available at `"your_ip":8889`
+
+
+## About *Dozzle*
+Dozzle is a small lightweight application with a web based interface to monitor Docker logs. 
+It doesn’t store any log files. It is for live monitoring of your container logs only.