From dd285d3cc77b54cd1a9f62521351630a1b62bc29 Mon Sep 17 00:00:00 2001
From: Dominik Mizyn <d.mizyn@partner.samsung.com>
Date: Fri, 21 Aug 2020 13:10:11 +0200
Subject: [PATCH] [CDS] Add logs to STDOUT

This commit change logging level of used loggers to "INFO" and root
logging level to "INFO"

Thanks to that we will see "info", "error" and "warn" messages.

Issue-ID: OOM-2514
Change-Id: I545e2ee69f1bcde7f7313fdda8f80e8201b7461c
Signed-off-by: Dominik Mizyn <d.mizyn@partner.samsung.com>
---
 .../cds-blueprints-processor/resources/config/logback.xml    | 12 ++++++------
 kubernetes/cds/charts/cds-blueprints-processor/values.yaml   |  9 +++++++++
 .../cds/charts/cds-sdc-listener/resources/config/logback.xml | 12 ++++++------
 kubernetes/cds/charts/cds-sdc-listener/values.yaml           |  9 +++++++++
 4 files changed, 30 insertions(+), 12 deletions(-)

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 349336ee79..88ac8d98df 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 2de835492f..933c56dca4 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
+++ b/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
@@ -159,6 +159,15 @@ ingress:
   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 5715226eb2..b48cad75f1 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 30f9451673..a5da627d0f 100644
--- a/kubernetes/cds/charts/cds-sdc-listener/values.yaml
+++ b/kubernetes/cds/charts/cds-sdc-listener/values.yaml
@@ -80,6 +80,15 @@ persistence:
 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
-- 
2.16.6