From 9f4fcb9654b0954d9fcd2606d6c0d0cbbf9d61ff Mon Sep 17 00:00:00 2001
From: Roman Zhilkin <mrutsy@zhs.one>
Date: Thu, 23 Jan 2025 18:38:32 +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=BF=D1=80=D0=BE=D0=BC=D0=B5=D1=82=D0=B5?=
 =?UTF-8?q?=D1=83=D1=81=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manufacturer/configs/apache/apache.conf       |  5 +++
 .../configs/prometheus/prometheus.yml         |  8 ++++
 .../container/{wordpress => services}/.env    |  0
 .../docker-compose.yml                        | 43 ++++++++++++++++++-
 4 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 manufacturer/configs/prometheus/prometheus.yml
 rename manufacturer/container/{wordpress => services}/.env (100%)
 rename manufacturer/container/{wordpress => services}/docker-compose.yml (51%)

diff --git a/manufacturer/configs/apache/apache.conf b/manufacturer/configs/apache/apache.conf
index 0e05ce5..fb3a9eb 100644
--- a/manufacturer/configs/apache/apache.conf
+++ b/manufacturer/configs/apache/apache.conf
@@ -9,6 +9,11 @@ ServerName localhost
         Require all granted
     </Directory>
 
+    <Location /server-status>
+        SetHandler server-status
+        Require ip 10.10.1.0/24
+    </Location>
+
     ErrorLog /proc/self/fd/2
     CustomLog /proc/self/fd/1 common
 </VirtualHost>
\ No newline at end of file
diff --git a/manufacturer/configs/prometheus/prometheus.yml b/manufacturer/configs/prometheus/prometheus.yml
new file mode 100644
index 0000000..7fdd09f
--- /dev/null
+++ b/manufacturer/configs/prometheus/prometheus.yml
@@ -0,0 +1,8 @@
+global:
+  scrape_interval: 15s
+
+scrape_configs:
+  - job_name: 'apache'
+    metrics_path: '/server-status'
+    static_configs:
+      - targets: ['10.10.1.2:80']
\ No newline at end of file
diff --git a/manufacturer/container/wordpress/.env b/manufacturer/container/services/.env
similarity index 100%
rename from manufacturer/container/wordpress/.env
rename to manufacturer/container/services/.env
diff --git a/manufacturer/container/wordpress/docker-compose.yml b/manufacturer/container/services/docker-compose.yml
similarity index 51%
rename from manufacturer/container/wordpress/docker-compose.yml
rename to manufacturer/container/services/docker-compose.yml
index 1df41cf..2705401 100644
--- a/manufacturer/container/wordpress/docker-compose.yml
+++ b/manufacturer/container/services/docker-compose.yml
@@ -1,3 +1,5 @@
+version: '3.7'  # Указание версии Docker Compose
+
 services:
   db:
     image: mariadb:11.6.2
@@ -6,11 +8,17 @@ services:
       MYSQL_DATABASE: ${MYSQL_DATABASE}
       MYSQL_USER: ${MYSQL_USER}
       MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+    networks:
+      db:
+    hostname: db
     volumes:
       - db_data:/var/lib/mysql
 
   wordpress:
     image: wordpress:6.7.1-php8.3-fpm-alpine
+    networks:
+      - wp
+      - db
     volumes:
       - wordpress_data:/var/www/html
 
@@ -19,6 +27,10 @@ services:
       context: ../../../.
       dockerfile: manufacturer/container/apache/Dockerfile
     image: custom-apache:v5.2
+    networks:
+      metrics:
+        ipv4_address: 10.10.1.2
+      wp:
     ports:
       - "80:80"
       - "443:443"
@@ -28,6 +40,35 @@ services:
     depends_on:
       - wordpress
 
+  prometheus:
+    image: prom/prometheus:v3.1.0
+    volumes:
+      - ../../configs/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
+    networks:
+      metrics:
+        ipv4_address: 10.10.1.3
+    ports:
+      - "9090:9090"
+
 volumes:
   wordpress_data:
-  db_data:
\ No newline at end of file
+  db_data:
+
+networks:
+  db:
+    name: db
+    driver: bridge
+    external: false
+
+  wp:
+    name: wp
+    driver: bridge
+    external: false
+
+  metrics:
+    name: metrics
+    driver: bridge
+    external: false
+    ipam:
+      config:
+        - subnet: 10.10.1.0/24
\ No newline at end of file