From 7bac1b5a914b9a8ac50c096591a01da628ce52bc Mon Sep 17 00:00:00 2001
From: Roman Zhilkin <mrutsy@zhs.one>
Date: Thu, 23 Jan 2025 19:17:36 +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=B3=D1=80=D0=B0=D1=84=D0=B0=D0=BD=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manufacturer/container/services/.env          |  1 +
 .../container/services/docker-compose.yml     | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/manufacturer/container/services/.env b/manufacturer/container/services/.env
index 6895b52..f66935b 100644
--- a/manufacturer/container/services/.env
+++ b/manufacturer/container/services/.env
@@ -4,4 +4,5 @@ MYSQL_ROOT_PASSWORD=wordpress
 MYSQL_USER=wordpress
 MYSQL_PASSWORD=wordpress
 
+GF_SECURITY_ADMIN_PASSWORD=admin
 
diff --git a/manufacturer/container/services/docker-compose.yml b/manufacturer/container/services/docker-compose.yml
index 9a9f54d..9e30776 100644
--- a/manufacturer/container/services/docker-compose.yml
+++ b/manufacturer/container/services/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.7'  # Указание версии Docker Compose
-
 services:
   db:
     image: mariadb:11.6.2
@@ -28,7 +26,7 @@ services:
     build:
       context: ../../../.
       dockerfile: manufacturer/container/apache/Dockerfile
-    image: custom-apache:v5.2
+    image: custom-apache:v5.3
     networks:
       metrics:
         ipv4_address: 10.10.1.2
@@ -52,9 +50,22 @@ services:
     ports:
       - "9090:9090"
 
+  grafana:
+    image: grafana/grafana:11.4.0
+    networks:
+      metrics:
+        ipv4_address: 10.10.1.4
+    ports:
+      - "3000:3000"
+    environment:
+      GF_SECURITY_ADMIN_PASSWORD: ${GF_SECURITY_ADMIN_PASSWORD}
+    volumes:
+      - grafana_data:/var/lib/grafana
+
 volumes:
-  wordpress_data:
   db_data:
+  grafana_data:
+  wordpress_data:
 
 networks:
   db: