Merge "[CDS] Add logs to STDOUT"
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/logback.xml b/kubernetes/cds/charts/cds-blueprints-processor/resources/config/logback.xml
index 349336e..88ac8d9 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/logback.xml
+++ b/kubernetes/cds/charts/cds-blueprints-processor/resources/config/logback.xml
@@ -30,13 +30,13 @@
         </encoder>
     </appender>
 
-    <logger name="org.springframework" level="info"/>
-    <logger name="org.springframework.web" level="info"/>
-    <logger name="org.springframework.security.web.authentication" level="warn"/>
-    <logger name="org.hibernate" level="error"/>
-    <logger name="org.onap.ccsdk.cds" level="info"/>
+    <logger name="org.springframework" level="{{ .Values.logback.logger.springframework }}"/>
+    <logger name="org.springframework.web" level="{{ .Values.logback.logger.springframeworkWeb }}"/>
+    <logger name="org.springframework.security.web.authentication" level="{{ .Values.logback.logger.springframeworkSecurityWebauthentication }}"/>
+    <logger name="org.hibernate" level="{{ .Values.logback.logger.hibernate }}"/>
+    <logger name="org.onap.ccsdk.cds" level="{{ .Values.logback.logger.onapCcsdkCds }}"/>
 
-    <root level="info">
+    <root level="{{ .Values.logback.rootLogLevel }}">
         <appender-ref ref="STDOUT"/>
     </root>
 
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/values.yaml b/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
index 2de8354..933c56d 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
+++ b/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
@@ -159,6 +159,15 @@
   config:
     ssl: "none"
 
+logback:
+  rootLogLevel: INFO
+  logger:
+    springframework: INFO
+    springframeworkWeb: INFO
+    springframeworkSecurityWebauthentication: INFO
+    hibernate: INFO
+    onapCcsdkCds: INFO
+
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
diff --git a/kubernetes/cds/charts/cds-sdc-listener/resources/config/logback.xml b/kubernetes/cds/charts/cds-sdc-listener/resources/config/logback.xml
index 5715226..b48cad7 100644
--- a/kubernetes/cds/charts/cds-sdc-listener/resources/config/logback.xml
+++ b/kubernetes/cds/charts/cds-sdc-listener/resources/config/logback.xml
@@ -30,13 +30,13 @@
     </encoder>
   </appender>
 
-  <logger name="org.springframework" level="info"/>
-  <logger name="org.springframework.web" level="info"/>
-  <logger name="org.springframework.security.web.authentication" level="warn"/>
-  <logger name="org.hibernate" level="error"/>
-  <logger name="org.onap.ccsdk.cds" level="info"/>
+  <logger name="org.springframework" level="{{ .Values.logback.logger.springframework }}"/>
+  <logger name="org.springframework.web" level="{{ .Values.logback.logger.springframeworkWeb }}"/>
+  <logger name="org.springframework.security.web.authentication" level="{{ .Values.logback.logger.springframeworkSecurityWebauthentication }}"/>
+  <logger name="org.hibernate" level="{{ .Values.logback.logger.hibernate }}"/>
+  <logger name="org.onap.ccsdk.cds" level="{{ .Values.logback.logger.onapCcsdkCds }}"/>
 
-  <root level="warn">
+  <root level="{{ .Values.logback.rootLogLevel }}">
     <appender-ref ref="STDOUT"/>
   </root>
 
diff --git a/kubernetes/cds/charts/cds-sdc-listener/values.yaml b/kubernetes/cds/charts/cds-sdc-listener/values.yaml
index 30f9451..a5da627 100644
--- a/kubernetes/cds/charts/cds-sdc-listener/values.yaml
+++ b/kubernetes/cds/charts/cds-sdc-listener/values.yaml
@@ -80,6 +80,15 @@
 ingress:
   enabled: false
 
+logback:
+  rootLogLevel: INFO
+  logger:
+    springframework: INFO
+    springframeworkWeb: INFO
+    springframeworkSecurityWebauthentication: INFO
+    hibernate: INFO
+    onapCcsdkCds: INFO
+
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little