From d655b3c2cfc4f4667c6b89851b11a1901217bb3a Mon Sep 17 00:00:00 2001
From: krishnaa96 <krishna.moorthy6@wipro.com>
Date: Mon, 29 Mar 2021 19:29:35 +0530
Subject: Remove logback file from classpath

The logback in the helm charts are not able
to override the one in the classpath. So, it
is being removed from the classpath and the
logback will come from deployment charts

Issue-ID: OOM-2514
Signed-off-by: krishnaa96 <krishna.moorthy6@wipro.com>
Change-Id: I4fe7339fcc3d5378b41f5393f0753fe6fa5f6f29
---
 .../src/main/resources/application.properties      |   2 +-
 cmso-topology/src/main/resources/logback.xml       | 377 ---------------------
 2 files changed, 1 insertion(+), 378 deletions(-)
 delete mode 100644 cmso-topology/src/main/resources/logback.xml

(limited to 'cmso-topology')

diff --git a/cmso-topology/src/main/resources/application.properties b/cmso-topology/src/main/resources/application.properties
index bb11c96..5c3447a 100644
--- a/cmso-topology/src/main/resources/application.properties
+++ b/cmso-topology/src/main/resources/application.properties
@@ -54,7 +54,7 @@ server.port=7998
 kubernetes.namespace=org.onap.optf.cmso
 
 
-com.att.eelf.logging.file=logback.xml
+#com.att.eelf.logging.file=logback.xml
 com.att.eelf.logging.path=
 
 logging.config=
diff --git a/cmso-topology/src/main/resources/logback.xml b/cmso-topology/src/main/resources/logback.xml
deleted file mode 100644
index 2fd5329..0000000
--- a/cmso-topology/src/main/resources/logback.xml
+++ /dev/null
@@ -1,377 +0,0 @@
-<!--
-  Copyright © 2017-2018 AT&T Intellectual Property.
-  Modifications Copyright © 2018 IBM.
-  
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  
-  
-  Unless otherwise specified, all documentation contained herein is licensed
-  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
-  you may not use this documentation except in compliance with the License.
-  You may obtain a copy of the License at
-  
-          https://creativecommons.org/licenses/by/4.0/
-  
-  Unless required by applicable law or agreed to in writing, documentation
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<configuration scan="true" scanPeriod="3 seconds" debug="false">
-
-	<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
-	<property resource="application.properties" />
-	<property name="namespace" value="${kubernetes.namespace}"></property>
-	<!-- directory path for all other type logs -->
-	<property name="logDir" value="logs" />
-	<!-- directory path for debugging type logs -->
-	<property name="debugDir" value="debug-logs" />
-	<property name="logDirectory" value="${logDir}" />
-	<property name="debugLogDirectory" value="${debugDir}" />
-	<!-- log file names -->
-	<property name="generalLogName" value="application" />
-	<property name="securityLogName" value="security" />
-	<property name="performanceLogName" value="performance" />
-	<property name="serverLogName" value="server" />
-	<property name="policyLogName" value="policy" />
-	<property name="errorLogName" value="error" />
-	<property name="metricsLogName" value="metrics" />
-	<property name="auditLogName" value="audit" />
-	<property name="debugLogName" value="debug" />
-
-	<property name="defaultPattern"
-		value="%d{yyyy-MM-dd HH:mm:ss.SSS} $ version: %X{version} threadId: {PID:- } %-5level  namespace:${namespace} %logger{20} [ hostname: %X{hostname} serviceName: %X{serviceName} version: %X{version} transactionId: %X{transactionId} requestTimeStamp: %X{requestTimestamp}  responseTimeStamp: %X{responseTimestamp} duration: %X{duration}] %m%n" />
-
-	<property name="performanceandAuditpattern"
-		value="%date{ISO8601,UTC}|%thread|%.-5level|namespace:${namespace}|%logger{20}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{serviceName}| %msg%n" />
-
-	<property name="auditLoggerPattern"
-		value="%X{BeginTimestamp}|%X{EndTimestamp}|%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{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}| %msg%n" />
-
-	<property name="metricsLoggerPattern"
-		value="%X{BeginTimestamp}|%X{EndTimestamp}|%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{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{TargetVirtualEntity}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}| %msg%n" />
-
-	<property name="errorLoggerPattern"
-		value="%date{ISO8601,UTC}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%.-5level|%X{ErrorCode}|%X{ErrorDescription}| %msg%n" />
-
-	<property name="debugLoggerPattern"
-		value="%date{ISO8601,UTC}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Timer}| %msg%n" />
-
-	<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.FixedWindowRollingPolicy">
-			<fileNamePattern>${logDirectory}/${generalLogName}.%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>${defaultPattern}</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="asyncEELF"
-		class="ch.qos.logback.classic.AsyncAppender">
-		<queueSize>256</queueSize>
-		<appender-ref ref="EELF" />
-	</appender>
-
-	<!-- EELF Security Appender. This appender is used to record security events 
-		to the security log file. Security events are separate from other loggers 
-		in EELF so that security log records can be captured and managed in a secure 
-		way separate from the other logs. This appender is set to never discard any 
-		events. -->
-	<appender name="EELFSecurity"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${logDirectory}/${securityLogName}.log</file>
-		<rollingPolicy
-			class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-			<fileNamePattern>${logDirectory}/${securityLogName}.%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>${defaultPattern}</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="asyncEELFSecurity"
-		class="ch.qos.logback.classic.AsyncAppender">
-		<queueSize>256</queueSize>
-		<discardingThreshold>0</discardingThreshold>
-		<appender-ref ref="EELFSecurity" />
-	</appender>
-
-	<!-- EELF Performance Appender. This appender is used to record performance 
-		records. -->
-	<appender name="EELFPerformance"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${logDirectory}/${performanceLogName}.log</file>
-		<rollingPolicy
-			class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-			<fileNamePattern>${logDirectory}/${performanceLogName}.%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>${defaultPattern}</pattern>
-		</encoder>
-	</appender>
-	<appender name="asyncEELFPerformance"
-		class="ch.qos.logback.classic.AsyncAppender">
-		<queueSize>256</queueSize>
-		<appender-ref ref="EELFPerformance" />
-	</appender>
-
-	<!-- EELF Server Appender. This appender is used to record Server related 
-		logging events. The Server logger and appender are specializations of the 
-		EELF application root logger and appender. This can be used to segregate 
-		Server events from other components, or it can be eliminated to record these 
-		events as part of the application root log. -->
-	<appender name="EELFServer"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${logDirectory}/${serverLogName}.log</file>
-		<rollingPolicy
-			class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-			<fileNamePattern>${logDirectory}/${serverLogName}.%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>${defaultPattern}</pattern>
-		</encoder>
-	</appender>
-	<appender name="asyncEELFServer"
-		class="ch.qos.logback.classic.AsyncAppender">
-		<queueSize>256</queueSize>
-		<appender-ref ref="EELFServer" />
-	</appender>
-
-
-	<!-- EELF Policy Appender. This appender is used to record Policy engine 
-		related logging events. The Policy 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="EELFPolicy"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${logDirectory}/${policyLogName}.log</file>
-		<rollingPolicy
-			class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-			<fileNamePattern>${logDirectory}/${policyLogName}.%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>${defaultPattern}</pattern>
-		</encoder>
-	</appender>
-	<appender name="asyncEELFPolicy"
-		class="ch.qos.logback.classic.AsyncAppender">
-		<queueSize>256</queueSize>
-		<appender-ref ref="EELFPolicy" />
-	</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.FixedWindowRollingPolicy">
-			<fileNamePattern>${logDirectory}/${auditLogName}.%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>${auditLoggerPattern}</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.FixedWindowRollingPolicy">
-			<fileNamePattern>${logDirectory}/${metricsLogName}.%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>${metricsLoggerPattern}</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}.log</file>
-		<rollingPolicy
-			class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-			<fileNamePattern>${logDirectory}/${errorLogName}.%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>${errorLoggerPattern}</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}.log</file>
-		<rollingPolicy
-			class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-			<fileNamePattern>${debugLogDirectory}/${debugLogName}.%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>${debugLoggerPattern}</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="${EELF_LEVEL:-info}" additivity="false">
-		<appender-ref ref="asyncEELF" />
-	</logger>
-	<logger name="com.att.eelf.security" level="${DECURITY_LEVEL:-info}" additivity="false">
-		<appender-ref ref="asyncEELFSecurity" />
-	</logger>
-	<logger name="com.att.eelf.perf" level="${PERF_LEVEL:-info}" additivity="false">
-		<appender-ref ref="asyncEELFPerformance" />
-	</logger>
-	<logger name="com.att.eelf.server" level="${SERVER_LEVEL:-info}" additivity="false">
-		<appender-ref ref="asyncEELFServer" />
-	</logger>
-	<logger name="com.att.eelf.policy" level="${POLICY_LEVEL:-info}" additivity="false">
-		<appender-ref ref="asyncEELFPolicy" />
-	</logger>
-	<logger name="com.att.eelf.audit" level="${AUDIT_LEVEL:-info}" additivity="false">
-		<appender-ref ref="asyncEELFAudit" />
-	</logger>
-
-	<logger name="com.att.eelf.metrics" level="${METRICS_LEVEL:-info}" additivity="false">
-		<appender-ref ref="asyncEELFMetrics" />
-	</logger>
-
-	<logger name="com.att.eelf.error" level="${ERROR_LEVEL:-error}"
-		additivity="false">
-		<appender-ref ref="asyncEELFError" />
-	</logger>
-
-	<logger name="com.att.eelf.debug" level="${DEBUG_LEVEL:-debug}"
-		additivity="false">
-		<appender-ref ref="asyncEELFDebug" />
-	</logger>
-
-	<root level="${ROOT_LEVEL:-INFO}">
-		<!-- appender-ref ref="STDOUT" / -->
-		<appender-ref ref="asyncEELF" />
-	</root>
-
-</configuration>
-- 
cgit 1.2.3-korg