From 478f4deb97721db9593bb688efe3c60b1659d1cf Mon Sep 17 00:00:00 2001 From: Nummedal Date: Mon, 18 Aug 2025 12:55:26 +0200 Subject: [PATCH 1/3] Oppdater modia common utils --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7937b31..416ebd5 100644 --- a/build.gradle.kts +++ b/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" From 6dd86468a6de0285b9279a7bae954632069b34eb Mon Sep 17 00:00:00 2001 From: Nummedal Date: Mon, 18 Aug 2025 15:14:03 +0200 Subject: [PATCH 2/3] Legg til teamlog og fjern securelog --- .nais/dev.yml | 4 +- .nais/prod.yml | 4 +- build.gradle.kts | 1 + .../kotlin/no/nav/utils/TjenestekallLogger.kt | 16 +++----- src/main/resources/logback.xml | 1 - src/main/resources/team-logs.xml | 38 +++++++++++++++++++ 6 files changed, 49 insertions(+), 15 deletions(-) create mode 100644 src/main/resources/team-logs.xml diff --git a/.nais/dev.yml b/.nais/dev.yml index 85446aa..e008fef 100644 --- a/.nais/dev.yml +++ b/.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 diff --git a/.nais/prod.yml b/.nais/prod.yml index 420cb1f..8b949a1 100644 --- a/.nais/prod.yml +++ b/.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 diff --git a/build.gradle.kts b/build.gradle.kts index 416ebd5..7467776 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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") diff --git a/src/main/kotlin/no/nav/utils/TjenestekallLogger.kt b/src/main/kotlin/no/nav/utils/TjenestekallLogger.kt index 49443a9..c4ff764 100644 --- a/src/main/kotlin/no/nav/utils/TjenestekallLogger.kt +++ b/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, - ) = tjenestekallLogg.info(format(header, fields)) + ) = tjenestekallLogg.info(Logging.TEAM_LOGS_MARKER,format(header, fields)) fun warn( header: String, fields: Map, - ) = tjenestekallLogg.warn(format(header, fields)) + ) = tjenestekallLogg.warn(Logging.TEAM_LOGS_MARKER,format(header, fields)) fun error( header: String, fields: Map, - ) = tjenestekallLogg.error(format(header, fields)) + ) = tjenestekallLogg.error(Logging.TEAM_LOGS_MARKER,format(header, fields)) fun error( header: String, fields: Map, 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, diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 68f1691..b4b0c43 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -1,6 +1,5 @@ - diff --git a/src/main/resources/team-logs.xml b/src/main/resources/team-logs.xml new file mode 100644 index 0000000..055085c --- /dev/null +++ b/src/main/resources/team-logs.xml @@ -0,0 +1,38 @@ + + + + + team-logs.nais-system:5170 + + {"google_cloud_project":"${GOOGLE_CLOUD_PROJECT}","nais_namespace_name":"${NAIS_NAMESPACE}","nais_pod_name":"${NAIS_POD_NAME}","nais_container_name":"${NAIS_APP_NAME}"} + false + + + + TEAM_LOGS + + ACCEPT + DENY + + + + + + + + TEAM_LOGS + + DENY + ACCEPT + + + + + + + + + + + + \ No newline at end of file From 46213240fef1be6212dd8eb63d29ab691c2b479e Mon Sep 17 00:00:00 2001 From: Nummedal Date: Mon, 18 Aug 2025 15:16:02 +0200 Subject: [PATCH 3/3] format --- src/main/kotlin/no/nav/utils/TjenestekallLogger.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/no/nav/utils/TjenestekallLogger.kt b/src/main/kotlin/no/nav/utils/TjenestekallLogger.kt index c4ff764..45d4686 100644 --- a/src/main/kotlin/no/nav/utils/TjenestekallLogger.kt +++ b/src/main/kotlin/no/nav/utils/TjenestekallLogger.kt @@ -7,23 +7,23 @@ object TjenestekallLogger { fun info( header: String, fields: Map, - ) = tjenestekallLogg.info(Logging.TEAM_LOGS_MARKER,format(header, fields)) + ) = tjenestekallLogg.info(Logging.TEAM_LOGS_MARKER, format(header, fields)) fun warn( header: String, fields: Map, - ) = tjenestekallLogg.warn(Logging.TEAM_LOGS_MARKER,format(header, fields)) + ) = tjenestekallLogg.warn(Logging.TEAM_LOGS_MARKER, format(header, fields)) fun error( header: String, fields: Map, - ) = tjenestekallLogg.error(Logging.TEAM_LOGS_MARKER,format(header, fields)) + ) = tjenestekallLogg.error(Logging.TEAM_LOGS_MARKER, format(header, fields)) fun error( header: String, fields: Map, throwable: Throwable, - ) = tjenestekallLogg.error(Logging.TEAM_LOGS_MARKER,format(header, fields), throwable) + ) = tjenestekallLogg.error(Logging.TEAM_LOGS_MARKER, format(header, fields), throwable) fun format( header: String,