Add Prometheus config for http and k8s participants in csit

Issue-ID: POLICY-4944
Change-Id: I1e0e5795c166f532960a0e6c104b35eec32f685e
Signed-off-by: FrancescoFioraEst <francesco.fiora@est.tech>

diff --git a/helm/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml b/helm/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml
index c3c4f98..17e1033 100644 (file)
--- a/helm/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml
+++ b/helm/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml
@@ -57,12 +57,13 @@ participant:
 management:
   endpoints:
     web:
+      base-path: /
       exposure:
         include: health, metrics, prometheus
 server:
   port: 8084
   servlet:
-    context-path: /onap/policy/clamp/acm/httpparticipant
+    context-path: /onap/httpparticipant
   ssl:
     enabled: false
 

diff --git a/helm/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml b/helm/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
index 070ec50..08ed594 100644 (file)
--- a/helm/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
+++ b/helm/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
@@ -61,6 +61,7 @@ participant:
 management:
   endpoints:
     web:
+      base-path: /
       exposure:
         include: health, metrics, prometheus
 
@@ -69,7 +70,7 @@ server:
   # See springboot documentation.
   port: 8083
   servlet:
-    context-path: /onap/policy/clamp/acm/k8sparticipant
+    context-path: /onap/k8sparticipant
   ssl:
     enabled: false
 

diff --git a/helm/prometheus/resources/prometheus.yml b/helm/prometheus/resources/prometheus.yml
index 04451de..b3f656f 100644 (file)
--- a/helm/prometheus/resources/prometheus.yml
+++ b/helm/prometheus/resources/prometheus.yml
@@ -95,7 +95,7 @@ scrape_configs:
       username: "runtimeUser"
       password: "zb!XztG34"
 
-  - job_name: "acm-participant-metrics"
+  - job_name: "acm-participant-policy-metrics"
     metrics_path: "/onap/policyparticipant/prometheus"
     static_configs:
       - targets:
@@ -103,3 +103,21 @@ scrape_configs:
     basic_auth:
       username: "participantUser"
       password: "zb!XztG34"
+
+  - job_name: "acm-participant-http-metrics"
+    metrics_path: "/onap/httpparticipant/prometheus"
+    static_configs:
+      - targets:
+          - "policy-clamp-ac-http-ppnt:8084"
+    basic_auth:
+      username: "participantUser"
+      password: "zb!XztG34"
+
+  - job_name: "acm-participant-k8s-metrics"
+    metrics_path: "/onap/k8sparticipant/prometheus"
+    static_configs:
+      - targets:
+          - "policy-clamp-ac-k8s-ppnt:8083"
+    basic_auth:
+      username: "participantUser"
+      password: "zb!XztG34"