Merge "Revert "[AAI] Add logs to STDOUT""

4 files changed, 38 insertions, 60 deletions

diff --git a/components/aai-resources/resources/config/logback.xml b/components/aai-resources/resources/config/logback.xml
index f532b4f..ba06414 100644
--- a/components/aai-resources/resources/config/logback.xml
+++ b/components/aai-resources/resources/config/logback.xml
@@ -5,7 +5,6 @@
     ================================================================================
     Copyright © 2017 AT&T Intellectual Property. All rights reserved.
     Modifications Copyright © 2018 Amdocs, Bell Canada
-	Modifications Copyright © 2020 Samsung Electronics
     ================================================================================
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -60,7 +59,9 @@
     <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
 	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder>
-			<pattern>{{ .Values.log.consolePattern.config }}</pattern>
+			<pattern>
+				%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}
+			</pattern>
 		</encoder>
 	</appender>
 
@@ -279,23 +280,23 @@
 	</appender>
 	<!-- logback internals logging -->
 
-	<logger name="ch.qos.logback.classic" level="{{.Values.logback.loggger.qosLogbackClassic}}" />
-	<logger name="ch.qos.logback.core" level="{{.Values.logback.loggger.qosLogbackCore}}" />
+	<logger name="ch.qos.logback.classic" level="WARN" />
+	<logger name="ch.qos.logback.core" level="WARN" />
 
-	<logger name="com.att.aft.dme2" level="{{.Values.logback.loggger.attAftDme2}}" />
-	<logger name="com.jayway.jsonpath" level="{{.Values.logback.loggger.jaywayJsonpath}}" />
+	<logger name="com.att.aft.dme2" level="WARN" />
+	<logger name="com.jayway.jsonpath" level="WARN" />
 
-	<logger name="org.apache" level="{{.Values.logback.loggger.apache}}" />
-	<logger name="org.apache.commons" level="{{.Values.logback.loggger.apacheCommons}}" />
-	<logger name="org.apache.zookeeper" level="{{.Values.logback.loggger.apacheZookeeper}}" />
-	<logger name="org.codehaus.groovy" level="{{.Values.logback.loggger.codehausGroovy}}" />
-	<logger name="org.eclipse.jetty" level="{{.Values.logback.loggger.eclipseJetty}}" />
+	<logger name="org.apache" level="OFF" />
+	<logger name="org.apache.commons" level="WARN" />
+	<logger name="org.apache.zookeeper" level="OFF" />
+	<logger name="org.codehaus.groovy" level="WARN" />
+	<logger name="org.eclipse.jetty" level="WARN" />
 	<!-- Spring related loggers -->
-	<logger name="org.springframework" level="{{.Values.logback.loggger.springframework}}" />
-	<logger name="org.springframework.beans" level="{{.Values.logback.loggger.springframeworkBeans}}" />
-	<logger name="org.springframework.web" level="{{.Values.logback.loggger.springframeworkWeb}}" />
-	<logger name="org.janusgraph" level="{{.Values.logback.loggger.janusgraph}}" />
-	<logger name="org.zookeeper" level="{{.Values.logback.loggger.zookeeper}}" />
+	<logger name="org.springframework" level="WARN" />
+	<logger name="org.springframework.beans" level="WARN" />
+	<logger name="org.springframework.web" level="WARN" />
+	<logger name="org.janusgraph" level="WARN" />
+	<logger name="org.zookeeper" level="OFF" />
 
 
 	<logger name="org.onap.aai" level="DEBUG" additivity="false">
@@ -334,7 +335,7 @@
 		<appender-ref ref="dmaapAAIEventConsumerInfo" />
 	</logger>
 
-	<root level="{{.Values.logback.rootLogLevel.config}}">
+	<root level="DEBUG">
 		<appender-ref ref="external" />
 		<appender-ref ref="STDOUT" />
 	</root>
diff --git a/components/aai-resources/resources/fproxy/config/logback-spring.xml b/components/aai-resources/resources/fproxy/config/logback-spring.xml
index 6d24a23..9a08348 100644
--- a/components/aai-resources/resources/fproxy/config/logback-spring.xml
+++ b/components/aai-resources/resources/fproxy/config/logback-spring.xml
@@ -3,14 +3,16 @@
  
     <property name="LOGS" value="./logs/AAF-FPS" />
     <property name="FILEPREFIX" value="application" />
-
-    <appender name="STDOUT"
+ 
+    <appender name="Console"
         class="ch.qos.logback.core.ConsoleAppender">
         <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>{{ .Values.log.consolePattern.fproxy }}</Pattern>
+            <Pattern>
+                %d{ISO8601} %-5level [%t] %C{1.}: %msg%n%throwable
+            </Pattern>
         </layout>
     </appender>
-
+ 
     <appender name="RollingFile"
         class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${LOGS}/${FILEPREFIX}.log</file>
@@ -30,14 +32,14 @@
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
     </appender>
-
+     
     <!-- LOG everything at INFO level -->
-    <root level="{{.Values.logback.rootLogLevel.fproxy}}">
+    <root level="info">
         <appender-ref ref="RollingFile" />
-        <appender-ref ref="STDOUT" />
+        <appender-ref ref="Console" />
     </root>
-
+ 
     <!-- LOG "com.baeldung*" at TRACE level -->
     <logger name="org.onap.aaf.fproxy" level="info" />
-
+ 
 </configuration>
\ No newline at end of file
diff --git a/components/aai-resources/resources/rproxy/config/logback-spring.xml b/components/aai-resources/resources/rproxy/config/logback-spring.xml
index c0c506a..799fd86 100644
--- a/components/aai-resources/resources/rproxy/config/logback-spring.xml
+++ b/components/aai-resources/resources/rproxy/config/logback-spring.xml
@@ -4,10 +4,12 @@
     <property name="LOGS" value="./logs/reverse-proxy" />
     <property name="FILEPREFIX" value="application" />
  
-    <appender name="STDOUT"
+    <appender name="Console"
         class="ch.qos.logback.core.ConsoleAppender">
         <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>{{ .Values.log.consolePattern.rproxy }}</Pattern>
+            <Pattern>
+                %d{ISO8601} %-5level [%t] %C{1.}: %msg%n%throwable
+            </Pattern>
         </layout>
     </appender>
  
@@ -30,14 +32,14 @@
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
     </appender>
-
+     
     <!-- LOG everything at INFO level -->
-    <root level="{{.Values.logback.rootLogLevelrproxy}}">
+    <root level="info">
         <appender-ref ref="RollingFile" />
-        <appender-ref ref="STDOUT" />
+        <appender-ref ref="Console" />
     </root>
-
+ 
     <!-- LOG "com.baeldung*" at TRACE level  -->
     <logger name="org.onap.aaf.rproxy" level="info" />
-
+ 
 </configuration>
diff --git a/components/aai-resources/values.yaml b/components/aai-resources/values.yaml
index 82f8a36..b71c9c4 100644
--- a/components/aai-resources/values.yaml
+++ b/components/aai-resources/values.yaml
@@ -84,33 +84,6 @@ service:
 ingress:
   enabled: false
 
-log:
-  logDir: {{ .Values.log.logDir }}
-  root:
-    level:
-      config: {{ .Values.log.root.level.resources.config }}
-      fproxy: {{ .Values.log.root.level.resources.fproxy }}
-      rproxy: {{ .Values.log.root.level.resources.rproxy }}
-  consolePattern:
-    config: {{ .Values.log.consolePattern.resources.config }}
-    fproxy: {{ .Values.log.consolePattern.resources.fproxy }}
-    rproxy: {{ .Values.log.consolePattern.resources.rproxy }}
-  loggger:
-    apache: {{ .Values.log.logger.apache }}
-    apacheCommons: {{ .Values.log.logger.apacheCommons }}
-    apacheZookeeper: {{ .Values.log.logger.apacheZookeeper }}
-    attAftDme2: {{ .Values.log.logger.attAftDme2 }}
-    codehausGroovy: {{ .Values.log.logger.codehausGroovy }}
-    eclipseJetty: {{ .Values.log.logger.eclipseJetty }}
-    janusgraph: {{ .Values.log.logger.janusgraph }}
-    jaywayJsonpath: {{ .Values.log.logger.jaywayJsonpath }}
-    qosLogbackClassic: {{ .Values.log.logger.qosLogbackClassic }}
-    qosLogbackCore: {{ .Values.log.logger.qosLogbackCore }}
-    springframework: {{ .Values.log.logger.springframework }}
-    springframeworkBeans: {{ .Values.log.logger.springframeworkBeans }}
-    springframeworkWeb: {{ .Values.log.logger.springframeworkWeb }}
-    zookeeper: {{ .Values.log.logger.zookeeper }}
-
   # 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
   # resources, such as Minikube. If you do want to specify resources, uncomment the following