Adjust loggers to latest

Setup is broken, updating to latest SO logger config is fixing this.
See bug to have more details.

Change-Id: I2cd456aa4d813a9c1245506252bae1c76ba773a4
Issue-ID: OOM-462
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

11 files changed, 1522 insertions, 990 deletions

diff --git a/kubernetes/config/docker/init/src/config/log/mso/logback.apihandler-infra.xml b/kubernetes/config/docker/init/src/config/log/mso/logback.apihandler-infra.xml
index d6c11888f8..3e0ea61ea6 100644
--- a/kubernetes/config/docker/init/src/config/log/mso/logback.apihandler-infra.xml
+++ b/kubernetes/config/docker/init/src/config/log/mso/logback.apihandler-infra.xml
@@ -1,110 +1,139 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration scan="true" scanPeriod="3 seconds" debug="true">

-   <property name="logDir" value="/var/log/onap" />

-   <property name="componentName" value="mso" />

-   <property name="subComponentName" value="apiHandlerInfra" />

-   <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />

-   <property name="pattern" value="%d{&amp;quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&amp;quot;, UTC}\t[%thread]\t%-5level\t%logger{36}\t%replace(%replace(%replace(%mdc){'\t','\\\\t'}){', ','\t'}){'\n', '\\\\n'}\t%replace(%replace(%msg){'\n', '\\\\n'}){'\t','\\\\t'}%n" />

-   <!--  log file names -->

-   <property name="errorLogName" value="error" />

-   <property name="metricsLogName" value="metrics" />

-   <property name="auditLogName" value="audit" />

-   <property name="debugLogName" value="debug" />

-   <property name="queueSize" value="256" />

-   <property name="maxFileSize" value="50MB" />

-   <property name="maxHistory" value="30" />

-   <property name="totalSizeCap" value="10GB" />

-   <!-- EELF Appenders -->

-   <appender name="EELFAudit" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${auditLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFAudit" />

-   </appender>

-   <appender name="EELFMetrics" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${metricsLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFMetrics" />

-   </appender>

-   <appender name="EELFError" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${errorLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${errorLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-      <filter class="ch.qos.logback.classic.filter.ThresholdFilter">

-         <level>INFO</level>

-      </filter>

-   </appender>

-   <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFError" />

-   </appender>

-   <appender name="EELFDebug" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${debugLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFDebug" />

-      <includeCallerData>true</includeCallerData>

-   </appender>

-   <!--  EELF loggers -->

-   <logger name="com.att.eelf.audit" level="info" additivity="false">

-      <appender-ref ref="asyncEELFAudit" />

-   </logger>

-   <logger name="com.att.eelf.metrics" level="info" additivity="false">

-      <appender-ref ref="asyncEELFMetrics" />

-   </logger>

-   <logger name="com.att.eelf.error" level="info" additivity="false">

-      <appender-ref ref="asyncEELFError" />

-   </logger>

-   <logger name="com.att.eelf.debug" level="debug" additivity="false">

-      <appender-ref ref="asyncEELFDebug" />

-   </logger>

-   <root level="INFO">

-      <appender-ref ref="asyncEELFDebug" />

-   </root>

-</configuration>
\ No newline at end of file
+<configuration scan="false" debug="true">
+  <!--<jmxConfigurator /> -->
+  <!-- directory path for all other type logs -->
+  <property name="logDir" value="/var/log/onap" />
+  
+  <!-- directory path for debugging type logs -->
+  <property name="debugDir" value="/var/log/onap" />
+  
+  <!--  specify the component name 
+    <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
+  <property name="componentName" value="MSO"></property>
+  <property name="subComponentName" value="ApiHandlerInfra"></property>
+  <!--  log file names -->
+  <property name="errorLogName" value="error" />
+  <property name="metricsLogName" value="metrics" />
+  <property name="auditLogName" value="audit" />
+  <property name="debugLogName" value="debug" />
+
+  <property name="errorPattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%.-5level|%X{ErrorCode}|%X{ErrorDesc}|%msg%n" />
+  <property name="debugPattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}|%X{RequestId}|%msg%n" />
+
+  <property name="auditPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{RemoteHost}||||||||%msg%n" />
+  <property name="metricPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{RemoteHost}||||%X{TargetVirtualEntity}|||||%msg%n" />
+  <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />
+  <property name="debugLogDirectory" value="${debugDir}/${componentName}/${subComponentName}" />
+
+
+  <!-- ============================================================================ -->
+  <!-- EELF Appenders -->
+  <!-- ============================================================================ -->
+
+  <!-- The EELFAppender is used to record events to the general application 
+    log -->
+  
+  <!-- EELF Audit Appender. This appender is used to record audit engine 
+    related logging events. The audit logger and appender are specializations 
+    of the EELF application root logger and appender. This can be used to segregate 
+    Policy engine events from other components, or it can be eliminated to record 
+    these events as part of the application root log. -->
+    
+  <appender name="EELFAudit"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${auditLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${auditLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+         <pattern>${auditPattern}</pattern>
+    </encoder>
+  </appender>
+  <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFAudit" />
+  </appender>
+
+<appender name="EELFMetrics"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${metricsLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${metricsLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+      <!-- <pattern>"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - 
+        %msg%n"</pattern> -->
+      <pattern>${metricPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  
+  <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFMetrics"/>
+  </appender>
+   
+  <appender name="EELFError"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${errorLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${errorLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>INFO</level>
+    </filter>
+    <encoder>
+      <pattern>${errorPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFError"/>
+  </appender>
+  
+   <appender name="EELFDebug"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${debugLogDirectory}/${debugLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${debugLogDirectory}/${debugLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+      <pattern>${debugPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFDebug" />
+    <includeCallerData>true</includeCallerData>
+  </appender>
+ 
+  
+  <!-- ============================================================================ -->
+  <!--  EELF loggers -->
+  <!-- ============================================================================ -->
+
+  <logger name="com.att.eelf.audit" level="info" additivity="false">
+    <appender-ref ref="asyncEELFAudit" />
+  </logger>
+  
+  <logger name="com.att.eelf.metrics" level="info" additivity="false">
+        <appender-ref ref="asyncEELFMetrics" />
+  </logger>
+
+  <logger name="com.att.eelf.error" level="debug" additivity="false">
+    <appender-ref ref="asyncEELFError" />
+  </logger> 
+  <root level="INFO">
+    <appender-ref ref="asyncEELFDebug" />
+  </root>
+
+</configuration>
diff --git a/kubernetes/config/docker/init/src/config/log/mso/logback.appc.xml b/kubernetes/config/docker/init/src/config/log/mso/logback.appc.xml
index ef9589adfc..588f6f39d2 100644
--- a/kubernetes/config/docker/init/src/config/log/mso/logback.appc.xml
+++ b/kubernetes/config/docker/init/src/config/log/mso/logback.appc.xml
@@ -1,110 +1,138 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration scan="true" scanPeriod="3 seconds" debug="true">

-   <property name="logDir" value="/var/log/onap" />

-   <property name="componentName" value="mso" />

-   <property name="subComponentName" value="appcAdapter" />

-   <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />

-   <property name="pattern" value="%d{&amp;quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&amp;quot;, UTC}\t[%thread]\t%-5level\t%logger{36}\t%replace(%replace(%replace(%mdc){'\t','\\\\t'}){', ','\t'}){'\n', '\\\\n'}\t%replace(%replace(%msg){'\n', '\\\\n'}){'\t','\\\\t'}%n" />

-   <!--  log file names -->

-   <property name="errorLogName" value="error" />

-   <property name="metricsLogName" value="metrics" />

-   <property name="auditLogName" value="audit" />

-   <property name="debugLogName" value="debug" />

-   <property name="queueSize" value="256" />

-   <property name="maxFileSize" value="50MB" />

-   <property name="maxHistory" value="30" />

-   <property name="totalSizeCap" value="10GB" />

-   <!-- EELF Appenders -->

-   <appender name="EELFAudit" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${auditLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFAudit" />

-   </appender>

-   <appender name="EELFMetrics" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${metricsLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFMetrics" />

-   </appender>

-   <appender name="EELFError" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${errorLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${errorLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-      <filter class="ch.qos.logback.classic.filter.ThresholdFilter">

-         <level>INFO</level>

-      </filter>

-   </appender>

-   <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFError" />

-   </appender>

-   <appender name="EELFDebug" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${debugLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFDebug" />

-      <includeCallerData>true</includeCallerData>

-   </appender>

-   <!--  EELF loggers -->

-   <logger name="com.att.eelf.audit" level="info" additivity="false">

-      <appender-ref ref="asyncEELFAudit" />

-   </logger>

-   <logger name="com.att.eelf.metrics" level="info" additivity="false">

-      <appender-ref ref="asyncEELFMetrics" />

-   </logger>

-   <logger name="com.att.eelf.error" level="info" additivity="false">

-      <appender-ref ref="asyncEELFError" />

-   </logger>

-   <logger name="com.att.eelf.debug" level="debug" additivity="false">

-      <appender-ref ref="asyncEELFDebug" />

-   </logger>

-   <root level="INFO">

-      <appender-ref ref="asyncEELFDebug" />

-   </root>

-</configuration>
\ No newline at end of file
+<configuration scan="false" debug="true">
+  <!--<jmxConfigurator /> -->
+  <!-- directory path for all other type logs -->
+  <property name="logDir" value="/var/log/onap" />
+  
+  <!-- directory path for debugging type logs -->
+  <property name="debugDir" value="/var/log/onap" />
+  
+  <!--  specify the component name 
+    <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
+  <property name="componentName" value="MSO"></property>
+  <property name="subComponentName" value="AppCAdapter"></property>
+  <!--  log file names -->
+  <property name="errorLogName" value="error" />
+  <property name="metricsLogName" value="metrics" />
+  <property name="auditLogName" value="audit" />
+  <property name="debugLogName" value="debug" />
+
+  <property name="errorPattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%.-5level|%X{ErrorCode}|%X{ErrorDesc}|%msg%n" />
+  <property name="debugPattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}|%X{RequestId}|%msg%n" />
+
+  <property name="auditPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{RemoteHost}||||||||%msg%n" />
+  <property name="metricPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{RemoteHost}||||%X{TargetVirtualEntity}|||||%msg%n" />
+  <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />
+  <property name="debugLogDirectory" value="${debugDir}/${componentName}/${subComponentName}" />
+
+  <!-- ============================================================================ -->
+  <!-- EELF Appenders -->
+  <!-- ============================================================================ -->
+
+  <!-- The EELFAppender is used to record events to the general application 
+    log -->
+  
+  <!-- EELF Audit Appender. This appender is used to record audit engine 
+    related logging events. The audit logger and appender are specializations 
+    of the EELF application root logger and appender. This can be used to segregate 
+    Policy engine events from other components, or it can be eliminated to record 
+    these events as part of the application root log. -->
+    
+  <appender name="EELFAudit"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${auditLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${auditLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+         <pattern>${auditPattern}</pattern>
+    </encoder>
+  </appender>
+  <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFAudit" />
+  </appender>
+
+<appender name="EELFMetrics"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${metricsLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${metricsLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+      <!-- <pattern>"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - 
+        %msg%n"</pattern> -->
+      <pattern>${metricPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  
+  <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFMetrics"/>
+  </appender>
+   
+  <appender name="EELFError"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${errorLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${errorLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>INFO</level>
+    </filter>
+    <encoder>
+      <pattern>${errorPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFError"/>
+  </appender>
+  
+   <appender name="EELFDebug"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${debugLogDirectory}/${debugLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${debugLogDirectory}/${debugLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+      <pattern>${debugPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFDebug" />
+    <includeCallerData>true</includeCallerData>
+  </appender>
+ 
+  
+  <!-- ============================================================================ -->
+  <!--  EELF loggers -->
+  <!-- ============================================================================ -->
+
+  <logger name="com.att.eelf.audit" level="info" additivity="false">
+    <appender-ref ref="asyncEELFAudit" />
+  </logger>
+  
+  <logger name="com.att.eelf.metrics" level="info" additivity="false">
+        <appender-ref ref="asyncEELFMetrics" />
+  </logger>
+
+  <logger name="com.att.eelf.error" level="debug" additivity="false">
+    <appender-ref ref="asyncEELFError" />
+  </logger> 
+  <root level="INFO">
+    <appender-ref ref="asyncEELFDebug" />
+  </root>
+
+</configuration>
diff --git a/kubernetes/config/docker/init/src/config/log/mso/logback.asdc.xml b/kubernetes/config/docker/init/src/config/log/mso/logback.asdc.xml
index 99615e361c..b4879e017f 100644
--- a/kubernetes/config/docker/init/src/config/log/mso/logback.asdc.xml
+++ b/kubernetes/config/docker/init/src/config/log/mso/logback.asdc.xml
@@ -1,110 +1,138 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration scan="true" scanPeriod="3 seconds" debug="true">

-   <property name="logDir" value="/var/log/onap" />

-   <property name="componentName" value="mso" />

-   <property name="subComponentName" value="asdcController" />

-   <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />

-   <property name="pattern" value="%d{&amp;quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&amp;quot;, UTC}\t[%thread]\t%-5level\t%logger{36}\t%replace(%replace(%replace(%mdc){'\t','\\\\t'}){', ','\t'}){'\n', '\\\\n'}\t%replace(%replace(%msg){'\n', '\\\\n'}){'\t','\\\\t'}%n" />

-   <!--  log file names -->

-   <property name="errorLogName" value="error" />

-   <property name="metricsLogName" value="metrics" />

-   <property name="auditLogName" value="audit" />

-   <property name="debugLogName" value="debug" />

-   <property name="queueSize" value="256" />

-   <property name="maxFileSize" value="50MB" />

-   <property name="maxHistory" value="30" />

-   <property name="totalSizeCap" value="10GB" />

-   <!-- EELF Appenders -->

-   <appender name="EELFAudit" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${auditLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFAudit" />

-   </appender>

-   <appender name="EELFMetrics" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${metricsLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFMetrics" />

-   </appender>

-   <appender name="EELFError" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${errorLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${errorLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-      <filter class="ch.qos.logback.classic.filter.ThresholdFilter">

-         <level>INFO</level>

-      </filter>

-   </appender>

-   <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFError" />

-   </appender>

-   <appender name="EELFDebug" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${debugLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFDebug" />

-      <includeCallerData>true</includeCallerData>

-   </appender>

-   <!--  EELF loggers -->

-   <logger name="com.att.eelf.audit" level="info" additivity="false">

-      <appender-ref ref="asyncEELFAudit" />

-   </logger>

-   <logger name="com.att.eelf.metrics" level="info" additivity="false">

-      <appender-ref ref="asyncEELFMetrics" />

-   </logger>

-   <logger name="com.att.eelf.error" level="info" additivity="false">

-      <appender-ref ref="asyncEELFError" />

-   </logger>

-   <logger name="com.att.eelf.debug" level="debug" additivity="false">

-      <appender-ref ref="asyncEELFDebug" />

-   </logger>

-   <root level="INFO">

-      <appender-ref ref="asyncEELFDebug" />

-   </root>

-</configuration>
\ No newline at end of file
+<configuration scan="false" debug="true">
+  <!--<jmxConfigurator /> -->
+  <!-- directory path for all other type logs -->
+  <property name="logDir" value="/var/log/onap" />
+  
+  <!-- directory path for debugging type logs -->
+  <property name="debugDir" value="/var/log/onap" />
+  
+  <!--  specify the component name 
+    <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
+  <property name="componentName" value="MSO"></property>
+  <property name="subComponentName" value="ASDCController"></property>
+  <!--  log file names -->
+  <property name="errorLogName" value="error" />
+  <property name="metricsLogName" value="metrics" />
+  <property name="auditLogName" value="audit" />
+  <property name="debugLogName" value="debug" />
+
+  <property name="errorPattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%.-5level|%X{ErrorCode}|%X{ErrorDesc}|%msg%n" />
+  <property name="debugPattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}|%X{RequestId}|%msg%n" />
+
+  <property name="auditPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{RemoteHost}||||||||%msg%n" />
+  <property name="metricPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{RemoteHost}||||%X{TargetVirtualEntity}|||||%msg%n" />
+  <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />
+  <property name="debugLogDirectory" value="${debugDir}/${componentName}/${subComponentName}" />
+
+  <!-- ============================================================================ -->
+  <!-- EELF Appenders -->
+  <!-- ============================================================================ -->
+
+  <!-- The EELFAppender is used to record events to the general application 
+    log -->
+  
+  <!-- EELF Audit Appender. This appender is used to record audit engine 
+    related logging events. The audit logger and appender are specializations 
+    of the EELF application root logger and appender. This can be used to segregate 
+    Policy engine events from other components, or it can be eliminated to record 
+    these events as part of the application root log. -->
+    
+  <appender name="EELFAudit"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${auditLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${auditLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+         <pattern>${auditPattern}</pattern>
+    </encoder>
+  </appender>
+  <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFAudit" />
+  </appender>
+
+<appender name="EELFMetrics"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${metricsLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${metricsLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+      <!-- <pattern>"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - 
+        %msg%n"</pattern> -->
+      <pattern>${metricPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  
+  <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFMetrics"/>
+  </appender>
+   
+  <appender name="EELFError"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${errorLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${errorLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>INFO</level>
+    </filter>
+    <encoder>
+      <pattern>${errorPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFError"/>
+  </appender>
+  
+   <appender name="EELFDebug"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${debugLogDirectory}/${debugLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${debugLogDirectory}/${debugLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+      <pattern>${debugPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFDebug" />
+    <includeCallerData>true</includeCallerData>
+  </appender>
+ 
+  
+  <!-- ============================================================================ -->
+  <!--  EELF loggers -->
+  <!-- ============================================================================ -->
+
+  <logger name="com.att.eelf.audit" level="info" additivity="false">
+    <appender-ref ref="asyncEELFAudit" />
+  </logger>
+  
+  <logger name="com.att.eelf.metrics" level="info" additivity="false">
+        <appender-ref ref="asyncEELFMetrics" />
+  </logger>
+
+  <logger name="com.att.eelf.error" level="debug" additivity="false">
+    <appender-ref ref="asyncEELFError" />
+  </logger> 
+  <root level="INFO">
+    <appender-ref ref="asyncEELFDebug" />
+  </root>
+
+</configuration>
diff --git a/kubernetes/config/docker/init/src/config/log/mso/logback.bpmn.xml b/kubernetes/config/docker/init/src/config/log/mso/logback.bpmn.xml
index 2e6425906c..3bc3ca157b 100644
--- a/kubernetes/config/docker/init/src/config/log/mso/logback.bpmn.xml
+++ b/kubernetes/config/docker/init/src/config/log/mso/logback.bpmn.xml
@@ -1,110 +1,139 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration scan="true" scanPeriod="3 seconds" debug="true">

-   <property name="logDir" value="/var/log/onap" />

-   <property name="componentName" value="mso" />

-   <property name="subComponentName" value="bpmn" />

-   <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />

-   <property name="pattern" value="%d{&amp;quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&amp;quot;, UTC}\t[%thread]\t%-5level\t%logger{36}\t%replace(%replace(%replace(%mdc){'\t','\\\\t'}){', ','\t'}){'\n', '\\\\n'}\t%replace(%replace(%msg){'\n', '\\\\n'}){'\t','\\\\t'}%n" />

-   <!--  log file names -->

-   <property name="errorLogName" value="error" />

-   <property name="metricsLogName" value="metrics" />

-   <property name="auditLogName" value="audit" />

-   <property name="debugLogName" value="debug" />

-   <property name="queueSize" value="256" />

-   <property name="maxFileSize" value="50MB" />

-   <property name="maxHistory" value="30" />

-   <property name="totalSizeCap" value="10GB" />

-   <!-- EELF Appenders -->

-   <appender name="EELFAudit" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${auditLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFAudit" />

-   </appender>

-   <appender name="EELFMetrics" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${metricsLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFMetrics" />

-   </appender>

-   <appender name="EELFError" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${errorLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${errorLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-      <filter class="ch.qos.logback.classic.filter.ThresholdFilter">

-         <level>INFO</level>

-      </filter>

-   </appender>

-   <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFError" />

-   </appender>

-   <appender name="EELFDebug" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${debugLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFDebug" />

-      <includeCallerData>true</includeCallerData>

-   </appender>

-   <!--  EELF loggers -->

-   <logger name="com.att.eelf.audit" level="info" additivity="false">

-      <appender-ref ref="asyncEELFAudit" />

-   </logger>

-   <logger name="com.att.eelf.metrics" level="info" additivity="false">

-      <appender-ref ref="asyncEELFMetrics" />

-   </logger>

-   <logger name="com.att.eelf.error" level="info" additivity="false">

-      <appender-ref ref="asyncEELFError" />

-   </logger>

-   <logger name="com.att.eelf.debug" level="debug" additivity="false">

-      <appender-ref ref="asyncEELFDebug" />

-   </logger>

-   <root level="INFO">

-      <appender-ref ref="asyncEELFDebug" />

-   </root>

-</configuration>
\ No newline at end of file
+<configuration scan="true" scanPeriod="3 seconds" debug="true">
+  <!--<jmxConfigurator /> -->
+  <!-- directory path for all other type logs -->
+  <property name="logDir" value="/var/log/onap" />
+
+  <!-- directory path for debugging type logs -->
+  <property name="debugDir" value="/var/log/onap" />
+
+  <!--  specify the component name
+    <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
+  <property name="componentName" value="MSO"></property>
+  <property name="subComponentName" value="BPMN"></property>
+  <!--  log file names -->
+  <property name="errorLogName" value="error" />
+  <property name="metricsLogName" value="metrics" />
+  <property name="auditLogName" value="audit" />
+  <property name="debugLogName" value="debug" />
+
+  <property name="errorPattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%.-5level|%X{ErrorCode}|%X{ErrorDesc}|%msg%n" />
+  <property name="debugPattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}|%X{RequestId}|%msg%n" />
+  
+  <property name="auditPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{RemoteHost}||||||||%msg%n" />
+  <property name="metricPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{RemoteHost}||||%X{TargetVirtualEntity}|||||%msg%n" />
+  <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />
+  <property name="debugLogDirectory" value="${debugDir}/${componentName}/${subComponentName}" />
+
+
+  <!-- ============================================================================ -->
+  <!-- EELF Appenders -->
+  <!-- ============================================================================ -->
+
+  <!-- The EELFAppender is used to record events to the general application
+    log -->
+
+  <!-- EELF Audit Appender. This appender is used to record audit engine
+    related logging events. The audit logger and appender are specializations
+    of the EELF application root logger and appender. This can be used to segregate
+    Policy engine events from other components, or it can be eliminated to record
+    these events as part of the application root log. -->
+
+  <appender name="EELFAudit"
+            class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${auditLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+            class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${auditLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+      <pattern>${auditPattern}</pattern>
+    </encoder>
+  </appender>
+  <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFAudit" />
+  </appender>
+
+  <appender name="EELFMetrics"
+            class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${metricsLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+            class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${metricsLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+      <!-- <pattern>"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} -
+        %msg%n"</pattern> -->
+      <pattern>${metricPattern}</pattern>
+    </encoder>
+  </appender>
+
+
+  <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFMetrics"/>
+  </appender>
+
+  <appender name="EELFError"
+            class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${errorLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+            class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${errorLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>INFO</level>
+    </filter>
+    <encoder>
+      <pattern>${errorPattern}</pattern>
+    </encoder>
+  </appender>
+
+  <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFError"/>
+  </appender>
+
+  <appender name="EELFDebug"
+            class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${debugLogDirectory}/${debugLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+            class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${debugLogDirectory}/${debugLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+      <pattern>${debugPattern}</pattern>
+    </encoder>
+  </appender>
+
+  <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFDebug" />
+    <includeCallerData>true</includeCallerData>
+  </appender>
+
+
+  <!-- ============================================================================ -->
+  <!--  EELF loggers -->
+  <!-- ============================================================================ -->
+
+  <logger name="com.att.eelf.audit" level="info" additivity="false">
+    <appender-ref ref="asyncEELFAudit" />
+  </logger>
+
+  <logger name="com.att.eelf.metrics" level="info" additivity="false">
+    <appender-ref ref="asyncEELFMetrics" />
+  </logger>
+
+  <logger name="com.att.eelf.error" level="debug" additivity="false">
+    <appender-ref ref="asyncEELFError" />
+  </logger>
+  <root level="INFO">
+    <appender-ref ref="asyncEELFDebug" />
+  </root>
+
+</configuration>
diff --git a/kubernetes/config/docker/init/src/config/log/mso/logback.msorequestsdbadapter.xml b/kubernetes/config/docker/init/src/config/log/mso/logback.msorequestsdbadapter.xml
index e6e0591b3a..64a5022aa6 100644
--- a/kubernetes/config/docker/init/src/config/log/mso/logback.msorequestsdbadapter.xml
+++ b/kubernetes/config/docker/init/src/config/log/mso/logback.msorequestsdbadapter.xml
@@ -1,110 +1,138 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration scan="true" scanPeriod="3 seconds" debug="true">

-   <property name="logDir" value="/var/log/onap" />

-   <property name="componentName" value="mso" />

-   <property name="subComponentName" value="requestDB" />

-   <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />

-   <property name="pattern" value="%d{&amp;quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&amp;quot;, UTC}\t[%thread]\t%-5level\t%logger{36}\t%replace(%replace(%replace(%mdc){'\t','\\\\t'}){', ','\t'}){'\n', '\\\\n'}\t%replace(%replace(%msg){'\n', '\\\\n'}){'\t','\\\\t'}%n" />

-   <!--  log file names -->

-   <property name="errorLogName" value="error" />

-   <property name="metricsLogName" value="metrics" />

-   <property name="auditLogName" value="audit" />

-   <property name="debugLogName" value="debug" />

-   <property name="queueSize" value="256" />

-   <property name="maxFileSize" value="50MB" />

-   <property name="maxHistory" value="30" />

-   <property name="totalSizeCap" value="10GB" />

-   <!-- EELF Appenders -->

-   <appender name="EELFAudit" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${auditLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFAudit" />

-   </appender>

-   <appender name="EELFMetrics" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${metricsLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFMetrics" />

-   </appender>

-   <appender name="EELFError" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${errorLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${errorLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-      <filter class="ch.qos.logback.classic.filter.ThresholdFilter">

-         <level>INFO</level>

-      </filter>

-   </appender>

-   <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFError" />

-   </appender>

-   <appender name="EELFDebug" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${debugLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFDebug" />

-      <includeCallerData>true</includeCallerData>

-   </appender>

-   <!--  EELF loggers -->

-   <logger name="com.att.eelf.audit" level="info" additivity="false">

-      <appender-ref ref="asyncEELFAudit" />

-   </logger>

-   <logger name="com.att.eelf.metrics" level="info" additivity="false">

-      <appender-ref ref="asyncEELFMetrics" />

-   </logger>

-   <logger name="com.att.eelf.error" level="info" additivity="false">

-      <appender-ref ref="asyncEELFError" />

-   </logger>

-   <logger name="com.att.eelf.debug" level="debug" additivity="false">

-      <appender-ref ref="asyncEELFDebug" />

-   </logger>

-   <root level="INFO">

-      <appender-ref ref="asyncEELFDebug" />

-   </root>

-</configuration>
\ No newline at end of file
+<configuration scan="false" debug="true">
+  <!--<jmxConfigurator /> -->
+  <!-- directory path for all other type logs -->
+  <property name="logDir" value="/var/log/onap" />
+  
+  <!-- directory path for debugging type logs -->
+  <property name="debugDir" value="/var/log/onap" />
+  
+  <!--  specify the component name 
+    <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
+  <property name="componentName" value="MSO"></property>
+  <property name="subComponentName" value="RequestDB"></property>
+  <!--  log file names -->
+  <property name="errorLogName" value="error" />
+  <property name="metricsLogName" value="metrics" />
+  <property name="auditLogName" value="audit" />
+  <property name="debugLogName" value="debug" />
+
+  <property name="errorPattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%.-5level|%X{ErrorCode}|%X{ErrorDesc}|%msg%n" />
+  <property name="debugPattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}|%X{RequestId}|%msg%n" />
+
+  <property name="auditPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{RemoteHost}||||||||%msg%n" />
+  <property name="metricPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{RemoteHost}||||%X{TargetVirtualEntity}|||||%msg%n" />
+  <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />
+  <property name="debugLogDirectory" value="${debugDir}/${componentName}/${subComponentName}" />
+
+  <!-- ============================================================================ -->
+  <!-- EELF Appenders -->
+  <!-- ============================================================================ -->
+
+  <!-- The EELFAppender is used to record events to the general application 
+    log -->
+  
+  <!-- EELF Audit Appender. This appender is used to record audit engine 
+    related logging events. The audit logger and appender are specializations 
+    of the EELF application root logger and appender. This can be used to segregate 
+    Policy engine events from other components, or it can be eliminated to record 
+    these events as part of the application root log. -->
+    
+  <appender name="EELFAudit"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${auditLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${auditLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+         <pattern>${auditPattern}</pattern>
+    </encoder>
+  </appender>
+  <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFAudit" />
+  </appender>
+
+<appender name="EELFMetrics"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${metricsLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${metricsLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+      <!-- <pattern>"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - 
+        %msg%n"</pattern> -->
+      <pattern>${metricPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  
+  <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFMetrics"/>
+  </appender>
+   
+  <appender name="EELFError"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${errorLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${errorLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>INFO</level>
+    </filter>
+    <encoder>
+      <pattern>${errorPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFError"/>
+  </appender>
+  
+   <appender name="EELFDebug"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${debugLogDirectory}/${debugLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${debugLogDirectory}/${debugLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+      <pattern>${debugPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFDebug" />
+    <includeCallerData>true</includeCallerData>
+  </appender>
+ 
+  
+  <!-- ============================================================================ -->
+  <!--  EELF loggers -->
+  <!-- ============================================================================ -->
+
+  <logger name="com.att.eelf.audit" level="info" additivity="false">
+    <appender-ref ref="asyncEELFAudit" />
+  </logger>
+  
+  <logger name="com.att.eelf.metrics" level="info" additivity="false">
+        <appender-ref ref="asyncEELFMetrics" />
+  </logger>
+
+  <logger name="com.att.eelf.error" level="debug" additivity="false">
+    <appender-ref ref="asyncEELFError" />
+  </logger> 
+  <root level="INFO">
+    <appender-ref ref="asyncEELFDebug" />
+  </root>
+
+</configuration>
diff --git a/kubernetes/config/docker/init/src/config/log/mso/logback.network.xml b/kubernetes/config/docker/init/src/config/log/mso/logback.network.xml
index 3e5c670e05..542a8f6f00 100644
--- a/kubernetes/config/docker/init/src/config/log/mso/logback.network.xml
+++ b/kubernetes/config/docker/init/src/config/log/mso/logback.network.xml
@@ -1,110 +1,139 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration scan="true" scanPeriod="3 seconds" debug="true">

-   <property name="logDir" value="/var/log/onap" />

-   <property name="componentName" value="mso" />

-   <property name="subComponentName" value="networkAdapter" />

-   <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />

-   <property name="pattern" value="%d{&amp;quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&amp;quot;, UTC}\t[%thread]\t%-5level\t%logger{36}\t%replace(%replace(%replace(%mdc){'\t','\\\\t'}){', ','\t'}){'\n', '\\\\n'}\t%replace(%replace(%msg){'\n', '\\\\n'}){'\t','\\\\t'}%n" />

-   <!--  log file names -->

-   <property name="errorLogName" value="error" />

-   <property name="metricsLogName" value="metrics" />

-   <property name="auditLogName" value="audit" />

-   <property name="debugLogName" value="debug" />

-   <property name="queueSize" value="256" />

-   <property name="maxFileSize" value="50MB" />

-   <property name="maxHistory" value="30" />

-   <property name="totalSizeCap" value="10GB" />

-   <!-- EELF Appenders -->

-   <appender name="EELFAudit" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${auditLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFAudit" />

-   </appender>

-   <appender name="EELFMetrics" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${metricsLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFMetrics" />

-   </appender>

-   <appender name="EELFError" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${errorLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${errorLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-      <filter class="ch.qos.logback.classic.filter.ThresholdFilter">

-         <level>INFO</level>

-      </filter>

-   </appender>

-   <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFError" />

-   </appender>

-   <appender name="EELFDebug" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${debugLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFDebug" />

-      <includeCallerData>true</includeCallerData>

-   </appender>

-   <!--  EELF loggers -->

-   <logger name="com.att.eelf.audit" level="info" additivity="false">

-      <appender-ref ref="asyncEELFAudit" />

-   </logger>

-   <logger name="com.att.eelf.metrics" level="info" additivity="false">

-      <appender-ref ref="asyncEELFMetrics" />

-   </logger>

-   <logger name="com.att.eelf.error" level="info" additivity="false">

-      <appender-ref ref="asyncEELFError" />

-   </logger>

-   <logger name="com.att.eelf.debug" level="debug" additivity="false">

-      <appender-ref ref="asyncEELFDebug" />

-   </logger>

-   <root level="INFO">

-      <appender-ref ref="asyncEELFDebug" />

-   </root>

-</configuration>
\ No newline at end of file
+<configuration scan="false" debug="true">
+  <!--<jmxConfigurator /> -->
+  <!-- directory path for all other type logs -->
+  <property name="logDir" value="/var/log/onap" />
+  
+  <!-- directory path for debugging type logs -->
+  <property name="debugDir" value="/var/log/onap" />
+  
+  <!--  specify the component name 
+    <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
+  <property name="componentName" value="MSO"></property>
+  <property name="subComponentName" value="NetworkAdapter"></property>
+  <!--  log file names -->
+  <property name="errorLogName" value="error" />
+  <property name="metricsLogName" value="metrics" />
+  <property name="auditLogName" value="audit" />
+  <property name="debugLogName" value="debug" />
+
+  <property name="errorPattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%.-5level|%X{ErrorCode}|%X{ErrorDesc}|%msg%n" />
+  <property name="debugPattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}|%X{RequestId}|%msg%n" />
+
+  <property name="auditPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{RemoteHost}||||||||%msg%n" />
+  <property name="metricPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{RemoteHost}||||%X{TargetVirtualEntity}|||||%msg%n" />
+  <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />
+  <property name="debugLogDirectory" value="${debugDir}/${componentName}/${subComponentName}" />
+  
+
+  <!-- ============================================================================ -->
+  <!-- EELF Appenders -->
+  <!-- ============================================================================ -->
+
+  <!-- The EELFAppender is used to record events to the general application 
+    log -->
+  
+  <!-- EELF Audit Appender. This appender is used to record audit engine 
+    related logging events. The audit logger and appender are specializations 
+    of the EELF application root logger and appender. This can be used to segregate 
+    Policy engine events from other components, or it can be eliminated to record 
+    these events as part of the application root log. -->
+    
+  <appender name="EELFAudit"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${auditLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${auditLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+         <pattern>${auditPattern}</pattern>
+    </encoder>
+  </appender>
+  <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFAudit" />
+  </appender>
+
+<appender name="EELFMetrics"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${metricsLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${metricsLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+      <!-- <pattern>"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - 
+        %msg%n"</pattern> -->
+      <pattern>${metricPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  
+  <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFMetrics"/>
+  </appender>
+   
+  <appender name="EELFError"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${errorLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${errorLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>INFO</level>
+    </filter>
+    <encoder>
+      <pattern>${errorPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFError"/>
+  </appender>
+  
+   <appender name="EELFDebug"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${debugLogDirectory}/${debugLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${debugLogDirectory}/${debugLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+      <pattern>${debugPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFDebug" />
+    <includeCallerData>true</includeCallerData>
+  </appender>
+ 
+  
+  <!-- ============================================================================ -->
+  <!--  EELF loggers -->
+  <!-- ============================================================================ -->
+
+  <logger name="com.att.eelf.audit" level="info" additivity="false">
+    <appender-ref ref="asyncEELFAudit" />
+  </logger>
+  
+  <logger name="com.att.eelf.metrics" level="info" additivity="false">
+        <appender-ref ref="asyncEELFMetrics" />
+  </logger>
+
+  <logger name="com.att.eelf.error" level="debug" additivity="false">
+    <appender-ref ref="asyncEELFError" />
+  </logger> 
+  <root level="INFO">
+    <appender-ref ref="asyncEELFDebug" />
+  </root>
+
+</configuration>
diff --git a/kubernetes/config/docker/init/src/config/log/mso/logback.sdnc.xml b/kubernetes/config/docker/init/src/config/log/mso/logback.sdnc.xml
index 07d1df3914..1323a8961d 100644
--- a/kubernetes/config/docker/init/src/config/log/mso/logback.sdnc.xml
+++ b/kubernetes/config/docker/init/src/config/log/mso/logback.sdnc.xml
@@ -1,110 +1,138 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration scan="true" scanPeriod="3 seconds" debug="true">

-   <property name="logDir" value="/var/log/onap" />

-   <property name="componentName" value="mso" />

-   <property name="subComponentName" value="sdncAdapter" />

-   <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />

-   <property name="pattern" value="%d{&amp;quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&amp;quot;, UTC}\t[%thread]\t%-5level\t%logger{36}\t%replace(%replace(%replace(%mdc){'\t','\\\\t'}){', ','\t'}){'\n', '\\\\n'}\t%replace(%replace(%msg){'\n', '\\\\n'}){'\t','\\\\t'}%n" />

-   <!--  log file names -->

-   <property name="errorLogName" value="error" />

-   <property name="metricsLogName" value="metrics" />

-   <property name="auditLogName" value="audit" />

-   <property name="debugLogName" value="debug" />

-   <property name="queueSize" value="256" />

-   <property name="maxFileSize" value="50MB" />

-   <property name="maxHistory" value="30" />

-   <property name="totalSizeCap" value="10GB" />

-   <!-- EELF Appenders -->

-   <appender name="EELFAudit" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${auditLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFAudit" />

-   </appender>

-   <appender name="EELFMetrics" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${metricsLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFMetrics" />

-   </appender>

-   <appender name="EELFError" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${errorLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${errorLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-      <filter class="ch.qos.logback.classic.filter.ThresholdFilter">

-         <level>INFO</level>

-      </filter>

-   </appender>

-   <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFError" />

-   </appender>

-   <appender name="EELFDebug" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${debugLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFDebug" />

-      <includeCallerData>true</includeCallerData>

-   </appender>

-   <!--  EELF loggers -->

-   <logger name="com.att.eelf.audit" level="info" additivity="false">

-      <appender-ref ref="asyncEELFAudit" />

-   </logger>

-   <logger name="com.att.eelf.metrics" level="info" additivity="false">

-      <appender-ref ref="asyncEELFMetrics" />

-   </logger>

-   <logger name="com.att.eelf.error" level="info" additivity="false">

-      <appender-ref ref="asyncEELFError" />

-   </logger>

-   <logger name="com.att.eelf.debug" level="debug" additivity="false">

-      <appender-ref ref="asyncEELFDebug" />

-   </logger>

-   <root level="INFO">

-      <appender-ref ref="asyncEELFDebug" />

-   </root>

-</configuration>
\ No newline at end of file
+<configuration scan="false" debug="true">
+  <!--<jmxConfigurator /> -->
+  <!-- directory path for all other type logs -->
+  <property name="logDir" value="/var/log/onap" />
+  
+  <!-- directory path for debugging type logs -->
+  <property name="debugDir" value="/var/log/onap" />
+  
+  <!--  specify the component name 
+    <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
+  <property name="componentName" value="MSO"></property>
+  <property name="subComponentName" value="SDNCAdapter"></property>
+  <!--  log file names -->
+  <property name="errorLogName" value="error" />
+  <property name="metricsLogName" value="metrics" />
+  <property name="auditLogName" value="audit" />
+  <property name="debugLogName" value="debug" />
+
+  <property name="errorPattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%.-5level|%X{ErrorCode}|%X{ErrorDesc}|%msg%n" />
+  <property name="debugPattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}|%X{RequestId}|%msg%n" />
+
+  <property name="auditPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{RemoteHost}||||||||%msg%n" />
+  <property name="metricPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{RemoteHost}||||%X{TargetVirtualEntity}|||||%msg%n" />
+  <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />
+  <property name="debugLogDirectory" value="${debugDir}/${componentName}/${subComponentName}" />
+
+  <!-- ============================================================================ -->
+  <!-- EELF Appenders -->
+  <!-- ============================================================================ -->
+
+  <!-- The EELFAppender is used to record events to the general application 
+    log -->
+  
+  <!-- EELF Audit Appender. This appender is used to record audit engine 
+    related logging events. The audit logger and appender are specializations 
+    of the EELF application root logger and appender. This can be used to segregate 
+    Policy engine events from other components, or it can be eliminated to record 
+    these events as part of the application root log. -->
+    
+  <appender name="EELFAudit"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${auditLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${auditLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+         <pattern>${auditPattern}</pattern>
+    </encoder>
+  </appender>
+  <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFAudit" />
+  </appender>
+
+<appender name="EELFMetrics"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${metricsLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${metricsLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+      <!-- <pattern>"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - 
+        %msg%n"</pattern> -->
+      <pattern>${metricPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  
+  <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFMetrics"/>
+  </appender>
+   
+  <appender name="EELFError"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${errorLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${errorLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>INFO</level>
+    </filter>
+    <encoder>
+      <pattern>${errorPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFError"/>
+  </appender>
+  
+   <appender name="EELFDebug"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${debugLogDirectory}/${debugLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${debugLogDirectory}/${debugLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+      <pattern>${debugPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFDebug" />
+    <includeCallerData>true</includeCallerData>
+  </appender>
+ 
+  
+  <!-- ============================================================================ -->
+  <!--  EELF loggers -->
+  <!-- ============================================================================ -->
+
+  <logger name="com.att.eelf.audit" level="info" additivity="false">
+    <appender-ref ref="asyncEELFAudit" />
+  </logger>
+  
+  <logger name="com.att.eelf.metrics" level="info" additivity="false">
+        <appender-ref ref="asyncEELFMetrics" />
+  </logger>
+
+  <logger name="com.att.eelf.error" level="debug" additivity="false">
+    <appender-ref ref="asyncEELFError" />
+  </logger> 
+  <root level="INFO">
+    <appender-ref ref="asyncEELFDebug" />
+  </root>
+
+</configuration>
diff --git a/kubernetes/config/docker/init/src/config/log/mso/logback.tenant.xml b/kubernetes/config/docker/init/src/config/log/mso/logback.tenant.xml
index 6e5bc2748c..a25c182e97 100644
--- a/kubernetes/config/docker/init/src/config/log/mso/logback.tenant.xml
+++ b/kubernetes/config/docker/init/src/config/log/mso/logback.tenant.xml
@@ -1,110 +1,139 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration scan="true" scanPeriod="3 seconds" debug="true">

-   <property name="logDir" value="/var/log/onap" />

-   <property name="componentName" value="mso" />

-   <property name="subComponentName" value="tenantAdapter" />

-   <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />

-   <property name="pattern" value="%d{&amp;quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&amp;quot;, UTC}\t[%thread]\t%-5level\t%logger{36}\t%replace(%replace(%replace(%mdc){'\t','\\\\t'}){', ','\t'}){'\n', '\\\\n'}\t%replace(%replace(%msg){'\n', '\\\\n'}){'\t','\\\\t'}%n" />

-   <!--  log file names -->

-   <property name="errorLogName" value="error" />

-   <property name="metricsLogName" value="metrics" />

-   <property name="auditLogName" value="audit" />

-   <property name="debugLogName" value="debug" />

-   <property name="queueSize" value="256" />

-   <property name="maxFileSize" value="50MB" />

-   <property name="maxHistory" value="30" />

-   <property name="totalSizeCap" value="10GB" />

-   <!-- EELF Appenders -->

-   <appender name="EELFAudit" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${auditLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFAudit" />

-   </appender>

-   <appender name="EELFMetrics" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${metricsLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFMetrics" />

-   </appender>

-   <appender name="EELFError" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${errorLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${errorLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-      <filter class="ch.qos.logback.classic.filter.ThresholdFilter">

-         <level>INFO</level>

-      </filter>

-   </appender>

-   <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFError" />

-   </appender>

-   <appender name="EELFDebug" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${debugLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFDebug" />

-      <includeCallerData>true</includeCallerData>

-   </appender>

-   <!--  EELF loggers -->

-   <logger name="com.att.eelf.audit" level="info" additivity="false">

-      <appender-ref ref="asyncEELFAudit" />

-   </logger>

-   <logger name="com.att.eelf.metrics" level="info" additivity="false">

-      <appender-ref ref="asyncEELFMetrics" />

-   </logger>

-   <logger name="com.att.eelf.error" level="info" additivity="false">

-      <appender-ref ref="asyncEELFError" />

-   </logger>

-   <logger name="com.att.eelf.debug" level="debug" additivity="false">

-      <appender-ref ref="asyncEELFDebug" />

-   </logger>

-   <root level="INFO">

-      <appender-ref ref="asyncEELFDebug" />

-   </root>

-</configuration>
\ No newline at end of file
+<configuration scan="false" debug="true">
+  <!--<jmxConfigurator /> -->
+  <!-- directory path for all other type logs -->
+  <property name="logDir" value="/var/log/onap" />
+  
+  <!-- directory path for debugging type logs -->
+  <property name="debugDir" value="/var/log/onap" />
+  
+  <!--  specify the component name 
+    <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
+  <property name="componentName" value="MSO"></property>
+  <property name="subComponentName" value="TenantAdapter"></property>
+  <!--  log file names -->
+  <property name="errorLogName" value="error" />
+  <property name="metricsLogName" value="metrics" />
+  <property name="auditLogName" value="audit" />
+  <property name="debugLogName" value="debug" />
+
+  <property name="errorPattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%.-5level|%X{ErrorCode}|%X{ErrorDesc}|%msg%n" />
+  <property name="debugPattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}|%X{RequestId}|%msg%n" />
+
+  <property name="auditPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{RemoteHost}||||||||%msg%n" />
+  <property name="metricPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{RemoteHost}||||%X{TargetVirtualEntity}|||||%msg%n" />
+  <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />
+  <property name="debugLogDirectory" value="${debugDir}/${componentName}/${subComponentName}" />
+  
+
+  <!-- ============================================================================ -->
+  <!-- EELF Appenders -->
+  <!-- ============================================================================ -->
+
+  <!-- The EELFAppender is used to record events to the general application 
+    log -->
+  
+  <!-- EELF Audit Appender. This appender is used to record audit engine 
+    related logging events. The audit logger and appender are specializations 
+    of the EELF application root logger and appender. This can be used to segregate 
+    Policy engine events from other components, or it can be eliminated to record 
+    these events as part of the application root log. -->
+    
+  <appender name="EELFAudit"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${auditLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${auditLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+         <pattern>${auditPattern}</pattern>
+    </encoder>
+  </appender>
+  <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFAudit" />
+  </appender>
+
+<appender name="EELFMetrics"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${metricsLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${metricsLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+      <!-- <pattern>"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - 
+        %msg%n"</pattern> -->
+      <pattern>${metricPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  
+  <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFMetrics"/>
+  </appender>
+   
+  <appender name="EELFError"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${errorLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${errorLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>INFO</level>
+    </filter>
+    <encoder>
+      <pattern>${errorPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFError"/>
+  </appender>
+  
+   <appender name="EELFDebug"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${debugLogDirectory}/${debugLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${debugLogDirectory}/${debugLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+      <pattern>${debugPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFDebug" />
+    <includeCallerData>true</includeCallerData>
+  </appender>
+ 
+  
+  <!-- ============================================================================ -->
+  <!--  EELF loggers -->
+  <!-- ============================================================================ -->
+
+  <logger name="com.att.eelf.audit" level="info" additivity="false">
+    <appender-ref ref="asyncEELFAudit" />
+  </logger>
+  
+  <logger name="com.att.eelf.metrics" level="info" additivity="false">
+        <appender-ref ref="asyncEELFMetrics" />
+  </logger>
+
+  <logger name="com.att.eelf.error" level="debug" additivity="false">
+    <appender-ref ref="asyncEELFError" />
+  </logger> 
+  <root level="INFO">
+    <appender-ref ref="asyncEELFDebug" />
+  </root>
+
+</configuration>
diff --git a/kubernetes/config/docker/init/src/config/log/mso/logback.vfc.xml b/kubernetes/config/docker/init/src/config/log/mso/logback.vfc.xml
new file mode 100644
index 0000000000..d0b66be5bb
--- /dev/null
+++ b/kubernetes/config/docker/init/src/config/log/mso/logback.vfc.xml
@@ -0,0 +1,138 @@
+<configuration scan="false" debug="true">
+  <!--<jmxConfigurator /> -->
+  <!-- directory path for all other type logs -->
+  <property name="logDir" value="/var/log/onap" />
+  
+  <!-- directory path for debugging type logs -->
+  <property name="debugDir" value="/var/log/onap" />
+  
+  <!--  specify the component name 
+    <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
+  <property name="componentName" value="MSO"></property>
+  <property name="subComponentName" value="vfcadapter"></property>
+  <!--  log file names -->
+  <property name="errorLogName" value="error" />
+  <property name="metricsLogName" value="metrics" />
+  <property name="auditLogName" value="audit" />
+  <property name="debugLogName" value="debug" />
+
+  <property name="errorPattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%.-5level|%X{ErrorCode}|%X{ErrorDesc}|%msg%n" />
+  <property name="debugPattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}|%X{RequestId}|%msg%n" />
+
+  <property name="auditPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{RemoteHost}||||||||%msg%n" />
+  <property name="metricPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{RemoteHost}||||%X{TargetVirtualEntity}|||||%msg%n" />
+  <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />
+  <property name="debugLogDirectory" value="${debugDir}/${componentName}/${subComponentName}" />
+
+  <!-- ============================================================================ -->
+  <!-- EELF Appenders -->
+  <!-- ============================================================================ -->
+
+  <!-- The EELFAppender is used to record events to the general application 
+    log -->
+  
+  <!-- EELF Audit Appender. This appender is used to record audit engine 
+    related logging events. The audit logger and appender are specializations 
+    of the EELF application root logger and appender. This can be used to segregate 
+    Policy engine events from other components, or it can be eliminated to record 
+    these events as part of the application root log. -->
+    
+  <appender name="EELFAudit"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${auditLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${auditLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+         <pattern>${auditPattern}</pattern>
+    </encoder>
+  </appender>
+  <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFAudit" />
+  </appender>
+
+<appender name="EELFMetrics"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${metricsLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${metricsLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+      <!-- <pattern>"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - 
+        %msg%n"</pattern> -->
+      <pattern>${metricPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  
+  <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFMetrics"/>
+  </appender>
+   
+  <appender name="EELFError"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${errorLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${errorLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>INFO</level>
+    </filter>
+    <encoder>
+      <pattern>${errorPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFError"/>
+  </appender>
+  
+   <appender name="EELFDebug"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${debugLogDirectory}/${debugLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${debugLogDirectory}/${debugLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+      <pattern>${debugPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFDebug" />
+    <includeCallerData>true</includeCallerData>
+  </appender>
+ 
+  
+  <!-- ============================================================================ -->
+  <!--  EELF loggers -->
+  <!-- ============================================================================ -->
+
+  <logger name="com.att.eelf.audit" level="info" additivity="false">
+    <appender-ref ref="asyncEELFAudit" />
+  </logger>
+  
+  <logger name="com.att.eelf.metrics" level="info" additivity="false">
+        <appender-ref ref="asyncEELFMetrics" />
+  </logger>
+
+  <logger name="com.att.eelf.error" level="debug" additivity="false">
+    <appender-ref ref="asyncEELFError" />
+  </logger> 
+  <root level="INFO">
+    <appender-ref ref="asyncEELFDebug" />
+  </root>
+
+</configuration>
diff --git a/kubernetes/config/docker/init/src/config/log/mso/logback.vnf.xml b/kubernetes/config/docker/init/src/config/log/mso/logback.vnf.xml
index aca0fff177..32f6e69f81 100644
--- a/kubernetes/config/docker/init/src/config/log/mso/logback.vnf.xml
+++ b/kubernetes/config/docker/init/src/config/log/mso/logback.vnf.xml
@@ -1,110 +1,138 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration scan="true" scanPeriod="3 seconds" debug="true">

-   <property name="logDir" value="/var/log/onap" />

-   <property name="componentName" value="mso" />

-   <property name="subComponentName" value="vnfAdapter" />

-   <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />

-   <property name="pattern" value="%d{&amp;quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&amp;quot;, UTC}\t[%thread]\t%-5level\t%logger{36}\t%replace(%replace(%replace(%mdc){'\t','\\\\t'}){', ','\t'}){'\n', '\\\\n'}\t%replace(%replace(%msg){'\n', '\\\\n'}){'\t','\\\\t'}%n" />

-   <!--  log file names -->

-   <property name="errorLogName" value="error" />

-   <property name="metricsLogName" value="metrics" />

-   <property name="auditLogName" value="audit" />

-   <property name="debugLogName" value="debug" />

-   <property name="queueSize" value="256" />

-   <property name="maxFileSize" value="50MB" />

-   <property name="maxHistory" value="30" />

-   <property name="totalSizeCap" value="10GB" />

-   <!-- EELF Appenders -->

-   <appender name="EELFAudit" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${auditLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFAudit" />

-   </appender>

-   <appender name="EELFMetrics" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${metricsLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFMetrics" />

-   </appender>

-   <appender name="EELFError" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${errorLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${errorLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-      <filter class="ch.qos.logback.classic.filter.ThresholdFilter">

-         <level>INFO</level>

-      </filter>

-   </appender>

-   <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFError" />

-   </appender>

-   <appender name="EELFDebug" class="ch.qos.logback.core.rolling.RollingFileAppender">

-      <file>${logDirectory}/${debugLogName}.log</file>

-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-         <fileNamePattern>${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>

-         <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

-            <maxFileSize>${maxFileSize}</maxFileSize>

-         </timeBasedFileNamingAndTriggeringPolicy>

-         <maxHistory>${maxHistory}</maxHistory>

-         <totalSizeCap>${totalSizeCap}</totalSizeCap>

-      </rollingPolicy>

-      <encoder>

-         <pattern>${pattern}</pattern>

-      </encoder>

-   </appender>

-   <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">

-      <queueSize>${queueSize}</queueSize>

-      <appender-ref ref="EELFDebug" />

-      <includeCallerData>true</includeCallerData>

-   </appender>

-   <!--  EELF loggers -->

-   <logger name="com.att.eelf.audit" level="info" additivity="false">

-      <appender-ref ref="asyncEELFAudit" />

-   </logger>

-   <logger name="com.att.eelf.metrics" level="info" additivity="false">

-      <appender-ref ref="asyncEELFMetrics" />

-   </logger>

-   <logger name="com.att.eelf.error" level="info" additivity="false">

-      <appender-ref ref="asyncEELFError" />

-   </logger>

-   <logger name="com.att.eelf.debug" level="debug" additivity="false">

-      <appender-ref ref="asyncEELFDebug" />

-   </logger>

-   <root level="INFO">

-      <appender-ref ref="asyncEELFDebug" />

-   </root>

-</configuration>
\ No newline at end of file
+<configuration scan="false" debug="true">
+  <!--<jmxConfigurator /> -->
+  <!-- directory path for all other type logs -->
+  <property name="logDir" value="/var/log/onap" />
+  
+  <!-- directory path for debugging type logs -->
+  <property name="debugDir" value="/var/log/onap" />
+  
+  <!--  specify the component name 
+    <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
+  <property name="componentName" value="MSO"></property>
+  <property name="subComponentName" value="VnfAdapter"></property>
+  <!--  log file names -->
+  <property name="errorLogName" value="error" />
+  <property name="metricsLogName" value="metrics" />
+  <property name="auditLogName" value="audit" />
+  <property name="debugLogName" value="debug" />
+
+  <property name="errorPattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%.-5level|%X{ErrorCode}|%X{ErrorDesc}|%msg%n" />
+  <property name="debugPattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}|%X{RequestId}|%msg%n" />
+
+  <property name="auditPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{RemoteHost}||||||||%msg%n" />
+  <property name="metricPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{RemoteHost}||||%X{TargetVirtualEntity}|||||%msg%n" />
+  <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />
+  <property name="debugLogDirectory" value="${debugDir}/${componentName}/${subComponentName}" />
+
+  <!-- ============================================================================ -->
+  <!-- EELF Appenders -->
+  <!-- ============================================================================ -->
+
+  <!-- The EELFAppender is used to record events to the general application 
+    log -->
+  
+  <!-- EELF Audit Appender. This appender is used to record audit engine 
+    related logging events. The audit logger and appender are specializations 
+    of the EELF application root logger and appender. This can be used to segregate 
+    Policy engine events from other components, or it can be eliminated to record 
+    these events as part of the application root log. -->
+    
+  <appender name="EELFAudit"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${auditLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${auditLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+         <pattern>${auditPattern}</pattern>
+    </encoder>
+  </appender>
+  <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFAudit" />
+  </appender>
+
+<appender name="EELFMetrics"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${metricsLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${metricsLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+      <!-- <pattern>"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - 
+        %msg%n"</pattern> -->
+      <pattern>${metricPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  
+  <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFMetrics"/>
+  </appender>
+   
+  <appender name="EELFError"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${errorLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${errorLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>INFO</level>
+    </filter>
+    <encoder>
+      <pattern>${errorPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFError"/>
+  </appender>
+  
+   <appender name="EELFDebug"
+    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${debugLogDirectory}/${debugLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${debugLogDirectory}/${debugLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+      <pattern>${debugPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFDebug" />
+    <includeCallerData>true</includeCallerData>
+  </appender>
+ 
+  
+  <!-- ============================================================================ -->
+  <!--  EELF loggers -->
+  <!-- ============================================================================ -->
+
+  <logger name="com.att.eelf.audit" level="info" additivity="false">
+    <appender-ref ref="asyncEELFAudit" />
+  </logger>
+  
+  <logger name="com.att.eelf.metrics" level="info" additivity="false">
+        <appender-ref ref="asyncEELFMetrics" />
+  </logger>
+
+  <logger name="com.att.eelf.error" level="debug" additivity="false">
+    <appender-ref ref="asyncEELFError" />
+  </logger> 
+  <root level="INFO">
+    <appender-ref ref="asyncEELFDebug" />
+  </root>
+
+</configuration>
diff --git a/kubernetes/config/docker/init/src/config/log/mso/logback.workflow-message-adapter.xml b/kubernetes/config/docker/init/src/config/log/mso/logback.workflow-message-adapter.xml
new file mode 100644
index 0000000000..a7130a103f
--- /dev/null
+++ b/kubernetes/config/docker/init/src/config/log/mso/logback.workflow-message-adapter.xml
@@ -0,0 +1,138 @@
+<configuration scan="false" debug="true">
+  <!--<jmxConfigurator /> -->
+  <!-- directory path for all other type logs -->
+  <property name="logDir" value="/var/log/onap" />
+
+  <!-- directory path for debugging type logs -->
+  <property name="debugDir" value="/var/log/onap" />
+
+  <!--  specify the component name
+    <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
+  <property name="componentName" value="MSO"></property>
+  <property name="subComponentName" value="WorkflowMessageAdapter"></property>
+  <!--  log file names -->
+  <property name="errorLogName" value="error" />
+  <property name="metricsLogName" value="metrics" />
+  <property name="auditLogName" value="audit" />
+  <property name="debugLogName" value="debug" />
+
+  <property name="errorPattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%.-5level|%X{ErrorCode}|%X{ErrorDesc}|%msg%n" />
+  <property name="debugPattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}|%X{RequestId}|%msg%n" />
+
+  <property name="auditPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{RemoteHost}||||||||%msg%n" />
+  <property name="metricPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{RemoteHost}||||%X{TargetVirtualEntity}|||||%msg%n" />
+  <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />
+  <property name="debugLogDirectory" value="${debugDir}/${componentName}/${subComponentName}" />
+
+  <!-- ============================================================================ -->
+  <!-- EELF Appenders -->
+  <!-- ============================================================================ -->
+
+  <!-- The EELFAppender is used to record events to the general application
+    log -->
+
+  <!-- EELF Audit Appender. This appender is used to record audit engine
+    related logging events. The audit logger and appender are specializations
+    of the EELF application root logger and appender. This can be used to segregate
+    Policy engine events from other components, or it can be eliminated to record
+    these events as part of the application root log. -->
+
+  <appender name="EELFAudit"
+            class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${auditLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+            class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${auditLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+      <pattern>${auditPattern}</pattern>
+    </encoder>
+  </appender>
+  <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFAudit" />
+  </appender>
+
+  <appender name="EELFMetrics"
+            class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${metricsLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+            class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${metricsLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+      <!-- <pattern>"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} -
+        %msg%n"</pattern> -->
+      <pattern>${metricPattern}</pattern>
+    </encoder>
+  </appender>
+
+
+  <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFMetrics"/>
+  </appender>
+
+  <appender name="EELFError"
+            class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${errorLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+            class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${errorLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>INFO</level>
+    </filter>
+    <encoder>
+      <pattern>${errorPattern}</pattern>
+    </encoder>
+  </appender>
+
+  <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFError"/>
+  </appender>
+
+  <appender name="EELFDebug"
+            class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${debugLogDirectory}/${debugLogName}${jboss.server.name}.log</file>
+    <rollingPolicy
+            class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${debugLogDirectory}/${debugLogName}${jboss.server.name}.log.%d</fileNamePattern>
+      <!--<maxHistory>30</maxHistory>-->
+    </rollingPolicy>
+    <encoder>
+      <pattern>${debugPattern}</pattern>
+    </encoder>
+  </appender>
+
+  <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFDebug" />
+    <includeCallerData>true</includeCallerData>
+  </appender>
+
+
+  <!-- ============================================================================ -->
+  <!--  EELF loggers -->
+  <!-- ============================================================================ -->
+
+  <logger name="com.att.eelf.audit" level="info" additivity="false">
+    <appender-ref ref="asyncEELFAudit" />
+  </logger>
+
+  <logger name="com.att.eelf.metrics" level="info" additivity="false">
+    <appender-ref ref="asyncEELFMetrics" />
+  </logger>
+
+  <logger name="com.att.eelf.error" level="debug" additivity="false">
+    <appender-ref ref="asyncEELFError" />
+  </logger>
+  <root level="INFO">
+    <appender-ref ref="asyncEELFDebug" />
+  </root>
+
+</configuration>
\ No newline at end of file