Adding runtime-acm to grafana dashboard

Issue-ID: POLICY-4146
Change-Id: Iecd0cfa1a6e6162bb9a06345dfd12fb8375ae98b
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>

diff --git a/csit/compose-grafana.yml b/csit/compose-grafana.yml
index e487a70..3d925eb 100644 (file)
--- a/csit/compose-grafana.yml
+++ b/csit/compose-grafana.yml
@@ -224,6 +224,23 @@ services:
         'pap', '6969',
         'apex-pdp', '6969'
         ]
+   policy-clamp-runtime-acm:
+      image: nexus3.onap.org:10001/onap/policy-clamp-runtime-acm:${POLICY_CLAMP_VERSION}
+      container_name: policy-clamp-runtime-acm
+      depends_on:
+       - mariadb
+       - simulator
+      hostname: policy-clamp-runtime-acm
+      expose:
+       - 6969
+      volumes:
+       - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
+       - ./config/clamp/AcRuntimeParameters.yaml:/opt/app/policy/clamp/etc/AcRuntimeParameters.yaml:ro
+      entrypoint: /opt/app/policy/bin/wait_for_port.sh
+      command: [
+        '-c', './acm-runtime.sh',
+        'message-router', '3904'
+        ]
    prometheus:
       image: prom/prometheus:v2.32.1
       container_name: prometheus

diff --git a/csit/config/clamp/AcRuntimeParameters.yaml b/csit/config/clamp/AcRuntimeParameters.yaml
index 4003182..d70627f 100644 (file)
--- a/csit/config/clamp/AcRuntimeParameters.yaml
+++ b/csit/config/clamp/AcRuntimeParameters.yaml
@@ -32,8 +32,8 @@ security:
 
 server:
   port: 6969
-  servlet:
-    context-path: /onap/policy/clamp/acm
+  ssl:
+    enabled: {{HTTPS_ENABLED}}
   error:
     path: /error
 
@@ -52,17 +52,18 @@ runtime:
           - ${topicServer:message-router}
         topicCommInfrastructure: dmaap
         fetchTimeout: 15000
-        useHttps: true
+        useHttps: {{HTTPS_ENABLED}}
     topicSinks:
       -
         topic: POLICY-ACRUNTIME-PARTICIPANT
         servers:
           - ${topicServer:message-router}
         topicCommInfrastructure: dmaap
-        useHttps: true
+        useHttps: {{HTTPS_ENABLED}}
 
 management:
   endpoints:
     web:
+      base-path: /
       exposure:
         include: health, metrics, prometheus

diff --git a/csit/config/clamp/HttpParticipantParameters.yaml b/csit/config/clamp/HttpParticipantParameters.yaml
index 529b095..62b9dc4 100644 (file)
--- a/csit/config/clamp/HttpParticipantParameters.yaml
+++ b/csit/config/clamp/HttpParticipantParameters.yaml
@@ -22,13 +22,13 @@ participant:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
           fetchTimeout: 15000
-          useHttps: true
+          useHttps: {{HTTPS_ENABLED}}
       topicSinks:
         - topic: POLICY-ACRUNTIME-PARTICIPANT
           servers:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
-          useHttps: true
+          useHttps: {{HTTPS_ENABLED}}
 management:
   endpoints:
     web:
@@ -36,5 +36,7 @@ management:
         include: health, metrics, prometheus
 server:
   port: 8084
+  ssl:
+    enabled: {{HTTPS_ENABLED}}
   servlet:
     context-path: /onap/policy/clamp/acm/httpparticipant

diff --git a/csit/config/clamp/KubernetesParticipantParameters.yaml b/csit/config/clamp/KubernetesParticipantParameters.yaml
index c6acf40..49c568c 100644 (file)
--- a/csit/config/clamp/KubernetesParticipantParameters.yaml
+++ b/csit/config/clamp/KubernetesParticipantParameters.yaml
@@ -26,14 +26,14 @@ participant:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
           fetchTimeout: 15000
-          useHttps: true
+          useHttps: {{HTTPS_ENABLED}}
       topicSinks:
         -
           topic: POLICY-ACRUNTIME-PARTICIPANT
           servers:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
-          useHttps: true
+          useHttps: {{HTTPS_ENABLED}}
 
 management:
   endpoints:
@@ -42,6 +42,8 @@ management:
         include: health, metrics, prometheus
 server:
   port: 8083
+  ssl:
+    enabled: {{HTTPS_ENABLED}}
   servlet:
     context-path: /onap/policy/clamp/acm/k8sparticipant
 

diff --git a/csit/config/clamp/PolicyParticipantParameters.yaml b/csit/config/clamp/PolicyParticipantParameters.yaml
index 1cb4e6d..73d40d4 100644 (file)
--- a/csit/config/clamp/PolicyParticipantParameters.yaml
+++ b/csit/config/clamp/PolicyParticipantParameters.yaml
@@ -13,7 +13,7 @@ participant:
     port: 6969
     userName: policyadmin
     password: zb!XztG34
-    useHttps: true
+    useHttps: {{HTTPS_ENABLED}}
     allowSelfSignedCerts: true
   policyPapParameters:
     clientName: pap
@@ -21,7 +21,7 @@ participant:
     port: 6969
     userName: policyadmin
     password: zb!XztG34
-    useHttps: true
+    useHttps: {{HTTPS_ENABLED}}
     allowSelfSignedCerts: true
   intermediaryParameters:
     reportingTimeIntervalMs: 120000
@@ -40,14 +40,14 @@ participant:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
           fetchTimeout: 15000
-          useHttps: true
+          useHttps: {{HTTPS_ENABLED}}
       topicSinks:
         -
           topic: POLICY-ACRUNTIME-PARTICIPANT
           servers:
             - ${topicServer:message-router}
           topicCommInfrastructure: dmaap
-          useHttps: true
+          useHttps: {{HTTPS_ENABLED}}
 management:
   endpoints:
     web:
@@ -55,5 +55,7 @@ management:
         include: health, metrics, prometheus
 server:
   port: 8085
+  ssl:
+    enabled: {{HTTPS_ENABLED}}
   servlet:
     context-path: /onap/policy/clamp/acm/policyparticipant

diff --git a/csit/metrics/prometheus.yml b/csit/metrics/prometheus.yml
index 1b292cd..934f754 100644 (file)
--- a/csit/metrics/prometheus.yml
+++ b/csit/metrics/prometheus.yml
@@ -84,3 +84,12 @@ scrape_configs:
     basic_auth:
       username: "healthcheck"
       password: "zb!XztG34"
+
+  - job_name: "acm-metrics"
+    metrics_path: "/prometheus"
+    static_configs:
+      - targets:
+          - "policy-clamp-runtime-acm:6969"
+    basic_auth:
+      username: "runtimeUser"
+      password: "zb!XztG34"