Merge "[AAI] Make aai log level configurable"

10 files changed, 21 insertions, 9 deletions

diff --git a/kubernetes/aai/components/aai-babel/resources/config/logback.xml b/kubernetes/aai/components/aai-babel/resources/config/logback.xml
index 125731cf6e..686423b31f 100644
--- a/kubernetes/aai/components/aai-babel/resources/config/logback.xml
+++ b/kubernetes/aai/components/aai-babel/resources/config/logback.xml
@@ -131,7 +131,7 @@
   <!-- This determines the logging level for 3rd party code -->
   <!-- ============================================================================ -->
 
-  <root level="INFO">
+  <root level={{ .Values.log.level.root | upper | quote }}>
     <appender-ref ref="asyncEELF" />
     <appender-ref ref="asyncEELFDebug" />
     <appender-ref ref="AsyncSysOut" />
diff --git a/kubernetes/aai/components/aai-babel/values.yaml b/kubernetes/aai/components/aai-babel/values.yaml
index e058d82e46..579289a908 100644
--- a/kubernetes/aai/components/aai-babel/values.yaml
+++ b/kubernetes/aai/components/aai-babel/values.yaml
@@ -104,4 +104,6 @@ serviceAccount:
 #Log configuration
 log:
   path: /var/log/onap
+  level:
+    root: INFO
 logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/logback.xml b/kubernetes/aai/components/aai-graphadmin/resources/config/logback.xml
index fd79f7043a..f30fd2da60 100644
--- a/kubernetes/aai/components/aai-graphadmin/resources/config/logback.xml
+++ b/kubernetes/aai/components/aai-graphadmin/resources/config/logback.xml
@@ -851,7 +851,7 @@
     </then>
   </if>
 
-  <logger name="org.onap.aai" level="DEBUG" additivity="false">
+  <logger name="org.onap.aai" level={{ .Values.log.level.base | upper | quote }} additivity="false">
     <if condition='property("logToFileEnabled").contains("true")'>
       <then>
         <appender-ref ref="asyncDEBUG"/>
@@ -1185,7 +1185,7 @@
     </if>
     <appender-ref ref="STDOUT"/>
   </logger>
-  <root level="DEBUG">
+  <root level={{ .Values.log.level.root | upper | quote }}>
     <if condition='property("logToFileEnabled").contains("true")'>
       <then>
         <appender-ref ref="external"/>
diff --git a/kubernetes/aai/components/aai-graphadmin/values.yaml b/kubernetes/aai/components/aai-graphadmin/values.yaml
index 8b6b5f906a..d3609a9110 100644
--- a/kubernetes/aai/components/aai-graphadmin/values.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/values.yaml
@@ -291,4 +291,7 @@ serviceAccount:
 #Log configuration
 log:
   path: /var/log/onap
+  level:
+    root: DEBUG
+    base: DEBUG
 logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
diff --git a/kubernetes/aai/components/aai-modelloader/resources/config/log/logback.xml b/kubernetes/aai/components/aai-modelloader/resources/config/log/logback.xml
index 129af8f2ac..dd8da5951a 100644
--- a/kubernetes/aai/components/aai-modelloader/resources/config/log/logback.xml
+++ b/kubernetes/aai/components/aai-modelloader/resources/config/log/logback.xml
@@ -163,10 +163,9 @@
   <logger name="ch.qos.logback.classic" level="WARN" />
   <logger name="ch.qos.logback.core" level="WARN" />
 
-  <root>
+  <root level={{ .Values.log.level.root | upper | quote }}>
     <appender-ref ref="asyncEELF" />
     <appender-ref ref="AsyncSysOut" />
-    <!-- <appender-ref ref="asyncEELFDebug" /> -->
   </root>
 
 </configuration>
diff --git a/kubernetes/aai/components/aai-modelloader/values.yaml b/kubernetes/aai/components/aai-modelloader/values.yaml
index ab3d8646c2..97f489f9e9 100644
--- a/kubernetes/aai/components/aai-modelloader/values.yaml
+++ b/kubernetes/aai/components/aai-modelloader/values.yaml
@@ -102,4 +102,6 @@ securityContext:
 #Log configuration
 log:
   path: /var/log/onap
+  level:
+    root: INFO
 logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
diff --git a/kubernetes/aai/components/aai-resources/resources/config/logback.xml b/kubernetes/aai/components/aai-resources/resources/config/logback.xml
index b52318500d..8d18640281 100644
--- a/kubernetes/aai/components/aai-resources/resources/config/logback.xml
+++ b/kubernetes/aai/components/aai-resources/resources/config/logback.xml
@@ -363,7 +363,7 @@
   <logger name="org.zookeeper" level="OFF" />
 
 
-  <logger name="org.onap.aai" level="DEBUG" additivity="false">
+  <logger name="org.onap.aai" level={{ .Values.log.level.base | upper | quote }} additivity="false">
     <if condition='property("logToFileEnabled").contains("true")'>
       <then>
         <appender-ref ref="asyncDEBUG"/>
@@ -425,7 +425,7 @@
     <appender-ref ref="STDOUT"/>
   </logger>
 
-  <root level="DEBUG">
+  <root level={{ .Values.log.level.root | upper | quote }}>
     <if condition='property("logToFileEnabled").contains("true")'>
       <then>
         <appender-ref ref="external"/>
diff --git a/kubernetes/aai/components/aai-resources/values.yaml b/kubernetes/aai/components/aai-resources/values.yaml
index b1d32028c2..3023d86f19 100644
--- a/kubernetes/aai/components/aai-resources/values.yaml
+++ b/kubernetes/aai/components/aai-resources/values.yaml
@@ -360,6 +360,9 @@ serviceAccount:
 #Log configuration
 log:
   path: /var/log/onap
+  level:
+    root: DEBUG
+    base: DEBUG # base package (org.onap.aai)
 logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
 
 # To make logback capping values configurable
diff --git a/kubernetes/aai/components/aai-traversal/resources/config/logback.xml b/kubernetes/aai/components/aai-traversal/resources/config/logback.xml
index 3dc4867f5d..acdc893f55 100644
--- a/kubernetes/aai/components/aai-traversal/resources/config/logback.xml
+++ b/kubernetes/aai/components/aai-traversal/resources/config/logback.xml
@@ -332,7 +332,7 @@
   <logger name="org.zookeeper" level="OFF" />
 
 
-  <logger name="org.onap.aai" level="DEBUG" additivity="false">
+  <logger name="org.onap.aai" level={{ .Values.log.level.base | upper | quote }} additivity="false">
     <if condition='property("logToFileEnabled").contains("true")'>
       <then>
         <appender-ref ref="asyncDEBUG" />
@@ -424,7 +424,7 @@
     <appender-ref ref="STDOUT" />
   </logger>
 
-  <root level="DEBUG">
+  <root level={{ .Values.log.level.root | upper | quote }}>
     <if condition='property("logToFileEnabled").contains("true")'>
       <then>
         <appender-ref ref="external" />
diff --git a/kubernetes/aai/components/aai-traversal/values.yaml b/kubernetes/aai/components/aai-traversal/values.yaml
index aca1ec7731..f6194b8ac0 100644
--- a/kubernetes/aai/components/aai-traversal/values.yaml
+++ b/kubernetes/aai/components/aai-traversal/values.yaml
@@ -368,4 +368,7 @@ serviceAccount:
 #Log configuration
 log:
   path: /var/log/onap
+  level:
+    root: DEBUG
+    base: DEBUG # base package (org.onap.aai)
 logConfigMapNamePrefix: '{{ include "common.fullname" . }}'