From: Jim Hahn <jrh3@att.com>
Date: Tue, 16 Apr 2019 20:56:08 +0000 (-0400)
Subject: Audit and metric logs contain everything
X-Git-Tag: 3.0.2-ONAP~6^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0feb04e826bb65424a2f6046c899cc24b325ca2a;p=policy%2Fpap.git

Audit and metric logs contain everything

Currently, the audit and metric logs contain everything, because
there is no filtering configured in logback.xml.  After some discussion,
we decided to just remove those two log files for now, as they may
be completely revamped in a future release of ONAP.

Change-Id: I1f964e1bb97092e3795e368798e071a6d40832c2
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
---

diff --git a/packages/policy-pap-tarball/src/main/resources/etc/logback.xml b/packages/policy-pap-tarball/src/main/resources/etc/logback.xml
index d4aaf73f..a0761396 100644
--- a/packages/policy-pap-tarball/src/main/resources/etc/logback.xml
+++ b/packages/policy-pap-tarball/src/main/resources/etc/logback.xml
@@ -1,6 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2019 Nordix Foundation.
+   Modifications Copyright (C) 2019 AT&T Intellectual Property.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -26,18 +27,11 @@
     <property name="debugLog" value="debug" />
     <property name="networkLog" value="network" />
 
-    <property name="metricLog" value="metric" />
-    <property name="transactionLog" value="audit" />
-
     <property name="debugPattern"
         value="[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n" />
     <property name="errorPattern" value="${debugPattern}" />
     <property name="networkPattern" value="[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%t]%m%n" />
 
-    <property name="metricPattern"
-        value="%X{RequestID}|%X{InvocationID}|%X{ServiceName}|%X{PartnerName}|%X{BeginTimestamp}|%X{EndTimestamp}|%X{ElapsedTime}|%X{ServiceInstanceID}|%X{VirtualServerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%X{Severity}|%X{TargetEntity}|%X{TargetServiceName}|%X{Server}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{ClientIPAddress}|%X{ProcessKey}|%X{RemoteHost}|%X{AlertSeverity}|%X{TargetVirtualEntity}|%level|%thread| %msg%n" />
-    <property name="transactionPattern" value="${metricPattern}" />
-
     <appender name="ErrorOut" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${logDir}/${errorLog}.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
@@ -95,42 +89,6 @@
         <appender-ref ref="NetworkOut" />
     </appender>
 
-    <appender name="MetricOut" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${logDir}/${metricLog}.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${logDir}/${metricLog}.%d{yyyy-MM-dd}.%i.log.zip
-            </fileNamePattern>
-            <maxFileSize>50MB</maxFileSize>
-            <maxHistory>30</maxHistory>
-            <totalSizeCap>10GB</totalSizeCap>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${metricPattern}</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="AsyncMetricOut" class="ch.qos.logback.classic.AsyncAppender">
-        <appender-ref ref="MetricOut" />
-    </appender>
-
-    <appender name="TransactionOut" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${logDir}/${transactionLog}.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${logDir}/${transactionLog}.%d{yyyy-MM-dd}.%i.log.zip
-            </fileNamePattern>
-            <maxFileSize>50MB</maxFileSize>
-            <maxHistory>30</maxHistory>
-            <totalSizeCap>10GB</totalSizeCap>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${transactionPattern}</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="AsyncTransactionOut" class="ch.qos.logback.classic.AsyncAppender">
-        <appender-ref ref="TransactionOut" />
-    </appender>
-
     <logger name="network" level="INFO" additivity="false">
         <appender-ref ref="AsyncNetworkOut" />
     </logger>
@@ -142,8 +100,6 @@
     <root level="INFO">
         <appender-ref ref="AsyncDebugOut" />
         <appender-ref ref="AsyncErrorOut" />
-        <appender-ref ref="AsyncMetricOut" />
-        <appender-ref ref="AsyncTransactionOut" />
     </root>
 
 </configuration>