diff --git a/config/prometheus.yml b/config/prometheus.yml index cd440f7..71b0660 100644 --- a/config/prometheus.yml +++ b/config/prometheus.yml @@ -10,14 +10,12 @@ alerting: alertmanagers: - static_configs: - targets: - # We're not setting up Alertmanager in this config - # but you can add it later if needed scrape_configs: # Prometheus itself - job_name: 'prometheus' static_configs: - - targets: ['localhost:9090'] + - targets: ['prometheus:9090'] # Container metrics via cAdvisor - job_name: 'cadvisor' @@ -44,4 +42,4 @@ scrape_configs: # Alloy metrics - job_name: 'alloy' static_configs: - - targets: ['alloy:12345'] # Default metrics port for Alloy + - targets: ['alloy:12345'] diff --git a/docker-compose.yml b/docker-compose.yml index 9b906b3..a90ce92 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,12 +4,12 @@ services: image: grafana/grafana:latest container_name: grafana healthcheck: - test: ["CMD", "wget", "-q", "--spider", "http://localhost:9010"] + test: ["CMD", "wget", "-q", "--spider", "http://localhost:3003"] interval: 30s timeout: 10s retries: 3 ports: - - "9010:3000" + - "3003:3000" environment: - GF_SECURITY_ADMIN_USER=admin - GF_SECURITY_ADMIN_PASSWORD=password # Change this in production @@ -62,7 +62,7 @@ services: image: prom/prometheus:latest container_name: prometheus ports: - - "9040:9090" + - "3004:9090" volumes: - ./config/prometheus.yml:/etc/prometheus/prometheus.yml - ./config/prometheus-alerts.yml:/etc/prometheus/alerts.yml