From 8b616de8e4a9c4087278ce67fb931ac262f6238d Mon Sep 17 00:00:00 2001
From: vimal-tech-starter <varnam2311@gmail.com>
Date: Mon, 23 Mar 2026 06:31:12 +0530
Subject: [PATCH] Monitoring phase separated with it's own docker compose file

Signed-off-by: vimal-tech-starter <varnam2311@gmail.com>
---
 docker-compose.yml                            | 27 +++++------------
 monitoring/docker-compose.yml                 | 30 +++++++++++++++++++
 .../prometheus}/prometheus.yml                |  2 --
 3 files changed, 38 insertions(+), 21 deletions(-)
 create mode 100644 monitoring/docker-compose.yml
 rename {prometheus => monitoring/prometheus}/prometheus.yml (98%)

diff --git a/docker-compose.yml b/docker-compose.yml
index 91e1838..fb5cd4f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,8 @@ services:
       interval: 10s
       timeout: 5s
       retries: 5
+    networks:
+      - monitoring-network
 
   contact-api:
     build: .
@@ -31,25 +33,12 @@ services:
     environment:
       SPRING_PROFILES_ACTIVE: prod
     restart: unless-stopped
-
-  prometheus:
-    image: prom/prometheus
-    container_name: vimaltech-prometheus
-    volumes:
-      - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
-    ports:
-      - "9090:9090"
-    restart: unless-stopped
-
-  grafana:
-    image: grafana/grafana
-    container_name: vimaltech-grafana
-    ports:
-      - "3000:3000"
-    volumes:
-      - grafana_data:/var/lib/grafana
-    restart: unless-stopped
+    networks:
+      - monitoring-network
 
 volumes:
   vimaltech_pgdata:
-  grafana_data:
\ No newline at end of file
+
+networks:
+  monitoring-network:
+    name: monitoring-network
\ No newline at end of file
diff --git a/monitoring/docker-compose.yml b/monitoring/docker-compose.yml
new file mode 100644
index 0000000..7065beb
--- /dev/null
+++ b/monitoring/docker-compose.yml
@@ -0,0 +1,30 @@
+services:
+
+  prometheus:
+    image: prom/prometheus:latest
+    container_name: vimaltech-prometheus
+    restart: unless-stopped
+    volumes:
+      - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
+    ports:
+      - "9090:9090"
+    networks:
+      - monitoring-network
+
+  grafana:
+    image: grafana/grafana:latest
+    container_name: vimaltech-grafana
+    restart: unless-stopped
+    ports:
+      - "3000:3000"
+    networks:
+      - monitoring-network
+    volumes:
+      - grafana-data:/var/lib/grafana
+
+volumes:
+  grafana-data:
+
+networks:
+  monitoring-network:
+    external: true
\ No newline at end of file
diff --git a/prometheus/prometheus.yml b/monitoring/prometheus/prometheus.yml
similarity index 98%
rename from prometheus/prometheus.yml
rename to monitoring/prometheus/prometheus.yml
index 76ed345..562a436 100644
--- a/prometheus/prometheus.yml
+++ b/monitoring/prometheus/prometheus.yml
@@ -3,8 +3,6 @@ global:
 
 scrape_configs:
   - job_name: 'contact-api'
-
     metrics_path: /actuator/prometheus
-
     static_configs:
       - targets: ['contact-api:8080']
\ No newline at end of file