X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Faai%2Fcomponents%2Faai-resources%2Fresources%2Fconfig%2Flocalhost-access-logback.xml;h=07919a97a250ee13e02e1a8f6599e834132cf387;hb=refs%2Fheads%2Fmaster;hp=5ddd293658b8e1563a76cbc6487e923caee2eeeb;hpb=4b31de9cd509903fe8c30b226720c87890857795;p=oom.git

diff --git a/kubernetes/aai/components/aai-resources/resources/config/localhost-access-logback.xml b/kubernetes/aai/components/aai-resources/resources/config/localhost-access-logback.xml
index 5ddd293658..07919a97a2 100644
--- a/kubernetes/aai/components/aai-resources/resources/config/localhost-access-logback.xml
+++ b/kubernetes/aai/components/aai-resources/resources/config/localhost-access-logback.xml
@@ -27,14 +27,17 @@
 <configuration>
   <property name="AJSC_HOME" value="${AJSC_HOME:-.}" />
 
-  <property name="logToFileEnabled" value='{{.Values.accessLogback.logToFileEnabled}}'/>
+  <property name="logToFileEnabled" value='{{.Values.accessLogback.logToFileEnabled}}' />
   <property name="maxHistory" value='{{.Values.accessLogback.maxHistory}}' />
   <property name="totalSizeCap" value='{{.Values.accessLogback.totalSizeCap}}' />
+  <property name="livenessAccessLogEnabled"
+    value='{{.Values.accessLogback.livenessAccessLogEnabled}}' />
+
 
   <if condition='property("logToFileEnabled").contains("true")'>
     <then>
       <appender name="ACCESS"
-                class="ch.qos.logback.core.rolling.RollingFileAppender">
+        class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
           <fileNamePattern>${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log.%d{yyyy-MM-dd}.zip
@@ -43,17 +46,36 @@
           <totalSizeCap>${totalSizeCap}</totalSizeCap>
         </rollingPolicy>
         <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</Pattern>
+          <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</Pattern>
         </encoder>
       </appender>
-      <appender-ref ref="ACCESS"/>
+      <appender-ref ref="ACCESS" />
     </then>
   </if>
 
   <appender name="STDOUTACCESS" class="ch.qos.logback.core.ConsoleAppender">
     <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>
+      <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>
+    <if condition='property("livenessAccessLogEnabled").contains("false")'>
+      <then>
+        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
+          <evaluator class="ch.qos.logback.access.net.URLEvaluator">
+            <URL>/aai/util/echo</URL>
+          </evaluator>
+          <OnMismatch>NEUTRAL</OnMismatch>
+          <OnMatch>DENY</OnMatch>
+        </filter>
+      </then>
+    </if>
   </appender>
 
   <appender-ref ref="STDOUTACCESS" />
@@ -83,5 +105,4 @@
 %z - Custom pattern that parses the cert for the subject
 %y - Custom pattern determines rest or dme2
 -->
-*/}}
-
+*/}}
\ No newline at end of file