summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Mizyn <d.mizyn@partner.samsung.com>2020-08-26 08:39:34 +0200
committerDominik Mizyn <d.mizyn@samsung.com>2020-09-01 15:08:15 +0200
commitbefaa5500924f9ebda0b4bf65d8d6ab5a9f0745a (patch)
tree3877df9612488fef551ddada948aebb994e9d8e3
parent7e6e2bf385f85e85e008d06b2415290851fee2b7 (diff)
[AAI] Add logs to STDOUT
This commit add STDOUT appender to root level logging. Additionally, it approximates the logback.xml file to ONAP Application Logging Specification v1.2 Issue-ID: OOM-2514 Signed-off-by: Dominik Mizyn <d.mizyn@partner.samsung.com> Change-Id: Iee075bb1400fd2ab2afbc39bf87e93f269ebaf84
-rw-r--r--components/aai-babel/requirements.yaml3
-rw-r--r--components/aai-babel/resources/config/logback.xml85
-rw-r--r--components/aai-babel/resources/fproxy/config/logback-spring.xml12
-rw-r--r--components/aai-babel/resources/rproxy/config/logback-spring.xml12
-rw-r--r--components/aai-babel/values.yaml26
-rw-r--r--components/aai-graphadmin/resources/config/logback.xml110
-rw-r--r--components/aai-graphadmin/values.yaml58
-rw-r--r--components/aai-resources/resources/config/logback.xml35
-rw-r--r--components/aai-resources/resources/fproxy/config/logback-spring.xml20
-rw-r--r--components/aai-resources/resources/rproxy/config/logback-spring.xml16
-rw-r--r--components/aai-resources/values.yaml27
-rw-r--r--components/aai-schema-service/config/logback.xml71
-rw-r--r--components/aai-schema-service/values.yaml38
-rw-r--r--components/aai-search-data/resources/config/log/logback.xml43
-rw-r--r--components/aai-search-data/resources/fproxy/config/logback-spring.xml2
-rw-r--r--components/aai-search-data/resources/rproxy/config/logback-spring.xml2
-rw-r--r--components/aai-search-data/values.yaml29
-rw-r--r--components/aai-traversal/resources/config/logback.xml35
-rw-r--r--components/aai-traversal/values.yaml20
-rw-r--r--values.yaml83
20 files changed, 511 insertions, 216 deletions
diff --git a/components/aai-babel/requirements.yaml b/components/aai-babel/requirements.yaml
index 8297688..5fcafdb 100644
--- a/components/aai-babel/requirements.yaml
+++ b/components/aai-babel/requirements.yaml
@@ -1,5 +1,6 @@
# Copyright © 2018 Amdocs, AT&T
# Modifications Copyright © 2018 Bell Canada
+# Modifications Copyright © 2020 Samsung Electronics
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@ dependencies:
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
- repository: '@local'
+ repository: '@local' \ No newline at end of file
diff --git a/components/aai-babel/resources/config/logback.xml b/components/aai-babel/resources/config/logback.xml
index 878d8c0..b8e8ad0 100644
--- a/components/aai-babel/resources/config/logback.xml
+++ b/components/aai-babel/resources/config/logback.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
# Copyright © 2018 Amdocs, Bell Canada, AT&T
+# Modifications Copyright © 2020 Samsung Electronics
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@
<include resource="org/springframework/boot/logging/logback/base.xml" />
<property name="componentName" value="AAI-BAS" />
- <property name="logDirectory" value="/var/log/onap/${componentName}" />
+ <property name="logDirectory" value="{{ .Values.log.logDir }}/${componentName}" />
<!-- default EELF log file names -->
<property name="generalLogName" value="error" />
@@ -27,6 +28,13 @@
<property name="auditLogName" value="audit" />
<property name="debugLogName" value="debug" />
+ <property name="p_tim" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}"/>
+ <property name="p_lvl" value="%level"/>
+ <property name="p_log" value="%logger"/>
+ <property name="p_mdc" value="%replace(%replace(%mdc){'\t','\\\\t'}){'\n', '\\\\n'}"/>
+ <property name="p_mak" value="%replace(%replace(%marker){'\t', '\\\\t'}){'\n','\\\\n'}"/>
+ <property name="p_thr" value="%thread"/>
+
<property name="errorLogPattern"
value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{RequestId}|%thread|%mdc{ServiceName}|%mdc{PartnerName}|%mdc{TargetEntity}|%mdc{TargetServiceName}|%.-5level|%logger|%mdc{ClassName}|%msg%n" />
@@ -36,6 +44,9 @@
<property name="metricsLogPattern"
value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{BeginTimestamp}|%mdc{EndTimestamp}|%mdc{RequestId}|%mdc{ServiceInstanceId}|%thread|%mdc{ServerFQDN}|%mdc{ServiceName}|%mdc{PartnerName}|%mdc{TargetEntity}|%mdc{TargetServiceName}|%mdc{StatusCode}|%mdc{ResponseCode}|%mdc{ResponseDescription}|%logger|%.-5level|||%mdc{ElapsedTime}|%mdc{RemoteHost}|%mdc{ClientAddress}|%mdc{ClassName}|||%msg%n" />
+ <!-- Console (human-readable) logging -->
+ <property name="consolePattern" value="{{ .Values.log.consolePattern.babel.config }}"/>
+
<!-- ============================================================================ -->
<!-- EELF Appenders -->
<!-- ============================================================================ -->
@@ -131,64 +142,72 @@
<includeCallerData>false</includeCallerData>
</appender>
- <!-- ============================================================================ -->
- <!-- Default / root appenders -->
- <!-- This determines the logging level for 3rd party code -->
- <!-- ============================================================================ -->
-
- <root level="INFO">
- <appender-ref ref="asyncEELF" />
- <appender-ref ref="asyncEELFDebug" />
-</root>
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>${consolePattern}</pattern>
+ </encoder>
+ </appender>
<!-- ============================================================================ -->
<!-- EELF loggers -->
<!-- ============================================================================ -->
<logger name="com.att.eelf" level="INFO" additivity="false">
- <appender-ref ref="asyncEELF" />
-</logger>
+ <appender-ref ref="asyncEELF" />
+ </logger>
<!-- The level of this logger determines the contents of the debug log -->
<logger name="com.att.eelf.debug" level="INFO" additivity="false">
- <appender-ref ref="asyncEELFDebug" />
-</logger>
+ <appender-ref ref="asyncEELFDebug" />
+ </logger>
<logger name="com.att.eelf.audit" level="INFO" additivity="false">
- <appender-ref ref="asyncEELFAudit" />
-</logger>
+ <appender-ref ref="asyncEELFAudit" />
+ </logger>
<logger name="com.att.eelf.metrics" level="INFO" additivity="false">
- <appender-ref ref="asyncEELFMetrics" />
-</logger>
+ <appender-ref ref="asyncEELFMetrics" />
+ </logger>
<!-- ============================================================================ -->
<!-- Non-EELF loggers -->
<!-- ============================================================================ -->
<!-- ATT packages including DMAAP message routing -->
- <logger name="com.att" level="INFO" />
+ <logger name="com.att" level="{{.Values.log.logger.att}}" />
<!-- Spring related loggers -->
- <logger name="org.springframework" level="WARN" />
- <logger name="org.springframework.beans" level="WARN" />
- <logger name="org.springframework.web" level="WARN" />
+ <logger name="org.springframework" level="{{.Values.log.logger.springframework}}" />
+ <logger name="org.springframework.beans" level="{{.Values.log.logger.springframeworkBeans}}" />
+ <logger name="org.springframework.web" level="{{.Values.log.logger.springframeworkWeb}}" />
<!-- Other Loggers that may help troubleshoot -->
- <logger name="org.apache" level="WARN" />
- <logger name="org.apache.commons" level="WARN" />
+ <logger name="org.apache" level="{{.Values.log.logger.apache}}" />
+ <logger name="org.apache.commons" level="{{.Values.log.logger.apacheCommons}}" />
<!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging. May aid in troubleshooting) -->
- <logger name="org.apache.camel" level="WARN" />
- <logger name="org.apache.cxf" level="WARN" />
- <logger name="org.apache.camel.processor.interceptor" level="WARN" />
- <logger name="org.apache.cxf.jaxrs.interceptor" level="WARN" />
- <logger name="org.apache.cxf.service" level="WARN" />
- <logger name="org.restlet" level="WARN" />
- <logger name="org.apache.camel.component.restlet" level="WARN" />
+ <logger name="org.apache.camel" level="{{.Values.log.logger.apacheCamel}}" />
+ <logger name="org.apache.cxf" level="{{.Values.log.logger.apacheCxf}}" />
+ <logger name="org.apache.camel.processor.interceptor" level="{{.Values.log.logger.apacheCamelProcessorInterceptor}}" />
+ <logger name="org.apache.cxf.jaxrs.interceptor" level="{{.Values.log.logger.apacheCxfJaxrsInterceptor}}" />
+ <logger name="org.apache.cxf.service" level="{{.Values.log.logger.apacheCxfService}}" />
+ <logger name="org.apache.camel.component.restlet" level="{{.Values.log.logger.apacheCamelComponentRestlet}}" />
+
+ <logger name="org.restlet" level="{{.Values.log.logger.restlet}}" />
<!-- logback internals logging -->
- <logger name="ch.qos.logback.classic" level="WARN" />
- <logger name="ch.qos.logback.core" level="WARN" />
+ <logger name="ch.qos.logback.classic" level="{{.Values.log.logger.qosLogbackClassic}}" />
+ <logger name="ch.qos.logback.core" level="{{.Values.log.logger.qosLogbackCore}}" />
+
+ <!-- ============================================================================ -->
+ <!-- Default / root appenders -->
+ <!-- This determines the logging level for 3rd party code -->
+ <!-- ============================================================================ -->
+
+ <root level="{{ .Values.log.root.level }}">
+ <appender-ref ref="asyncEELF" />
+ <appender-ref ref="asyncEELFDebug" />
+ <appender-ref ref="STDOUT" />
+ </root>
</configuration>
diff --git a/components/aai-babel/resources/fproxy/config/logback-spring.xml b/components/aai-babel/resources/fproxy/config/logback-spring.xml
index 0637cfb..aa37596 100644
--- a/components/aai-babel/resources/fproxy/config/logback-spring.xml
+++ b/components/aai-babel/resources/fproxy/config/logback-spring.xml
@@ -4,12 +4,10 @@
<property name="LOGS" value="./logs/AAF-FPS" />
<property name="FILEPREFIX" value="application" />
- <appender name="Console"
+ <appender name="STDOUT"
class="ch.qos.logback.core.ConsoleAppender">
<layout class="ch.qos.logback.classic.PatternLayout">
- <Pattern>
- %d{ISO8601} %-5level [%t] %C{1.}: %msg%n%throwable
- </Pattern>
+ <Pattern>{{ .Values.log.consolePattern.babel.froxy }}</Pattern>
</layout>
</appender>
@@ -34,12 +32,12 @@
</appender>
<!-- LOG everything at INFO level -->
- <root level="info">
+ <root level="{{ .Values.log.root.level }}">
<appender-ref ref="RollingFile" />
- <appender-ref ref="Console" />
+ <appender-ref ref="STDOUT" />
</root>
<!-- LOG "com.baeldung*" at TRACE level -->
- <logger name="org.onap.aaf.fproxy" level="info" />
+ <logger name="org.onap.aaf.fproxy" level="INFO" />
</configuration> \ No newline at end of file
diff --git a/components/aai-babel/resources/rproxy/config/logback-spring.xml b/components/aai-babel/resources/rproxy/config/logback-spring.xml
index 2cd95d4..368367d 100644
--- a/components/aai-babel/resources/rproxy/config/logback-spring.xml
+++ b/components/aai-babel/resources/rproxy/config/logback-spring.xml
@@ -4,12 +4,10 @@
<property name="LOGS" value="./logs/reverse-proxy" />
<property name="FILEPREFIX" value="application" />
- <appender name="Console"
+ <appender name="STDOUT"
class="ch.qos.logback.core.ConsoleAppender">
<layout class="ch.qos.logback.classic.PatternLayout">
- <Pattern>
- %d{ISO8601} %-5level [%t] %C{1.}: %msg%n%throwable
- </Pattern>
+ <Pattern>{{ .Values.log.consolePattern.babel.rproxy }}</Pattern>
</layout>
</appender>
@@ -34,12 +32,12 @@
</appender>
<!-- LOG everything at INFO level -->
- <root level="info">
+ <root level="{{ .Values.log.root.level }}">
<appender-ref ref="RollingFile" />
- <appender-ref ref="Console" />
+ <appender-ref ref="STDOUT" />
</root>
<!-- LOG "com.baeldung*" at TRACE level -->
- <logger name="org.onap.aaf.rproxy" level="info" />
+ <logger name="org.onap.aaf.rproxy" level="INFO" />
</configuration>
diff --git a/components/aai-babel/values.yaml b/components/aai-babel/values.yaml
index 6f2c033..d2eeb6c 100644
--- a/components/aai-babel/values.yaml
+++ b/components/aai-babel/values.yaml
@@ -68,6 +68,32 @@ ingress:
config:
ssl: "redirect"
+log:
+ logDir: {{ .Values.log.logDir }}
+ root:
+ level: {{ .Values.log.root.level.babel }}
+ consolePattern:
+ babel:
+ config: {{ .Values.log.consolePattern.babel.config }}
+ froxy: {{ .Values.log.consolePattern.babel.froxy }}
+ rproxy: {{ .Values.log.consolePattern.babel.rproxy }}
+ logger:
+ apache: {{ .Values.log.logger.apache }}
+ apacheCamel: {{ .Values.log.logger.apacheCamel }}
+ apacheCamelComponentRestlet: {{ .Values.log.logger.apacheCamelComponentRestlet }}
+ apacheCamelProcessorInterceptor: {{ .Values.log.logger.apacheCamelProcessorInterceptor }}
+ apacheCommons: {{ .Values.log.logger.apacheCommons }}
+ apacheCxf: {{ .Values.log.logger.apacheCxf }}
+ apacheCxfJaxrsInterceptor: {{ .Values.log.logger.apacheCxfJaxrsInterceptor }}
+ apacheCxfService: {{ .Values.log.logger.apacheCxfService }}
+ att: {{ .Values.log.logger.att }}
+ qosLogbackClassic: {{ .Values.log.logger.qosLogbackClassic }}
+ qosLogbackCore: {{ .Values.log.logger.qosLogbackCore }}
+ restlet: {{ .Values.log.logger.restlet }}
+ springframework: {{ .Values.log.logger.springframework }}
+ springframeworkBeans: {{ .Values.log.logger.springframeworkBeans }}
+ springframeworkWeb: {{ .Values.log.logger.springframeworkWeb }}
+
resources:
small:
limits:
diff --git a/components/aai-graphadmin/resources/config/logback.xml b/components/aai-graphadmin/resources/config/logback.xml
index 553de3f..3862167 100644
--- a/components/aai-graphadmin/resources/config/logback.xml
+++ b/components/aai-graphadmin/resources/config/logback.xml
@@ -52,13 +52,13 @@
<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
<conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>
- %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}
- </pattern>
+ <pattern>{{ .Values.log.consolePattern }}</pattern>
</encoder>
</appender>
+
<appender name="SANE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${logDirectory}/rest/sane.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
@@ -735,57 +735,57 @@
<appender-ref ref="STDOUT"/>
</logger>
<!-- Spring related loggers -->
- <logger name="org.springframework" level="WARN"/>
- <logger name="org.springframework.beans" level="WARN"/>
- <logger name="org.springframework.web" level="WARN"/>
- <logger name="com.blog.spring.jms" level="WARN"/>
- <logger name="com.jayway.jsonpath" level="WARN"/>
+ <logger name="org.springframework" level="{{.Values.log.logger.springframework}}"/>
+ <logger name="org.springframework.beans" level="{{.Values.log.logger.springframeworkBeans}}"/>
+ <logger name="org.springframework.web" level="{{.Values.log.logger.springframeworkWeb}}"/>
+ <logger name="com.blog.spring.jms" level="{{.Values.log.logger.blogSpringJms}}"/>
+ <logger name="com.jayway.jsonpath" level="{{.Values.log.logger.jaywayJsonpath}}"/>
<!-- AJSC Services (bootstrap services) -->
- <logger name="ajsc" level="WARN"/>
- <logger name="ajsc.RouteMgmtService" level="WARN"/>
- <logger name="ajsc.ComputeService" level="WARN"/>
- <logger name="ajsc.VandelayService" level="WARN"/>
- <logger name="ajsc.FilePersistenceService" level="WARN"/>
- <logger name="ajsc.UserDefinedJarService" level="WARN"/>
- <logger name="ajsc.UserDefinedBeansDefService" level="WARN"/>
- <logger name="ajsc.LoggingConfigurationService" level="WARN"/>
+ <logger name="ajsc" level="{{.Values.log.logger.ajsc}}"/>
+ <logger name="ajsc.RouteMgmtService" level="{{.Values.log.logger.ajscRouteMgmtService}}"/>
+ <logger name="ajsc.ComputeService" level="{{.Values.log.logger.ajscComputeService}}"/>
+ <logger name="ajsc.VandelayService" level="{{.Values.log.logger.ajscVandelayService}}"/>
+ <logger name="ajsc.FilePersistenceService" level="{{.Values.log.logger.ajscFilePersistenceService}}"/>
+ <logger name="ajsc.UserDefinedJarService" level="{{.Values.log.logger.ajscUserDefinedJarService}}"/>
+ <logger name="ajsc.UserDefinedBeansDefService" level="{{.Values.log.logger.ajscUserDefinedBeansDefService}}"/>
+ <logger name="ajsc.LoggingConfigurationService" level="{{.Values.log.logger.ajscLoggingConfigurationService}}"/>
<!-- AJSC related loggers (DME2 Registration, csi logging, restlet, servlet
logging) -->
- <logger name="org.codehaus.groovy" level="WARN"/>
- <logger name="com.att.scamper" level="WARN"/>
- <logger name="ajsc.utils" level="WARN"/>
- <logger name="ajsc.utils.DME2Helper" level="WARN"/>
- <logger name="ajsc.filters" level="WARN"/>
- <logger name="ajsc.beans.interceptors" level="WARN"/>
- <logger name="ajsc.restlet" level="WARN"/>
- <logger name="ajsc.servlet" level="WARN"/>
- <logger name="com.att.ajsc" level="WARN"/>
- <logger name="com.att.ajsc.csi.logging" level="WARN"/>
- <logger name="com.att.ajsc.filemonitor" level="WARN"/>
- <logger name="com.netflix.loadbalancer" level="WARN"/>
- <logger name="org.apache.zookeeper" level="WARN"/>
+ <logger name="org.codehaus.groovy" level="{{.Values.log.logger.codehausGroovy}}"/>
+ <logger name="com.att.scamper" level="{{.Values.log.logger.attScamper}}"/>
+ <logger name="ajsc.utils" level="{{.Values.log.logger.ajscUtils}}"/>
+ <logger name="ajsc.utils.DME2Helper" level="{{.Values.log.logger.ajscUtilsDME2Helper}}"/>
+ <logger name="ajsc.filters" level="{{.Values.log.logger.ajscFilters}}"/>
+ <logger name="ajsc.beans.interceptors" level="{{.Values.log.logger.ajscBeansInterceptors}}"/>
+ <logger name="ajsc.restlet" level="{{.Values.log.logger.ajscRestlet}}"/>
+ <logger name="ajsc.servlet" level="{{.Values.log.logger.ajscServlet}}"/>
+ <logger name="com.att.ajsc" level="{{.Values.log.logger.attAjsc}}"/>
+ <logger name="com.att.ajsc.csi.logging" level="{{.Values.log.logger.attAjscCsiLogging}}"/>
+ <logger name="com.att.ajsc.filemonitor" level="{{.Values.log.logger.attAjscFilemonitor}}"/>
+ <logger name="com.netflix.loadbalancer" level="{{.Values.log.logger.netflixLoadbalancer}}"/>
+ <logger name="org.apache.zookeeper" level="{{.Values.log.logger.apacheZookeeper}}"/>
<!-- Other Loggers that may help troubleshoot -->
- <logger name="net.sf" level="WARN"/>
- <logger name="org.apache.commons.httpclient" level="WARN"/>
- <logger name="org.apache.commons" level="WARN"/>
- <logger name="org.apache.coyote" level="WARN"/>
- <logger name="org.apache.jasper" level="WARN"/>
+ <logger name="net.sf" level="{{.Values.log.logger.sf}}"/>
+ <logger name="org.apache.commons.httpclient" level="{{.Values.log.logger.apacheCommonsHttpclient}}"/>
+ <logger name="org.apache.commons" level="{{.Values.log.logger.apacheCommons}}"/>
+ <logger name="org.apache.coyote" level="{{.Values.log.logger.apacheCoyote}}"/>
+ <logger name="org.apache.jasper" level="{{.Values.log.logger.apacheJasper}}"/>
<!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging.
May aid in troubleshooting) -->
- <logger name="org.apache.camel" level="WARN"/>
- <logger name="org.apache.cxf" level="WARN"/>
- <logger name="org.apache.camel.processor.interceptor" level="WARN"/>
- <logger name="org.apache.cxf.jaxrs.interceptor" level="WARN"/>
- <logger name="org.apache.cxf.service" level="WARN"/>
- <logger name="org.restlet" level="WARN"/>
- <logger name="org.apache.camel.component.restlet" level="WARN"/>
- <logger name="org.hibernate.validator" level="WARN"/>
- <logger name="org.hibernate" level="WARN"/>
- <logger name="org.hibernate.ejb" level="OFF"/>
+ <logger name="org.apache.camel" level="{{.Values.log.logger.apacheCamel}}"/>
+ <logger name="org.apache.cxf" level="{{.Values.log.logger.apacheCxf}}"/>
+ <logger name="org.apache.camel.processor.interceptor" level="{{.Values.log.logger.apacheCamelProcessorInterceptor}}"/>
+ <logger name="org.apache.cxf.jaxrs.interceptor" level="{{.Values.log.logger.apacheCxfJaxrsInterceptor}}"/>
+ <logger name="org.apache.cxf.service" level="{{.Values.log.logger.apacheCxfService}}"/>
+ <logger name="org.restlet" level="{{.Values.log.logger.restlet}}"/>
+ <logger name="org.apache.camel.component.restlet" level="{{.Values.log.logger.apacheCamelComponentRestlet}}"/>
+ <logger name="org.hibernate.validator" level="{{.Values.log.logger.hibernateValidator}}"/>
+ <logger name="org.hibernate" level="{{.Values.log.logger.hibernate}}"/>
+ <logger name="org.hibernate.ejb" level="{{.Values.log.logger.hibernateEjb}}"/>
<!-- logback internals logging -->
- <logger name="ch.qos.logback.classic" level="WARN"/>
- <logger name="ch.qos.logback.core" level="WARN"/>
- <logger name="org.eclipse.jetty" level="WARN"/>
+ <logger name="ch.qos.logback.classic" level="{{.Values.log.logger.qosLogbackClassic}}"/>
+ <logger name="ch.qos.logback.core" level="{{.Values.log.logger.qosLogbackCore}}"/>
+ <logger name="org.eclipse.jetty" level="{{.Values.log.logger.eclipseJetty}}"/>
<!-- logback jms appenders & loggers definition starts here -->
<appender name="auditLogs" class="ch.qos.logback.core.rolling.RollingFileAppender">
<filter class="ch.qos.logback.classic.filter.ThresholdFilter"/>
@@ -839,6 +839,7 @@
<includeCallerData>true</includeCallerData>
<appender-ref ref="auth"/>
</appender>
+
<logger name="AuditRecord" level="INFO" additivity="false">
<appender-ref ref="auditLogs"/>
</logger>
@@ -938,20 +939,21 @@
<appender-ref ref="dataExportAudit"/>
<appender-ref ref="STDOUT"/>
</logger>
- <logger name="org.apache" level="WARN"/>
- <logger name="org.zookeeper" level="WARN"/>
- <logger name="com.netflix" level="WARN"/>
- <logger name="org.janusgraph" level="WARN"/>
- <logger name="com.att.aft.dme2" level="WARN"/>
+ <logger name="org.apache" level="{{.Values.log.logger.apache}}"/>
+ <logger name="org.zookeeper" level="{{.Values.log.logger.zookeeper}}"/>
+ <logger name="com.netflix" level="{{.Values.log.logger.netflix}}"/>
+ <logger name="org.janusgraph" level="{{.Values.log.logger.janusgraph}}"/>
+ <logger name="com.att.aft.dme2" level="{{.Values.log.logger.attAftDme2}}"/>
<!-- ============================================================================ -->
<!-- General EELF logger -->
<!-- ============================================================================ -->
- <logger name="com.att.eelf" level="WARN" additivity="false">
+ <logger name="com.att.eelf" level="INFO" additivity="false">
<appender-ref ref="asyncDEBUG"/>
<appender-ref ref="asyncERROR"/>
<appender-ref ref="asyncMETRIC"/>
</logger>
- <root level="DEBUG">
+
+ <root level="{{ .Values.log.root.level }}">
<appender-ref ref="external"/>
<appender-ref ref="STDOUT"/>
</root>
diff --git a/components/aai-graphadmin/values.yaml b/components/aai-graphadmin/values.yaml
index 2527cea..7379077 100644
--- a/components/aai-graphadmin/values.yaml
+++ b/components/aai-graphadmin/values.yaml
@@ -3,6 +3,7 @@
# org.onap.aai
# ================================================================================
# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2020 Samsung Electronics
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -133,6 +134,63 @@ persistence:
mountSubPath: aai/aai-graphadmin
mountSubPath1: aai/migration
+log:
+ logDir: {{ .Values.log.logDir }}
+ root:
+ level: {{ .Values.log.root.level.graphadmin }}
+ consolePattern: {{ .Values.log.consolePattern.graphadmin }}
+ logger:
+ ajsc: {{ .Values.log.logger.ajsc }}
+ ajscBeansInterceptors: {{ .Values.log.logger.ajscBeansInterceptors }}
+ ajscComputeService: {{ .Values.log.logger.ajscComputeService }}
+ ajscFilePersistenceService: {{ .Values.log.logger.ajscFilePersistenceService }}
+ ajscFilters: {{ .Values.log.logger.ajscFilters }}
+ ajscLoggingConfigurationService: {{ .Values.log.logger.ajscLoggingConfigurationService }}
+ ajscRestlet: {{ .Values.log.logger.ajscRestlet }}
+ ajscRouteMgmtService: {{ .Values.log.logger.ajscRouteMgmtService }}
+ ajscServlet: {{ .Values.log.logger.ajscServlet }}
+ ajscUserDefinedBeansDefService: {{ .Values.log.logger.ajscUserDefinedBeansDefService }}
+ ajscUserDefinedJarService: {{ .Values.log.logger.ajscUserDefinedJarService }}
+ ajscUtils: {{ .Values.log.logger.ajscUtils }}
+ ajscUtilsDME2Helper: {{ .Values.log.logger.ajscUtilsDME2Helper }}
+ ajscVandelayService: {{ .Values.log.logger.ajscVandelayService }}
+ apache: {{ .Values.log.logger.apache }}
+ apacheCamel: {{ .Values.log.logger.apacheCamel }}
+ apacheCamelComponentRestlet: {{ .Values.log.logger.apacheCamelComponentRestlet }}
+ apacheCamelProcessorInterceptor: {{ .Values.log.logger.apacheCamelProcessorInterceptor }}
+ apacheCommons: {{ .Values.log.logger.apacheCommons }}
+ apacheCommonsHttpclient: {{ .Values.log.logger.apacheCommonsHttpclient }}
+ apacheCoyote: {{ .Values.log.logger.apacheCoyote }}
+ apacheCxf: {{ .Values.log.logger.apacheCxf }}
+ apacheCxfJaxrsInterceptor: {{ .Values.log.logger.apacheCxfJaxrsInterceptor }}
+ apacheCxfService: {{ .Values.log.logger.apacheCxfService }}
+ apacheJasper: {{ .Values.log.logger.apacheJasper }}
+ apacheZookeeper: {{ .Values.log.logger.apacheZookeeper }}
+ attAftDme2: {{ .Values.log.logger.attAftDme2 }}
+ attAjsc: {{ .Values.log.logger.attAjsc }}
+ attAjscCsiLogging: {{ .Values.log.logger.attAjscCsiLogging }}
+ attAjscFilemonitor: {{ .Values.log.logger.attAjscFilemonitor }}
+ attEelf: {{ .Values.log.logger.attEelf }}
+ attScamper: {{ .Values.log.logger.attScamper }}
+ blogSpringJms: {{ .Values.log.logger.blogSpringJms }}
+ codehausGroovy: {{ .Values.log.logger.codehausGroovy }}
+ eclipseJetty: {{ .Values.log.logger.eclipseJetty }}
+ hibernate: {{ .Values.log.logger.hibernate }}
+ hibernateEjb: {{ .Values.log.logger.hibernateEjb }}
+ hibernateValidator: {{ .Values.log.logger.hibernateValidator }}
+ janusgraph: {{ .Values.log.logger.janusgraph }}
+ jaywayJsonpath: {{ .Values.log.logger.jaywayJsonpath }}
+ netflix: {{ .Values.log.logger.netflix }}
+ netflixLoadbalancer: {{ .Values.log.logger.netflixLoadbalancer }}
+ qosLogbackClassic: {{ .Values.log.logger.qosLogbackClassic }}
+ qosLogbackCore: {{ .Values.log.logger.qosLogbackCore }}
+ restlet: {{ .Values.log.logger.restlet }}
+ sf: {{ .Values.log.logger.sf }}
+ springframework: {{ .Values.log.logger.springframework }}
+ springframeworkBeans: {{ .Values.log.logger.springframeworkBeans }}
+ springframeworkWeb: {{ .Values.log.logger.springframeworkWeb }}
+ zookeeper: {{ .Values.log.logger.zookeeper }}
+
resources:
small:
limits:
diff --git a/components/aai-resources/resources/config/logback.xml b/components/aai-resources/resources/config/logback.xml
index ba06414..f532b4f 100644
--- a/components/aai-resources/resources/config/logback.xml
+++ b/components/aai-resources/resources/config/logback.xml
@@ -5,6 +5,7 @@
================================================================================
Copyright © 2017 AT&T Intellectual Property. All rights reserved.
Modifications Copyright © 2018 Amdocs, Bell Canada
+ Modifications Copyright © 2020 Samsung Electronics
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -59,9 +60,7 @@
<conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>
- %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}
- </pattern>
+ <pattern>{{ .Values.log.consolePattern.config }}</pattern>
</encoder>
</appender>
@@ -280,23 +279,23 @@
</appender>
<!-- logback internals logging -->
- <logger name="ch.qos.logback.classic" level="WARN" />
- <logger name="ch.qos.logback.core" level="WARN" />
+ <logger name="ch.qos.logback.classic" level="{{.Values.logback.loggger.qosLogbackClassic}}" />
+ <logger name="ch.qos.logback.core" level="{{.Values.logback.loggger.qosLogbackCore}}" />
- <logger name="com.att.aft.dme2" level="WARN" />
- <logger name="com.jayway.jsonpath" level="WARN" />
+ <logger name="com.att.aft.dme2" level="{{.Values.logback.loggger.attAftDme2}}" />
+ <logger name="com.jayway.jsonpath" level="{{.Values.logback.loggger.jaywayJsonpath}}" />
- <logger name="org.apache" level="OFF" />
- <logger name="org.apache.commons" level="WARN" />
- <logger name="org.apache.zookeeper" level="OFF" />
- <logger name="org.codehaus.groovy" level="WARN" />
- <logger name="org.eclipse.jetty" level="WARN" />
+ <logger name="org.apache" level="{{.Values.logback.loggger.apache}}" />
+ <logger name="org.apache.commons" level="{{.Values.logback.loggger.apacheCommons}}" />
+ <logger name="org.apache.zookeeper" level="{{.Values.logback.loggger.apacheZookeeper}}" />
+ <logger name="org.codehaus.groovy" level="{{.Values.logback.loggger.codehausGroovy}}" />
+ <logger name="org.eclipse.jetty" level="{{.Values.logback.loggger.eclipseJetty}}" />
<!-- Spring related loggers -->
- <logger name="org.springframework" level="WARN" />
- <logger name="org.springframework.beans" level="WARN" />
- <logger name="org.springframework.web" level="WARN" />
- <logger name="org.janusgraph" level="WARN" />
- <logger name="org.zookeeper" level="OFF" />
+ <logger name="org.springframework" level="{{.Values.logback.loggger.springframework}}" />
+ <logger name="org.springframework.beans" level="{{.Values.logback.loggger.springframeworkBeans}}" />
+ <logger name="org.springframework.web" level="{{.Values.logback.loggger.springframeworkWeb}}" />
+ <logger name="org.janusgraph" level="{{.Values.logback.loggger.janusgraph}}" />
+ <logger name="org.zookeeper" level="{{.Values.logback.loggger.zookeeper}}" />
<logger name="org.onap.aai" level="DEBUG" additivity="false">
@@ -335,7 +334,7 @@
<appender-ref ref="dmaapAAIEventConsumerInfo" />
</logger>
- <root level="DEBUG">
+ <root level="{{.Values.logback.rootLogLevel.config}}">
<appender-ref ref="external" />
<appender-ref ref="STDOUT" />
</root>
diff --git a/components/aai-resources/resources/fproxy/config/logback-spring.xml b/components/aai-resources/resources/fproxy/config/logback-spring.xml
index 9a08348..6d24a23 100644
--- a/components/aai-resources/resources/fproxy/config/logback-spring.xml
+++ b/components/aai-resources/resources/fproxy/config/logback-spring.xml
@@ -3,16 +3,14 @@
<property name="LOGS" value="./logs/AAF-FPS" />
<property name="FILEPREFIX" value="application" />
-
- <appender name="Console"
+
+ <appender name="STDOUT"
class="ch.qos.logback.core.ConsoleAppender">
<layout class="ch.qos.logback.classic.PatternLayout">
- <Pattern>
- %d{ISO8601} %-5level [%t] %C{1.}: %msg%n%throwable
- </Pattern>
+ <Pattern>{{ .Values.log.consolePattern.fproxy }}</Pattern>
</layout>
</appender>
-
+
<appender name="RollingFile"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOGS}/${FILEPREFIX}.log</file>
@@ -32,14 +30,14 @@
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
</appender>
-
+
<!-- LOG everything at INFO level -->
- <root level="info">
+ <root level="{{.Values.logback.rootLogLevel.fproxy}}">
<appender-ref ref="RollingFile" />
- <appender-ref ref="Console" />
+ <appender-ref ref="STDOUT" />
</root>
-
+
<!-- LOG "com.baeldung*" at TRACE level -->
<logger name="org.onap.aaf.fproxy" level="info" />
-
+
</configuration> \ No newline at end of file
diff --git a/components/aai-resources/resources/rproxy/config/logback-spring.xml b/components/aai-resources/resources/rproxy/config/logback-spring.xml
index 799fd86..c0c506a 100644
--- a/components/aai-resources/resources/rproxy/config/logback-spring.xml
+++ b/components/aai-resources/resources/rproxy/config/logback-spring.xml
@@ -4,12 +4,10 @@
<property name="LOGS" value="./logs/reverse-proxy" />
<property name="FILEPREFIX" value="application" />
- <appender name="Console"
+ <appender name="STDOUT"
class="ch.qos.logback.core.ConsoleAppender">
<layout class="ch.qos.logback.classic.PatternLayout">
- <Pattern>
- %d{ISO8601} %-5level [%t] %C{1.}: %msg%n%throwable
- </Pattern>
+ <Pattern>{{ .Values.log.consolePattern.rproxy }}</Pattern>
</layout>
</appender>
@@ -32,14 +30,14 @@
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
</appender>
-
+
<!-- LOG everything at INFO level -->
- <root level="info">
+ <root level="{{.Values.logback.rootLogLevelrproxy}}">
<appender-ref ref="RollingFile" />
- <appender-ref ref="Console" />
+ <appender-ref ref="STDOUT" />
</root>
-
+
<!-- LOG "com.baeldung*" at TRACE level -->
<logger name="org.onap.aaf.rproxy" level="info" />
-
+
</configuration>
diff --git a/components/aai-resources/values.yaml b/components/aai-resources/values.yaml
index b71c9c4..82f8a36 100644
--- a/components/aai-resources/values.yaml
+++ b/components/aai-resources/values.yaml
@@ -84,6 +84,33 @@ service:
ingress:
enabled: false
+log:
+ logDir: {{ .Values.log.logDir }}
+ root:
+ level:
+ config: {{ .Values.log.root.level.resources.config }}
+ fproxy: {{ .Values.log.root.level.resources.fproxy }}
+ rproxy: {{ .Values.log.root.level.resources.rproxy }}
+ consolePattern:
+ config: {{ .Values.log.consolePattern.resources.config }}
+ fproxy: {{ .Values.log.consolePattern.resources.fproxy }}
+ rproxy: {{ .Values.log.consolePattern.resources.rproxy }}
+ loggger:
+ apache: {{ .Values.log.logger.apache }}
+ apacheCommons: {{ .Values.log.logger.apacheCommons }}
+ apacheZookeeper: {{ .Values.log.logger.apacheZookeeper }}
+ attAftDme2: {{ .Values.log.logger.attAftDme2 }}
+ codehausGroovy: {{ .Values.log.logger.codehausGroovy }}
+ eclipseJetty: {{ .Values.log.logger.eclipseJetty }}
+ janusgraph: {{ .Values.log.logger.janusgraph }}
+ jaywayJsonpath: {{ .Values.log.logger.jaywayJsonpath }}
+ qosLogbackClassic: {{ .Values.log.logger.qosLogbackClassic }}
+ qosLogbackCore: {{ .Values.log.logger.qosLogbackCore }}
+ springframework: {{ .Values.log.logger.springframework }}
+ springframeworkBeans: {{ .Values.log.logger.springframeworkBeans }}
+ springframeworkWeb: {{ .Values.log.logger.springframeworkWeb }}
+ zookeeper: {{ .Values.log.logger.zookeeper }}
+
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
diff --git a/components/aai-schema-service/config/logback.xml b/components/aai-schema-service/config/logback.xml
index 9cfffe9..320be85 100644
--- a/components/aai-schema-service/config/logback.xml
+++ b/components/aai-schema-service/config/logback.xml
@@ -58,11 +58,10 @@
<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
<conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>
- %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}
- </pattern>
+ <pattern>{{ .Values.log.consolePattern.schemaService }}</pattern>
</encoder>
</appender>
@@ -224,45 +223,45 @@
</logger>
<!-- Spring related loggers -->
- <logger name="org.springframework" level="WARN"/>
- <logger name="org.springframework.beans" level="WARN"/>
- <logger name="org.springframework.web" level="WARN"/>
- <logger name="com.blog.spring.jms" level="WARN"/>
- <logger name="com.jayway.jsonpath" level="WARN"/>
+ <logger name="org.springframework" level="{{ .Values.log.logger.springframework }}"/>
+ <logger name="org.springframework.beans" level="{{ .Values.log.logger.springframeworkBeans }}"/>
+ <logger name="org.springframework.web" level="{{ .Values.log.logger.springframeworkWeb }}"/>
+ <logger name="com.blog.spring.jms" level="{{ .Values.log.logger.blogSpringJms }}"/>
+ <logger name="com.jayway.jsonpath" level="{{ .Values.log.logger.jaywayJsonpath }}"/>
<!-- AJSC related loggers (DME2 Registration, csi logging, restlet, servlet
logging) -->
- <logger name="org.codehaus.groovy" level="WARN"/>
- <logger name="com.netflix.loadbalancer" level="WARN"/>
+ <logger name="org.codehaus.groovy" level="{{ .Values.log.logger.codehausGroovy }}"/>
+ <logger name="com.netflix.loadbalancer" level="{{ .Values.log.logger.netflixLoadbalancer }}"/>
- <logger name="org.apache.zookeeper" level="OFF"/>
+ <logger name="org.apache.zookeeper" level="{{ .Values.log.logger.apacheZookeeper }}"/>
<!-- Other Loggers that may help troubleshoot -->
- <logger name="net.sf" level="WARN"/>
- <logger name="org.apache.commons.httpclient" level="WARN"/>
- <logger name="org.apache.commons" level="WARN"/>
- <logger name="org.apache.coyote" level="WARN"/>
- <logger name="org.apache.jasper" level="WARN"/>
+ <logger name="net.sf" level="{{ .Values.log.logger.sf }}"/>
+ <logger name="org.apache.commons.httpclient" level="{{ .Values.log.logger.apacheCommonsHttpclient }}"/>
+ <logger name="org.apache.commons" level="{{ .Values.log.logger.apacheCommons }}"/>
+ <logger name="org.apache.coyote" level="{{ .Values.log.logger.apacheCoyote }}"/>
+ <logger name="org.apache.jasper" level="{{ .Values.log.logger.apacheJasper }}"/>
<!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging.
May aid in troubleshooting) -->
- <logger name="org.apache.camel" level="WARN"/>
- <logger name="org.apache.cxf" level="WARN"/>
- <logger name="org.apache.camel.processor.interceptor" level="WARN"/>
- <logger name="org.apache.cxf.jaxrs.interceptor" level="WARN"/>
- <logger name="org.apache.cxf.service" level="WARN"/>
- <logger name="org.restlet" level="WARN"/>
- <logger name="org.apache.camel.component.restlet" level="WARN"/>
-
- <logger name="org.hibernate.validator" level="WARN"/>
- <logger name="org.hibernate" level="WARN"/>
- <logger name="org.hibernate.ejb" level="OFF"/>
+ <logger name="org.apache.camel" level="{{ .Values.log.logger.apacheCamel }}"/>
+ <logger name="org.apache.cxf" level="{{ .Values.log.logger.apacheCxf }}"/>
+ <logger name="org.apache.camel.processor.interceptor" level="{{ .Values.log.logger.apacheCamelProcessorInterceptor }}"/>
+ <logger name="org.apache.cxf.jaxrs.interceptor" level="{{ .Values.log.logger.apacheCxfJaxrsInterceptor }}"/>
+ <logger name="org.apache.cxf.service" level="{{ .Values.log.logger.apacheCxfService }}"/>
+ <logger name="org.restlet" level="{{ .Values.log.logger.restlet }}"/>
+ <logger name="org.apache.camel.component.restlet" level="{{ .Values.log.logger.apacheCamelComponentRestlet }}"/>
+
+ <logger name="org.hibernate.validator" level="{{ .Values.log.logger.hibernateValidator }}"/>
+ <logger name="org.hibernate" level="{{ .Values.log.logger.hibernate }}"/>
+ <logger name="org.hibernate.ejb" level="{{ .Values.log.logger.hibernateEjb }}"/>
<!-- logback internals logging -->
- <logger name="ch.qos.logback.classic" level="WARN"/>
- <logger name="ch.qos.logback.core" level="WARN"/>
+ <logger name="ch.qos.logback.classic" level="{{ .Values.log.logger.qosLogbackClassic }}"/>
+ <logger name="ch.qos.logback.core" level="{{ .Values.log.logger.qosLogbackCore }}"/>
- <logger name="org.eclipse.jetty" level="WARN"/>
+ <logger name="org.eclipse.jetty" level="{{ .Values.log.logger.eclipseJetty }}"/>
<logger name="org.onap.aai.aaf.auth" level="DEBUG" additivity="false">
<appender-ref ref="asyncAUTH" />
@@ -282,13 +281,13 @@
<appender-ref ref="asynctranslog" />
</logger>
- <logger name="org.apache" level="OFF"/>
- <logger name="org.zookeeper" level="OFF"/>
- <logger name="org.janusgraph" level="WARN"/>
- <logger name="com.att.aft.dme2" level="WARN"/>
-
+ <logger name="org.apache" level="{{ .Values.log.logger.apache }}"/>
+ <logger name="org.zookeeper" level="{{ .Values.log.logger.zookeeper }}"/>
+ <logger name="org.janusgraph" level="{{ .Values.log.logger.janusgraph }}"/>
+ <logger name="com.att.aft.dme2" level="{{ .Values.log.logger.attAftDme2 }}"/>
- <root level="DEBUG">
+ <root level="{{ .Values.log.root.level }}">
+ <appender-ref ref="external" />
<appender-ref ref="STDOUT" />
<appender-ref ref="external"/>
</root>
diff --git a/components/aai-schema-service/values.yaml b/components/aai-schema-service/values.yaml
index 84f36b2..fdb64bc 100644
--- a/components/aai-schema-service/values.yaml
+++ b/components/aai-schema-service/values.yaml
@@ -53,6 +53,44 @@ service:
ingress:
enabled: false
+log:
+ logDir: {{ .Values.log.logDir }}
+ root:
+ level: {{ .Values.log.root.level.schemaService }}
+ consolePattern: {{ .Values.log.consolePattern.schemaService }}
+ logger:
+ apache: {{ .Values.log.logger.apache }}
+ apacheCamel: {{ .Values.log.logger.apacheCamel }}
+ apacheCamelComponentRestlet: {{ .Values.log.logger.apacheCamelComponentRestlet }}
+ apacheCamelProcessorInterceptor: {{ .Values.log.logger.apacheCamelProcessorInterceptor }}
+ apacheCommons: {{ .Values.log.logger.apacheCommons }}
+ apacheCommonsHttpclient: {{ .Values.log.logger.apacheCommonsHttpclient }}
+ apacheCoyote: {{ .Values.log.logger.apacheCoyote }}
+ apacheCxf: {{ .Values.log.logger.apacheCxf }}
+ apacheCxfJaxrsInterceptor: {{ .Values.log.logger.apacheCxfJaxrsInterceptor }}
+ apacheCxfService: {{ .Values.log.logger.apacheCxfService }}
+ apacheJasper: {{ .Values.log.logger.apacheJasper }}
+ apacheZookeeper: {{ .Values.log.logger.apacheZookeeper }}
+ attAftDme2: {{ .Values.log.logger.attAftDme2 }}
+ blogSpringJms: {{ .Values.log.logger.blogSpringJms }}
+ codehausGroovy: {{ .Values.log.logger.codehausGroovy }}
+ eclipseJetty: {{ .Values.log.logger.eclipseJetty }}
+ hibernate: {{ .Values.log.logger.hibernate }}
+ hibernateEjb: {{ .Values.log.logger.hibernateEjb }}
+ hibernateValidator: {{ .Values.log.logger.hibernateValidator }}
+ janusgraph: {{ .Values.log.logger.janusgraph }}
+ jaywayJsonpath: {{ .Values.log.logger.jaywayJsonpath }}
+ netflixLoadbalancer: {{ .Values.log.logger.netflixLoadbalancer }}
+ qosLogbackClassic: {{ .Values.log.logger.qosLogbackClassic }}
+ qosLogbackCore: {{ .Values.log.logger.qosLogbackCore }}
+ restlet: {{ .Values.log.logger.restlet }}
+ sf: {{ .Values.log.logger.sf }}
+ springframework: {{ .Values.log.logger.springframework }}
+ springframeworkBeans: {{ .Values.log.logger.springframeworkBeans }}
+ springframeworkWeb: {{ .Values.log.logger.springframeworkWeb }}
+ zookeeper: {{ .Values.log.logger.zookeeper }}
+
+
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
diff --git a/components/aai-search-data/resources/config/log/logback.xml b/components/aai-search-data/resources/config/log/logback.xml
index adfed4a..a325e88 100644
--- a/components/aai-search-data/resources/config/log/logback.xml
+++ b/components/aai-search-data/resources/config/log/logback.xml
@@ -39,7 +39,7 @@
<!-- Example evaluator filter applied against console appender -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>${errorLogPattern}</pattern>
+ <pattern>{{ .Values.log.consolePattern }}</pattern>
</encoder>
</appender>
@@ -156,37 +156,38 @@
</logger>
<!-- Spring related loggers -->
- <logger name="org.springframework" level="WARN" />
- <logger name="org.springframework.beans" level="WARN" />
- <logger name="org.springframework.web" level="WARN" />
- <logger name="com.blog.spring.jms" level="WARN" />
+ <logger name="org.springframework" level="{{.Values.log.logger.springframework}}" />
+ <logger name="org.springframework.beans" level="{{.Values.log.logger.springframeworkBeans}}" />
+ <logger name="org.springframework.web" level="{{.Values.log.logger.springframeworkWeb}}" />
+ <logger name="com.blog.spring.jms" level="{{.Values.log.logger.blogSpringJms}}" />
<!-- SearchDB loggers -->
- <logger name="org.openecomp.sa" level="INFO" />
+ <logger name="org.openecomp.sa" level="{{.Values.log.logger.openecompSa}}" />
<!-- Other Loggers that may help troubleshoot -->
- <logger name="net.sf" level="WARN" />
- <logger name="org.apache.commons.httpclient" level="WARN" />
- <logger name="org.apache.commons" level="WARN" />
- <logger name="org.apache.coyote" level="WARN" />
- <logger name="org.apache.jasper" level="WARN" />
+ <logger name="net.sf" level="{{.Values.log.logger.sf}}" />
+ <logger name="org.apache.commons.httpclient" level="{{.Values.log.logger.apacheCommonsHttpclient}}" />
+ <logger name="org.apache.commons" level="{{.Values.log.logger.apacheCommons}}" />
+ <logger name="org.apache.coyote" level="{{.Values.log.logger.apacheCoyote}}" />
+ <logger name="org.apache.jasper" level="{{.Values.log.logger.apacheJasper}}" />
<!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging.
May aid in troubleshooting) -->
- <logger name="org.apache.camel" level="WARN" />
- <logger name="org.apache.cxf" level="WARN" />
- <logger name="org.apache.camel.processor.interceptor" level="WARN" />
- <logger name="org.apache.cxf.jaxrs.interceptor" level="WARN" />
- <logger name="org.apache.cxf.service" level="WARN" />
- <logger name="org.restlet" level="WARN" />
- <logger name="org.apache.camel.component.restlet" level="WARN" />
+ <logger name="org.apache.camel" level="{{.Values.log.logger.apacheCamel}}" />
+ <logger name="org.apache.cxf" level="{{.Values.log.logger.apacheCxf}}" />
+ <logger name="org.apache.camel.processor.interceptor" level="{{.Values.log.logger.apacheCamelProcessorInterceptor}}" />
+ <logger name="org.apache.cxf.jaxrs.interceptor" level="{{.Values.log.logger.apacheCxfJaxrsInterceptor}}" />
+ <logger name="org.apache.cxf.service" level="{{.Values.log.logger.apacheCxfService}}" />
+ <logger name="org.restlet" level="{{.Values.log.logger.restlet}}" />
+ <logger name="org.apache.camel.component.restlet" level="{{.Values.log.loggerapacheCamelComponentRestlet}}" />
<!-- logback internals logging -->
- <logger name="ch.qos.logback.classic" level="WARN" />
- <logger name="ch.qos.logback.core" level="WARN" />
+ <logger name="ch.qos.logback.classic" level="{{.Values.log.logger.qosLogbackClassic}}" />
+ <logger name="ch.qos.logback.core" level="{{.Values.log.logger.qosLogbackCore}}" />
- <root>
+ <root level="{{.Values.logback.rootLogLeve.configl}}">
<appender-ref ref="asyncEELF" />
+ <appender-ref ref="STDOUT" />
<!-- <appender-ref ref="asyncEELFDebug" /> -->
</root>
diff --git a/components/aai-search-data/resources/fproxy/config/logback-spring.xml b/components/aai-search-data/resources/fproxy/config/logback-spring.xml
index edac199..48178ff 100644
--- a/components/aai-search-data/resources/fproxy/config/logback-spring.xml
+++ b/components/aai-search-data/resources/fproxy/config/logback-spring.xml
@@ -34,7 +34,7 @@
</appender>
<!-- LOG everything at INFO level -->
- <root level="debug">
+ <root level="{{.Values.logback.rootLogLevel.fproxy}}">
<appender-ref ref="RollingFile" />
<appender-ref ref="Console" />
</root>
diff --git a/components/aai-search-data/resources/rproxy/config/logback-spring.xml b/components/aai-search-data/resources/rproxy/config/logback-spring.xml
index 289fe75..19aa552 100644
--- a/components/aai-search-data/resources/rproxy/config/logback-spring.xml
+++ b/components/aai-search-data/resources/rproxy/config/logback-spring.xml
@@ -34,7 +34,7 @@
</appender>
<!-- LOG everything at INFO level -->
- <root level="debug">
+ <root level="{{.Values.logback.rootLogLevel.rproxy}}">
<appender-ref ref="RollingFile" />
<appender-ref ref="Console" />
</root>
diff --git a/components/aai-search-data/values.yaml b/components/aai-search-data/values.yaml
index 53a2064..6296d0c 100644
--- a/components/aai-search-data/values.yaml
+++ b/components/aai-search-data/values.yaml
@@ -59,6 +59,35 @@ service:
ingress:
enabled: false
+log:
+ logDir: {{ .Values.log.logDir }}
+ root:
+ level:
+ config: {{ .Values.log.root.level.searchData.config }}
+ fproxy: {{ .Values.log.root.level.searchData.fproxy }}
+ rproxy: {{ .Values.log.root.level.searchData.rproxy }}
+ consolePattern: {{ .Values.log.consolePattern.searchData }}
+ logger:
+ apacheCamel: {{ .Values.log.logger.apacheCamel }}
+ apacheCamelComponentRestlet: {{ .Values.log.logger.apacheCamelComponentRestlet }}
+ apacheCamelProcessorInterceptor: {{ .Values.log.logger.apacheCamelProcessorInterceptor }}
+ apacheCommons: {{ .Values.log.logger.apacheCommons }}
+ apacheCommonsHttpclient: {{ .Values.log.logger.apacheCommonsHttpclient }}
+ apacheCoyote: {{ .Values.log.logger.apacheCoyote }}
+ apacheCxf: {{ .Values.log.logger.apacheCxf }}
+ apacheCxfJaxrsInterceptor: {{ .Values.log.logger.apacheCxfJaxrsInterceptor }}
+ apacheCxfService: {{ .Values.log.logger.apacheCxfService }}
+ apacheJasper: {{ .Values.log.logger.apacheJasper }}
+ blogSpringJms: {{ .Values.log.logger.blogSpringJms }}
+ openecompSa: {{ .Values.log.logger.openecompSa }}
+ qosLogbackClassic: {{ .Values.log.logger.qosLogbackClassic }}
+ qosLogbackCore: {{ .Values.log.logger.qosLogbackCore }}
+ restlet: {{ .Values.log.logger.restlet }}
+ sf: {{ .Values.log.logger.sf }}
+ springframework: {{ .Values.log.logger.springframework }}
+ springframeworkBeans: {{ .Values.log.logger.springframeworkBeans }}
+ springframeworkWeb: {{ .Values.log.logger.springframeworkWeb }}
+
resources:
small:
limits:
diff --git a/components/aai-traversal/resources/config/logback.xml b/components/aai-traversal/resources/config/logback.xml
index d466ccf..935dce9 100644
--- a/components/aai-traversal/resources/config/logback.xml
+++ b/components/aai-traversal/resources/config/logback.xml
@@ -33,13 +33,13 @@
<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
<conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>
- %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}
- </pattern>
+ <pattern>{{ .Values.log.consolePattern }}</pattern>
</encoder>
</appender>
+
<appender name="SANE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${logDirectory}/rest/sane.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
@@ -213,6 +213,7 @@
<pattern>${eelfLogPattern}</pattern>
</encoder>
</appender>
+
<logger name="org.onap.aai" level="DEBUG" additivity="false">
<appender-ref ref="asyncDEBUG" />
<appender-ref ref="asyncERROR" />
@@ -222,15 +223,15 @@
</logger>
<!-- Spring related loggers -->
- <logger name="org.springframework" level="WARN" />
- <logger name="org.springframework.beans" level="WARN" />
- <logger name="org.springframework.web" level="WARN" />
- <logger name="com.blog.spring.jms" level="WARN" />
- <logger name="com.jayway.jsonpath" level="WARN" />
+ <logger name="org.springframework" level="{{.Values.log.logger.springframework}}" />
+ <logger name="org.springframework.beans" level="{{.Values.log.logger.springframeworkBeans}}" />
+ <logger name="org.springframework.web" level="{{.Values.log.logger.springframeworkWeb}}" />
+ <logger name="com.blog.spring.jms" level="{{.Values.log.logger.blogSpringJms}}" />
+ <logger name="com.jayway.jsonpath" level="{{.Values.log.logger.jaywayJsonpath}}" />
- <logger name="ch.qos.logback.classic" level="WARN" />
- <logger name="ch.qos.logback.core" level="WARN" />
- <logger name="org.eclipse.jetty" level="WARN" />
+ <logger name="ch.qos.logback.classic" level="{{.Values.log.logger.qosLogbackClassic}}" />
+ <logger name="ch.qos.logback.core" level="{{.Values.log.logger.qosLogbackCore}}" />
+ <logger name="org.eclipse.jetty" level="{{.Values.log.logger.eclipseJetty}}" />
<logger name="org.onap.aai.interceptors.post" level="DEBUG"
additivity="false">
@@ -247,19 +248,19 @@
<appender-ref ref="dmaapAAIEventConsumerDebug" />
<appender-ref ref="dmaapAAIEventConsumerMetric" />
</logger>
- <logger name="org.apache" level="OFF" />
- <logger name="org.zookeeper" level="OFF" />
- <logger name="com.thinkaurelius" level="WARN" />
- <logger name="com.att.aft.dme2" level="WARN" />
+ <logger name="org.apache" level="{{.Values.log.logger.apache}}" />
+ <logger name="org.zookeeper" level="{{.Values.log.logger.zookeeper}}" />
+ <logger name="com.thinkaurelius" level="{{.Values.log.logger.thinkaurelius}}" />
+ <logger name="com.att.aft.dme2" level="{{.Values.log.logger.attAftDme2}}" />
<!-- ============================================================================ -->
<!-- General EELF logger -->
<!-- ============================================================================ -->
- <logger name="com.att.eelf" level="WARN" additivity="false">
+ <logger name="com.att.eelf" level="INFO" additivity="false">
<appender-ref ref="asyncDEBUG" />
<appender-ref ref="asyncERROR" />
<appender-ref ref="asyncMETRIC" />
</logger>
- <root level="DEBUG">
+ <root level="{{.Values.log.root.level}}">
<appender-ref ref="external" />
{{if .Values.global.config.logback.console.enabled}}
<appender-ref ref="STDOUT" />
diff --git a/components/aai-traversal/values.yaml b/components/aai-traversal/values.yaml
index 04185ee..df2796c 100644
--- a/components/aai-traversal/values.yaml
+++ b/components/aai-traversal/values.yaml
@@ -97,6 +97,26 @@ service:
ingress:
enabled: false
+log:
+ logDir: {{ .Values.log.logDir }}
+ root:
+ level: {{ .Values.log.root.level.traversal }}
+ consolePattern: {{ .Values.log.consolePattern.traversal }}
+ logger:
+ apache: {{ .Values.log.logger.apache }}
+ attAftDme2: {{ .Values.log.logger.attAftDme2 }}
+ attEelf: {{ .Values.log.logger.attEelf }}
+ blogSpringJms: {{ .Values.log.logger.blogSpringJms }}
+ eclipseJetty: {{ .Values.log.logger.eclipseJetty }}
+ jaywayJsonpath: {{ .Values.log.logger.jaywayJsonpath }}
+ qosLogbackClassic: {{ .Values.log.logger.qosLogbackClassic }}
+ qosLogbackCore: {{ .Values.log.logger.qosLogbackCore }}
+ springframework: {{ .Values.log.logger.springframework }}
+ springframeworkBeans: {{ .Values.log.logger.springframeworkBeans }}
+ springframeworkWeb: {{ .Values.log.logger.springframeworkWeb }}
+ thinkaurelius: {{ .Values.log.logger.thinkaurelius }}
+ zookeeper: {{ .Values.log.logger.zookeeper }}
+
# Configure resource requests and limits
# ref: http://kubernetes.io/docs/user-guide/compute-resources/
resources:
diff --git a/values.yaml b/values.yaml
index 36245f9..92e0c84 100644
--- a/values.yaml
+++ b/values.yaml
@@ -33,6 +33,89 @@ global: # global defaults
installSidecarSecurity: false
aafEnabled: true
+log:
+ logDir: /var/log/onap
+ queueSize: 256
+ root:
+ level:
+ babel: INFO
+ graphadmin: INFO
+ resources:
+ config: INFO
+ froxy: INFO
+ rproxy: INFO
+ schemaService: INFO
+ searchData:
+ config: INFO
+ fproxy: INFO
+ rproxy: INFO
+ traversal: INFO
+ consolePattern:
+ babel:
+ config: "%nopexception${p_log}\t${p_tim}\t${p_lvl}\t%message\t${p_mdc}\t%rootException\t${p_mak}\t${p_thr}%n"
+ froxy: "%d{ISO8601} %-5level [%t] %C{1.}: %msg%n%throwable"
+ rproxy: "%d{ISO8601} %-5level [%t] %C{1.}: %msg%n%throwable"
+ graphadmin: "%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"
+ resources:
+ config: "%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"
+ froxy: "%d{ISO8601} %-5level [%t] %C{1.}: %msg%n%throwable"
+ rproxy: "%d{ISO8601} %-5level [%t] %C{1.}: %msg%n%throwable"
+ schemaService: "%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"
+ searchData: "%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{RequestId}|%thread|SearchDataService|%mdc{PartnerName}|%logger||%.-5level|%msg%n"
+ traversal: "%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"
+ logger:
+ ajsc: WARN
+ ajscBeansInterceptors: WARN
+ ajscComputeService: WARN
+ ajscFilePersistenceService: WARN
+ ajscFilters: WARN
+ ajscLoggingConfigurationService: WARN
+ ajscRestlet: WARN
+ ajscRouteMgmtService: WARN
+ ajscServlet: WARN
+ ajscUserDefinedBeansDefService: WARN
+ ajscUserDefinedJarService: WARN
+ ajscUtils: WARN
+ ajscUtilsDME2Helper: WARN
+ ajscVandelayService: WARN
+ apache: WARN
+ apacheCamel: WARN
+ apacheCamelComponentRestlet: WARN
+ apacheCamelProcessorInterceptor: WARN
+ apacheCommons: WARN
+ apacheCommonsHttpclient: WARN
+ apacheCoyote: WARN
+ apacheCxf: WARN
+ apacheCxfJaxrsInterceptor: WARN
+ apacheCxfService: WARN
+ apacheJasper: WARN
+ apacheZookeeper: WARN
+ att: INFO
+ attAftDme2: WARN
+ attAjsc: WARN
+ attAjscCsiLogging: WARN
+ attAjscFilemonitor: WARN
+ attScamper: WARN
+ blogSpringJms: WARN
+ codehausGroovy: WARN
+ eclipseJetty: WARN
+ hibernate: WARN
+ hibernateEjb: OFF
+ hibernateValidator: WARN
+ janusgraph: WARN
+ jaywayJsonpath: WARN
+ netflix: WARN
+ netflixLoadbalancer: WARN
+ qosLogbackClassic: WARN
+ qosLogbackCore: WARN
+ restlet: WARN
+ sf: WARN
+ springframework: WARN
+ springframeworkBeans: WARN
+ springframeworkWeb: WARN
+ thinkaurelius: WARN
+ zookeeper: OFF
+
fproxy:
name: forward-proxy
activeSpringProfiles: noHostVerification,cadi