From: halil.cakal <halil.cakal@est.tech>
Date: Mon, 7 Oct 2024 15:48:05 +0000 (+0100)
Subject: Autodiscover cps-and-ncmp containers when load balancing
X-Git-Tag: 3.5.4~9^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=69bd654946ab5512aa282bc8b74b654d80bf5245;p=cps.git

Autodiscover cps-and-ncmp containers when load balancing

- remove hard-coded container names from load balancer(nginx) and
  prometheus

Issue-ID: CPS-2437

Change-Id: Ia64b949c2eb3e4d67e123b046e66d5bfdda2c801
Signed-off-by: halil.cakal <halil.cakal@est.tech>
---

diff --git a/docker-compose/config/nginx/nginx.conf b/docker-compose/config/nginx/nginx.conf
index 7d6b997f77..6e9d102fed 100644
--- a/docker-compose/config/nginx/nginx.conf
+++ b/docker-compose/config/nginx/nginx.conf
@@ -21,9 +21,7 @@ http {
     # Add more server entries here for scaling or load balancing
     upstream cps-and-ncmp {
         least_conn;
-        server docker-compose-cps-and-ncmp-1:8080;
-        ### DEBUG: Disable next line for easier debugging on 1 instance (see also docker-compose.yml)
-        server docker-compose-cps-and-ncmp-2:8080;
+        server cps-and-ncmp:8080;
     }
 
     server {
diff --git a/docker-compose/config/prometheus.yml b/docker-compose/config/prometheus.yml
index 89af4a6800..e1aa4763d9 100644
--- a/docker-compose/config/prometheus.yml
+++ b/docker-compose/config/prometheus.yml
@@ -3,10 +3,12 @@ global:
   evaluation_interval: 5s
 
 scrape_configs:
-  - job_name: 'cps-and-ncmp'
-    metrics_path: '/actuator/prometheus'
-    scrape_interval: 5s
-    static_configs:
-      - targets:
-        - 'docker-compose-cps-and-ncmp-1:8080'
-        - 'docker-compose-cps-and-ncmp-2:8080'
+- job_name: 'cps-and-ncmp'
+  metrics_path: '/actuator/prometheus'
+  scrape_interval: 5s
+  static_configs:
+    # If you want to inject Prometheus into particular containers, the targets should be provided similar to the following examples:
+    # - 'docker-compose-cps-and-ncmp-1:8080'
+    # - 'docker-compose-cps-and-ncmp-2:8080'
+    - targets:
+      - 'cps-and-ncmp:8080'
\ No newline at end of file