diff --git a/manufacturer/configs/prometheus/prometheus.yml b/manufacturer/configs/prometheus/prometheus.yml index 7fdd09f..7b369de 100644 --- a/manufacturer/configs/prometheus/prometheus.yml +++ b/manufacturer/configs/prometheus/prometheus.yml @@ -3,6 +3,6 @@ global: scrape_configs: - job_name: 'apache' - metrics_path: '/server-status' + metrics_path: '/metrics' static_configs: - - targets: ['10.10.1.2:80'] \ No newline at end of file + - targets: ['10.10.1.5:9117'] \ No newline at end of file diff --git a/manufacturer/container/services/docker-compose.yml b/manufacturer/container/services/docker-compose.yml index 5e48de1..f794d93 100644 --- a/manufacturer/container/services/docker-compose.yml +++ b/manufacturer/container/services/docker-compose.yml @@ -50,6 +50,21 @@ services: ports: - "9090:9090" + exporter: + image: lusotycoon/apache-exporter + container_name: exporter + privileged: true + networks: + metrics: + ipv4_address: 10.10.1.5 + ports: + - mode: ingress + target: 9117 + published: "9117" + protocol: tcp + restart: unless-stopped + entrypoint: /bin/apache_exporter --scrape_uri="http://10.10.1.2/server-status?auto" + grafana: image: grafana/grafana:11.4.0 networks: @@ -62,6 +77,8 @@ services: volumes: - grafana_data:/var/lib/grafana - ../../configs/grafana/provisioning:/etc/grafana/provisioning +# - ../grafana/import_dashboard.sh:/docker-entrypoint-init.d/import_dashboard.sh +# entrypoint: [ "/bin/sh", "-c", "chmod +x /docker-entrypoint-init.d/import_dashboard.sh && /docker-entrypoint-init.d/import_dashboard.sh" ] volumes: db_data: