Merge "[Portal] Followed Logging Compliance Specification Guidelines"

4 files changed, 16 insertions, 10 deletions

diff --git a/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/logback.xml b/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/logback.xml
index 99fe917de5..ece708914e 100644
--- a/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/logback.xml
+++ b/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/logback.xml
@@ -40,6 +40,8 @@
 	<!-- specify the component name -->

 	<property name="componentName" value="onapportal"></property>

 

+	<!--  specify the application name -->

+    <property name="application_name" value="Portal"></property>

 	<!-- specify the base path of the log directory -->

 	<property name="logDirPrefix" value="/var/log/onap"></property>

 

@@ -67,7 +69,7 @@
 		value="%X{MetricsLogBeginTimestamp}|%X{MetricsLogEndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{ClientIPAddress}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{TargetVisualEntity}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}| %msg%n" />

 

 	<property name="errorLoggerPattern"

-		value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{ClassName}|%X{AlertSeverity}|%X{ErrorCode}|%X{ErrorDescription}| %msg%n" />

+		value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{AlertSeverity}|%X{ErrorCode}|%X{ErrorDescription}| %msg%n" />

 

 	<property name="defaultLoggerPattern"

 		value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%X{ClassName}| %msg%n" />

@@ -274,15 +276,15 @@
 		<appender-ref ref="asyncEELFServer" /> </logger> <logger name="com.att.eelf.policy"

 		level="info" additivity="false"> <appender-ref ref="asyncEELFPolicy" /> </logger> -->

 

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

+	<logger name="EELFAudit" level="info" additivity="false">

 		<appender-ref ref="asyncEELFAudit" />

 	</logger>

 

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

+	<logger name="EELFMetrics" level="info" additivity="false">

 		<appender-ref ref="asyncEELFMetrics" />

 	</logger>

 

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

+	<logger name="EELFError" level="info" additivity="false">

 		<appender-ref ref="asyncEELFError" />

 	</logger>

 

@@ -292,6 +294,7 @@
 

 	<root level="INFO">

 		<appender-ref ref="asyncEELF" />

+		<appender-ref ref="STDOUT" />

 	</root>

 

 </configuration>

diff --git a/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/music.properties b/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/music.properties
index 4efbac7fe3..e0724c6d06 100644
--- a/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/music.properties
+++ b/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/music.properties
@@ -27,7 +27,7 @@ music.serialize.compress = true
 
 #By default it's eventual
 music.atomic.get = false
-music.atomic.put = true
+music.atomic.put = false
 cassandra.host={{.Values.cassandra.service.name}}
 cassandra.user=${CASSA_USER}
 cassandra.password=${CASSA_PASSWORD}
diff --git a/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/logback.xml b/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/logback.xml
index 85e1eed648..e1fee17381 100644
--- a/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/logback.xml
+++ b/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/logback.xml
@@ -41,6 +41,8 @@
   <!--<jmxConfigurator /> -->

   <!--  specify the component name -->

   <property name="componentName" value="onapsdk"></property>

+  <!--  specify the application name -->

+  <property name="application_name" value="PortalSDK"></property>

   <!--  specify the base path of the log directory -->

   <property name="logDirPrefix" value="/var/log/onap"></property>

   <!-- The directories where logs are written -->

@@ -60,7 +62,7 @@
   <!-- 1610 Logging Fields Format Revisions -->

   <property name="auditLoggerPattern" value="%X{AuditLogBeginTimestamp}|%X{AuditLogEndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{ClientIPAddress}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}| %msg%n" />

   <property name="metricsLoggerPattern" value="%X{MetricsLogBeginTimestamp}|%X{MetricsLogEndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{ClientIPAddress}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{TargetVisualEntity}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}| %msg%n" />

-  <property name="errorLoggerPattern" value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{ClassName}|%X{AlertSeverity}|%X{ErrorCode}|%X{ErrorDescription}| %msg%n" />

+  <property name="errorLoggerPattern" value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{AlertSeverity}|%X{ErrorCode}|%X{ErrorDescription}| %msg%n" />

   <property name="defaultLoggerPattern" value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%X{ClassName}| %msg%n" />

   <!-- use %class so library logging calls yield their class name -->

   <property name="applicationLoggerPattern" value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%class{36}| %msg%n" />

@@ -204,19 +206,20 @@
   <logger name="org.onap.eelf" level="info" additivity="false">

     <appender-ref ref="asyncEELF" />

   </logger>

-  <logger name="org.onap.eelf.audit" level="info" additivity="false">

+  <logger name="EELFAudit" level="info" additivity="false">

     <appender-ref ref="asyncEELFAudit" />

   </logger>

   <logger name="org.onap.eelf.debug" level="debug" additivity="false">

     <appender-ref ref="asyncEELFDebug" />

   </logger>

-  <logger name="org.onap.eelf.error" level="info" additivity="false">

+  <logger name="EELFError" level="info" additivity="false">

     <appender-ref ref="asyncEELFError" />

   </logger>

-  <logger name="org.onap.eelf.metrics" level="info" additivity="false">

+  <logger name="EELFMetrics" level="info" additivity="false">

     <appender-ref ref="asyncEELFMetrics" />

   </logger>

   <root level="DEBUG">

     <appender-ref ref="asyncEELF" />

+    <appender-ref ref="STDOUT" />

   </root>

 </configuration>

diff --git a/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/music.properties b/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/music.properties
index f97b90c654..a4c0acc9d0 100644
--- a/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/music.properties
+++ b/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/music.properties
@@ -27,7 +27,7 @@ music.serialize.compress = true
 
 #By default it's eventual
 music.atomic.get = false
-music.atomic.put = true
+music.atomic.put = false
 
 cassandra.host={{.Values.cassandra.service.name}}
 cassandra.user=${CASSA_USER}