Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
-
name: Start
run: |
docker compose up -d
docker compose up -d --wait --wait-timeout 180
working-directory: test
env:
LIBRENMS_IMAGE: ${{ env.BUILD_TAG }}
Expand Down
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -149,3 +149,6 @@ EXPOSE 8000 514 514/udp 162 162/udp
VOLUME [ "/data" ]

ENTRYPOINT [ "/init" ]

HEALTHCHECK --start-period=1m --timeout=10s \
CMD /usr/local/bin/healthcheck
6 changes: 6 additions & 0 deletions rootfs/etc/s6-overlay/scripts/config-dispatcher
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ echo ">>"
echo ">> Sidecar dispatcher container detected"
echo ">>"

cat >"${LIBRENMS_PATH}/config.d/dispatcher-health.php" <<'EOL'
<?php
$config['service_health_file'] = '/opt/librenms/storage/dispatcher-health';
EOL
rm -f "${LIBRENMS_PATH}/storage/dispatcher-health"

file_env 'DB_PASSWORD'
if [ -z "$DB_PASSWORD" ]; then
echo >&2 "ERROR: Either DB_PASSWORD or DB_PASSWORD_FILE must be defined"
Expand Down
31 changes: 31 additions & 0 deletions rootfs/usr/local/bin/healthcheck
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#!/usr/bin/env sh
set -eu

services=""
check_librenms=0
if [ "${SIDECAR_DISPATCHER:-0}" = "1" ]; then
services="$services dispatcher"
check_librenms=1
fi
if [ "${SIDECAR_SYSLOGNG:-0}" = "1" ]; then
services="$services syslogng"
fi
if [ "${SIDECAR_SNMPTRAPD:-0}" = "1" ]; then
services="$services snmptrapd"
fi

if [ -z "$services" ]; then
services="nginx php-fpm snmpd cron"
check_librenms=1
fi

for service in $services; do
if [ "$(s6-svstat -o up,wantedup "/run/service/$service")" != "true true" ]; then
echo >&2 "Service $service is not running"
exit 1
fi
done

if [ "$check_librenms" = "1" ]; then
exec lnms health:check
fi
26 changes: 26 additions & 0 deletions test/services.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,29 @@ for service in $services; do
;;
esac
done

healthcheck
if [ "${SIDECAR_DISPATCHER:-0}" = "1" ]; then
# Freeze the dispatcher so it cannot refresh the stale heartbeat during the check.
s6-svc -p /run/service/dispatcher
touch -d '@1' /opt/librenms/storage/dispatcher-health
if healthcheck; then
s6-svc -c /run/service/dispatcher
echo >&2 "Healthcheck accepted a stale dispatcher heartbeat"
exit 1
fi
s6-svc -c /run/service/dispatcher
fi

for service in $services; do
s6-svc -d "/run/service/$service"
s6-svwait -d -t 120000 "/run/service/$service"
if healthcheck; then
s6-svc -u "/run/service/$service"
echo >&2 "Healthcheck accepted stopped service $service"
exit 1
fi
s6-svc -u "/run/service/$service"
s6-svwait -u -t 10000 "/run/service/$service"
done
timeout 30 sh -c 'until healthcheck; do sleep 1; done'
Loading