From 3bebf252eb8341406fa77889d20e4adf17d3a060 Mon Sep 17 00:00:00 2001 From: "halil.cakal" Date: Wed, 4 Dec 2024 10:12:02 +0000 Subject: Plot metrics for each cps-and-ncmp instance separately in Grafana - assing port range to cps-and-ncmp service to plot metrics separately Issue-ID: CPS-2536 Change-Id: Ic097017bbcca25f28341e8e77f658a0a4e8964d7 Signed-off-by: halil.cakal --- docker-compose/config/endurance.env | 1 + docker-compose/config/prometheus.yml | 13 +++++++++++-- docker-compose/docker-compose.yml | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) (limited to 'docker-compose') diff --git a/docker-compose/config/endurance.env b/docker-compose/config/endurance.env index 0ca1a1149a..be337219cf 100644 --- a/docker-compose/config/endurance.env +++ b/docker-compose/config/endurance.env @@ -3,6 +3,7 @@ DB_PORT=5433 NGINX_CONTAINER_NAME=endurance-nginx-loadbalancer CPS_CORE_PORT=8884 +CPS_PORT_RANGE=8798-8799 ZOOKEEPER_CONTAINER_NAME=endurance-zookeeper ZOOKEEPER_PORT=2182 diff --git a/docker-compose/config/prometheus.yml b/docker-compose/config/prometheus.yml index e1aa4763d9..8db07c8d05 100644 --- a/docker-compose/config/prometheus.yml +++ b/docker-compose/config/prometheus.yml @@ -3,7 +3,7 @@ global: evaluation_interval: 5s scrape_configs: -- job_name: 'cps-and-ncmp' +- job_name: 'cps-and-ncmp-kpi' metrics_path: '/actuator/prometheus' scrape_interval: 5s static_configs: @@ -11,4 +11,13 @@ scrape_configs: # - '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 + - '172.17.0.1:8698' + - '172.17.0.1:8699' + +- job_name: 'cps-and-ncmp-endurance' + metrics_path: '/actuator/prometheus' + scrape_interval: 5s + static_configs: + - targets: + - '172.17.0.1:8798' + - '172.17.0.1:8799' \ No newline at end of file diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index ae34fc3606..604cfe91a2 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -49,6 +49,8 @@ services: cps-and-ncmp: image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/cps-and-ncmp:${CPS_VERSION:-latest} + ports: + - ${CPS_PORT_RANGE:-8698-8699}:8080 environment: CPS_USERNAME: ${CPS_CORE_USERNAME:-cpsuser} CPS_PASSWORD: ${CPS_CORE_PASSWORD:-cpsr0cks!} -- cgit