From 624b15beb1f7fa65f709a83806d22bb08aa149c8 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Sun, 22 Mar 2020 16:48:13 +0100 Subject: [PATCH] Allow multi discovery workers through LIBRENMS_CRON_DISCOVERY_WRAPPER_WORKERS env var (#59) --- CHANGELOG.md | 4 ++++ doc/docker/environment-variables.md | 1 + rootfs/etc/cont-init.d/05-svc-cron.sh | 3 +++ 3 files changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b90250..5cb576e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 1.61-RC3 (2020/03/22) + +* Allow multi discovery workers through `LIBRENMS_CRON_DISCOVERY_WRAPPER_WORKERS` env var (#59) + ## 1.61-RC2 (2020/03/05) * Add `php7-sockets` extension (#61) diff --git a/doc/docker/environment-variables.md b/doc/docker/environment-variables.md index 7524e47..30f0789 100644 --- a/doc/docker/environment-variables.md +++ b/doc/docker/environment-variables.md @@ -28,6 +28,7 @@ * `SIDECAR_CRON`: Set to `1` to enable sidecar cron mode for this container (default `0`) * `LIBRENMS_CRON_DISCOVERY_ENABLE`: Enable LibreNMS discovery for this container cronjobs (default `true`) +* `LIBRENMS_CRON_DISCOVERY_WRAPPER_WORKERS`: Spawn multiple discovery.php processes in parallel (default `1`) * `LIBRENMS_CRON_DAILY_ENABLE`: Enable LibreNMS daily script for this container cronjobs (default `true`) * `LIBRENMS_CRON_ALERTS_ENABLE`: Enable LibreNMS alerts generation for this container cronjobs (default `true`) * `LIBRENMS_CRON_BILLING_ENABLE`: Enable LibreNMS billing polling for this container cronjobs (default `true`) diff --git a/rootfs/etc/cont-init.d/05-svc-cron.sh b/rootfs/etc/cont-init.d/05-svc-cron.sh index fbe4c54..79a0b99 100644 --- a/rootfs/etc/cont-init.d/05-svc-cron.sh +++ b/rootfs/etc/cont-init.d/05-svc-cron.sh @@ -7,6 +7,7 @@ LIBRENMS_POLLER_THREADS=${LIBRENMS_POLLER_THREADS:-16} LIBRENMS_POLLER_INTERVAL=${LIBRENMS_POLLER_INTERVAL:-5} LIBRENMS_CRON_DISCOVERY_ENABLE=${LIBRENMS_CRON_DISCOVERY_ENABLE:-true} +LIBRENMS_CRON_DISCOVERY_WRAPPER_WORKERS=${LIBRENMS_CRON_DISCOVERY_WRAPPER_WORKERS:-1} LIBRENMS_CRON_DAILY_ENABLE=${LIBRENMS_CRON_DAILY_ENABLE:-true} LIBRENMS_CRON_ALERTS_ENABLE=${LIBRENMS_CRON_ALERTS_ENABLE:-true} LIBRENMS_CRON_BILLING_ENABLE=${LIBRENMS_CRON_BILLING_ENABLE:-true} @@ -40,9 +41,11 @@ sed -i -e "s/ librenms //" ${CRONTAB_PATH}/librenms if [ "$LIBRENMS_CRON_DISCOVERY_ENABLE" != "true" ]; then echo "Disable discovery cron" + sed -i "/discovery-wrapper.py/d" ${CRONTAB_PATH}/librenms sed -i "/discovery.php/d" ${CRONTAB_PATH}/librenms else echo "Enable discovery cron" + sed -i -e "s/discovery-wrapper.py 1/discovery-wrapper.py ${LIBRENMS_CRON_DISCOVERY_WRAPPER_WORKERS}/" ${CRONTAB_PATH}/librenms fi if [ "$LIBRENMS_CRON_DAILY_ENABLE" != "true" ]; then