From 2b702356cc24de31e0a078bf310afac3d66584b3 Mon Sep 17 00:00:00 2001
From: Roman Zhilkin <mrutsy@zhs.one>
Date: Sat, 25 Jan 2025 08:01:54 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B0=D1=82=D1=87=20=D0=B1=D0=B5=D0=B7?=
 =?UTF-8?q?=D0=BE=D0=BF=D0=B0=D1=81=D0=BD=D0=BE=D1=81=D1=82=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Скрытие портов извне и обращение сервисов по имени внутри сети
---
 .../provisioning/datasources/datasource.yaml     |  2 +-
 manufacturer/configs/prometheus/prometheus.yml   |  2 +-
 .../container/services/docker-compose.yml        | 16 +++++++---------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/manufacturer/configs/grafana/provisioning/datasources/datasource.yaml b/manufacturer/configs/grafana/provisioning/datasources/datasource.yaml
index bd64727..bf545de 100644
--- a/manufacturer/configs/grafana/provisioning/datasources/datasource.yaml
+++ b/manufacturer/configs/grafana/provisioning/datasources/datasource.yaml
@@ -3,5 +3,5 @@ datasources:
   - name: Prometheus
     type: prometheus
     access: proxy
-    url: http://10.10.1.3:9090
+    url: http://stransit-test-prometheus:9090
     isDefault: true
\ No newline at end of file
diff --git a/manufacturer/configs/prometheus/prometheus.yml b/manufacturer/configs/prometheus/prometheus.yml
index 7b369de..26018d9 100644
--- a/manufacturer/configs/prometheus/prometheus.yml
+++ b/manufacturer/configs/prometheus/prometheus.yml
@@ -5,4 +5,4 @@ scrape_configs:
   - job_name: 'apache'
     metrics_path: '/metrics'
     static_configs:
-      - targets: ['10.10.1.5:9117']
\ No newline at end of file
+      - targets: ['stransit-test-exporter:9117']
\ No newline at end of file
diff --git a/manufacturer/container/services/docker-compose.yml b/manufacturer/container/services/docker-compose.yml
index c1a89b9..442e1c8 100644
--- a/manufacturer/container/services/docker-compose.yml
+++ b/manufacturer/container/services/docker-compose.yml
@@ -30,7 +30,7 @@ services:
     build:
       context: ../../../.
       dockerfile: manufacturer/container/apache/Dockerfile
-    image: stransit-test-apache:v1
+    image: stransit-test-apache:v1.1
     container_name: stransit-test-apache
     networks:
       stransit-test-metrics:
@@ -52,15 +52,12 @@ services:
     networks:
       stransit-test-metrics:
         ipv4_address: 10.10.1.5
-    ports:
-      - mode: ingress
-        target: 9117
-        published: "9117"
-        protocol: tcp
+    expose:
+      - 9117
     depends_on:
       - stransit-test-apache
     restart: unless-stopped
-    entrypoint: /bin/apache_exporter  --scrape_uri="http://10.10.1.2/server-status?auto"
+    entrypoint: /bin/apache_exporter  --scrape_uri="http://stransit-test-apache/server-status?auto"
 
   stransit-test-prometheus:
     image: prom/prometheus:v3.1.0
@@ -70,8 +67,8 @@ services:
     networks:
       stransit-test-metrics:
         ipv4_address: 10.10.1.3
-    ports:
-      - "9090:9090"
+    expose:
+      - 9090
     depends_on:
       - stransit-test-exporter
 
@@ -85,6 +82,7 @@ services:
       - "3000:3000"
     environment:
       GF_SECURITY_ADMIN_PASSWORD: ${GF_SECURITY_ADMIN_PASSWORD}
+      GF_SERVER_SERVE_FROM_SUB_PATH: true
     volumes:
       - grafana_data:/var/lib/grafana
       - ../../configs/grafana/provisioning:/etc/grafana/provisioning