From 8ff1281469272a489d7f2f6da6c2bdb792fc0a57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristen=20H=C3=A6rum?= Date: Mon, 6 Jan 2025 10:08:17 +0100 Subject: [PATCH 1/3] Fjerner eksponering av heapdump --- .../adresse-service/src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- apps/brreg-stub/src/main/resources/application.yml | 7 ++++--- apps/bruker-service/src/main/resources/application.yml | 7 ++++--- apps/dolly-backend/src/main/resources/application.yml | 5 ++--- apps/dolly-frontend/src/main/resources/application.yml | 7 ++++--- apps/dollystatus/src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 10 ++++++---- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../miljoer-service/src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- apps/pdl-forvalter/src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- apps/person-service/src/main/resources/application.yml | 7 ++++--- apps/profil-api/src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../sykemelding-api/src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- apps/udi-stub/src/main/resources/application.yml | 7 ++++--- .../src/main/resources/application.yml | 7 ++++--- 54 files changed, 216 insertions(+), 163 deletions(-) diff --git a/apps/adresse-service/src/main/resources/application.yml b/apps/adresse-service/src/main/resources/application.yml index 5b96088b72e..5b3bf750fca 100644 --- a/apps/adresse-service/src/main/resources/application.yml +++ b/apps/adresse-service/src/main/resources/application.yml @@ -34,12 +34,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/altinn3-tilgang-service/src/main/resources/application.yml b/apps/altinn3-tilgang-service/src/main/resources/application.yml index 16f513682d3..654d076c3a4 100644 --- a/apps/altinn3-tilgang-service/src/main/resources/application.yml +++ b/apps/altinn3-tilgang-service/src/main/resources/application.yml @@ -37,12 +37,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/amelding-service/src/main/resources/application.yml b/apps/amelding-service/src/main/resources/application.yml index e90182fd21e..404bec3cc25 100644 --- a/apps/amelding-service/src/main/resources/application.yml +++ b/apps/amelding-service/src/main/resources/application.yml @@ -30,12 +30,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/app-tilgang-analyse-service/src/main/resources/application.yml b/apps/app-tilgang-analyse-service/src/main/resources/application.yml index ebf58a884c3..829bfd78a09 100644 --- a/apps/app-tilgang-analyse-service/src/main/resources/application.yml +++ b/apps/app-tilgang-analyse-service/src/main/resources/application.yml @@ -32,12 +32,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/arbeidsforhold-service/src/main/resources/application.yml b/apps/arbeidsforhold-service/src/main/resources/application.yml index 9e816896986..f15c64ba7ef 100644 --- a/apps/arbeidsforhold-service/src/main/resources/application.yml +++ b/apps/arbeidsforhold-service/src/main/resources/application.yml @@ -33,12 +33,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/batch-bestilling-service/src/main/resources/application.yml b/apps/batch-bestilling-service/src/main/resources/application.yml index 5e056d09e77..0a85377386b 100644 --- a/apps/batch-bestilling-service/src/main/resources/application.yml +++ b/apps/batch-bestilling-service/src/main/resources/application.yml @@ -28,12 +28,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/brreg-stub/src/main/resources/application.yml b/apps/brreg-stub/src/main/resources/application.yml index de4ff173f11..0667df0b3ea 100644 --- a/apps/brreg-stub/src/main/resources/application.yml +++ b/apps/brreg-stub/src/main/resources/application.yml @@ -12,12 +12,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/bruker-service/src/main/resources/application.yml b/apps/bruker-service/src/main/resources/application.yml index 3cb53ea7f47..c08c085bc98 100644 --- a/apps/bruker-service/src/main/resources/application.yml +++ b/apps/bruker-service/src/main/resources/application.yml @@ -33,12 +33,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/dolly-backend/src/main/resources/application.yml b/apps/dolly-backend/src/main/resources/application.yml index 6caad4f8bde..7187259ca47 100644 --- a/apps/dolly-backend/src/main/resources/application.yml +++ b/apps/dolly-backend/src/main/resources/application.yml @@ -64,15 +64,14 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: health: show-components: always show-details: always - heapdump: - enabled: true prometheus: enabled: true prometheus: diff --git a/apps/dolly-frontend/src/main/resources/application.yml b/apps/dolly-frontend/src/main/resources/application.yml index 1731e1a42b7..d448be506fd 100644 --- a/apps/dolly-frontend/src/main/resources/application.yml +++ b/apps/dolly-frontend/src/main/resources/application.yml @@ -246,12 +246,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/dollystatus/src/main/resources/application.yml b/apps/dollystatus/src/main/resources/application.yml index 069adad970b..02b34f3f5a6 100644 --- a/apps/dollystatus/src/main/resources/application.yml +++ b/apps/dollystatus/src/main/resources/application.yml @@ -3,12 +3,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/endringsmelding-frontend/src/main/resources/application.yml b/apps/endringsmelding-frontend/src/main/resources/application.yml index 38f3e2e9a89..0437a6213d6 100644 --- a/apps/endringsmelding-frontend/src/main/resources/application.yml +++ b/apps/endringsmelding-frontend/src/main/resources/application.yml @@ -44,12 +44,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/endringsmelding-service/src/main/resources/application.yml b/apps/endringsmelding-service/src/main/resources/application.yml index d7cdb8c63fc..d552f471d1e 100644 --- a/apps/endringsmelding-service/src/main/resources/application.yml +++ b/apps/endringsmelding-service/src/main/resources/application.yml @@ -45,12 +45,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true health: elasticsearch: enabled: false diff --git a/apps/faste-data-frontend/src/main/resources/application.yml b/apps/faste-data-frontend/src/main/resources/application.yml index 47faf21eb99..6d226e085c8 100644 --- a/apps/faste-data-frontend/src/main/resources/application.yml +++ b/apps/faste-data-frontend/src/main/resources/application.yml @@ -62,12 +62,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml index 3c4d2f1263e..716b962f019 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml +++ b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml @@ -48,12 +48,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/generer-navn-service/src/main/resources/application.yml b/apps/generer-navn-service/src/main/resources/application.yml index 5777e19d691..f470d5ceed7 100644 --- a/apps/generer-navn-service/src/main/resources/application.yml +++ b/apps/generer-navn-service/src/main/resources/application.yml @@ -29,12 +29,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/generer-organisasjon-populasjon-service/src/main/resources/application.yml b/apps/generer-organisasjon-populasjon-service/src/main/resources/application.yml index 241b6cc21ef..c26902af9b9 100644 --- a/apps/generer-organisasjon-populasjon-service/src/main/resources/application.yml +++ b/apps/generer-organisasjon-populasjon-service/src/main/resources/application.yml @@ -41,12 +41,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/generer-synt-amelding-service/src/main/resources/application.yml b/apps/generer-synt-amelding-service/src/main/resources/application.yml index e50b841c107..df0c280972e 100644 --- a/apps/generer-synt-amelding-service/src/main/resources/application.yml +++ b/apps/generer-synt-amelding-service/src/main/resources/application.yml @@ -38,12 +38,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/helsepersonell-service/src/main/resources/application.yml b/apps/helsepersonell-service/src/main/resources/application.yml index 43f90ed6aca..da7af8a8eee 100644 --- a/apps/helsepersonell-service/src/main/resources/application.yml +++ b/apps/helsepersonell-service/src/main/resources/application.yml @@ -29,12 +29,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/inntektsmelding-generator-service/src/main/resources/application.yml b/apps/inntektsmelding-generator-service/src/main/resources/application.yml index 593df4d3e10..edb4821e98f 100644 --- a/apps/inntektsmelding-generator-service/src/main/resources/application.yml +++ b/apps/inntektsmelding-generator-service/src/main/resources/application.yml @@ -24,12 +24,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/inntektsmelding-service/src/main/resources/application.yml b/apps/inntektsmelding-service/src/main/resources/application.yml index dc654d232cf..3e93ae1704b 100644 --- a/apps/inntektsmelding-service/src/main/resources/application.yml +++ b/apps/inntektsmelding-service/src/main/resources/application.yml @@ -40,12 +40,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/jenkins-batch-status-service/src/main/resources/application.yml b/apps/jenkins-batch-status-service/src/main/resources/application.yml index 12bda26837d..38b6be1140a 100644 --- a/apps/jenkins-batch-status-service/src/main/resources/application.yml +++ b/apps/jenkins-batch-status-service/src/main/resources/application.yml @@ -41,12 +41,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/joark-dokument-service/src/main/resources/application.yml b/apps/joark-dokument-service/src/main/resources/application.yml index 50215c47d64..76d160784c6 100644 --- a/apps/joark-dokument-service/src/main/resources/application.yml +++ b/apps/joark-dokument-service/src/main/resources/application.yml @@ -34,12 +34,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/kodeverk-service/src/main/resources/application.yml b/apps/kodeverk-service/src/main/resources/application.yml index 824b314a535..7f880895661 100644 --- a/apps/kodeverk-service/src/main/resources/application.yml +++ b/apps/kodeverk-service/src/main/resources/application.yml @@ -22,12 +22,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application.yml b/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application.yml index 29a6a0e10d4..9e676dc80e1 100644 --- a/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application.yml +++ b/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application.yml @@ -28,13 +28,15 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - health.show-details: always - heapdump.enabled: true - prometheus.enabled: true + health: + show-details: always + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/levende-arbeidsforhold-scheduler/src/main/resources/application.yml b/apps/levende-arbeidsforhold-scheduler/src/main/resources/application.yml index e1281b264c9..0ade711cee5 100644 --- a/apps/levende-arbeidsforhold-scheduler/src/main/resources/application.yml +++ b/apps/levende-arbeidsforhold-scheduler/src/main/resources/application.yml @@ -25,12 +25,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/levende-arbeidsforhold-service/src/main/resources/application.yml b/apps/levende-arbeidsforhold-service/src/main/resources/application.yml index bd6d7946969..9366022b2f8 100644 --- a/apps/levende-arbeidsforhold-service/src/main/resources/application.yml +++ b/apps/levende-arbeidsforhold-service/src/main/resources/application.yml @@ -28,12 +28,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/miljoer-service/src/main/resources/application.yml b/apps/miljoer-service/src/main/resources/application.yml index 41fae00bc00..47f1bcc1780 100644 --- a/apps/miljoer-service/src/main/resources/application.yml +++ b/apps/miljoer-service/src/main/resources/application.yml @@ -31,12 +31,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/oppsummeringsdokument-service/src/main/resources/application.yml b/apps/oppsummeringsdokument-service/src/main/resources/application.yml index a3800a156d5..780c6e746f0 100644 --- a/apps/oppsummeringsdokument-service/src/main/resources/application.yml +++ b/apps/oppsummeringsdokument-service/src/main/resources/application.yml @@ -30,12 +30,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/organisasjon-bestilling-service/src/main/resources/application.yml b/apps/organisasjon-bestilling-service/src/main/resources/application.yml index 5d10b138922..e8d0b3a450e 100644 --- a/apps/organisasjon-bestilling-service/src/main/resources/application.yml +++ b/apps/organisasjon-bestilling-service/src/main/resources/application.yml @@ -33,12 +33,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/organisasjon-faste-data-service/src/main/resources/application.yml b/apps/organisasjon-faste-data-service/src/main/resources/application.yml index b35c5e82706..f0e7149af43 100644 --- a/apps/organisasjon-faste-data-service/src/main/resources/application.yml +++ b/apps/organisasjon-faste-data-service/src/main/resources/application.yml @@ -38,12 +38,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/organisasjon-forvalter/src/main/resources/application.yml b/apps/organisasjon-forvalter/src/main/resources/application.yml index 095c0107efa..8e48224db96 100644 --- a/apps/organisasjon-forvalter/src/main/resources/application.yml +++ b/apps/organisasjon-forvalter/src/main/resources/application.yml @@ -63,12 +63,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/organisasjon-mottak-service/src/main/resources/application.yml b/apps/organisasjon-mottak-service/src/main/resources/application.yml index f5454299df6..77d033f0b1c 100644 --- a/apps/organisasjon-mottak-service/src/main/resources/application.yml +++ b/apps/organisasjon-mottak-service/src/main/resources/application.yml @@ -49,12 +49,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/organisasjon-service/src/main/resources/application.yml b/apps/organisasjon-service/src/main/resources/application.yml index 9f897c11c45..64de1fe9017 100644 --- a/apps/organisasjon-service/src/main/resources/application.yml +++ b/apps/organisasjon-service/src/main/resources/application.yml @@ -34,12 +34,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/organisasjon-tilgang-service/src/main/resources/application.yml b/apps/organisasjon-tilgang-service/src/main/resources/application.yml index 543d3d30f23..3f5e8bd26ec 100644 --- a/apps/organisasjon-tilgang-service/src/main/resources/application.yml +++ b/apps/organisasjon-tilgang-service/src/main/resources/application.yml @@ -38,12 +38,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/orgnummer-service/src/main/resources/application.yml b/apps/orgnummer-service/src/main/resources/application.yml index 7928e2c4f00..2de7966ba4c 100644 --- a/apps/orgnummer-service/src/main/resources/application.yml +++ b/apps/orgnummer-service/src/main/resources/application.yml @@ -43,12 +43,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/oversikt-frontend/src/main/resources/application.yml b/apps/oversikt-frontend/src/main/resources/application.yml index cab26a3240a..cdd1bac15de 100644 --- a/apps/oversikt-frontend/src/main/resources/application.yml +++ b/apps/oversikt-frontend/src/main/resources/application.yml @@ -39,12 +39,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/pdl-forvalter/src/main/resources/application.yml b/apps/pdl-forvalter/src/main/resources/application.yml index e2b6c90f4ca..5acfc5165d8 100644 --- a/apps/pdl-forvalter/src/main/resources/application.yml +++ b/apps/pdl-forvalter/src/main/resources/application.yml @@ -56,12 +56,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true health: elasticsearch: enabled: false diff --git a/apps/person-faste-data-service/src/main/resources/application.yml b/apps/person-faste-data-service/src/main/resources/application.yml index 96c6b85b36e..aaa24d49517 100644 --- a/apps/person-faste-data-service/src/main/resources/application.yml +++ b/apps/person-faste-data-service/src/main/resources/application.yml @@ -32,12 +32,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/person-organisasjon-tilgang-service/src/main/resources/application.yml b/apps/person-organisasjon-tilgang-service/src/main/resources/application.yml index 1da5b3b1184..095b0b2f172 100644 --- a/apps/person-organisasjon-tilgang-service/src/main/resources/application.yml +++ b/apps/person-organisasjon-tilgang-service/src/main/resources/application.yml @@ -38,12 +38,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/person-search-service/src/main/resources/application.yml b/apps/person-search-service/src/main/resources/application.yml index 1aecee96702..e2fbb948c45 100644 --- a/apps/person-search-service/src/main/resources/application.yml +++ b/apps/person-search-service/src/main/resources/application.yml @@ -41,12 +41,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/person-service/src/main/resources/application.yml b/apps/person-service/src/main/resources/application.yml index 6a61ab08e39..8c6411c1eaf 100644 --- a/apps/person-service/src/main/resources/application.yml +++ b/apps/person-service/src/main/resources/application.yml @@ -39,12 +39,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/profil-api/src/main/resources/application.yml b/apps/profil-api/src/main/resources/application.yml index 4c9b6cac076..6d87e3d1b3f 100644 --- a/apps/profil-api/src/main/resources/application.yml +++ b/apps/profil-api/src/main/resources/application.yml @@ -41,12 +41,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/skattekort-service/src/main/resources/application.yml b/apps/skattekort-service/src/main/resources/application.yml index 51e2bcada96..72a52109bee 100644 --- a/apps/skattekort-service/src/main/resources/application.yml +++ b/apps/skattekort-service/src/main/resources/application.yml @@ -23,12 +23,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/sykemelding-api/src/main/resources/application.yml b/apps/sykemelding-api/src/main/resources/application.yml index f1e9d0240b5..b49e9a7862a 100644 --- a/apps/sykemelding-api/src/main/resources/application.yml +++ b/apps/sykemelding-api/src/main/resources/application.yml @@ -31,12 +31,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/synt-sykemelding-api/src/main/resources/application.yml b/apps/synt-sykemelding-api/src/main/resources/application.yml index a9ff3f6ba65..70e49cef899 100644 --- a/apps/synt-sykemelding-api/src/main/resources/application.yml +++ b/apps/synt-sykemelding-api/src/main/resources/application.yml @@ -59,12 +59,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/synt-vedtakshistorikk-service/src/main/resources/application.yml b/apps/synt-vedtakshistorikk-service/src/main/resources/application.yml index 12285d7ae0a..3ab20446b84 100644 --- a/apps/synt-vedtakshistorikk-service/src/main/resources/application.yml +++ b/apps/synt-vedtakshistorikk-service/src/main/resources/application.yml @@ -65,12 +65,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/tenor-search-service/src/main/resources/application.yml b/apps/tenor-search-service/src/main/resources/application.yml index 765f641ea55..72f6aa800c2 100644 --- a/apps/tenor-search-service/src/main/resources/application.yml +++ b/apps/tenor-search-service/src/main/resources/application.yml @@ -29,12 +29,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/testnav-ident-pool/src/main/resources/application.yml b/apps/testnav-ident-pool/src/main/resources/application.yml index eec84e92cc7..50680851ade 100644 --- a/apps/testnav-ident-pool/src/main/resources/application.yml +++ b/apps/testnav-ident-pool/src/main/resources/application.yml @@ -15,12 +15,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/testnorge-statisk-data-forvalter/src/main/resources/application.yml b/apps/testnorge-statisk-data-forvalter/src/main/resources/application.yml index fb9d79b9227..52b818eb1db 100644 --- a/apps/testnorge-statisk-data-forvalter/src/main/resources/application.yml +++ b/apps/testnorge-statisk-data-forvalter/src/main/resources/application.yml @@ -83,12 +83,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/tilbakemelding-api/src/main/resources/application.yml b/apps/tilbakemelding-api/src/main/resources/application.yml index f90336663c1..fdf868899a9 100644 --- a/apps/tilbakemelding-api/src/main/resources/application.yml +++ b/apps/tilbakemelding-api/src/main/resources/application.yml @@ -38,12 +38,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/tps-messaging-service/src/main/resources/application.yml b/apps/tps-messaging-service/src/main/resources/application.yml index c36f3d7945a..b7c23264167 100644 --- a/apps/tps-messaging-service/src/main/resources/application.yml +++ b/apps/tps-messaging-service/src/main/resources/application.yml @@ -50,12 +50,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true health: show-details: always health: diff --git a/apps/udi-stub/src/main/resources/application.yml b/apps/udi-stub/src/main/resources/application.yml index 0072dcc00e8..6d4f4085497 100644 --- a/apps/udi-stub/src/main/resources/application.yml +++ b/apps/udi-stub/src/main/resources/application.yml @@ -33,12 +33,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: diff --git a/apps/varslinger-service/src/main/resources/application.yml b/apps/varslinger-service/src/main/resources/application.yml index 2308249ef43..55331eeaa37 100644 --- a/apps/varslinger-service/src/main/resources/application.yml +++ b/apps/varslinger-service/src/main/resources/application.yml @@ -29,12 +29,13 @@ management: enabled-by-default: true web: base-path: /internal - exposure.include: prometheus,heapdump,health + exposure: + include: prometheus,health path-mapping: prometheus: metrics endpoint: - prometheus.enabled: true - heapdump.enabled: true + prometheus: + enabled: true prometheus: metrics: export: From 4bf6d6ca10efad7c195bf972bcba71050ee97050 Mon Sep 17 00:00:00 2001 From: Stian Gustavsson Date: Mon, 6 Jan 2025 10:19:43 +0100 Subject: [PATCH 2/3] Fjernet utdatert z-ident migrering fra doc Fjernet z-ident migreringsinfo som ikke lenger er gyldig og en lenke som ikke eksisterer lenger --- docs/solution-description/azure-ad-og-z-ident.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docs/solution-description/azure-ad-og-z-ident.md b/docs/solution-description/azure-ad-og-z-ident.md index faf91d76a7c..ee5139cf616 100644 --- a/docs/solution-description/azure-ad-og-z-ident.md +++ b/docs/solution-description/azure-ad-og-z-ident.md @@ -75,9 +75,3 @@ Med access_tokene, som brukes i kommunikasjon fra frontend til backend, vil back Det betyr at vi kan bruke dagens mekanismer for å hente ut epost istedenfor for Z-bruker i Dolly. I Dolly frontend vil vi nå ha mulighet til å hente ut personlige informasjon om brukeren. Som epost, navn osv... som vil hjelpe oss til bedre feilsøkning, og være et steg i å kunne hjelpe personer utenfor NAV. - -### Migererig fra Z-Bruker - -I en periode vil vi legge til funksjonalitet for å kunne kopiere en Z-bruker over til din personlige bruker. På den måten vil ingen miste allerede opprettede brukere. - -[Prototype](https://invis.io/ENXCGRI6XD8#/429665609_Innlogging_Personlig_ident_1) \ No newline at end of file From 3ab8b8e1e292b83a3fd9a698e9093ed5e9125bc9 Mon Sep 17 00:00:00 2001 From: Stian Gustavsson Date: Mon, 6 Jan 2025 11:32:54 +0100 Subject: [PATCH 3/3] - Fikset visning av kildedata i Tenor komponent, grunnet manglende suspense handling (#3711) --- .../js/src/pages/tenorSoek/resultatVisning/TabsVisning.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/dolly-frontend/src/main/js/src/pages/tenorSoek/resultatVisning/TabsVisning.tsx b/apps/dolly-frontend/src/main/js/src/pages/tenorSoek/resultatVisning/TabsVisning.tsx index 3724e2ed864..16545afd3df 100644 --- a/apps/dolly-frontend/src/main/js/src/pages/tenorSoek/resultatVisning/TabsVisning.tsx +++ b/apps/dolly-frontend/src/main/js/src/pages/tenorSoek/resultatVisning/TabsVisning.tsx @@ -1,7 +1,8 @@ import { Tabs } from '@navikt/ds-react' -import React, { lazy } from 'react' +import React, { lazy, Suspense } from 'react' import styled from 'styled-components' import { FileCodeIcon, KeyVerticalIcon } from '@navikt/aksel-icons' +import Loading from '@/components/ui/loading/Loading' const TabsVisningFormatter = styled.div` width: 100%; @@ -56,7 +57,9 @@ export const TabsVisning = ({ children, kildedata }: any) => { marginBottom: '15px', }} > - + }> + +