Update compose and set crons sidecar as legacy

doc/notes/crons.md

@@ -1,6 +1,6 @@
-## Crons
+## Crons (legacy)
 
-If you want to enable the cronjob, you have to run a "sidecar" container (see cron service in [docker-compose.yml](../../examples/compose/docker-compose.yml) example) or run a simple container like this :
+If you want to enable the old crons, you have to run a "sidecar" container (see cron service in [docker-compose.yml](../../examples/compose-legacy/docker-compose.yml) example) or run a simple container like this :
 
 ```bash
 docker run -d --name librenms_cron \

doc/notes/dispatcher-service.md

@@ -1,6 +1,6 @@
 ## Dispatcher service
 
-If you want to enable the new [Dispatcher service](https://docs.librenms.org/Extensions/Dispatcher-Service/), you have to run a "sidecar" container (see dispatcher service in [docker-compose.yml](../../examples/dispatcher/docker-compose.yml) example) or run a simple container like this:
+If you want to enable the new [Dispatcher service](https://docs.librenms.org/Extensions/Dispatcher-Service/), you have to run a "sidecar" container (see dispatcher service in [docker-compose.yml](../../examples/compose/docker-compose.yml) example) or run a simple container like this:
 
 ```bash
 docker run -d --name librenms_dispatcher \

examples/compose-legacy/docker-compose.yml

@@ -28,13 +28,6 @@ services:
       - "TZ=${TZ}"
     restart: always
 
-  redis:
-    image: redis:5.0-alpine
-    container_name: librenms_redis
-    environment:
-      - "TZ=${TZ}"
-    restart: always
-
   rrdcached:
     image: crazymax/rrdcached
     container_name: librenms_rrdcached
@@ -91,14 +84,13 @@ services:
       - "./librenms.env"
     restart: always
 
-  dispatcher:
+  cron:
     image: librenms/librenms:latest
-    container_name: librenms_dispatcher
+    container_name: librenms_cron
     domainname: example.com
     hostname: librenms
     depends_on:
       - librenms
-      - redis
     volumes:
       - "./librenms:/data"
     environment:
@@ -110,10 +102,7 @@ services:
       - "DB_USER=${MYSQL_USER}"
       - "DB_PASSWORD=${MYSQL_PASSWORD}"
       - "DB_TIMEOUT=60"
-      - "REDIS_HOST=redis"
-      - "REDIS_PORT=6379"
-      - "REDIS_DB=0"
-      - "SIDECAR_DISPATCHER=1"
+      - "SIDECAR_CRON=1"
     env_file:
       - "./librenms.env"
     restart: always

examples/compose-legacy/librenms.env

@@ -0,0 +1,26 @@
+MEMORY_LIMIT=256M
+UPLOAD_MAX_SIZE=16M
+OPCACHE_MEM_SIZE=128
+REAL_IP_FROM=0.0.0.0/32
+REAL_IP_HEADER=X-Forwarded-For
+LOG_IP_VAR=remote_addr
+
+LIBRENMS_POLLER_THREADS=16
+LIBRENMS_POLLER_INTERVAL=5
+
+LIBRENMS_CRON_DISCOVERY_ENABLE=true
+LIBRENMS_CRON_DAILY_ENABLE=true
+LIBRENMS_CRON_ALERTS_ENABLE=true
+LIBRENMS_CRON_BILLING_ENABLE=true
+LIBRENMS_CRON_BILLING_CALCULATE_ENABLE=true
+LIBRENMS_CRON_CHECK_SERVICES_ENABLE=true
+LIBRENMS_CRON_POLLER_ENABLE=true
+LIBRENMS_CRON_SNMPSCAN_ENABLE=true
+LIBRENMS_CRON_SNMPSCAN_NETS=192.168.0.0/24,192.168.1.0/24
+LIBRENMS_CRON_SNMPSCAN_LOGFILE=/data/logs/snmp-scan.log
+
+LIBRENMS_SNMP_COMMUNITY=librenmsdocker
+MEMCACHED_HOST=memcached
+MEMCACHED_PORT=11211
+RRDCACHED_HOST=rrdcached
+RRDCACHED_PORT=42217

examples/compose/docker-compose.yml

@@ -28,6 +28,13 @@ services:
       - "TZ=${TZ}"
     restart: always
 
+  redis:
+    image: redis:5.0-alpine
+    container_name: librenms_redis
+    environment:
+      - "TZ=${TZ}"
+    restart: always
+
   rrdcached:
     image: crazymax/rrdcached
     container_name: librenms_rrdcached
@@ -84,13 +91,14 @@ services:
       - "./librenms.env"
     restart: always
 
-  cron:
+  dispatcher:
     image: librenms/librenms:latest
-    container_name: librenms_cron
+    container_name: librenms_dispatcher
     domainname: example.com
     hostname: librenms
     depends_on:
       - librenms
+      - redis
     volumes:
       - "./librenms:/data"
     environment:
@@ -102,7 +110,10 @@ services:
       - "DB_USER=${MYSQL_USER}"
       - "DB_PASSWORD=${MYSQL_PASSWORD}"
       - "DB_TIMEOUT=60"
-      - "SIDECAR_CRON=1"
+      - "REDIS_HOST=redis"
+      - "REDIS_PORT=6379"
+      - "REDIS_DB=0"
+      - "SIDECAR_DISPATCHER=1"
     env_file:
       - "./librenms.env"
     restart: always

examples/compose/librenms.env

@@ -5,22 +5,24 @@ REAL_IP_FROM=0.0.0.0/32
 REAL_IP_HEADER=X-Forwarded-For
 LOG_IP_VAR=remote_addr
 
-LIBRENMS_POLLER_THREADS=16
-LIBRENMS_POLLER_INTERVAL=5
-
-LIBRENMS_CRON_DISCOVERY_ENABLE=true
-LIBRENMS_CRON_DAILY_ENABLE=true
-LIBRENMS_CRON_ALERTS_ENABLE=true
-LIBRENMS_CRON_BILLING_ENABLE=true
-LIBRENMS_CRON_BILLING_CALCULATE_ENABLE=true
-LIBRENMS_CRON_CHECK_SERVICES_ENABLE=true
-LIBRENMS_CRON_POLLER_ENABLE=true
-LIBRENMS_CRON_SNMPSCAN_ENABLE=true
-LIBRENMS_CRON_SNMPSCAN_NETS=192.168.0.0/24,192.168.1.0/24
-LIBRENMS_CRON_SNMPSCAN_LOGFILE=/data/logs/snmp-scan.log
-
 LIBRENMS_SNMP_COMMUNITY=librenmsdocker
 MEMCACHED_HOST=memcached
 MEMCACHED_PORT=11211
 RRDCACHED_HOST=rrdcached
 RRDCACHED_PORT=42217
+
+LIBRENMS_SERVICE_POLLER_WORKERS=24
+LIBRENMS_SERVICE_SERVICES_WORKERS=8
+LIBRENMS_SERVICE_DISCOVERY_WORKERS=16
+
+LIBRENMS_SERVICE_POLLER_FREQUENCY=300
+LIBRENMS_SERVICE_SERVICES_FREQUENCY=300
+LIBRENMS_SERVICE_DISCOVERY_FREQUENCY=21600
+LIBRENMS_SERVICE_BILLING_FREQUENCY=300
+LIBRENMS_SERVICE_BILLING_CALCULATE_FREQUENCY=60
+LIBRENMS_SERVICE_POLLER_DOWN_RETRY=60
+LIBRENMS_SERVICE_LOGLEVEL=INFO
+LIBRENMS_SERVICE_UPDATE_FREQUENCY=86400
+
+LIBRENMS_SERVICE_PING_ENABLED=false
+LIBRENMS_SERVICE_WATCHDOG_ENABLED=false

examples/dispatcher/librenms.env

@@ -1,28 +0,0 @@
-MEMORY_LIMIT=256M
-UPLOAD_MAX_SIZE=16M
-OPCACHE_MEM_SIZE=128
-REAL_IP_FROM=0.0.0.0/32
-REAL_IP_HEADER=X-Forwarded-For
-LOG_IP_VAR=remote_addr
-
-LIBRENMS_SNMP_COMMUNITY=librenmsdocker
-MEMCACHED_HOST=memcached
-MEMCACHED_PORT=11211
-RRDCACHED_HOST=rrdcached
-RRDCACHED_PORT=42217
-
-LIBRENMS_SERVICE_POLLER_WORKERS=24
-LIBRENMS_SERVICE_SERVICES_WORKERS=8
-LIBRENMS_SERVICE_DISCOVERY_WORKERS=16
-
-LIBRENMS_SERVICE_POLLER_FREQUENCY=300
-LIBRENMS_SERVICE_SERVICES_FREQUENCY=300
-LIBRENMS_SERVICE_DISCOVERY_FREQUENCY=21600
-LIBRENMS_SERVICE_BILLING_FREQUENCY=300
-LIBRENMS_SERVICE_BILLING_CALCULATE_FREQUENCY=60
-LIBRENMS_SERVICE_POLLER_DOWN_RETRY=60
-LIBRENMS_SERVICE_LOGLEVEL=INFO
-LIBRENMS_SERVICE_UPDATE_FREQUENCY=86400
-
-LIBRENMS_SERVICE_PING_ENABLED=false
-LIBRENMS_SERVICE_WATCHDOG_ENABLED=false