Merge pull request #269 from navikt/team-logs

Team logs

Author: sigrunnu

.nais/dev.yml

@@ -25,8 +25,6 @@ spec:
     autoInstrumentation:
       enabled: true
       runtime: java
-  secureLogs:
-    enabled: true
   resources:
     requests:
       cpu: 50m
@@ -63,6 +61,8 @@ spec:
           namespace: poao
         - application: syfooversiktsrv
           namespace: teamsykefravr
+        - application: logging
+          namespace: nais-system
     inbound:
       rules:
         - application: rpa-medlemskap-og-avgift

.nais/prod.yml

@@ -25,8 +25,6 @@ spec:
     autoInstrumentation:
       enabled: true
       runtime: java
-  secureLogs:
-    enabled: true
   resources:
     requests:
       cpu: 50m
@@ -63,6 +61,8 @@ spec:
           namespace: poao
         - application: syfooversiktsrv
           namespace: teamsykefravr
+        - application: logging
+          namespace: nais-system
     inbound:
       rules:
         - application: rpa-medlemskap-og-avgift

build.gradle.kts

@@ -14,7 +14,7 @@ val logstash_version = "8.1"
 val prometeus_version = "1.15.3"
 val nav_common_version = "3.2025.06.23_14.50-3af3985d8555"
 val tjenestespec_version = "1.2021.02.22-10.45-4201aaea72fb"
-val modia_common_utils_version = "1.2025.07.23-07.40-7ea9c01d168f"
+val modia_common_utils_version = "1.2025.08.18-10.50-4e02c5797b17"
 val junit_version = "5.13.4"
 val graphql_kotlin_version = "8.8.1"
 
@@ -76,6 +76,7 @@ dependencies {
     implementation("no.nav.tjenestespesifikasjoner:utbetaling-tjenestespesifikasjon:$tjenestespec_version")
     implementation("com.github.navikt.modia-common-utils:kotlin-utils:$modia_common_utils_version")
     implementation("com.github.navikt.modia-common-utils:ktor-utils:$modia_common_utils_version")
+    implementation("com.github.navikt.modia-common-utils:logging:$modia_common_utils_version")
     implementation("no.nav.common:token-client:$nav_common_version")
     implementation("no.nav.common:client:$nav_common_version")
     implementation("no.nav.common:log:$nav_common_version")

src/main/kotlin/no/nav/utils/TjenestekallLogger.kt

@@ -1,33 +1,29 @@
 package no.nav.utils
-
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
+import no.nav.personoversikt.common.logging.Logging
 
 object TjenestekallLogger {
-    private val tjenestekallLogg = LoggerFactory.getLogger("SecureLog")
+    private val tjenestekallLogg = Logging.teamLog
 
     fun info(
         header: String,
         fields: Map<String, Any?>,
-    ) = tjenestekallLogg.info(format(header, fields))
+    ) = tjenestekallLogg.info(Logging.TEAM_LOGS_MARKER, format(header, fields))
 
     fun warn(
         header: String,
         fields: Map<String, Any?>,
-    ) = tjenestekallLogg.warn(format(header, fields))
+    ) = tjenestekallLogg.warn(Logging.TEAM_LOGS_MARKER, format(header, fields))
 
     fun error(
         header: String,
         fields: Map<String, Any?>,
-    ) = tjenestekallLogg.error(format(header, fields))
+    ) = tjenestekallLogg.error(Logging.TEAM_LOGS_MARKER, format(header, fields))
 
     fun error(
         header: String,
         fields: Map<String, Any?>,
         throwable: Throwable,
-    ) = tjenestekallLogg.error(format(header, fields), throwable)
-
-    val logger: Logger = tjenestekallLogg
+    ) = tjenestekallLogg.error(Logging.TEAM_LOGS_MARKER, format(header, fields), throwable)
 
     fun format(
         header: String,

src/main/resources/logback.xml

@@ -1,6 +1,5 @@
 <configuration>
     <include resource="no/nav/common/log/logback-stdout-json.xml"/>
     <include resource="no/nav/common/log/logback-naudit.xml"/>
-    <include resource="no/nav/common/log/logback-securelogs.xml"/>
     <include resource="no/nav/common/log/logback-cxf.xml"/>
 </configuration>

src/main/resources/team-logs.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+    <!-- Team logs appender -->
+    <appender name="team-logs" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+        <destination>team-logs.nais-system:5170</destination>
+        <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <customFields>{"google_cloud_project":"${GOOGLE_CLOUD_PROJECT}","nais_namespace_name":"${NAIS_NAMESPACE}","nais_pod_name":"${NAIS_POD_NAME}","nais_container_name":"${NAIS_APP_NAME}"}</customFields>
+            <includeContext>false</includeContext>
+        </encoder>
+        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
+            <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
+                <marker>TEAM_LOGS</marker>
+            </evaluator>
+            <OnMatch>ACCEPT</OnMatch>
+            <OnMismatch>DENY</OnMismatch>
+        </filter>
+    </appender>
+
+    <appender name="default-json" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="net.logstash.logback.encoder.LogstashEncoder" />
+        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
+            <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
+                <marker>TEAM_LOGS</marker>
+            </evaluator>
+            <OnMatch>DENY</OnMatch>
+            <OnMismatch>ACCEPT</OnMismatch>
+        </filter>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="default-json" />
+        <appender-ref ref="team-logs" />
+    </root>
+
+    <logger name="TeamLog" level="INFO" additivity="false">
+        <appender-ref ref="team-logs" />
+    </logger>
+</included>