From: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
Date: Tue, 28 Aug 2018 11:28:12 +0000 (+0200)
Subject: Fix logback and AAF
X-Git-Tag: 3.0.0-ONAP~427^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b84a92dbbc8076ddf727d2c3927c902bf628e2b9;p=oom.git

Fix logback and AAF

Support AAF (Add https 8443)and logback files in clamp.

Issue-ID: OOM-1174
Change-Id: Icfe869325e20c84180c5ccfa2cfb40f013a072b1
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
---

diff --git a/kubernetes/clamp/resources/config/log/filebeat/filebeat.yml b/kubernetes/clamp/resources/config/log/filebeat/filebeat.yml
index 44c0e6a8ac..68c62dbd51 100644
--- a/kubernetes/clamp/resources/config/log/filebeat/filebeat.yml
+++ b/kubernetes/clamp/resources/config/log/filebeat/filebeat.yml
@@ -3,9 +3,9 @@ filebeat.prospectors:
 - input_type: log
   #This is the canolical path as mentioned in logback.xml, *.* means it will monitor all files in the directory.
   paths:
-    - /var/log/onap/*/*/*/*.log
-    - /var/log/onap/*/*/*.log
-    - /var/log/onap/*/*.log
+    - /var/log/ONAP/*/*/*/*.log
+    - /var/log/ONAP/*/*/*.log
+    - /var/log/ONAP/*/*.log
   #Files older than this should be ignored.In our case it will be 48 hours i.e. 2 days. It is a helping flag for clean_inactive
   ignore_older: 48h
   # Remove the registry entry for a file that is more than the specified time. In our case it will be 96 hours, i.e. 4 days. It will help to keep registry records with in limit
diff --git a/kubernetes/clamp/resources/config/logback.xml b/kubernetes/clamp/resources/config/logback.xml
index 0a8f8d5f84..9008739fe0 100644
--- a/kubernetes/clamp/resources/config/logback.xml
+++ b/kubernetes/clamp/resources/config/logback.xml
@@ -1,18 +1,24 @@
-<configuration scan="true" scanPeriod="10 seconds" debug="false">
-		<jmxConfigurator />
-		<property resource="application.properties" />
-		<property name="logDirectory" value="/var/log/onap/clamp" />
+<included>
+	<jmxConfigurator />
+	<!-- Example evaluator filter applied against console appender -->
+<property name="p_tim" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}"/>
+		<property name="p_lvl" value="%level"/>
+		<property name="p_log" value="%logger"/>
+		<property name="p_mdc" value="%replace(%replace(%mdc){'\t','\\\\t'}){'\n', '\\\\n'}"/>
+		<property name="p_msg" value="%replace(%replace(%msg){'\t', '\\\\t'}){'\n','\\\\n'}"/>
+		<property name="p_exc" value="%replace(%replace(%rootException){'\t', '\\\\t'}){'\n','\\\\n'}"/>
+		<property name="p_mak" value="%replace(%replace(%marker){'\t', '\\\\t'}){'\n','\\\\n'}"/>
+		<property name="p_thr" value="%thread"/>
+		<property name="defaultPattern" value="%nopexception${p_tim}\t${p_thr}\t${p_lvl}\t${p_log}\t${p_mdc}\t${p_msg}\t${p_exc}\t${p_mak}\t%n"/>
+		<property name="debugPattern" value="%nopexception${p_tim}|${p_lvl}|${p_mdc}|${p_exc}|%msg%n"/>
+
 		<!-- Example evaluator filter applied against console appender -->
 		<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-				<!-- filter class="ch.qos.logback.classic.filter.LevelFilter"> <level>ERROR</level> 
-						<onMatch>ACCEPT</onMatch> <onMismatch>DENY</onMismatch> </filter -->
-				<!-- 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>
 				<encoder>
-						<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n
-						</pattern>
+					<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n</pattern>
 				</encoder>
 		</appender>
 
@@ -21,16 +27,16 @@
 				<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
 						<level>INFO</level>
 				</filter>
-				<file>${logDirectory}/error.log</file>
+				<file>${logDirectory}/error2.log</file>
 				<append>true</append>
 				<encoder>
-						<pattern>%date{"yyyy-MM-dd'T'HH:mm:ss,SSSXXX", UTC}|%X{RequestId}|%.20thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%.-5level|%X{ErrorCode}|%X{ErrorDescription}|%msg%n</pattern>
+						<pattern>${defaultPattern}</pattern>
 				</encoder>
-				<rollingPolicy
-						class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-						<maxIndex>10</maxIndex>
-						<FileNamePattern>${logDirectory}/error.%i.log.zip
-						</FileNamePattern>
+				<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+					<fileNamePattern>${outputDirectory}/clamp/error.%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern>
+					<maxFileSize>50MB</maxFileSize>
+					<maxHistory>30</maxHistory>
+					<totalSizeCap>10GB</totalSizeCap>
 				</rollingPolicy>
 				<triggeringPolicy
 						class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
@@ -43,194 +49,190 @@
 				<file>${logDirectory}/debug.log</file>
 				<append>true</append>
 				<encoder>
-						<pattern>%date{"yyyy-MM-dd'T'HH:mm:ss,SSSXXX",UTC}|%X{RequestId}|%.20thread|%.-5level|%logger{36}|%msg%n</pattern>
+						<pattern>${debugPattern}</pattern>
 				</encoder>
-				<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-					<fileNamePattern>${logDirectory}/debug.%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern>
-					<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-						<maxFileSize>10MB</maxFileSize>
-					</timeBasedFileNamingAndTriggeringPolicy>
-					<maxHistory>5</maxHistory>
+				<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+					<fileNamePattern>${outputDirectory}/clamp/debug.%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern>
+					<maxFileSize>50MB</maxFileSize>
+					<maxHistory>30</maxHistory>
+					<totalSizeCap>10GB</totalSizeCap>
 				</rollingPolicy>
 		</appender>
 
-		<appender name="AUDIT"
-				class="ch.qos.logback.core.rolling.RollingFileAppender">
-				<file>${logDirectory}/audit.log</file>
-				<append>true</append>
-				<encoder>
-						<pattern>%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%.20thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}|%msg%n
-						</pattern>
-				</encoder>
-				<rollingPolicy
-						class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-						<maxIndex>10</maxIndex>
-						<FileNamePattern>${logDirectory}/audit.%i.log.zip
-						</FileNamePattern>
-				</rollingPolicy>
-				<triggeringPolicy
-						class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-						<maxFileSize>10MB</maxFileSize>
-				</triggeringPolicy>
-		</appender>
-		<appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
-				<queueSize>256</queueSize>
-				<appender-ref ref="AUDIT" />
-		</appender>
 
-		<appender name="METRIC"
-				class="ch.qos.logback.core.rolling.RollingFileAppender">
-				<file>${logDirectory}/metric.log</file>
-				<append>true</append>
-				<encoder>
-						<pattern>%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%.20thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{TargetVirtualEntity}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}|
-								%msg%n</pattern>
-				</encoder>
-				<rollingPolicy
-						class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-						<maxIndex>10</maxIndex>
-						<FileNamePattern>${logDirectory}/metric.%i.log.zip
-						</FileNamePattern>
-				</rollingPolicy>
-				<triggeringPolicy
-						class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-						<maxFileSize>10MB</maxFileSize>
-				</triggeringPolicy>
-		</appender>
-		<appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
-				<queueSize>256</queueSize>
-				<appender-ref ref="METRIC" />
-		</appender>
+	<appender name="AUDIT"
+		class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${logDirectory}/audit.log</file>
+		<append>true</append>
+		<encoder>
+			<pattern>%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%.20thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}|%msg%n
+			</pattern>
+		</encoder>
+		<rollingPolicy
+			class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+			<maxIndex>10</maxIndex>
+			<FileNamePattern>${logDirectory}/audit.%i.log.zip
+			</FileNamePattern>
+		</rollingPolicy>
+		<triggeringPolicy
+			class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+			<maxFileSize>10MB</maxFileSize>
+		</triggeringPolicy>
+	</appender>
+	<appender name="asyncEELFAudit"
+		class="ch.qos.logback.classic.AsyncAppender">
+		<queueSize>256</queueSize>
+		<appender-ref ref="AUDIT" />
+	</appender>
 
-		<!-- SECURITY related loggers -->
-		<appender name="SECURITY"
-				class="ch.qos.logback.core.rolling.RollingFileAppender">
-				<file>${logDirectory}/security.log</file>
-				<append>true</append>
-				<encoder>
-						<pattern>%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%.20thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}|%msg%n
-						</pattern>
-				</encoder>
-				<rollingPolicy
-						class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-						<maxIndex>10</maxIndex>
-						<FileNamePattern>${logDirectory}/security.%i.log.zip
-						</FileNamePattern>
-				</rollingPolicy>
-				<triggeringPolicy
-						class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-						<maxFileSize>10MB</maxFileSize>
-				</triggeringPolicy>
-		</appender>
-		<appender name="asyncEELFSecurity" class="ch.qos.logback.classic.AsyncAppender">
-				<queueSize>256</queueSize>
-				<appender-ref ref="SECURITY" />
-		</appender>
-
-		<!-- CLDS related loggers -->
-		<logger name="org.onap.clamp.clds" level="INFO" additivity="true">
-				<appender-ref ref="ERROR" />
-		</logger>
+	<appender name="METRIC"
+		class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${logDirectory}/metric.log</file>
+		<append>true</append>
+		<encoder>
+			<pattern>%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%.20thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{TargetVirtualEntity}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}|
+				%msg%n</pattern>
+		</encoder>
+		<rollingPolicy
+			class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+			<maxIndex>10</maxIndex>
+			<FileNamePattern>${logDirectory}/metric.%i.log.zip
+			</FileNamePattern>
+		</rollingPolicy>
+		<triggeringPolicy
+			class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+			<maxFileSize>10MB</maxFileSize>
+		</triggeringPolicy>
+	</appender>
+	<appender name="asyncEELFMetrics"
+		class="ch.qos.logback.classic.AsyncAppender">
+		<queueSize>256</queueSize>
+		<appender-ref ref="METRIC" />
+	</appender>
 
-		<!-- CLDS related loggers -->
-		<logger name="com.att.eelf.error" level="OFF" additivity="true">
-				<appender-ref ref="ERROR" />
-		</logger>
-		<!-- EELF related loggers -->
-		<logger name="com.att.eelf.audit" level="INFO" additivity="false">
-				<appender-ref ref="asyncEELFAudit" />
-		</logger>
-		<logger name="com.att.eelf.metrics" level="DEBUG" additivity="false">
-				<appender-ref ref="asyncEELFMetrics" />
-		</logger>
-		<logger name="com.att.eelf.security" level="DEBUG" additivity="false">
-				<appender-ref ref="asyncEELFSecurity" />
-		</logger>
+	<!-- SECURITY related loggers -->
+	<appender name="SECURITY"
+		class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${logDirectory}/security.log</file>
+		<append>true</append>
+		<encoder>
+			<pattern>%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%.20thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}|%msg%n
+			</pattern>
+		</encoder>
+		<rollingPolicy
+			class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+			<maxIndex>10</maxIndex>
+			<FileNamePattern>${logDirectory}/security.%i.log.zip
+			</FileNamePattern>
+		</rollingPolicy>
+		<triggeringPolicy
+			class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+			<maxFileSize>10MB</maxFileSize>
+		</triggeringPolicy>
+	</appender>
+	<appender name="asyncEELFSecurity"
+		class="ch.qos.logback.classic.AsyncAppender">
+		<queueSize>256</queueSize>
+		<appender-ref ref="SECURITY" />
+	</appender>
+	<!-- AAF related loggers -->
+	<logger name="org.onap.aaf" level="INFO" additivity="true">
+		<appender-ref ref="DEBUG" />
+	</logger>
+	<logger name="org.apache.catalina.core" level="INFO"
+		additivity="true">
+		<appender-ref ref="DEBUG" />
+	</logger>
+	<!-- CLDS related loggers -->
+	<logger name="org.onap.clamp.clds" level="INFO"
+		additivity="true">
+		<appender-ref ref="ERROR" />
+	</logger>
 
+	<!-- CLDS related loggers -->
+	<logger name="com.att.eelf.error" level="OFF" additivity="true">
+		<appender-ref ref="ERROR" />
+	</logger>
+	<!-- EELF related loggers -->
+	<logger name="com.att.eelf.audit" level="INFO"
+		additivity="false">
+		<appender-ref ref="asyncEELFAudit" />
+	</logger>
+	<logger name="com.att.eelf.metrics" level="DEBUG"
+		additivity="false">
+		<appender-ref ref="asyncEELFMetrics" />
+	</logger>
+	<logger name="com.att.eelf.security" level="DEBUG"
+		additivity="false">
+		<appender-ref ref="asyncEELFSecurity" />
+	</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" />
+	<!-- Spring related loggers -->
+	<logger name="org.springframework" level="DEBUG" />
 
-		<!-- 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" />
+	<!-- Other Loggers that may help troubleshoot -->
+	<logger name="org.apache" level="DEBUG" />
 
-		<!-- 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="DEBUG" />
-		<logger name="org.apache.camel.component.restlet" level="DEBUG" />
+	<!-- logback internals logging -->
+	<logger name="ch.qos.logback.classic" level="INFO" />
+	<logger name="ch.qos.logback.core" level="INFO" />
 
-		<!-- logback internals logging -->
-		<logger name="ch.qos.logback.classic" level="INFO" />
-		<logger name="ch.qos.logback.core" level="INFO" />
-
-		<!-- logback jms appenders & loggers definition starts here -->
-		<!-- logback jms appenders & loggers definition starts here -->
-		<appender name="auditLogs"
-				class="ch.qos.logback.core.rolling.RollingFileAppender">
-				<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-				</filter>
-				<file>${logDirectory}/Audit.log</file>
-				<rollingPolicy
-						class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-						<fileNamePattern>${logDirectory}/Audit.%i.log.zip
-						</fileNamePattern>
-						<minIndex>1</minIndex>
-						<maxIndex>9</maxIndex>
-				</rollingPolicy>
-				<triggeringPolicy
-						class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-						<maxFileSize>5MB</maxFileSize>
-				</triggeringPolicy>
-				<encoder>
-						<pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-				</encoder>
-		</appender>
-		<appender name="perfLogs"
-				class="ch.qos.logback.core.rolling.RollingFileAppender">
-				<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-				</filter>
-				<file>${logDirectory}/Perform.log</file>
-				<rollingPolicy
-						class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-						<fileNamePattern>${logDirectory}/Perform.%i.log.zip
-						</fileNamePattern>
-						<minIndex>1</minIndex>
-						<maxIndex>9</maxIndex>
-				</rollingPolicy>
-				<triggeringPolicy
-						class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-						<maxFileSize>5MB</maxFileSize>
-				</triggeringPolicy>
-				<encoder>
-						<pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-				</encoder>
-		</appender>
-		<logger name="AuditRecord" level="INFO" additivity="FALSE">
-				<appender-ref ref="auditLogs" />
-		</logger>
-		<logger name="AuditRecord_DirectCall" level="INFO" additivity="FALSE">
-				<appender-ref ref="auditLogs" />
-		</logger>
-		<logger name="PerfTrackerRecord" level="INFO" additivity="FALSE">
-				<appender-ref ref="perfLogs" />
-		</logger>
-		<!-- logback jms appenders & loggers definition ends here -->
+	<!-- logback jms appenders & loggers definition starts here -->
+	<appender name="auditLogs"
+		class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+		</filter>
+		<file>${logDirectory}/Audit-${lrmRVer}-${lrmRO}-${Pid}.log</file>
+		<rollingPolicy
+			class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+			<fileNamePattern>${logDirectory}/Audit-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip
+			</fileNamePattern>
+			<minIndex>1</minIndex>
+			<maxIndex>9</maxIndex>
+		</rollingPolicy>
+		<triggeringPolicy
+			class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+			<maxFileSize>5MB</maxFileSize>
+		</triggeringPolicy>
+		<encoder>
+			<pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
+		</encoder>
+	</appender>
+	<appender name="perfLogs"
+		class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+		</filter>
+		<file>${logDirectory}/Perform-${lrmRVer}-${lrmRO}-${Pid}.log</file>
+		<rollingPolicy
+			class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+			<fileNamePattern>${logDirectory}/Perform-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip
+			</fileNamePattern>
+			<minIndex>1</minIndex>
+			<maxIndex>9</maxIndex>
+		</rollingPolicy>
+		<triggeringPolicy
+			class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+			<maxFileSize>5MB</maxFileSize>
+		</triggeringPolicy>
+		<encoder>
+			<pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
+		</encoder>
+	</appender>
+	<logger name="AuditRecord" level="INFO" additivity="FALSE">
+		<appender-ref ref="auditLogs" />
+	</logger>
+	<logger name="AuditRecord_DirectCall" level="INFO"
+		additivity="FALSE">
+		<appender-ref ref="auditLogs" />
+	</logger>
+	<logger name="PerfTrackerRecord" level="INFO" additivity="FALSE">
+		<appender-ref ref="perfLogs" />
+	</logger>
+	<!-- logback jms appenders & loggers definition ends here -->
 
-		<root level="WARN">
-				<appender-ref ref="DEBUG" />
-				<appender-ref ref="STDOUT" />
-		</root>
+	<root level="DEBUG">
+		<appender-ref ref="DEBUG" />
+		<appender-ref ref="STDOUT" />
+	</root>
+</included>
 
-</configuration>
diff --git a/kubernetes/clamp/templates/service.yaml b/kubernetes/clamp/templates/service.yaml
index ce29de9aee..805eaa3936 100644
--- a/kubernetes/clamp/templates/service.yaml
+++ b/kubernetes/clamp/templates/service.yaml
@@ -29,10 +29,16 @@ spec:
     - port: {{ .Values.service.internalPort }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
       name: {{ .Values.service.portName }}
+    - port: {{ .Values.service.internalPort2 }}
+      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
+      name: {{ .Values.service.portName }}2
     {{- else -}}
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
       name: {{ .Values.service.portName }}
+    - port: {{ .Values.service.externalPort2 }}
+      targetPort: {{ .Values.service.internalPort2 }}
+      name: {{ .Values.service.portName }}2
     {{- end}}
   selector:
     app: {{ include "common.name" . }}
diff --git a/kubernetes/clamp/values.yaml b/kubernetes/clamp/values.yaml
index 2a321e7db2..88d2d53d46 100644
--- a/kubernetes/clamp/values.yaml
+++ b/kubernetes/clamp/values.yaml
@@ -27,7 +27,7 @@ subChartsOnly:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/clamp:2.0.2
+image: onap/clamp:3.0-STAGING-latest
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -56,7 +56,10 @@ config:
         "clamp.config.policy.pdpUrl1": "http://pdp.{{ include "common.namespace" . }}:8081/pdp/ , testpdp, alpha123",
         "clamp.config.policy.pdpUrl2": "http://pdp.{{ include "common.namespace" . }}:8081/pdp/ , testpdp, alpha123",
         "clamp.config.policy.papUrl": "http://pap.{{ include "common.namespace" . }}:9091/pap/ , testpap, alpha123",
-        "clamp.config.policy.clientKey": "dGVzdA=="
+        "clamp.config.policy.clientKey": "dGVzdA==",
+        "clamp.config.cadi.aafLocateUrl": "https://aaf-onap-test.osaaf.org:8095",
+        "com.att.eelf.logging.path": "/opt/clamp",
+        "com.att.eelf.logging.file": "logback.xml"
     }
 
 # subchart configuration
@@ -90,6 +93,10 @@ service:
   portName: clamp
   internalPort: 8080
   nodePort: 95
+  portName2: clamp-ssl
+  internalPort2: 8443
+  nodePort2: 34
+ 
 
 ingress:
   enabled: false