diff --git a/templates/monitoring/docker-compose.grafana.yml b/templates/monitoring/docker-compose.grafana.yml index 70ad8b8..ff42b22 100644 --- a/templates/monitoring/docker-compose.grafana.yml +++ b/templates/monitoring/docker-compose.grafana.yml @@ -10,6 +10,7 @@ services: volumes: - grafana_data:/var/lib/grafana - ./grafana/provisioning:/etc/grafana/provisioning + - ./grafana/dashboards:/etc/grafana/provisioning/dashboards environment: - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PASSWORD} - GF_INSTALL_PLUGINS=grafana-clock-panel,grafana-simple-json-datasource @@ -18,4 +19,8 @@ services: # Note: Grafana connects to external Prometheus instances via HTTPS volumes: - grafana_data: \ No newline at end of file + grafana_data: + +networks: + caddy_net: + external: true diff --git a/templates/monitoring/docker-compose.yml b/templates/monitoring/docker-compose.yml index b494aca..4ad21d1 100644 --- a/templates/monitoring/docker-compose.yml +++ b/templates/monitoring/docker-compose.yml @@ -64,6 +64,7 @@ services: restart: unless-stopped networks: - monitoring_net + - caddy_net command: -config.file=/etc/loki/local-config.yaml # PORT 9080 diff --git a/templates/monitoring/loki/loki.yml b/templates/monitoring/loki/loki.yml index 1f4da99..fa9a50a 100644 --- a/templates/monitoring/loki/loki.yml +++ b/templates/monitoring/loki/loki.yml @@ -41,4 +41,5 @@ limits_config: compactor: working_directory: /loki/boltdb-shipper-compactor retention_enabled: true - retention_delete_delay: 2h \ No newline at end of file + retention_delete_delay: 2h + delete_request_store: filesystem \ No newline at end of file