From 38be6c13f76e893cf47636257071b440dec0c5b2 Mon Sep 17 00:00:00 2001 From: Robert Günzler Date: Sun, 7 Sep 2025 17:32:13 +0200 Subject: initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert Günzler --- bundles/s6/files/etc/conf.d/s6-rc-common | 8 +++ bundles/s6/files/etc/init.d/s6-rc-init | 56 +++++++++++++++++++ bundles/s6/files/etc/init.d/s6-rc-up | 37 +++++++++++++ bundles/s6/files/etc/periodic/15min/s6-rc-metrics | 61 +++++++++++++++++++++ bundles/s6/files/etc/s6-rc/README | 18 +++++++ bundles/s6/files/etc/s6-rc/services/default/type | 1 + bundles/s6/files/etc/s6-rc/system.conf | 3 ++ .../templates/service/+service-log/consumer-for | 1 + .../templates/service/+service-log/notification-fd | 1 + .../templates/service/+service-log/pipeline-name | 1 + .../etc/s6-rc/templates/service/+service-log/run | 10 ++++ .../etc/s6-rc/templates/service/+service-log/type | 1 + .../templates/service/+service-srv/producer-for | 1 + .../etc/s6-rc/templates/service/+service-srv/run | 6 +++ .../etc/s6-rc/templates/service/+service-srv/type | 1 + bundles/s6/items.py | 62 ++++++++++++++++++++++ bundles/s6/metadata.py | 9 ++++ 17 files changed, 277 insertions(+) create mode 100644 bundles/s6/files/etc/conf.d/s6-rc-common create mode 100755 bundles/s6/files/etc/init.d/s6-rc-init create mode 100755 bundles/s6/files/etc/init.d/s6-rc-up create mode 100755 bundles/s6/files/etc/periodic/15min/s6-rc-metrics create mode 100644 bundles/s6/files/etc/s6-rc/README create mode 100644 bundles/s6/files/etc/s6-rc/services/default/type create mode 100644 bundles/s6/files/etc/s6-rc/system.conf create mode 100644 bundles/s6/files/etc/s6-rc/templates/service/+service-log/consumer-for create mode 100644 bundles/s6/files/etc/s6-rc/templates/service/+service-log/notification-fd create mode 100644 bundles/s6/files/etc/s6-rc/templates/service/+service-log/pipeline-name create mode 100644 bundles/s6/files/etc/s6-rc/templates/service/+service-log/run create mode 100644 bundles/s6/files/etc/s6-rc/templates/service/+service-log/type create mode 100644 bundles/s6/files/etc/s6-rc/templates/service/+service-srv/producer-for create mode 100755 bundles/s6/files/etc/s6-rc/templates/service/+service-srv/run create mode 100644 bundles/s6/files/etc/s6-rc/templates/service/+service-srv/type create mode 100644 bundles/s6/items.py create mode 100644 bundles/s6/metadata.py (limited to 'bundles/s6') diff --git a/bundles/s6/files/etc/conf.d/s6-rc-common b/bundles/s6/files/etc/conf.d/s6-rc-common new file mode 100644 index 0000000..bcd0e23 --- /dev/null +++ b/bundles/s6/files/etc/conf.d/s6-rc-common @@ -0,0 +1,8 @@ +s6_rc_base=/etc/s6-rc/services + +s6_rc_generated=/run/s6-rc-generated + +s6_rc_merged=/run/s6-rc-merged + +# used when starting/stopping service tree +s6_rc_timeout=30000 diff --git a/bundles/s6/files/etc/init.d/s6-rc-init b/bundles/s6/files/etc/init.d/s6-rc-init new file mode 100755 index 0000000..df1cd78 --- /dev/null +++ b/bundles/s6/files/etc/init.d/s6-rc-init @@ -0,0 +1,56 @@ +#!/sbin/openrc-run + +description="Initialize s6-rc" + +source /etc/conf.d/s6-rc-common + +depend() +{ + need localmount +} + +start() +{ + s6-rc-generate ${s6_rc_generated} + + local lower=$s6_rc_base + test -e "$lower" || eerror "Missing lower: $lower" + + local upper=$s6_rc_generated + test -e "$upper" || eerror "Missing upper: $upper" + + # mandatory for overlayfs, though not used because we mount read-only + local workdir=${s6_rc_merged}.ovlwork + mkdir -p ${workdir} + + # create mountpoint + mkdir -p ${s6_rc_merged} + + mount -t overlay overlay \ + -o lowerdir=${lower},upperdir=${upper},workdir=${workdir},ro \ + ${s6_rc_merged} + + test -e /etc/s6-rc/compiled || s6-rc-recompile ${s6_rc_merged} + + test -e /run/s6-rc || s6-rc-init -bd -t 3000 "${RC_SVCDIR}"/s6-scan +} + +stop() +{ + rm -rf ${s6_rc_generated} + + umount ${s6_rc_merged} + rm -rf ${s6_rc_merged}.ovlwork +} + +reload() +{ + s6-rc-generate ${s6_rc_generated} + + s6-rc-recompile ${s6_rc_merged} + + s6-rc -v2 -upb -t "$s6_rc_timeout" change default +} + + +extra_commands="reload" diff --git a/bundles/s6/files/etc/init.d/s6-rc-up b/bundles/s6/files/etc/init.d/s6-rc-up new file mode 100755 index 0000000..a2c1dee --- /dev/null +++ b/bundles/s6/files/etc/init.d/s6-rc-up @@ -0,0 +1,37 @@ +#!/sbin/openrc-run + +description="Bring up s6-rc services." + +source /etc/conf.d/s6-rc-common + +depend() +{ + need s6-svscan localmount + use s6-rc-init + + need network-online + use net + + after podman +} + +start() +{ + s6-rc -v2 -upb -t "$s6_rc_timeout" change default +} + +stop() +{ + s6-rc -v2 -dpb -t "$s6_rc_timeout" change default +} + +cleanup() +{ + rc-service s6-svscan stop || true # HACK + rm -rfv /etc/s6-rc/compiled + rm -rfv /etc/s6-rc/_* + rm -rfv /run/s6-rc + rm -rfv /run/openrc/s6-scan # HACK +} + +extra_commands="cleanup" diff --git a/bundles/s6/files/etc/periodic/15min/s6-rc-metrics b/bundles/s6/files/etc/periodic/15min/s6-rc-metrics new file mode 100755 index 0000000..4fa7625 --- /dev/null +++ b/bundles/s6/files/etc/periodic/15min/s6-rc-metrics @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +textfile_directory=/run/prom + +s6rc_service_is_up() { + if s6-rc -a list | grep -q "${1:?}"; then printf '1'; else printf '0'; fi +} + +printmetric() { + local name=${1:?} + local labels=${2:?} + local value=${3:?} + printf '%s{%s} %s\n' "$name" "$labels" "$value" +} + +services_count() { + printf '# HELP s6_rc_services_count number of services\n' + printf '# TYPE s6_rc_services_count gauge\n' + for bundle in $(s6-rc-db list bundles); do + printmetric 's6_rc_services_count' \ + $(printf 'bundle="%s"' $bundle) \ + $(s6-rc list $bundle | wc -l) + done +} + +services_up() { + printf '# HELP s6_rc_service_up if a service is running\n' + #printf '# TYPE s6_rc_service_up stateset\n' + for bundle in $(s6-rc-db list bundles) + do + for service in $(s6-rc-db contents "$bundle") + do + printmetric 's6_rc_service_up' \ + $(printf 'bundle="%s",service="%s"' $bundle $service) \ + $(s6rc_service_is_up $service) + done + done +} + +write_textfile() { + mkdir -p "$textfile_directory" || exit 1 + + tmp=$(mktemp --tmpdir metrics_s6_rc.XXXXX) + + ( + services_count + services_up + ) | tee "$tmp" + + mv -v "$tmp" "$textfile_directory"/s6_rc.prom || exit 1 + + chmod +r "$textfile_directory"/s6_rc.prom + chown nobody:nobody "$textfile_directory"/s6_rc.prom +} + +main() { + write_textfile +} + +main >/dev/null 2>&1 diff --git a/bundles/s6/files/etc/s6-rc/README b/bundles/s6/files/etc/s6-rc/README new file mode 100644 index 0000000..bd9014c --- /dev/null +++ b/bundles/s6/files/etc/s6-rc/README @@ -0,0 +1,18 @@ + +./services +---------- +this is the base s6-rc service tree that is merged with the services generated +by `s6-rc-generate`. +There MUST at least be a default target, most commonly a `bundle` that declares +the set of services that should run on boot. + +./templates +----------- +defines a set of services templates `s6-rc-generate` uses as input, +the string `+service` will be replaced with the target service name +(works in file names and inside files) + +./generate +---------- +defines a set of services `s6-rc-generate` should generate, +the names MUST be in the format