From e1ce21b42cc33e05686dded83454dd5f5cf59ac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franc=CC=A7ois=20Bonelle?= Date: Sun, 3 Apr 2022 13:02:20 +0200 Subject: [PATCH] Bump telegraf 1.22.0 --- syslog-ng/Dockerfile | 53 ------------------- syslog-ng/build.yaml | 4 -- syslog-ng/config.yaml | 48 ----------------- syslog-ng/rootfs/etc/cont-init.d/syslog-ng.sh | 14 ----- syslog-ng/rootfs/etc/fix-attrs.d/scripts | 1 - .../rootfs/etc/services.d/syslog-ng/finish | 8 --- syslog-ng/rootfs/etc/services.d/syslog-ng/run | 10 ---- syslog-ng/rootfs/etc/syslog-ng/syslog-ng.conf | 36 ------------- telegraf/build.yaml | 12 ++--- telegraf/config.yaml | 2 +- 10 files changed, 7 insertions(+), 181 deletions(-) delete mode 100755 syslog-ng/Dockerfile delete mode 100644 syslog-ng/build.yaml delete mode 100644 syslog-ng/config.yaml delete mode 100644 syslog-ng/rootfs/etc/cont-init.d/syslog-ng.sh delete mode 100644 syslog-ng/rootfs/etc/fix-attrs.d/scripts delete mode 100644 syslog-ng/rootfs/etc/services.d/syslog-ng/finish delete mode 100644 syslog-ng/rootfs/etc/services.d/syslog-ng/run delete mode 100644 syslog-ng/rootfs/etc/syslog-ng/syslog-ng.conf diff --git a/syslog-ng/Dockerfile b/syslog-ng/Dockerfile deleted file mode 100755 index 044c159..0000000 --- a/syslog-ng/Dockerfile +++ /dev/null @@ -1,53 +0,0 @@ -ARG BUILD_FROM -FROM ${BUILD_FROM} - -# Set shell -SHELL ["/bin/bash", "-o", "pipefail", "-c"] - -# Setup base system -ARG BUILD_ARCH=amd64 - -# Install syslog-ng -RUN \ - apt-get update -qq && \ - apt-get install -y wget ca-certificates gnupg2 debian-ports-archive-keyring xz-utils dirmngr systemd && \ - wget -qO - https://ose-repo.syslog-ng.com/apt/syslog-ng-ose-pub.asc | gpg --dearmor > /usr/share/keyrings/ose-repo-archive-keyring.gpg && \ - echo "deb [ signed-by=/usr/share/keyrings/ose-repo-archive-keyring.gpg ] https://ose-repo.syslog-ng.com/apt/ stable debian-testing" | tee --append /etc/apt/sources.list.d/syslog-ng-ose.list && \ - apt-get update -qq && \ - apt-get install -y libdbd-mysql libdbd-pgsql libdbd-sqlite3 syslog-ng && \ - rm -fr /tmp/* /var/{cache,log}/* /var/lib/apt/lists/* - -# Copy root filesystem -COPY rootfs / - -# Expose ports -EXPOSE 514/udp 601/tcp 6514/tcp - -# Define HealthCheck -HEALTHCHECK --interval=2m --timeout=3s --start-period=30s CMD /usr/sbin/syslog-ng-ctl stats || exit 1 - -# Build arguments -ARG BUILD_ARCH -ARG BUILD_DATE -ARG BUILD_DESCRIPTION -ARG BUILD_NAME -ARG BUILD_REF -ARG BUILD_REPOSITORY -ARG BUILD_VERSION - -# Labels -LABEL \ - io.hass.name="${BUILD_NAME}" \ - io.hass.description="${BUILD_DESCRIPTION}" \ - io.hass.arch="${BUILD_ARCH}" \ - io.hass.type="addon" \ - io.hass.version=${BUILD_VERSION} \ - maintainer="fbonelle" \ - org.opencontainers.image.title="${BUILD_NAME}" \ - org.opencontainers.image.description="${BUILD_DESCRIPTION}" \ - org.opencontainers.image.vendor="fbonelle's addons" \ - org.opencontainers.image.authors="fbonelle" \ - org.opencontainers.image.licenses="MIT" \ - org.opencontainers.image.created=${BUILD_DATE} \ - org.opencontainers.image.revision=${BUILD_REF} \ - org.opencontainers.image.version=${BUILD_VERSION} \ No newline at end of file diff --git a/syslog-ng/build.yaml b/syslog-ng/build.yaml deleted file mode 100644 index 7107ed2..0000000 --- a/syslog-ng/build.yaml +++ /dev/null @@ -1,4 +0,0 @@ -build_from: - aarch64: ghcr.io/hassio-addons/ubuntu-base/aarch64:7.1.4 - amd64: ghcr.io/hassio-addons/ubuntu-base/amd64:7.1.4 - armv7: ghcr.io/hassio-addons/ubuntu-base/armv7:7.1.4 diff --git a/syslog-ng/config.yaml b/syslog-ng/config.yaml deleted file mode 100644 index 706d45e..0000000 --- a/syslog-ng/config.yaml +++ /dev/null @@ -1,48 +0,0 @@ ---- -name: syslog-ng -version: 1.0 -slug: hassio_syslog_ng -description: An addon to add syslog-ng to hassio. -url: https://gitea.bonelle-family.dscloud.biz/francois.bonelle/hassio-repo.git -init: false -startup: services -boot: manual -arch: - - aarch64 - - amd64 - - armv7 -ports: - 514/udp: null - 601/tcp: null - 6514/tcp: null -apparmor: false -map: -- config:ro -- ssl:ro -- addons:ro -- backup:ro -- share:ro -host_ipc: true -host_dbus: true -privileged: -- NET_ADMIN -- SYS_ADMIN -- SYS_RAWIO -- SYS_TIME -- SYS_NICE -- SYS_RESOURCE -- SYS_PTRACE -- SYS_MODULE -- DAC_READ_SEARCH -host_pid: true -full_access: true -udev: true -devicetree: true -tmpfs: true -journald: true -options: - custom_conf: - location: "/config/syslog-ng.conf" -schema: - custom_conf: - location: str diff --git a/syslog-ng/rootfs/etc/cont-init.d/syslog-ng.sh b/syslog-ng/rootfs/etc/cont-init.d/syslog-ng.sh deleted file mode 100644 index 501554d..0000000 --- a/syslog-ng/rootfs/etc/cont-init.d/syslog-ng.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Home Assistant Community Add-on: syslog-ng -# Configures syslog-ng -# ============================================================================== -readonly CONFIG="/etc/syslog-ng/syslog-ng.conf" - -CUSTOM_CONF=$(bashio::config 'custom_conf.location') - -bashio::log.info "Using custom conf file" -rm /etc/syslog-ng/syslog-ng.conf -cp "${CUSTOM_CONF}" /etc/syslog-ng/syslog-ng.conf - -bashio::log.info "Finished updating config" \ No newline at end of file diff --git a/syslog-ng/rootfs/etc/fix-attrs.d/scripts b/syslog-ng/rootfs/etc/fix-attrs.d/scripts deleted file mode 100644 index 804f34d..0000000 --- a/syslog-ng/rootfs/etc/fix-attrs.d/scripts +++ /dev/null @@ -1 +0,0 @@ -/etc/syslog-ng/syslog-ng.conf false root 0755 0755 \ No newline at end of file diff --git a/syslog-ng/rootfs/etc/services.d/syslog-ng/finish b/syslog-ng/rootfs/etc/services.d/syslog-ng/finish deleted file mode 100644 index c009320..0000000 --- a/syslog-ng/rootfs/etc/services.d/syslog-ng/finish +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/execlineb -S0 -# ============================================================================== -# Home Assistant Community Add-on: syslog-ng -# ============================================================================== -if -n { s6-test $# -ne 0 } -if -n { s6-test ${1} -eq 256 } - -s6-svscanctl -t /var/run/s6/services diff --git a/syslog-ng/rootfs/etc/services.d/syslog-ng/run b/syslog-ng/rootfs/etc/services.d/syslog-ng/run deleted file mode 100644 index 4c1e5a4..0000000 --- a/syslog-ng/rootfs/etc/services.d/syslog-ng/run +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Home Assistant Community Add-on: Example -# Runs example1 script -# ============================================================================== - - -bashio::log.info "Starting syslog-ng" - -exec /usr/sbin/syslog-ng -F --no-caps --verbose diff --git a/syslog-ng/rootfs/etc/syslog-ng/syslog-ng.conf b/syslog-ng/rootfs/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index f2685e3..0000000 --- a/syslog-ng/rootfs/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,36 +0,0 @@ -@version: 3.29 - -options { - use_dns(no); - create_dirs(no); - ts_format(iso); -}; - -source s_systemd { - system(); - internal(); -}; - -source s_homeassistant { - file("/var/log/home-assistant.log" program-override("homeassistant")); -}; - -destination d_remotesyslog { - syslog("192.168.100.254" transport("udp") port("1514")); -}; - -rewrite r_host { - set("homeassistant", value("HOST")); -}; - -log { - source(s_systemd); - rewrite(r_host); - destination(d_remotesyslog); -}; - -log { - source(s_homeassistant); - rewrite(r_host); - destination(d_remotesyslog); -}; diff --git a/telegraf/build.yaml b/telegraf/build.yaml index 7e3627a..42286d0 100644 --- a/telegraf/build.yaml +++ b/telegraf/build.yaml @@ -1,8 +1,8 @@ build_from: - aarch64: ghcr.io/hassio-addons/debian-base/aarch64:5.2.3 - amd64: ghcr.io/hassio-addons/debian-base/amd64:5.2.3 - armhf: ghcr.io/hassio-addons/debian-base/armhf:5.2.3 - armv7: ghcr.io/hassio-addons/debian-base/armv7:5.2.3 - i386: ghcr.io/hassio-addons/debian-base/i386:5.2.3 + aarch64: ghcr.io/hassio-addons/debian-base/aarch64:5.3.0 + amd64: ghcr.io/hassio-addons/debian-base/amd64:5.3.0 + armhf: ghcr.io/hassio-addons/debian-base/armhf:5.3.0 + armv7: ghcr.io/hassio-addons/debian-base/armv7:5.3.0 + i386: ghcr.io/hassio-addons/debian-base/i386:5.3.0 args: - TELEGRAF_VERSION: 1.21.4 \ No newline at end of file + TELEGRAF_VERSION: 1.22.0 \ No newline at end of file diff --git a/telegraf/config.yaml b/telegraf/config.yaml index 6ef2358..0912f69 100644 --- a/telegraf/config.yaml +++ b/telegraf/config.yaml @@ -1,6 +1,6 @@ --- name: Telegraf -version: 1.21.4_a +version: 1.22.0_a slug: hassio_telegraf description: An addon to add telegraf to hassio. url: https://gitea.bonelle-family.dscloud.biz/francois.bonelle/hassio-repo.git