From 5d1e1429e84909957f98e1eb87eb44c3a37911b2 Mon Sep 17 00:00:00 2001
From: Roman Zhilkin <mrutsy@zhs.one>
Date: Thu, 23 Jan 2025 20:56:13 +0700
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B5=D0=BA=D1=81=D0=BF=D0=BE=D1=80=D1=82?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manufacturer/configs/prometheus/prometheus.yml  |  4 ++--
 .../container/services/docker-compose.yml       | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

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: