Revert "Updated logback to support Json log format in AAI-Graphadmin HTTP logs &...

This reverts commit d8a59d278e4b9c88101c6d0a5c7452148f39b332.

Reason for revert: This change also requires a new model-loader image that contains the logback encoder dependency that this relies on

Change-Id: I3bf1a6bb86b60f7fb2d99b7b59c1e82dcedc2466
Signed-off-by: Fiete.Ostkamp@telekom.de
Issue-ID: OOM-3339

diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/localhost-access-logback.xml b/kubernetes/aai/components/aai-graphadmin/resources/config/localhost-access-logback.xml
index cc9602c..8e1bf21 100644 (file)
--- a/kubernetes/aai/components/aai-graphadmin/resources/config/localhost-access-logback.xml
+++ b/kubernetes/aai/components/aai-graphadmin/resources/config/localhost-access-logback.xml
@@ -20,7 +20,6 @@
 */}}
 -->
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
     <property name="AJSC_HOME" value="${AJSC_HOME:-.}" />
     <property name="maxHistory" value='{{.Values.accessLogback.maxHistory}}' />
     <property name="totalSizeCap" value='{{.Values.accessLogback.totalSizeCap}}' />
@@ -45,37 +44,8 @@
     </if>
 
     <appender name="STDOUTACCESS" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder class="net.logstash.logback.encoder.AccessEventCompositeJsonEncoder">
-            <providers>
-                <pattern>
-                    <pattern>
-                        {
-                            "remoteIp": "%a",
-                            "remoteUser": "%u",
-                            "timestamp": "%t",
-                            "requestMethod": "%m",
-                            "requestUrl": "%U",
-                            "queryString": "%q",
-                            "httpStatusCode": "%s",
-                            "bytesSent": "%b",
-                            "transactionId": "%i{X-TransactionId}",
-                            "fromAppId": "%i{X-FromAppId}",
-                            "forwardedFor": "%i{X-Forwarded-For}",
-                            "aaiSslClientCn": "%i{X-AAI-SSL-Client-CN}",
-                            "aaiSslClientOu": "%i{X-AAI-SSL-Client-OU}",
-                            "aaiSslClientO": "%i{X-AAI-SSL-Client-O}",
-                            "aaiSslClientL": "%i{X-AAI-SSL-Client-L}",
-                            "aaiSslClientSt": "%i{X-AAI-SSL-Client-ST}",
-                            "aaiSslClientC": "%i{X-AAI-SSL-Client-C}",
-                            "aaiSslClientNotBefore": "%i{X-AAI-SSL-Client-NotBefore}",
-                            "aaiSslClientNotAfter": "%i{X-AAI-SSL-Client-NotAfter}",
-                            "aaiSslClientDn": "%i{X-AAI-SSL-Client-DN}",
-                            "durationMs": "%D",
-                            "logType": "access"
-                        }
-                    </pattern>
-                </pattern>
-            </providers>
+        <encoder class="org.onap.aai.logging.CustomLogPatternLayoutEncoder">
+            <Pattern>%a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D - "logType": "access"</Pattern>
         </encoder>
     </appender>
     <appender-ref ref="STDOUTACCESS" />

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 909e036..90579b0 100644 (file)
--- a/kubernetes/aai/components/aai-modelloader/resources/config/log/logback.xml
+++ b/kubernetes/aai/components/aai-modelloader/resources/config/log/logback.xml
@@ -17,6 +17,7 @@
 -->
 */}}
 <configuration scan="true" scanPeriod="3 seconds" debug="false">
+  <include resource="org/springframework/boot/logging/logback/base.xml" />
   <property name="logDir" value="/var/log/onap" />
   <property name="componentName" value="AAI-ML"></property>
 
@@ -31,34 +32,10 @@
 
   <property name="logDirectory" value="${logDir}/${componentName}" />
 
+  <!-- Example evaluator filter applied against console appender -->
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
-      <providers>
-        <timestamp><fieldName>timestamp</fieldName></timestamp>
-        <message/>
-        <mdc>
-          <fieldName>context</fieldName>
-          <includeMdcKeyName>RequestId</includeMdcKeyName>
-          <includeMdcKeyName>PartnerName</includeMdcKeyName>
-        </mdc>
-        <stackTrace>
-          <fieldName>exception</fieldName>
-          <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
-            <exclude>^sun\.reflect\..*\.invoke</exclude>
-            <exclude>^net\.sf\.cglib\.proxy\.MethodProxy\.invoke</exclude>
-            <rootCauseFirst>true</rootCauseFirst>
-          </throwableConverter>
-        </stackTrace>
-        <threadName><fieldName>thread</fieldName></threadName>
-        <loggerName>
-          <fieldName>logger</fieldName>
-          <shortenedLoggerNameLength>36</shortenedLoggerNameLength>
-        </loggerName>
-        <logLevel/>
-        <pattern>
-          <pattern>{"logType":"app", "app":"ModelLoader"}</pattern>
-        </pattern>
-      </providers>
+    <encoder>
+      <pattern>${errorLogPattern}</pattern>
     </encoder>
   </appender>
   <appender name="AsyncSysOut" class="ch.qos.logback.classic.AsyncAppender">