Merge pull request #1365 from navikt/less-logging

Less logging

Author: flexable777

src/main/kotlin/no/nav/klage/oppgave/config/InternalLogFilter.kt

@@ -0,0 +1,34 @@
+package no.nav.klage.oppgave.config
+
+import ch.qos.logback.classic.Level
+import ch.qos.logback.classic.Logger
+import ch.qos.logback.classic.turbo.TurboFilter
+import ch.qos.logback.core.spi.FilterReply
+import no.nav.klage.oppgave.util.getLogger
+import org.slf4j.Marker
+
+class InternalLogFilter : TurboFilter() {
+
+    companion object {
+        @Suppress("JAVA_CLASS_ON_COMPANION")
+        private val ourLogger = getLogger(javaClass.enclosingClass)
+    }
+
+    override fun decide(
+        marker: Marker?,
+        logger: Logger?,
+        level: Level?,
+        format: String?,
+        params: Array<out Any>?,
+        throwable: Throwable?
+    ): FilterReply {
+        if (level == Level.DEBUG && logger?.name == "org.springframework.web.filter.CommonsRequestLoggingFilter" &&
+            (format?.contains("request [GET /internal/prometheus") == true ||
+                    format?.contains("request [GET /internal/health") == true)
+        ) {
+            return FilterReply.DENY
+        }
+
+        return FilterReply.NEUTRAL
+    }
+}

src/main/resources/application.yml

@@ -8,7 +8,6 @@ spring:
       add-mappings: false
   mvc:
     throw-exception-if-no-handler-found: true
-    log-request-details: true
   datasource:
     url: jdbc:postgresql://${NAIS_DATABASE_KABAL_API_KABAL_API_HOST}:${NAIS_DATABASE_KABAL_API_KABAL_API_PORT}/${NAIS_DATABASE_KABAL_API_KABAL_API_DATABASE}
     username: ${NAIS_DATABASE_KABAL_API_KABAL_API_USERNAME}

src/main/resources/logback-spring.xml

@@ -3,6 +3,7 @@
     <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
 
     <turboFilter class="no.nav.klage.oppgave.config.SseBrokenPipeLogFilter" />
+    <turboFilter class="no.nav.klage.oppgave.config.InternalLogFilter" />
 
     <springProfile name="local">
         <appender name="text" class="ch.qos.logback.core.ConsoleAppender">
@@ -46,10 +47,8 @@
             <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
                 <fileNamePattern>/secure-logs/secure.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
                 <maxHistory>30</maxHistory>
-                <minIndex>1</minIndex>
-                <maxIndex>4</maxIndex>
-                <maxFileSize>30MB</maxFileSize>
-                <totalSizeCap>115MB</totalSizeCap>
+                <maxFileSize>26MB</maxFileSize>
+                <totalSizeCap>100MB</totalSizeCap>
             </rollingPolicy>
             <encoder class="net.logstash.logback.encoder.LogstashEncoder"/>
         </appender>
@@ -70,18 +69,10 @@
             <appender-ref ref="secureJson"/>
         </logger>
 
-        <logger name="org.springframework.web.servlet.DispatcherServlet" level="trace" additivity="false">
-            <appender-ref ref="secureJson"/>
-        </logger>
-
         <logger name="reactor.netty.http.client" level="debug" additivity="false">
             <appender-ref ref="secureJson"/>
         </logger>
 
-        <logger name="org.springframework.data.elasticsearch.client" level="trace" additivity="false">
-            <appender-ref ref="secureJson"/>
-        </logger>
-
         <logger name="org.springframework.data.convert.CustomConversions" level="error"/>
 
         <logger name="no.nav.security.token.support" level="debug" additivity="false">