Monitoring: add separate docker network

files/authelia/docker-compose.yml.j2

@@ -6,10 +6,10 @@ services:
     user: '{{ user_create_result.uid }}:{{ user_create_result.group }}'
     restart: 'unless-stopped'
     networks:
-      - "{{ web_proxy_network }}"
+      - "web_proxy_network"
     volumes:
       - "{{ config_dir }}:/config"
 
 networks:
-  {{ web_proxy_network }}:
+  web_proxy_network:
     external: true

files/caddyproxy/docker-compose.yml.j2

@@ -15,8 +15,8 @@ services:
       - {{ data_dir }}:/data
       - {{ config_dir }}:/config
     networks:
-      - "{{ web_proxy_network }}"
+      - "web_proxy_network"
 
 networks:
-  {{ web_proxy_network }}:
+  web_proxy_network:
     external: true

files/gitea/docker-compose.yml.j2

@@ -13,7 +13,7 @@ services:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     networks:
-      - "{{ web_proxy_network }}"
+      - "web_proxy_network"
     environment:
       - "USER_UID=${USER_UID}"
       - "USER_GID=${USER_GID}"
@@ -29,5 +29,5 @@ services:
       - "GITEA__mailer__FROM=gitea@vakhrushev.me"
 
 networks:
-  {{ web_proxy_network }}:
+  web_proxy_network:
     external: true

files/gramps/docker-compose.yml.j2

@@ -10,7 +10,7 @@ services:
     restart: unless-stopped
     networks:
       - "gramps_network"
-      - "{{ web_proxy_network }}"
+      - "web_proxy_network"
     volumes:
       - "{{ (data_dir, 'gramps_db') | path_join }}:/root/.gramps/grampsdb"  # persist Gramps database
       - "{{ (data_dir, 'gramps_users') | path_join }}:/app/users"  # persist user database
@@ -61,9 +61,12 @@ services:
     restart: unless-stopped
     networks:
       - "gramps_network"
+      - "monitoring_network"
 
 networks:
   gramps_network:
     driver: bridge
-  {{ web_proxy_network }}:
+  web_proxy_network:
+    external: true
+  monitoring_network:
     external: true

files/homepage/docker-compose.yml.j2

@@ -6,9 +6,9 @@ services:
     ports:
       - "127.0.0.1:{{ homepage_port }}:80"
     networks:
-      - "{{ web_proxy_network }}"
+      - "web_proxy_network"
 
 networks:
-  {{ web_proxy_network }}:
+  web_proxy_network:
     external: true
 

files/miniflux/docker-compose.yml.j2

@@ -10,7 +10,7 @@ services:
         condition: service_healthy
     networks:
       - "miniflux_network"
-      - "{{ web_proxy_network }}"
+      - "web_proxy_network"
     environment:
       - DATABASE_URL=postgres://{{ miniflux_postgres_user }}:{{ miniflux_postgres_password }}@miniflux_postgres/{{ miniflux_postgres_database }}?sslmode=disable
       - RUN_MIGRATIONS=1
@@ -38,7 +38,7 @@ services:
       - POSTGRES_DB={{ miniflux_postgres_database }}
     networks:
       - "miniflux_network"
-      - "{{ web_proxy_network }}"
+      - "monitoring_network"
     volumes:
       - {{ postgres_data_dir }}:/var/lib/postgresql/data
     healthcheck:
@@ -49,5 +49,7 @@ services:
 networks:
   miniflux_network:
     driver: bridge
-  {{ web_proxy_network }}:
+  web_proxy_network:
+    external: true
+  monitoring_network:
     external: true

files/netdata/docker-compose.yml.j2

@@ -11,7 +11,8 @@ services:
     security_opt:
       - apparmor:unconfined
     networks:
-      - "{{ web_proxy_network }}"
+      - "web_proxy_network"
+      - "monitoring_network"
     volumes:
       - "{{ config_dir }}:/etc/netdata"
       - "{{ (data_dir, 'lib') | path_join }}:/var/lib/netdata"
@@ -33,5 +34,7 @@ services:
       NETDATA_EXTRA_DEB_PACKAGES: "fail2ban"
 
 networks:
-  {{ web_proxy_network }}:
+  web_proxy_network:
+    external: true
+  monitoring_network:
     external: true

files/netdata/go.d/fail2ban.conf

@@ -1,3 +1,3 @@
 jobs:
   - name: fail2ban
-    update_every: 5  # Collect Fail2Ban jails statistics every 5 seconds
+    update_every: 15  # Collect Fail2Ban jails statistics every 15 seconds

files/netdata/go.d/postgres.conf

@@ -1,6 +1,11 @@
-autodetection_retry: 0
+update_every: 15
+
 jobs:
+  
   - name: outline_db
     dsn: 'postgresql://netdata:{{ netdata_postgres_password }}@outline_postgres:5432/outline'
+    collect_databases_matching: '!postgres'
+  
   - name: miniflux_db
     dsn: 'postgresql://netdata:{{ netdata_postgres_password }}@miniflux_postgres:5432/miniflux'
+    collect_databases_matching: '!postgres'

files/netdata/go.d/prometheus.conf

@@ -1,5 +1,4 @@
-update_every: 5
-autodetection_retry: 0
+update_every: 15
 
 jobs:
 

files/outline/docker-compose.yml.j2

@@ -13,7 +13,7 @@ services:
       - "127.0.0.1:{{ outline_port }}:3000"
     networks:
       - "outline_network"
-      - "{{ web_proxy_network }}"
+      - "web_proxy_network"
     environment:
       NODE_ENV: 'production'
       URL: 'https://outline.vakhrushev.me'
@@ -58,7 +58,8 @@ services:
     container_name: outline_redis
     restart: unless-stopped
     networks:
-      - "outline_network"   
+      - "outline_network"
+      - "monitoring_network"
 
   outline_postgres:
     image: postgres:16.3-bookworm
@@ -68,7 +69,7 @@ services:
       - {{ postgres_data_dir }}:/var/lib/postgresql/data
     networks:
       - "outline_network"
-      - "{{ web_proxy_network }}"
+      - "monitoring_network"
     environment:
       POSTGRES_USER: '{{ outline_postgres_user }}'
       POSTGRES_PASSWORD: '{{ outline_postgres_password }}'
@@ -77,5 +78,7 @@ services:
 networks:
   outline_network:
     driver: bridge
-  {{ web_proxy_network }}:
+  web_proxy_network:
+    external: true
+  monitoring_network:
     external: true

files/rssbridge/docker-compose.yml.j2

@@ -5,8 +5,8 @@ services:
     container_name: rssbridge_app
     restart: unless-stopped
     networks:
-      - "{{ web_proxy_network }}"
+      - "web_proxy_network"
 
 networks:
-  {{ web_proxy_network }}:
+  web_proxy_network:
     external: true

files/wakapi/docker-compose.yml.j2

@@ -8,7 +8,7 @@ services:
     restart: unless-stopped
     user: '{{ user_create_result.uid }}:{{ user_create_result.group }}'
     networks:
-      - "{{ web_proxy_network }}"
+      - "web_proxy_network"
     volumes:
       - "{{ data_dir }}:/data"
     environment:
@@ -28,5 +28,5 @@ services:
 
 
 networks:
-  {{ web_proxy_network }}:
+  web_proxy_network:
     external: true