diff options
| author |   Daniel Hanrahan <daniel.hanrahan@est.tech> | 2024-12-04 13:29:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2024-12-04 13:29:46 +0000 |
| commit | 49c48df725d462a2085d37fc055df399c2dbd4fc (patch) | |
| tree | a28310be5df587903d2cef5e845ff0f44a4b6c75 | |
| parent | 45c75e4716c4dd4575168d29016fba0b2fe3c50a (diff) | |
| parent | 3bebf252eb8341406fa77889d20e4adf17d3a060 (diff) | |
Merge "Plot metrics for each cps-and-ncmp instance separately in Grafana"
| -rw-r--r-- | docker-compose/config/endurance.env | 1 | ||||
| -rw-r--r-- | docker-compose/config/prometheus.yml | 13 | ||||
| -rw-r--r-- | docker-compose/docker-compose.yml | 2 |
3 files changed, 14 insertions, 2 deletions
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!} |