From d655b3c2cfc4f4667c6b89851b11a1901217bb3a Mon Sep 17 00:00:00 2001 From: krishnaa96 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 Change-Id: I4fe7339fcc3d5378b41f5393f0753fe6fa5f6f29 --- .../src/main/resources/application.properties | 2 +- cmso-optimizer/src/main/resources/logback.xml | 377 --------------------- .../src/main/resources/application.properties | 2 +- cmso-service/src/main/resources/logback.xml | 377 --------------------- .../src/main/resources/application.properties | 2 +- cmso-ticketmgt/src/main/resources/logback.xml | 377 --------------------- .../src/main/resources/application.properties | 2 +- cmso-topology/src/main/resources/logback.xml | 377 --------------------- 8 files changed, 4 insertions(+), 1512 deletions(-) delete mode 100644 cmso-optimizer/src/main/resources/logback.xml delete mode 100644 cmso-service/src/main/resources/logback.xml delete mode 100644 cmso-ticketmgt/src/main/resources/logback.xml delete mode 100644 cmso-topology/src/main/resources/logback.xml diff --git a/cmso-optimizer/src/main/resources/application.properties b/cmso-optimizer/src/main/resources/application.properties index a22df14..3788ee3 100644 --- a/cmso-optimizer/src/main/resources/application.properties +++ b/cmso-optimizer/src/main/resources/application.properties @@ -42,7 +42,7 @@ server.port=7997 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-optimizer/src/main/resources/logback.xml b/cmso-optimizer/src/main/resources/logback.xml deleted file mode 100644 index 2fd5329..0000000 --- a/cmso-optimizer/src/main/resources/logback.xml +++ /dev/null @@ -1,377 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${defaultPattern} - - - - - - - - - - - ${logDirectory}/${generalLogName}.log - - ${logDirectory}/${generalLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - - 256 - - - - - - ${logDirectory}/${securityLogName}.log - - ${logDirectory}/${securityLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - - 256 - 0 - - - - - - ${logDirectory}/${performanceLogName}.log - - ${logDirectory}/${performanceLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - 256 - - - - - - ${logDirectory}/${serverLogName}.log - - ${logDirectory}/${serverLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - 256 - - - - - - - ${logDirectory}/${policyLogName}.log - - ${logDirectory}/${policyLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - 256 - - - - - - - - ${logDirectory}/${auditLogName}.log - - ${logDirectory}/${auditLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${auditLoggerPattern} - - - - 256 - - - - - ${logDirectory}/${metricsLogName}.log - - ${logDirectory}/${metricsLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${metricsLoggerPattern} - - - - - - 256 - - - - - ${logDirectory}/${errorLogName}.log - - ${logDirectory}/${errorLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${errorLoggerPattern} - - - - - 256 - - - - - ${debugLogDirectory}/${debugLogName}.log - - ${debugLogDirectory}/${debugLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${debugLoggerPattern} - - - - - 256 - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cmso-service/src/main/resources/application.properties b/cmso-service/src/main/resources/application.properties index abc26be..f83b0d4 100644 --- a/cmso-service/src/main/resources/application.properties +++ b/cmso-service/src/main/resources/application.properties @@ -56,7 +56,7 @@ server.dispatchPort=8089 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-service/src/main/resources/logback.xml b/cmso-service/src/main/resources/logback.xml deleted file mode 100644 index d283b19..0000000 --- a/cmso-service/src/main/resources/logback.xml +++ /dev/null @@ -1,377 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${defaultPattern} - - - - - - - - - - - ${logDirectory}/${generalLogName}.log - - ${logDirectory}/${generalLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - - 256 - - - - - - ${logDirectory}/${securityLogName}.log - - ${logDirectory}/${securityLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - - 256 - 0 - - - - - - ${logDirectory}/${performanceLogName}.log - - ${logDirectory}/${performanceLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - 256 - - - - - - ${logDirectory}/${serverLogName}.log - - ${logDirectory}/${serverLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - 256 - - - - - - - ${logDirectory}/${policyLogName}.log - - ${logDirectory}/${policyLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - 256 - - - - - - - - ${logDirectory}/${auditLogName}.log - - ${logDirectory}/${auditLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${auditLoggerPattern} - - - - 256 - - - - - ${logDirectory}/${metricsLogName}.log - - ${logDirectory}/${metricsLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${metricsLoggerPattern} - - - - - - 256 - - - - - ${logDirectory}/${errorLogName}.log - - ${logDirectory}/${errorLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${errorLoggerPattern} - - - - - 256 - - - - - ${debugLogDirectory}/${debugLogName}.log - - ${debugLogDirectory}/${debugLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${debugLoggerPattern} - - - - - 256 - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cmso-ticketmgt/src/main/resources/application.properties b/cmso-ticketmgt/src/main/resources/application.properties index c4f853d..344ed71 100644 --- a/cmso-ticketmgt/src/main/resources/application.properties +++ b/cmso-ticketmgt/src/main/resources/application.properties @@ -54,7 +54,7 @@ server.port=7999 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-ticketmgt/src/main/resources/logback.xml b/cmso-ticketmgt/src/main/resources/logback.xml deleted file mode 100644 index 2fd5329..0000000 --- a/cmso-ticketmgt/src/main/resources/logback.xml +++ /dev/null @@ -1,377 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${defaultPattern} - - - - - - - - - - - ${logDirectory}/${generalLogName}.log - - ${logDirectory}/${generalLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - - 256 - - - - - - ${logDirectory}/${securityLogName}.log - - ${logDirectory}/${securityLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - - 256 - 0 - - - - - - ${logDirectory}/${performanceLogName}.log - - ${logDirectory}/${performanceLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - 256 - - - - - - ${logDirectory}/${serverLogName}.log - - ${logDirectory}/${serverLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - 256 - - - - - - - ${logDirectory}/${policyLogName}.log - - ${logDirectory}/${policyLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - 256 - - - - - - - - ${logDirectory}/${auditLogName}.log - - ${logDirectory}/${auditLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${auditLoggerPattern} - - - - 256 - - - - - ${logDirectory}/${metricsLogName}.log - - ${logDirectory}/${metricsLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${metricsLoggerPattern} - - - - - - 256 - - - - - ${logDirectory}/${errorLogName}.log - - ${logDirectory}/${errorLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${errorLoggerPattern} - - - - - 256 - - - - - ${debugLogDirectory}/${debugLogName}.log - - ${debugLogDirectory}/${debugLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${debugLoggerPattern} - - - - - 256 - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${defaultPattern} - - - - - - - - - - - ${logDirectory}/${generalLogName}.log - - ${logDirectory}/${generalLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - - 256 - - - - - - ${logDirectory}/${securityLogName}.log - - ${logDirectory}/${securityLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - - 256 - 0 - - - - - - ${logDirectory}/${performanceLogName}.log - - ${logDirectory}/${performanceLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - 256 - - - - - - ${logDirectory}/${serverLogName}.log - - ${logDirectory}/${serverLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - 256 - - - - - - - ${logDirectory}/${policyLogName}.log - - ${logDirectory}/${policyLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${defaultPattern} - - - - 256 - - - - - - - - ${logDirectory}/${auditLogName}.log - - ${logDirectory}/${auditLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${auditLoggerPattern} - - - - 256 - - - - - ${logDirectory}/${metricsLogName}.log - - ${logDirectory}/${metricsLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${metricsLoggerPattern} - - - - - - 256 - - - - - ${logDirectory}/${errorLogName}.log - - ${logDirectory}/${errorLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${errorLoggerPattern} - - - - - 256 - - - - - ${debugLogDirectory}/${debugLogName}.log - - ${debugLogDirectory}/${debugLogName}.%i.log.zip - - 1 - 9 - - - 5MB - - - ${debugLoggerPattern} - - - - - 256 - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit 1.2.3-korg