diff --git a/default-environment.env b/default-environment.env index f92003d..8a5fb76 100644 --- a/default-environment.env +++ b/default-environment.env @@ -58,3 +58,7 @@ GOTIFY_REGISTRATION=false # Portainer PORTAINER_GODEBUG=netdns=cgo + +# Node-red +DOCKER_SOCKET_PROXY_HOST=tcp://docker-socket-proxy:2375 +DOCKER_SOCKET_PROXY_LOG_LEVEL=info diff --git a/monitoring/docker-exporter/exporter.py b/monitoring/docker-exporter/exporter.py index 48ef7c6..1d82665 100644 --- a/monitoring/docker-exporter/exporter.py +++ b/monitoring/docker-exporter/exporter.py @@ -19,7 +19,7 @@ logger = logging.getLogger("docker-update-exporter") # --- Config --- EXPORTER_PORT = 9105 -CHECK_INTERVAL = 60 +CHECK_INTERVAL = 3600 CACHE_TTL = int(os.getenv("CACHE_TTL", "300")) SERVICES_UP_SCRIPT = os.getenv("SERVICES_UP_SCRIPT", "/compose/services-up.sh") CACHE_FILE = os.getenv("CACHE_FILE", "/data/remote_digest_cache.json") diff --git a/monitoring/node-red/docker-compose.yml b/monitoring/node-red/docker-compose.yml index 861f3a8..6fb5c71 100644 --- a/monitoring/node-red/docker-compose.yml +++ b/monitoring/node-red/docker-compose.yml @@ -9,13 +9,12 @@ services: depends_on: - docker-socket-proxy environment: - DOCKER_HOST: tcp://docker-socket-proxy:2375 + DOCKER_HOST: ${DOCKER_SOCKET_PROXY_HOST} + TZ: ${TZ} cap_drop: - ALL security_opt: - no-new-privileges:true - environment: - - TZ=${TZ} # ports: # - "1880:1880" volumes: diff --git a/monitoring/prometheus/docker-compose.yml b/monitoring/prometheus/docker-compose.yml index b7cf1a9..339fba6 100644 --- a/monitoring/prometheus/docker-compose.yml +++ b/monitoring/prometheus/docker-compose.yml @@ -4,10 +4,11 @@ services: docker-socket-proxy: profiles: ["monitoring","all","prometheus","prometheus-exporters"] image: tecnativa/docker-socket-proxy:latest - container_name: prometheus-docker-socket-proxy + container_name: docker-socket-proxy restart: unless-stopped environment: - LOG_LEVEL: warning + LOG_LEVEL: ${DOCKER_SOCKET_PROXY_LOG_LEVEL} + DISTRIBUTION: 1 CONTAINERS: 1 EVENTS: 1 IMAGES: 1 @@ -171,8 +172,8 @@ services: restart: unless-stopped depends_on: - docker-socket-proxy - cap_drop: - - ALL +# cap_drop: +# - ALL security_opt: - no-new-privileges:true volumes: @@ -198,8 +199,8 @@ services: # - ${PROJECT_ROOT}/monitoring/docker-exporter/data:/data:rw # - ${PROJECT_ROOT}/services-up.sh:/app/services-up.sh:ro environment: - LOG_LEVEL: DEBUG - DOCKER_HOST: tcp://docker-socket-proxy:2375 + LOG_LEVEL: ${DOCKER_EXPORTER_LOG_LEVEL} + DOCKER_HOST: ${DOCKER_SOCKET_PROXY_HOST} depends_on: - docker-socket-proxy