Update examples

2026-01-23 02:14:48 +00:00 · 2020-11-08 18:10:21 +01:00 · 2020-11-08 18:10:21 +01:00 · 06d918843a
commit 06d918843a
parent da1cffdafe
9 changed files with 174 additions and 60 deletions
--- a/examples/compose/docker-compose.yml
+++ b/examples/compose/docker-compose.yml
@ -34,23 +34,6 @@ services:
      - "TZ=${TZ}"
    restart: always

-  rrdcached:
-    image: crazymax/rrdcached
-    container_name: librenms_rrdcached
-    volumes:
-      - "./librenms/rrd:/data/db"
-      - "./rrd-journal:/data/journal"
-    environment:
-      - "TZ=${TZ}"
-      - "PUID=${PUID}"
-      - "PGID=${PGID}"
-      - "LOG_LEVEL=LOG_INFO"
-      - "WRITE_TIMEOUT=1800"
-      - "WRITE_JITTER=1800"
-      - "WRITE_THREADS=4"
-      - "FLUSH_DEAD_DATA_INTERVAL=3600"
-    restart: always
-
  msmtpd:
    image: crazymax/msmtpd:latest
    container_name: librenms_msmtpd
@ -69,7 +52,6 @@ services:
    depends_on:
      - db
      - memcached
-      - rrdcached
      - msmtpd
    volumes:
      - "./librenms:/data"
--- a/examples/compose/librenms.env
+++ b/examples/compose/librenms.env
@ -8,7 +8,6 @@ LOG_IP_VAR=remote_addr
 LIBRENMS_SNMP_COMMUNITY=librenmsdocker
 MEMCACHED_HOST=memcached
 MEMCACHED_PORT=11211
-RRDCACHED_SERVER=rrdcached:42217

 LIBRENMS_WEATHERMAP=false
 LIBRENMS_WEATHERMAP_SCHEDULE=*/5 * * * *
--- a/examples/pwd/librenms.yml
+++ b/examples/pwd/librenms.yml
@ -18,7 +18,6 @@ x-envlibrenms: &envlibrenms
  LIBRENMS_SNMP_COMMUNITY: "librenmsdocker"
  MEMCACHED_HOST: "memcached"
  MEMCACHED_PORT: "11211"
-  RRDCACHED_SERVER: "rrdcached:42217"
  LIBRENMS_WEATHERMAP: "true"
  LIBRENMS_WEATHERMAP_SCHEDULE: "*/5 * * * *"

@ -53,23 +52,6 @@ services:
      TZ: *TZ
    restart: always

-  rrdcached:
-    image: crazymax/rrdcached
-    volumes:
-      - "librenms:/data"
-      - "rrd-db:/data/db"
-      - "rrd-journal:/data/journal"
-    environment:
-      TZ: *TZ
-      PUID: *PUID
-      PGID: *PGID
-      LOG_LEVEL: "LOG_INFO"
-      WRITE_TIMEOUT: "1800"
-      WRITE_JITTER: "1800"
-      WRITE_THREADS: "4"
-      FLUSH_DEAD_DATA_INTERVAL: "3600"
-    restart: always
-
  librenms:
    image: librenms/librenms:edge
    hostname: librenms
@ -78,10 +60,8 @@ services:
    depends_on:
      - db
      - memcached
-      - rrdcached
    volumes:
      - "librenms:/data"
-      - "rrd-db:/data/rrd"
    environment:
      <<: *envlibrenms
      TZ: *TZ
@ -166,6 +146,4 @@ services:

 volumes:
  db:
-  rrd-db:
-  rrd-journal:
  librenms:
--- a/examples/rrdcached-server/.env
+++ b/examples/rrdcached-server/.env
@ -0,0 +1,7 @@
+TZ=Europe/Paris
+PUID=1000
+PGID=1000
+
+MYSQL_DATABASE=librenms
+MYSQL_USER=librenms
+MYSQL_PASSWORD=asupersecretpassword
--- a/examples/rrdcached-server/docker-compose.yml
+++ b/examples/rrdcached-server/docker-compose.yml
@ -0,0 +1,143 @@
+version: "3.5"
+
+services:
+  db:
+    image: mariadb:10.4
+    container_name: librenms_db
+    command:
+      - "mysqld"
+      - "--innodb-file-per-table=1"
+      - "--lower-case-table-names=0"
+      - "--character-set-server=utf8"
+      - "--collation-server=utf8_unicode_ci"
+    volumes:
+      - "./db:/var/lib/mysql"
+    environment:
+      - "TZ=${TZ}"
+      - "MYSQL_ALLOW_EMPTY_PASSWORD=yes"
+      - "MYSQL_DATABASE=${MYSQL_DATABASE}"
+      - "MYSQL_USER=${MYSQL_USER}"
+      - "MYSQL_PASSWORD=${MYSQL_PASSWORD}"
+    restart: always
+
+  memcached:
+    image: memcached:alpine
+    container_name: librenms_memcached
+    environment:
+      - "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
+    volumes:
+      - "./rrd/db:/data/db"
+      - "./rrd/journal:/data/journal"
+    environment:
+      - "TZ=${TZ}"
+      - "PUID=${PUID}"
+      - "PGID=${PGID}"
+      - "LOG_LEVEL=LOG_INFO"
+      - "WRITE_TIMEOUT=1800"
+      - "WRITE_JITTER=1800"
+      - "WRITE_THREADS=4"
+      - "FLUSH_DEAD_DATA_INTERVAL=3600"
+    restart: always
+
+  msmtpd:
+    image: crazymax/msmtpd:latest
+    container_name: librenms_msmtpd
+    env_file:
+      - "./msmtpd.env"
+    restart: always
+
+  librenms:
+    image: librenms/librenms:latest
+    container_name: librenms
+    hostname: librenms
+    ports:
+      - target: 8000
+        published: 8000
+        protocol: tcp
+    depends_on:
+      - db
+      - memcached
+      - rrdcached
+      - msmtpd
+    volumes:
+      - "./librenms:/data"
+    env_file:
+      - "./librenms.env"
+    environment:
+      - "TZ=${TZ}"
+      - "PUID=${PUID}"
+      - "PGID=${PGID}"
+      - "DB_HOST=db"
+      - "DB_NAME=${MYSQL_DATABASE}"
+      - "DB_USER=${MYSQL_USER}"
+      - "DB_PASSWORD=${MYSQL_PASSWORD}"
+      - "DB_TIMEOUT=60"
+    restart: always
+
+  dispatcher:
+    image: librenms/librenms:latest
+    container_name: librenms_dispatcher
+    hostname: librenms-dispatcher
+    depends_on:
+      - librenms
+      - redis
+    volumes:
+      - "./librenms:/data"
+    env_file:
+      - "./librenms.env"
+    environment:
+      - "TZ=${TZ}"
+      - "PUID=${PUID}"
+      - "PGID=${PGID}"
+      - "DB_HOST=db"
+      - "DB_NAME=${MYSQL_DATABASE}"
+      - "DB_USER=${MYSQL_USER}"
+      - "DB_PASSWORD=${MYSQL_PASSWORD}"
+      - "DB_TIMEOUT=60"
+      - "DISPATCHER_NODE_ID=dispatcher1"
+      - "REDIS_HOST=redis"
+      - "REDIS_PORT=6379"
+      - "REDIS_DB=0"
+      - "SIDECAR_DISPATCHER=1"
+    restart: always
+
+  syslogng:
+    image: librenms/librenms:latest
+    container_name: librenms_syslogng
+    hostname: librenms-syslogng
+    depends_on:
+      - librenms
+    ports:
+      - target: 514
+        published: 514
+        protocol: tcp
+      - target: 514
+        published: 514
+        protocol: udp
+    volumes:
+      - "./librenms:/data"
+    env_file:
+      - "./librenms.env"
+    environment:
+      - "TZ=${TZ}"
+      - "PUID=${PUID}"
+      - "PGID=${PGID}"
+      - "DB_HOST=db"
+      - "DB_NAME=${MYSQL_DATABASE}"
+      - "DB_USER=${MYSQL_USER}"
+      - "DB_PASSWORD=${MYSQL_PASSWORD}"
+      - "DB_TIMEOUT=60"
+      - "SIDECAR_SYSLOGNG=1"
+    restart: always
--- a/examples/rrdcached-server/librenms.env
+++ b/examples/rrdcached-server/librenms.env
@ -0,0 +1,14 @@
+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_SERVER=rrdcached:42217
+
+LIBRENMS_WEATHERMAP=false
+LIBRENMS_WEATHERMAP_SCHEDULE=*/5 * * * *
--- a/examples/rrdcached-server/msmtpd.env
+++ b/examples/rrdcached-server/msmtpd.env
@ -0,0 +1,10 @@
+# https://github.com/crazy-max/docker-msmtpd
+SMTP_HOST=smtp.gmail.com
+SMTP_PORT=587
+SMTP_TLS=on
+SMTP_STARTTLS=on
+SMTP_TLS_CHECKCERT=on
+SMTP_AUTH=on
+SMTP_USER=foo
+SMTP_PASSWORD=bar
+SMTP_FROM=foo@gmail.com
--- a/examples/traefik/docker-compose.yml
+++ b/examples/traefik/docker-compose.yml
@ -68,23 +68,6 @@ services:
      - "TZ=${TZ}"
    restart: always

-  rrdcached:
-    image: crazymax/rrdcached
-    container_name: librenms_rrdcached
-    volumes:
-      - "./librenms/rrd:/data/db"
-      - "./rrd-journal:/data/journal"
-    environment:
-      - "TZ=${TZ}"
-      - "PUID=${PUID}"
-      - "PGID=${PGID}"
-      - "LOG_LEVEL=LOG_INFO"
-      - "WRITE_TIMEOUT=1800"
-      - "WRITE_JITTER=1800"
-      - "WRITE_THREADS=4"
-      - "FLUSH_DEAD_DATA_INTERVAL=3600"
-    restart: always
-
  msmtpd:
    image: crazymax/msmtpd:latest
    container_name: librenms_msmtpd
@ -99,7 +82,6 @@ services:
    depends_on:
      - db
      - memcached
-      - rrdcached
      - msmtpd
    volumes:
      - "./librenms:/data"
--- a/examples/traefik/librenms.env
+++ b/examples/traefik/librenms.env
@ -8,7 +8,6 @@ LOG_IP_VAR=http_x_forwarded_for
 LIBRENMS_SNMP_COMMUNITY=librenmsdocker
 MEMCACHED_HOST=memcached
 MEMCACHED_PORT=11211
-RRDCACHED_SERVER=rrdcached:42217

 LIBRENMS_WEATHERMAP=false
 LIBRENMS_WEATHERMAP_SCHEDULE=*/5 * * * *