From f5653372e8a59f86eccde9045ad467d380a5496e Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Fri, 26 Apr 2019 16:41:38 +0200 Subject: Add missing parameters Add missing parameters for policy api host and port + creds + update logback Issue-ID: CLAMP-358 Change-Id: I62989efc7e8fef60c0b84c4b4425b1d24582d5c0 Signed-off-by: Determe, Sebastien (sd378r) --- kubernetes/clamp/resources/config/logback.xml | 280 ++++++++++++++++---------- kubernetes/clamp/values.yaml | 6 + 2 files changed, 177 insertions(+), 109 deletions(-) diff --git a/kubernetes/clamp/resources/config/logback.xml b/kubernetes/clamp/resources/config/logback.xml index 03551fe241..551ed34ee4 100644 --- a/kubernetes/clamp/resources/config/logback.xml +++ b/kubernetes/clamp/resources/config/logback.xml @@ -17,66 +17,97 @@ - - - - - - - - - - + + + + + + + + + + - - - - INFO - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n - - + + + + INFO + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n + + + - - - INFO - - ${logDirectory}/error2.log - true - - ${defaultPattern} - - - ${outputDirectory}/clamp/error.%d{yyyy-MM-dd}.%i.log.zip - 50MB - 30 - 10GB - - - 10MB - - + + + INFO + + ${logDirectory}/error.log + true + + ${defaultPattern} + + + ${outputDirectory}/clamp/error.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + + 10MB + + - - ${logDirectory}/debug.log - true - - ${debugPattern} - - - ${outputDirectory}/clamp/debug.%d{yyyy-MM-dd}.%i.log.zip - 50MB - 30 - 10GB - - + + ${logDirectory}/debug.log + true + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n + + + + ${outputDirectory}/clamp/debug.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + 30 + 10GB + + - ${logDirectory}/audit.log true @@ -95,13 +126,15 @@ 10MB - 256 - ${logDirectory}/metric.log true @@ -120,14 +153,16 @@ 10MB - 256 - ${logDirectory}/security.log true @@ -146,55 +181,15 @@ 10MB - 256 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -214,7 +209,8 @@ "%d [%thread] %-5level %logger{1024} - %msg%n" - @@ -234,14 +230,81 @@ "%d [%thread] %-5level %logger{1024} - %msg%n" - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -251,4 +314,3 @@ - diff --git a/kubernetes/clamp/values.yaml b/kubernetes/clamp/values.yaml index 77dabccf70..9d5fb05daf 100644 --- a/kubernetes/clamp/values.yaml +++ b/kubernetes/clamp/values.yaml @@ -56,6 +56,12 @@ config: "clamp.config.files.sdcController": "file:/opt/clamp/sdc-controllers-config.json", "clamp.config.dcae.inventory.url": "http://inventory.{{ include "common.namespace" . }}:8080", "clamp.config.dcae.dispatcher.url": "https://deployment-handler.{{ include "common.namespace" . }}:8443", + "clamp.config.policy.api.url": "http4://policy-api.{{ include "common.namespace" . }}:6969", + "clamp.config.policy.api.userName": "healthcheck", + "clamp.config.policy.api.password": "zb!XztG34", + "clamp.config.policy.pap.url": "http4://policy-pap.{{ include "common.namespace" . }}:6969", + "clamp.config.policy.pap.userName": "healthcheck", + "clamp.config.policy.pap.password": "zb!XztG34", "clamp.config.policy.pdpUrl1": "https://pdp.{{ include "common.namespace" . }}:8081/pdp/ , testpdp, alpha123", "clamp.config.policy.pdpUrl2": "https://pdp.{{ include "common.namespace" . }}:8081/pdp/ , testpdp, alpha123", "clamp.config.policy.papUrl": "https://pap.{{ include "common.namespace" . }}:9091/pap/ , testpap, alpha123", -- cgit 1.2.3-korg