From b4b0948858975bcb7f47803b06c1a6f2a7bea416 Mon Sep 17 00:00:00 2001
From: Jimmy Forsyth <jf2512@att.com>
Date: Tue, 1 May 2018 16:03:43 -0400
Subject: [PATCH] Update babel and ml to work properly in oom

Issue-ID: AAI-1110
Change-Id: Ibc51b36bb96c969a61aa54b31abf7c99f0e62fe6
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
---
 .../resources/config/auth/auth_policy.json         |   6 +-
 .../resources/config/auth/tomcat_keystore          | Bin 17136 -> 2214 bytes
 .../resources/config/babel-auth.properties         |   2 +-
 .../charts/aai-babel/resources/config/logback.xml  | 179 ++++++++++++
 .../aai/charts/aai-babel/templates/deployment.yaml |   5 +
 kubernetes/aai/charts/aai-babel/values.yaml        |   4 +-
 .../resources/config/log/logback.xml               | 311 ++++++++++-----------
 .../resources/config/model-loader.properties       |   2 +-
 .../aai-modelloader/templates/deployment.yaml      |   7 +-
 9 files changed, 345 insertions(+), 171 deletions(-)
 create mode 100644 kubernetes/aai/charts/aai-babel/resources/config/logback.xml

diff --git a/kubernetes/aai/charts/aai-babel/resources/config/auth/auth_policy.json b/kubernetes/aai/charts/aai-babel/resources/config/auth/auth_policy.json
index 5340a6ac75..e7c6459f65 100644
--- a/kubernetes/aai/charts/aai-babel/resources/config/auth/auth_policy.json
+++ b/kubernetes/aai/charts/aai-babel/resources/config/auth/auth_policy.json
@@ -8,7 +8,7 @@
             }
         ],
         "users": [
-            {"username": "CN=someone.onap.org, OU=someone, O=\"ONAP ORG\", L=NA, ST=NA, C=NA"}
+            {"username": "CN=ONAP, OU=ONAP, O=ONAP, L=Ottawa, ST=Ontario, C=CA"}
         ]
     },
     {
@@ -18,7 +18,7 @@
             "methods": [{"name": "POST"}]
         }],
         "users": [
-            {"username": "CN=someone.onap.org, OU=someone, O=\"ONAP ORG\", L=NA, ST=NA, C=NA"}
+            {"username": "CN=ONAP, OU=ONAP, O=ONAP, L=Ottawa, ST=Ontario, C=CA"}
         ]
     },
     {
@@ -30,7 +30,7 @@
             }
         ],
         "users": [
-            {"username": "CN=someone.onap.org, OU=someone, O=\"ONAP ORG\", L=NA, ST=NA, C=NA"}
+            {"username": "CN=ONAP, OU=ONAP, O=ONAP, L=Ottawa, ST=Ontario, C=CA"}
         ]
     },
     {
diff --git a/kubernetes/aai/charts/aai-babel/resources/config/auth/tomcat_keystore b/kubernetes/aai/charts/aai-babel/resources/config/auth/tomcat_keystore
index cbec3904283da265e46cb007c3abac66d9e7ce58..9eec841aa2c1243b5ca3e22b0b116e5bca2afd49 100644
GIT binary patch
literal 2214
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

literal 17136
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
GKmC88)hB-d

diff --git a/kubernetes/aai/charts/aai-babel/resources/config/babel-auth.properties b/kubernetes/aai/charts/aai-babel/resources/config/babel-auth.properties
index 8bf21b0b95..e7dfda081f 100644
--- a/kubernetes/aai/charts/aai-babel/resources/config/babel-auth.properties
+++ b/kubernetes/aai/charts/aai-babel/resources/config/babel-auth.properties
@@ -1,2 +1,2 @@
 auth.policy.file=/auth/auth_policy.json
-auth.authentication.disable=false
+auth.authentication.disable=true
diff --git a/kubernetes/aai/charts/aai-babel/resources/config/logback.xml b/kubernetes/aai/charts/aai-babel/resources/config/logback.xml
new file mode 100644
index 0000000000..63b8faf09a
--- /dev/null
+++ b/kubernetes/aai/charts/aai-babel/resources/config/logback.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xml>
+<configuration scan="true" scanPeriod="30 seconds" debug="true">
+  <include resource="org/springframework/boot/logging/logback/base.xml" />
+
+  <property name="componentName" value="AAI-BAS" />
+  <property name="logDirectory" value="${APP_HOME}/logs/${componentName}" />
+
+  <!-- default EELF log file names -->
+  <property name="generalLogName" value="error" />
+  <property name="metricsLogName" value="metrics" />
+  <property name="auditLogName" value="audit" />
+  <property name="debugLogName" value="debug" />
+
+  <property name="errorLogPattern"
+	    value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{RequestId}|%thread|%mdc{ServiceName}|%mdc{PartnerName}|%mdc{TargetEntity}|%mdc{TargetServiceName}|%.-5level|%logger|%mdc{ClassName}|%msg%n" />
+
+  <property name="auditLogPattern"
+	    value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{BeginTimestamp}|%mdc{EndTimestamp}|%mdc{RequestId}|%mdc{ServiceInstanceId}|%thread|%mdc{ServerFQDN}|%mdc{ServiceName}|%mdc{PartnerName}|%mdc{StatusCode}|%mdc{ResponseCode}|%mdc{ResponseDescription}|%logger|%.-5level|||%mdc{ElapsedTime}|%mdc{RemoteHost}|%mdc{ClientAddress}|%mdc{ClassName}|||%msg%n" />
+
+  <property name="metricsLogPattern"
+	    value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{BeginTimestamp}|%mdc{EndTimestamp}|%mdc{RequestId}|%mdc{ServiceInstanceId}|%thread|%mdc{ServerFQDN}|%mdc{ServiceName}|%mdc{PartnerName}|%mdc{TargetEntity}|%mdc{TargetServiceName}|%mdc{StatusCode}|%mdc{ResponseCode}|%mdc{ResponseDescription}|%logger|%.-5level|||%mdc{ElapsedTime}|%mdc{RemoteHost}|%mdc{ClientAddress}|%mdc{ClassName}|||%msg%n" />
+
+  <!-- ============================================================================ -->
+  <!-- EELF Appenders -->
+  <!-- ============================================================================ -->
+
+  <appender name="EELF"
+	    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${generalLogName}.log</file>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.log.zip
+      </fileNamePattern>
+      <maxHistory>60</maxHistory>
+    </rollingPolicy>
+    <encoder>
+      <pattern>${errorLogPattern}</pattern>
+    </encoder>
+  </appender>
+  <appender name="asyncEELF" class="ch.qos.logback.classic.AsyncAppender">
+    <!-- deny all events with a level below INFO, that is TRACE and DEBUG -->
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>INFO</level>
+    </filter>
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELF" />
+  </appender>
+
+  <!-- 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}.log</file>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.log.zip
+      </fileNamePattern>
+      <maxHistory>60</maxHistory>
+    </rollingPolicy>
+    <encoder>
+      <pattern>${auditLogPattern}</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}.log</file>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.log.zip
+      </fileNamePattern>
+      <maxHistory>60</maxHistory>
+    </rollingPolicy>
+    <encoder>
+      <pattern>${metricsLogPattern}</pattern>
+    </encoder>
+  </appender>
+
+  <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFMetrics" />
+  </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}.log.zip
+      </fileNamePattern>
+      <maxHistory>60</maxHistory>
+    </rollingPolicy>
+    <encoder>
+      <pattern>${errorLogPattern}</pattern>
+    </encoder>
+  </appender>
+
+  <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
+    <!-- allow only events with a level below INFO, that is TRACE and DEBUG -->
+    <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
+      <evaluator class="ch.qos.logback.classic.boolex.GEventEvaluator">
+	<expression>
+	  e.level.toInt() &lt; INFO.toInt()
+	</expression>
+      </evaluator>
+      <OnMismatch>DENY</OnMismatch>
+      <OnMatch>NEUTRAL</OnMatch>
+    </filter>
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFDebug" />
+    <includeCallerData>false</includeCallerData>
+  </appender>
+
+  <!-- ============================================================================ -->
+  <!-- Default / root appenders -->
+  <!-- This determines the logging level for 3rd party code -->
+  <!-- ============================================================================ -->
+
+  <root level="INFO">
+    <appender-ref ref="asyncEELF" />
+  <appender-ref ref="asyncEELFDebug" />
+</root>
+
+  <!-- ============================================================================ -->
+  <!--  EELF loggers -->
+  <!-- ============================================================================ -->
+
+  <logger name="com.att.eelf" level="INFO" additivity="false">
+  <appender-ref ref="asyncEELF" />
+</logger>
+
+  <!-- The level of this logger determines the contents of the debug log -->
+  <logger name="com.att.eelf.debug" level="INFO" additivity="false">
+  <appender-ref ref="asyncEELFDebug" />
+</logger>
+
+  <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>
+
+  <!-- ============================================================================ -->
+  <!-- Non-EELF loggers -->
+  <!-- ============================================================================ -->
+
+  <!-- ATT packages including DMAAP message routing -->
+  <logger name="com.att" level="INFO" />
+
+  <!-- Spring related loggers -->
+  <logger name="org.springframework" level="WARN" />
+  <logger name="org.springframework.beans" level="WARN" />
+  <logger name="org.springframework.web" level="WARN" />
+
+  <!-- Other Loggers that may help troubleshoot -->
+  <logger name="org.apache" level="WARN" />
+  <logger name="org.apache.commons" level="WARN" />
+
+  <!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging. May aid in troubleshooting) -->
+  <logger name="org.apache.camel" level="WARN" />
+  <logger name="org.apache.cxf" level="WARN" />
+  <logger name="org.apache.camel.processor.interceptor" level="WARN" />
+  <logger name="org.apache.cxf.jaxrs.interceptor" level="WARN" />
+  <logger name="org.apache.cxf.service" level="WARN" />
+  <logger name="org.restlet" level="WARN" />
+  <logger name="org.apache.camel.component.restlet" level="WARN" />
+
+  <!-- logback internals logging -->
+  <logger name="ch.qos.logback.classic" level="WARN" />
+  <logger name="ch.qos.logback.core" level="WARN" />
+
+</configuration>
diff --git a/kubernetes/aai/charts/aai-babel/templates/deployment.yaml b/kubernetes/aai/charts/aai-babel/templates/deployment.yaml
index 6b1312bbdc..15cd163edb 100644
--- a/kubernetes/aai/charts/aai-babel/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-babel/templates/deployment.yaml
@@ -77,6 +77,9 @@ spec:
             name: {{ include "common.fullname" . }}-secrets
           - mountPath: /logs
             name: {{ include "common.fullname" . }}-logs
+          - mountPath: /opt/app/babel/config/logback.xml
+            name: {{ include "common.fullname" . }}-config
+            subPath: logback.xml
           resources:
 {{ toYaml .Values.resources | indent 12 }}
         {{- if .Values.nodeSelector }}
@@ -99,6 +102,8 @@ spec:
               path: artifact-generator.properties
             - key: babel-auth.properties
               path: babel-auth.properties
+            - key: logback.xml
+              path: logback.xml
         - name: {{ include "common.fullname" . }}-secrets
           secret:
             secretName: {{ include "common.fullname" . }}-babel-secrets
diff --git a/kubernetes/aai/charts/aai-babel/values.yaml b/kubernetes/aai/charts/aai-babel/values.yaml
index 43f895267a..ef872a04a2 100644
--- a/kubernetes/aai/charts/aai-babel/values.yaml
+++ b/kubernetes/aai/charts/aai-babel/values.yaml
@@ -28,8 +28,8 @@ image: onap/babel:1.2-STAGING-latest
 
 # application configuration
 config:
-  keyStorePassword: OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
-  keyManagerPassword: OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
+  keyStorePassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+  keyManagerPassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
 
 # default number of instances
 replicaCount: 1
diff --git a/kubernetes/aai/charts/aai-modelloader/resources/config/log/logback.xml b/kubernetes/aai/charts/aai-modelloader/resources/config/log/logback.xml
index d512d3b91c..fcfac840b1 100644
--- a/kubernetes/aai/charts/aai-modelloader/resources/config/log/logback.xml
+++ b/kubernetes/aai/charts/aai-modelloader/resources/config/log/logback.xml
@@ -1,161 +1,152 @@
-<configuration debug="false" scan="true" scanPeriod="3 seconds">
-    <!--<jmxConfigurator /> -->
-    <!-- directory path for all other type logs -->
-    <property name="logDir" value="/var/log/onap" />
-    <property name="componentName" value="aai"></property>
-    <property name="subComponentName" value="aai-ml"></property>
-    <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />
-    <!--  default eelf log file names -->
-    <property name="generalLogName" 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" />
-    <property name="pattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}\t[%thread]\t%-5level\t%logger\t%replace(%replace(%replace(%mdc){'\t','\\\\t'}){', ','\t'}){'\n', '\\\\n'}\t%replace(%replace(%msg){'\n', '\\\\n'}){'\t','\\\\t'}%n" />
-    <!-- Example evaluator filter applied against console appender -->
-    <appender class="ch.qos.logback.core.ConsoleAppender" name="STDOUT">
-        <encoder>
-            <pattern>${pattern}</pattern>
-        </encoder>
-    </appender>
-    <!-- ============================================================================ -->
-    <!-- EELF Appenders -->
-    <!-- ============================================================================ -->
-    <!-- The EELFAppender is used to record events to the general application 
-                log -->
-    <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="EELF">
-        <file>${logDirectory}/${generalLogName}.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${logDirectory}/${generalLogName}.%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 class="ch.qos.logback.classic.AsyncAppender" name="asyncEELF">
-        <!-- deny all events with a level below INFO, that is TRACE and DEBUG -->
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>INFO</level>
-        </filter>
-        <queueSize>${queueSize}</queueSize>
-        <appender-ref ref="EELF" />
-    </appender>
-    <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="EELFAudit">
-        <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 class="ch.qos.logback.classic.AsyncAppender" name="asyncEELFAudit">
-        <queueSize>${queueSize}</queueSize>
-        <appender-ref ref="EELFAudit" />
-    </appender>
-    <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="EELFMetrics">
-        <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 class="ch.qos.logback.classic.AsyncAppender" name="asyncEELFMetrics">
-        <queueSize>${queueSize}</queueSize>
-        <appender-ref ref="EELFMetrics" />
-    </appender>
-    <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="EELFDebug">
-        <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 class="ch.qos.logback.classic.AsyncAppender" name="asyncEELFDebug">
-        <queueSize>${queueSize}</queueSize>
-        <appender-ref ref="EELFDebug" />
-        <includeCallerData>true</includeCallerData>
-    </appender>
-    <!-- ============================================================================ -->
-    <!-- EELF loggers -->
-    <!-- ============================================================================ -->
-    <logger additivity="false" level="info" name="com.att.eelf">
-        <appender-ref ref="asyncEELF" />
-        <appender-ref ref="asyncEELFDebug" />
-    </logger>
-    <logger additivity="false" level="info" name="com.att.eelf.security">
-        <appender-ref ref="asyncEELFSecurity" />
-    </logger>
-    <logger additivity="false" level="info" name="com.att.eelf.perf">
-        <appender-ref ref="asyncEELFPerformance" />
-    </logger>
-    <logger additivity="false" level="info" name="com.att.eelf.server">
-        <appender-ref ref="asyncEELFServer" />
-    </logger>
-    <logger additivity="false" level="info" name="com.att.eelf.policy">
-        <appender-ref ref="asyncEELFPolicy" />
-    </logger>
-    <logger additivity="false" level="info" name="com.att.eelf.audit">
-        <appender-ref ref="asyncEELFAudit" />
-    </logger>
-    <logger additivity="false" level="info" name="com.att.eelf.metrics">
-        <appender-ref ref="asyncEELFMetrics" />
-    </logger>
-    <!-- Spring related loggers -->
-    <logger level="WARN" name="org.springframework" />
-    <logger level="WARN" name="org.springframework.beans" />
-    <logger level="WARN" name="org.springframework.web" />
-    <logger level="WARN" name="com.blog.spring.jms" />
-    <logger level="INFO" name="com.att" />
-    <!-- Model Loader loggers -->
-    <logger level="INFO" name="org.openecomp.modelloader" />
-    <!-- Other Loggers that may help troubleshoot -->
-    <logger level="WARN" name="net.sf" />
-    <logger level="WARN" name="org.apache.commons.httpclient" />
-    <logger level="WARN" name="org.apache.commons" />
-    <logger level="WARN" name="org.apache.coyote" />
-    <logger level="WARN" name="org.apache.jasper" />
-    <!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging. 
-                May aid in troubleshooting) -->
-    <logger level="WARN" name="org.apache.camel" />
-    <logger level="WARN" name="org.apache.cxf" />
-    <logger level="WARN" name="org.apache.camel.processor.interceptor" />
-    <logger level="WARN" name="org.apache.cxf.jaxrs.interceptor" />
-    <logger level="WARN" name="org.apache.cxf.service" />
-    <logger level="WARN" name="org.restlet" />
-    <logger level="WARN" name="org.apache.camel.component.restlet" />
-    <!-- logback internals logging -->
-    <logger level="WARN" name="ch.qos.logback.classic" />
-    <logger level="WARN" name="ch.qos.logback.core" />
-    <root>
-        <appender-ref ref="asyncEELF" />
-        <!-- <appender-ref ref="asyncEELFDebug" /> -->
-    </root>
+<configuration scan="true" scanPeriod="3 seconds" debug="false">
+  <include resource="org/springframework/boot/logging/logback/base.xml" />
+  <property name="logDir" value="${AJSC_HOME}/logs" />
+  <property name="componentName" value="AAI-ML"></property>
+
+  <!-- default eelf log file names -->
+  <property name="generalLogName" value="error" />
+  <property name="metricsLogName" value="metrics" />
+  <property name="auditLogName" value="audit" />
+  <property name="debugLogName" value="debug" />
+
+  <property name="errorLogPattern"
+	    value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{RequestId}|%thread|ModelLoader|%mdc{PartnerName}|%logger||%.-5level|%msg%n" />
+  <property name="auditMetricPattern" value="%m%n" />
+
+  <property name="logDirectory" value="${logDir}/${componentName}" />
+
+  <!-- Example evaluator filter applied against console appender -->
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>${defaultPattern}</pattern>
+    </encoder>
+  </appender>
+
+  <!-- ============================================================================ -->
+  <!-- EELF Appenders -->
+  <!-- ============================================================================ -->
+
+  <!-- The EELFAppender is used to record events to the general application
+       log -->
+
+  <appender name="EELF"
+	    class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${generalLogName}.log</file>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.log.zip</fileNamePattern>
+      <maxHistory>60</maxHistory>
+    </rollingPolicy>
+    <encoder>
+      <pattern>${errorLogPattern}</pattern>
+    </encoder>
+  </appender>
+  <appender name="asyncEELF" class="ch.qos.logback.classic.AsyncAppender">
+    <!-- deny all events with a level below INFO, that is TRACE and DEBUG -->
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>INFO</level>
+    </filter>
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELF" />
+  </appender>
+
+  <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}.log.zip</fileNamePattern>
+      <maxHistory>60</maxHistory>
+    </rollingPolicy>
+    <encoder>
+      <pattern>${auditMetricPattern}</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}.log</file>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.log.zip</fileNamePattern>
+      <maxHistory>60</maxHistory>
+    </rollingPolicy>
+    <encoder>
+      <pattern>${auditMetricPattern}</pattern>
+    </encoder>
+  </appender>
+  <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFMetrics" />
+  </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}.log.zip</fileNamePattern>
+      <maxHistory>60</maxHistory>
+    </rollingPolicy>
+    <encoder>
+      <pattern>${errorLogPattern}</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" level="info" additivity="false">
+    <appender-ref ref="asyncEELF" />
+    <appender-ref ref="asyncEELFDebug" />
+  </logger>
+  <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>
+
+  <!-- Spring related loggers -->
+  <logger name="org.springframework" level="WARN" />
+  <logger name="org.springframework.beans" level="WARN" />
+  <logger name="org.springframework.web" level="WARN" />
+  <logger name="com.blog.spring.jms" level="WARN" />
+
+  <logger name="com.att" level="INFO" />
+
+  <!-- Model Loader loggers -->
+  <logger name="org.openecomp.modelloader" level="INFO" />
+
+  <!-- Other Loggers that may help troubleshoot -->
+  <logger name="net.sf" level="WARN" />
+  <logger name="org.apache.commons.httpclient" level="WARN" />
+  <logger name="org.apache.commons" level="WARN" />
+  <logger name="org.apache.coyote" level="WARN" />
+  <logger name="org.apache.jasper" level="WARN" />
+
+  <!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging.
+       May aid in troubleshooting) -->
+  <logger name="org.apache.camel" level="WARN" />
+  <logger name="org.apache.cxf" level="WARN" />
+  <logger name="org.apache.camel.processor.interceptor" level="WARN" />
+  <logger name="org.apache.cxf.jaxrs.interceptor" level="WARN" />
+  <logger name="org.apache.cxf.service" level="WARN" />
+  <logger name="org.restlet" level="WARN" />
+  <logger name="org.apache.camel.component.restlet" level="WARN" />
+
+  <!-- logback internals logging -->
+  <logger name="ch.qos.logback.classic" level="WARN" />
+  <logger name="ch.qos.logback.core" level="WARN" />
+
+  <root>
+  <appender-ref ref="asyncEELF" />
+  <!-- <appender-ref ref="asyncEELFDebug" /> -->
+</root>
+
 </configuration>
diff --git a/kubernetes/aai/charts/aai-modelloader/resources/config/model-loader.properties b/kubernetes/aai/charts/aai-modelloader/resources/config/model-loader.properties
index e9b24b667c..38c25480c0 100644
--- a/kubernetes/aai/charts/aai-modelloader/resources/config/model-loader.properties
+++ b/kubernetes/aai/charts/aai-modelloader/resources/config/model-loader.properties
@@ -24,7 +24,7 @@ ml.aai.AUTH_USER=ModelLoader
 ml.aai.AUTH_PASSWORD=OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw
 
 # Model Loader Babel REST Client Configuration\r
-ml.babel.BASE_URL=https://aai-babel.{{.Release.Namespace}}:9516
+ml.babel.BASE_URL=https://babel.{{.Release.Namespace}}:9516
 ml.babel.GENERATE_ARTIFACTS_URL=/services/babel-service/v1/app/generateArtifacts
 ml.babel.KEYSTORE_FILE=babel-client-cert.p12
 ml.babel.KEYSTORE_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
diff --git a/kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml b/kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml
index 38ebe7689f..4bfa67de41 100644
--- a/kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml
@@ -50,9 +50,9 @@ spec:
           name: {{ include "common.fullname" . }}-prop-config
         - mountPath: /opt/app/model-loader/config/auth/
           name: {{ include "common.fullname" . }}-auth-config
-        - mountPath: /var/log/onap
+        - mountPath: /logs
           name: {{ include "common.fullname" . }}-logs
-        - mountPath: /opt/app/model-loader/bundleconfig/etc/logback.xml
+        - mountPath: /opt/app/model-loader/logback.xml
           name: {{ include "common.fullname" . }}-log-conf
           subPath: logback.xml
         ports:
@@ -67,11 +67,10 @@ spec:
         - mountPath: /usr/share/filebeat/filebeat.yml
           subPath: filebeat.yml
           name: filebeat-conf
-        - mountPath: /var/log/onap
+        - mountPath: /logs
           name: {{ include "common.fullname" . }}-logs
         - mountPath: /usr/share/filebeat/data
           name: aai-filebeat
-
       volumes:
       - name: localtime
         hostPath:
-- 
2.16.6