Expose systemd-journal-gatewayd to Supervisor (#1627)

* Add systemd-journal-remote to the image

This allows to access journald's log from within Supervisor and expose
more system logs to users.

* Allow to access systemd-journal-gatewayd from Supervisor

Create a systemd-journal-gatewayd.socket service using a Unix socket and
bind mount it into the Supervisor container. This allows to query
systemd-journald from Supervisor directly.

buildroot-external/configs/generic_x86_64_defconfig

@@ -90,6 +90,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y

buildroot-external/configs/khadas_vim3_defconfig

@@ -79,6 +79,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y

buildroot-external/configs/odroid_c2_defconfig

@@ -79,6 +79,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y

buildroot-external/configs/odroid_c4_defconfig

@@ -79,6 +79,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y

buildroot-external/configs/odroid_n2_defconfig

@@ -79,6 +79,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y

buildroot-external/configs/odroid_xu4_defconfig

@@ -79,6 +79,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y

buildroot-external/configs/ova_defconfig

@@ -93,6 +93,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y

buildroot-external/configs/rpi0_w_defconfig

@@ -80,6 +80,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y

buildroot-external/configs/rpi2_defconfig

@@ -79,6 +79,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y

buildroot-external/configs/rpi3_64_defconfig

@@ -80,6 +80,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y

buildroot-external/configs/rpi3_defconfig

@@ -80,6 +80,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y

buildroot-external/configs/rpi4_64_defconfig

@@ -83,6 +83,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y

buildroot-external/configs/rpi4_defconfig

@@ -81,6 +81,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y

buildroot-external/configs/rpi_defconfig

@@ -79,6 +79,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y

buildroot-external/configs/tinker_defconfig

@@ -81,6 +81,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
 BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
+BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y

buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service

@@ -1,8 +1,8 @@
 [Unit]
 Description=HassOS supervisor
 Requires=docker.service rauc.service dbus.service
-Wants=network-online.target hassos-apparmor.service time-sync.target
+Wants=network-online.target hassos-apparmor.service time-sync.target systemd-journal-gatewayd.socket
-After=docker.service rauc.service dbus.service network-online.target hassos-apparmor.service time-sync.target
+After=docker.service rauc.service dbus.service network-online.target hassos-apparmor.service time-sync.target systemd-journal-gatewayd.socket
 RequiresMountsFor=/mnt/data /mnt/boot /mnt/overlay
 StartLimitIntervalSec=60
 StartLimitBurst=5

buildroot-external/rootfs-overlay/usr/lib/systemd/system/systemd-journal-gatewayd.socket

@@ -0,0 +1,18 @@
+#  SPDX-License-Identifier: LGPL-2.1-or-later
+#
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Journal Gateway Service Socket
+Documentation=man:systemd-journal-gatewayd(8)
+
+[Socket]
+ListenStream=/run/systemd-journal-gatewayd.sock
+
+[Install]
+WantedBy=sockets.target

buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor

@@ -81,6 +81,7 @@ if [ -z "${SUPERVISOR_CONTAINER_ID}" ]; then
         --name hassio_supervisor \
         --privileged --security-opt apparmor="hassio-supervisor" \
         -v /run/docker.sock:/run/docker.sock:rw \
+        -v /run/systemd-journal-gatewayd.sock:/run/systemd-journal-gatewayd.sock:rw \
         -v /run/dbus:/run/dbus:ro \
         -v /run/supervisor:/run/os:rw \
         -v /run/udev:/run/udev:ro \