From 476480c7c7687c8a98f91cce77af0db6124945ff Mon Sep 17 00:00:00 2001
From: "adheli.tavares" <adheli.tavares@est.tech>
Date: Tue, 7 Jun 2022 13:36:57 +0100
Subject: Adding runtime-acm to grafana dashboard

Issue-ID: POLICY-4146
Change-Id: Iecd0cfa1a6e6162bb9a06345dfd12fb8375ae98b
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
---
 csit/config/clamp/AcRuntimeParameters.yaml             |  9 +++++----
 csit/config/clamp/HttpParticipantParameters.yaml       |  6 ++++--
 csit/config/clamp/KubernetesParticipantParameters.yaml |  6 ++++--
 csit/config/clamp/PolicyParticipantParameters.yaml     | 10 ++++++----
 4 files changed, 19 insertions(+), 12 deletions(-)

(limited to 'csit/config/clamp')

diff --git a/csit/config/clamp/AcRuntimeParameters.yaml b/csit/config/clamp/AcRuntimeParameters.yaml
index 40031828..d70627f1 100644
--- 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 529b095a..62b9dc46 100644
--- 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 c6acf405..49c568cb 100644
--- 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 1cb4e6dc..73d40d4b 100644
--- 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
-- 
cgit 1.2.3-korg