diff options
Diffstat (limited to 'components/aai-graphadmin')
| -rw-r--r-- | components/aai-graphadmin/resources/config/logback.xml | 110 | ||||
| -rw-r--r-- | components/aai-graphadmin/values.yaml | 58 |
2 files changed, 54 insertions, 114 deletions
diff --git a/components/aai-graphadmin/resources/config/logback.xml b/components/aai-graphadmin/resources/config/logback.xml index 3862167..553de3f 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>{{ .Values.log.consolePattern }}</pattern> + <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> </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="{{.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="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"/> <!-- AJSC Services (bootstrap services) --> - <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}}"/> + <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"/> <!-- AJSC related loggers (DME2 Registration, csi logging, restlet, servlet logging) --> - <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}}"/> + <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"/> <!-- Other Loggers that may help troubleshoot --> - <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}}"/> + <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"/> <!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging. May aid in troubleshooting) --> - <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}}"/> + <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"/> <!-- logback internals logging --> - <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="ch.qos.logback.classic" level="WARN"/> + <logger name="ch.qos.logback.core" level="WARN"/> + <logger name="org.eclipse.jetty" level="WARN"/> <!-- 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,7 +839,6 @@ <includeCallerData>true</includeCallerData> <appender-ref ref="auth"/> </appender> - <logger name="AuditRecord" level="INFO" additivity="false"> <appender-ref ref="auditLogs"/> </logger> @@ -939,21 +938,20 @@ <appender-ref ref="dataExportAudit"/> <appender-ref ref="STDOUT"/> </logger> - <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}}"/> + <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"/> <!-- ============================================================================ --> <!-- General EELF logger --> <!-- ============================================================================ --> - <logger name="com.att.eelf" level="INFO" additivity="false"> + <logger name="com.att.eelf" level="WARN" additivity="false"> <appender-ref ref="asyncDEBUG"/> <appender-ref ref="asyncERROR"/> <appender-ref ref="asyncMETRIC"/> </logger> - - <root level="{{ .Values.log.root.level }}"> + <root level="DEBUG"> <appender-ref ref="external"/> <appender-ref ref="STDOUT"/> </root> diff --git a/components/aai-graphadmin/values.yaml b/components/aai-graphadmin/values.yaml index 7379077..2527cea 100644 --- a/components/aai-graphadmin/values.yaml +++ b/components/aai-graphadmin/values.yaml @@ -3,7 +3,6 @@ # 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. @@ -134,63 +133,6 @@ 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: |