summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrameshiyer27 <ramesh.murugan.iyer@est.tech>2022-10-12 14:58:43 +0100
committerrameshiyer27 <ramesh.murugan.iyer@est.tech>2022-10-12 16:32:50 +0100
commitb7a9c405de95315ce38b4913a1efee9bfd03fe04 (patch)
tree5892505be34ebfb3789f2e2d109f617ba089b7d0
parent98aba67b5c82af49b467b6742e38de031d6b73b5 (diff)
Fix CSIT failure in CLAMP, API and PAP tests
ACM servlet context path is updated to the CLAMP config file. Fixed prometheus endpoints in API and PAP. Issue-ID: POLICY-4394 Signed-off-by: zrrmmua <ramesh.murugan.iyer@est.tech> Change-Id: Id4fafd016beb8614ce99e0c1a5985dec52d69270
-rw-r--r--csit/compose-grafana.yml8
-rw-r--r--csit/config/api/apiParameters.yaml1
-rw-r--r--csit/config/clamp/AcRuntimeParameters.yaml2
-rw-r--r--csit/config/pap/papParameters.yaml1
-rw-r--r--csit/metrics/prometheus.yml2
5 files changed, 9 insertions, 5 deletions
diff --git a/csit/compose-grafana.yml b/csit/compose-grafana.yml
index f9908533..65781e53 100644
--- a/csit/compose-grafana.yml
+++ b/csit/compose-grafana.yml
@@ -144,7 +144,7 @@ services:
- ./config/drools/custom:/tmp/policy-install/config:ro
- ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
env_file:
- - config/drools/env/base.conf
+ - config/drools-pdp/env/base.conf
entrypoint: /opt/app/policy/bin/wait_for_port.sh
command: [
'-c', '/opt/app/policy/bin/pdpd-entrypoint.sh boot',
@@ -167,9 +167,9 @@ services:
- ./config/drools-apps/custom:/tmp/policy-install/config:ro
- ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
env_file:
- - config/drools-apps/env/base.conf
- - config/drools-apps/env/feature-healthcheck.conf
- - config/drools-apps/env/feature-pooling-dmaap.conf
+ - config/drools-applications/env/base.conf
+ - config/drools-applications/env/feature-healthcheck.conf
+ - config/drools-applications/env/feature-pooling-dmaap.conf
entrypoint: /opt/app/policy/bin/wait_for_port.sh
command: [
'-c', '/opt/app/policy/bin/pdpd-cl-entrypoint.sh boot',
diff --git a/csit/config/api/apiParameters.yaml b/csit/config/api/apiParameters.yaml
index b56b5123..61f88df6 100644
--- a/csit/config/api/apiParameters.yaml
+++ b/csit/config/api/apiParameters.yaml
@@ -80,4 +80,5 @@ management:
base-path: /
exposure:
include: health,metrics,prometheus
+ path-mapping.metrics: plain-metrics
path-mapping.prometheus: metrics
diff --git a/csit/config/clamp/AcRuntimeParameters.yaml b/csit/config/clamp/AcRuntimeParameters.yaml
index e437dd20..70fbb967 100644
--- a/csit/config/clamp/AcRuntimeParameters.yaml
+++ b/csit/config/clamp/AcRuntimeParameters.yaml
@@ -31,6 +31,8 @@ security:
enable-csrf: false
server:
+ servlet:
+ context-path: /onap/policy/clamp/acm
port: 6969
ssl:
enabled: false
diff --git a/csit/config/pap/papParameters.yaml b/csit/config/pap/papParameters.yaml
index bb050205..27e793f5 100644
--- a/csit/config/pap/papParameters.yaml
+++ b/csit/config/pap/papParameters.yaml
@@ -80,4 +80,5 @@ management:
base-path: /
exposure:
include: health, metrics, prometheus
+ path-mapping.metrics: plain-metrics
path-mapping.prometheus: metrics
diff --git a/csit/metrics/prometheus.yml b/csit/metrics/prometheus.yml
index c2e0cf10..4ad11752 100644
--- a/csit/metrics/prometheus.yml
+++ b/csit/metrics/prometheus.yml
@@ -86,7 +86,7 @@ scrape_configs:
password: "zb!XztG34"
- job_name: "acm-metrics"
- metrics_path: "/prometheus"
+ metrics_path: "/onap/policy/clamp/acm/prometheus"
static_configs:
- targets:
- "policy-clamp-runtime-acm:6969"