Fixed logback test config for multiple modules

Also removed unused logging code.

Change-Id: Iee9a74638e889142f1bb4e01c75c8ed3377357a8
Issue-ID: SDC-1656
Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>

16 files changed, 35 insertions, 714 deletions

diff --git a/catalog-be/src/main/resources/config/logback.xml b/catalog-be/src/main/resources/config/logback.xml
index b803298bba..7044d345c5 100644
--- a/catalog-be/src/main/resources/config/logback.xml
+++ b/catalog-be/src/main/resources/config/logback.xml
@@ -298,26 +298,6 @@
 	      <appender-ref ref="ERROR_ROLLING" />
 	</appender>
 
-	<!-- <appender name="DISPATCHER" class="ch.qos.logback.classic.sift.SiftingAppender">
-		<discriminator class="org.openecomp.core.logging.logback.EventTypeDiscriminator"/>
-		<sift>
-			<appender name="Audit" class="ch.qos.logback.core.rolling.RollingFileAppender">
-				<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>${default-log-pattern}</pattern>
-				</encoder>
-			</appender>
-		</sift>
-	</appender>-->
-
 	<root level="INFO">
 		<appender-ref ref="ASYNC_ERROR" />
 		<appender-ref ref="ASYNC_DEBUG" />
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/test/resources/logback-test.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/test/resources/logback-test.xml
index 6d9686714e..f9fa3d88e8 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/test/resources/logback-test.xml
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/test/resources/logback-test.xml
@@ -1,19 +1,13 @@
 <configuration>
 
-    <configuration>
-
-        <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder>
-                <Pattern>
-                    %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n
-                </Pattern>
-            </encoder>
-        </appender>
-
-        <root level="OFF">
-            <appender-ref ref="STDOUT" />
-        </root>
-
-    </configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="OFF">
+        <appender-ref ref="STDOUT" />
+    </root>
 
 </configuration>
\ No newline at end of file
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/logback-test.xml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/logback-test.xml
index c1932e31e8..ea08cd2ce7 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/logback-test.xml
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/logback-test.xml
@@ -1,14 +1,12 @@
 <configuration>
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <!-- encoders are assigned the type
-             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
         <encoder>
             <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
 
-    <root level="warn">
+    <root level="OFF">
         <appender-ref ref="STDOUT" />
     </root>
 
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/logback.xml b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/logback.xml
index c22d1811ce..de89c7ef2c 100644
--- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/logback.xml
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/logback.xml
@@ -291,26 +291,6 @@
 	      <appender-ref ref="ERROR_ROLLING" />
 	</appender>
 
-	<!-- <appender name="DISPATCHER" class="ch.qos.logback.classic.sift.SiftingAppender">
-		<discriminator class="org.openecomp.core.logging.logback.EventTypeDiscriminator"/>
-		<sift>
-			<appender name="Audit" class="ch.qos.logback.core.rolling.RollingFileAppender">
-				<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>${default-log-pattern}</pattern>
-				</encoder>
-			</appender>
-		</sift>
-	</appender>-->
-
 	<root level="INFO">
 		<appender-ref ref="ASYNC_ERROR" />
 		<appender-ref ref="ASYNC_DEBUG" />
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/logback.xml b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/logback.xml
index b803298bba..7044d345c5 100644
--- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/logback.xml
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/logback.xml
@@ -298,26 +298,6 @@
 	      <appender-ref ref="ERROR_ROLLING" />
 	</appender>
 
-	<!-- <appender name="DISPATCHER" class="ch.qos.logback.classic.sift.SiftingAppender">
-		<discriminator class="org.openecomp.core.logging.logback.EventTypeDiscriminator"/>
-		<sift>
-			<appender name="Audit" class="ch.qos.logback.core.rolling.RollingFileAppender">
-				<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>${default-log-pattern}</pattern>
-				</encoder>
-			</appender>
-		</sift>
-	</appender>-->
-
 	<root level="INFO">
 		<appender-ref ref="ASYNC_ERROR" />
 		<appender-ref ref="ASYNC_DEBUG" />
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/src/test/resources/logback-test.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/src/test/resources/logback-test.xml
index 6d9686714e..f9fa3d88e8 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/src/test/resources/logback-test.xml
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/src/test/resources/logback-test.xml
@@ -1,19 +1,13 @@
 <configuration>
 
-    <configuration>
-
-        <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder>
-                <Pattern>
-                    %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n
-                </Pattern>
-            </encoder>
-        </appender>
-
-        <root level="OFF">
-            <appender-ref ref="STDOUT" />
-        </root>
-
-    </configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="OFF">
+        <appender-ref ref="STDOUT" />
+    </root>
 
 </configuration>
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/logback-test.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/logback-test.xml
index 03ce9d1243..04378bf3ad 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/logback-test.xml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/logback-test.xml
@@ -1,13 +1,13 @@
-<!-- only one line, shut up logback ! -->
 <configuration>
+
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <Pattern>
-                %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n
-            </Pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
+
     <root level="off">
         <appender-ref ref="STDOUT" />
     </root>
+
 </configuration>
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/logback-test.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/logback-test.xml
index 31672ca4d9..b0d1006d00 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/logback-test.xml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/logback-test.xml
@@ -1,13 +1,13 @@
-<!-- only one line, shut up logback ! -->
 <configuration>
+
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <Pattern>
-                %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n
-            </Pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
+
     <root level="off">
         <appender-ref ref="STDOUT"/>
     </root>
+
 </configuration>
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/README b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/README
deleted file mode 100644
index 779c5d99df..0000000000
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/README
+++ /dev/null
@@ -1,29 +0,0 @@
-The purpose of this module is to make a Web application meet the OPENECOMP logging requirements described in
-OPENECOMP platform application logging guidelines.
-
-The default out-of-the box solution is based on SLF4J.
-
-It introduces three major areas of functionality as follows:
-
-1. Routing of logging messages for the Logback library, so that all logging events are written to separate files
-according to their type.
-
-2. An AOP aspect for measuring execution time and logging it, so that the application code is not contaminated with
-this type of logging.
-
-3. Collecting and populating the context of a Web API request and propagating it to every logging event.
-
-TODO:
-
-1. MetricsAspect
-  - Configurable metrics message
-  - Make sure there are no exceptions but applicative ones
-
-2. EventTypeDiscriminator
-  - Make event types configurable to make the names of log files easily customizable
-
-3. DispatchingAppender
-  - Read appenders from configuration, so that there is no need in EELF loggers
-  - Simpler use of discriminator or an entirely different mechanism
-  - Better appender name pattern, or mapping between a discriminating value and an appender name
-  - Discard the appenders cache on configuration changes
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/logback/DispatchingAppender.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/logback/DispatchingAppender.java
deleted file mode 100644
index fb0ceb97e2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/logback/DispatchingAppender.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright © 2016-2017 European Support Limited
- *
- * 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.
- */
-
-package org.openecomp.sdc.logging.logback;
-
-import ch.qos.logback.classic.Logger;
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.sift.MDCBasedDiscriminator;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.core.Appender;
-import ch.qos.logback.core.AppenderBase;
-import ch.qos.logback.core.joran.spi.DefaultClass;
-import ch.qos.logback.core.sift.Discriminator;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.LoggerFactory;
-
-/**
- * <p>Allows to use EELF logging configuration almost as is, by using a custom routing function, but pre-configured
- * appenders attached to the standard EELF loggers.</p>
- *
- * <p>Changes that must be made in <i>logback.xml</i> supplied with EELF:</p>
- *
- * <pre>
- *     &lt;appender name="DISPATCHER" class="org.openecomp.sdc.logging.logback.DispatchingAppender"&gt;
- *          &lt;discriminator class="org.openecomp.sdc.logging.logback.EventTypeDiscriminator"/&gt;
- *          &lt;appenderNamePattern&gt;asyncEELF%s&lt;/appenderNamePattern&gt;
- *     &lt;/appender&gt;
- *
- *     &lt;root level="INFO" additivity="false"&gt;
- *          &lt;appender-ref ref="DISPATCHER" /&gt;
- *      &lt;/root&gt;
- * </pre>
- *
- * @author EVITALIY
- * @since 17/08/2016.
- */
-public class DispatchingAppender extends AppenderBase<ILoggingEvent> {
-
-    // "magic" appender to indicate a missing appender
-    private static final Appender<ILoggingEvent> NO_APPENDER = new DispatchingAppender();
-
-    private final Map<String, Appender<ILoggingEvent>> appenders = new ConcurrentHashMap<>();
-
-    private Discriminator<ILoggingEvent> discriminator;
-    private String appenderNamePattern;
-
-    @DefaultClass(MDCBasedDiscriminator.class)
-    public void setDiscriminator(Discriminator<ILoggingEvent> discriminator) {
-        this.discriminator = discriminator;
-    }
-
-    public Discriminator<ILoggingEvent> getDiscriminator() {
-        return this.discriminator;
-    }
-
-    public void setAppenderNamePattern(String pattern) {
-        this.appenderNamePattern = pattern;
-    }
-
-    public String getAppenderNamePattern() {
-        return this.appenderNamePattern;
-    }
-
-    @Override
-    protected void append(ILoggingEvent event) {
-
-        if (this.isStarted()) {
-
-            String discriminatingValue = this.discriminator.getDiscriminatingValue(event);
-            String appenderName = String.format(this.appenderNamePattern, discriminatingValue);
-            Appender<ILoggingEvent> appender = this.lookupAppender(appenderName);
-            if (appender == NO_APPENDER) {
-                this.addError(String.format("Appender %s does not exist", appenderName));
-            } else {
-                appender.doAppend(event);
-            }
-        }
-    }
-
-    private Appender<ILoggingEvent> lookupAppender(String key) {
-
-        Appender<ILoggingEvent> appender = appenders.get(key);
-        if (appender != null) {
-            return appender;
-        }
-
-        LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
-        for (Logger log : context.getLoggerList()) {
-
-            Iterator<Appender<ILoggingEvent>> iterator = log.iteratorForAppenders();
-            while (iterator.hasNext()) {
-
-                Appender<ILoggingEvent> element = iterator.next();
-                if (key.equals(element.getName())) {
-                    this.appenders.putIfAbsent(key, element);
-                    return element;
-                }
-            }
-        }
-
-        // to avoid consecutive lookups if the required appender does not exist
-        this.appenders.putIfAbsent(key, NO_APPENDER);
-        return NO_APPENDER;
-    }
-
-    @Override
-    public void start() {
-
-        int errors = 0;
-        if (this.discriminator == null) {
-            this.addError("Missing discriminator. Aborting");
-        }
-
-        if (!this.discriminator.isStarted()) {
-            this.addError("Discriminator has not started successfully. Aborting");
-            ++errors;
-        }
-
-        if (this.appenderNamePattern == null) {
-            this.addError("Missing name pattern. Aborting");
-            ++errors;
-        }
-
-        if (errors == 0) {
-            super.start();
-        }
-    }
-}
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/resources/README b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/resources/README
deleted file mode 100644
index 430f36d760..0000000000
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/resources/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Different routing/dispatching mechanisms can be tested using -Dlogback.configurationFile and a custom configuration
-file, for example
-
--Dlogback.configurationFile=<path>/dispatching-logback.xml
-
-or
-
--Dlogback.configurationFile=<path>/sifting-logback.xml
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/resources/dispatching-logback.xml b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/resources/dispatching-logback.xml
deleted file mode 100644
index c6c51f14c1..0000000000
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/resources/dispatching-logback.xml
+++ /dev/null
@@ -1,335 +0,0 @@
-<configuration scan="true" scanPeriod="3 seconds">
-  <!--<jmxConfigurator /> -->
-  <!-- directory path for all other type logs -->
-  <property name="logDir" value="logs" />
-  
-  <!-- directory path for debugging type logs -->
-  <property name="debugDir" value="debug-logs" />
-  
-  <!--  specify the component name -->
-  <property name="componentName" value="SDC" />
-  
-  <!--  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="%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" />
-  
-  <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}|[%caller{3}]| %msg%n" />
-  
-  <property name="logDirectory" value="${logDir}/${componentName}" />
-  <property name="debugLogDirectory" value="${debugDir}/${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.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>
-      <outputPatternAsHeader>true</outputPatternAsHeader>
-      <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>${defaultPattern}</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>"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - 
-        %msg%n"</pattern> -->
-      <pattern>${defaultPattern}</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>${defaultPattern}</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="org.openecomp.eelf" level="info" additivity="false">
-    <appender-ref ref="asyncEELF" />
-  </logger>
-  <logger name="org.openecomp.eelf.security" level="info" additivity="false">
-    <appender-ref ref="asyncEELFSecurity" />
-  </logger>
-  <logger name="org.openecomp.eelf.perf" level="info" additivity="false">
-    <appender-ref ref="asyncEELFPerformance" />
-  </logger>
-  <logger name="org.openecomp.eelf.server" level="info" additivity="false">
-    <appender-ref ref="asyncEELFServer" />
-  </logger>
-  <logger name="org.openecomp.eelf.policy" level="info" additivity="false">
-    <appender-ref ref="asyncEELFPolicy" />
-  </logger>
-
-  <logger name="org.openecomp.eelf.audit" level="info" additivity="false">
-    <appender-ref ref="asyncEELFAudit" />
-  </logger>
-  
-  <logger name="org.openecomp.eelf.metrics" level="info" additivity="false">
-        <appender-ref ref="asyncEELFMetrics" />
-  </logger>
- 
- 
-   <logger name="org.openecomp.eelf.error" level="error" additivity="false">
-  <appender-ref ref="asyncEELFError" />
-  </logger>
-  
-   <logger name="org.openecomp.eelf.debug" level="debug" additivity="false">
-        <appender-ref ref="asyncEELFDebug" />
-  </logger>
-
-  <appender name="DISPATCHER" class="org.openecomp.sdc.logging.logback.DispatchingAppender">
-    <discriminator class="org.openecomp.sdc.logging.logback.EventTypeDiscriminator"/>
-    <appenderNamePattern>asyncEELF%s</appenderNamePattern>
-  </appender>
-  
-  <root level="DEBUG" additivity="false">
-    <appender-ref ref="DISPATCHER" />
-  </root>
-
-</configuration>
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/resources/logback-test.xml b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/resources/logback-test.xml
index 4029db2215..f9fa3d88e8 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/resources/logback-test.xml
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/resources/logback-test.xml
@@ -1,41 +1,13 @@
-<configuration scan="true" scanPeriod="3 seconds">
-
-    <property name="logDir" value="logs" />
-    <property name="componentName" value="SDC" />
-
-    <property name="defaultPattern"
-              value="%logger|%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" />
-
-    <property name="logDirectory" value="${logDir}/${componentName}" />
+<configuration>
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>${defaultPattern}</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
 
-    <appender name="DISPATCHER" class="ch.qos.logback.classic.sift.SiftingAppender">
-        <discriminator class="org.openecomp.sdc.logging.logback.EventTypeDiscriminator"/>
-        <sift>
-            <appender name="${eventType}" class="ch.qos.logback.core.rolling.RollingFileAppender">
-                <file>${logDirectory}/${eventType}.log</file>
-                <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                    <fileNamePattern>${logDirectory}/${eventType}.%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>
-        </sift>
-    </appender>
-
-    <root level="DEBUG">
-        <appender-ref ref="DISPATCHER" />
+    <root level="OFF">
+        <appender-ref ref="STDOUT" />
     </root>
 
 </configuration>
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/resources/sifting-logback.xml b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/resources/sifting-logback.xml
deleted file mode 100644
index b713b54b75..0000000000
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/resources/sifting-logback.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<configuration scan="true" scanPeriod="3 seconds" debug="true">
-
-    <property name="logDir" value="logs" />
-    <property name="componentName" value="SDC" />
-
-    <property name="defaultPattern" 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" />
-
-    <property name="debugPattern" 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}|[%caller{3}]| %msg%n" />
-
-    <property name="logDirectory" value="${logDir}/${componentName}" />
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${defaultPattern}</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="DISPATCHER" class="ch.qos.logback.classic.sift.SiftingAppender">
-        <discriminator class="org.openecomp.sdc.logging.logback.EventTypeDiscriminator"/>
-        <sift>
-            <appender name="${eventType}" class="ch.qos.logback.core.rolling.RollingFileAppender">
-                <file>${logDirectory}/${eventType}.log</file>
-                <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                    <fileNamePattern>${logDirectory}/${eventType}.%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>
-        </sift>
-    </appender>
-
-    <root level="DEBUG" additivity="false">
-        <appender-ref ref="DISPATCHER" />
-    </root>
-
-</configuration>
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/resources/logback-test.xml b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/resources/logback-test.xml
index 03ce9d1243..04378bf3ad 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/resources/logback-test.xml
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/resources/logback-test.xml
@@ -1,13 +1,13 @@
-<!-- only one line, shut up logback ! -->
 <configuration>
+
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <Pattern>
-                %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n
-            </Pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
+
     <root level="off">
         <appender-ref ref="STDOUT" />
     </root>
+
 </configuration>
\ No newline at end of file
diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/logback.xml b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/logback.xml
index b803298bba..7044d345c5 100644
--- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/logback.xml
+++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/logback.xml
@@ -298,26 +298,6 @@
 	      <appender-ref ref="ERROR_ROLLING" />
 	</appender>
 
-	<!-- <appender name="DISPATCHER" class="ch.qos.logback.classic.sift.SiftingAppender">
-		<discriminator class="org.openecomp.core.logging.logback.EventTypeDiscriminator"/>
-		<sift>
-			<appender name="Audit" class="ch.qos.logback.core.rolling.RollingFileAppender">
-				<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>${default-log-pattern}</pattern>
-				</encoder>
-			</appender>
-		</sift>
-	</appender>-->
-
 	<root level="INFO">
 		<appender-ref ref="ASYNC_ERROR" />
 		<appender-ref ref="ASYNC_DEBUG" />