Skip to content

Commit

Permalink
Merge branch 'master' into feature/rydde-apper-relatert-til-Altinn2
Browse files Browse the repository at this point in the history
  • Loading branch information
krharum committed Jan 6, 2025
2 parents 5c6e2eb + 3ab8b8e commit f61ea98
Show file tree
Hide file tree
Showing 55 changed files with 217 additions and 168 deletions.
7 changes: 4 additions & 3 deletions apps/adresse-service/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 4 additions & 3 deletions apps/amelding-service/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 4 additions & 3 deletions apps/brreg-stub/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 4 additions & 3 deletions apps/bruker-service/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 2 additions & 3 deletions apps/dolly-backend/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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%;
Expand Down Expand Up @@ -56,7 +57,9 @@ export const TabsVisning = ({ children, kildedata }: any) => {
marginBottom: '15px',
}}
>
<PrettyCode language={'json'} codeString={kildedataPretty} wrapLongLines />
<Suspense fallback={<Loading label={'Laster kildedata...'} />}>
<PrettyCode language={'json'} codeString={kildedataPretty} wrapLongLines />
</Suspense>
</Tabs.Panel>
</Tabs>
</TabsVisningFormatter>
Expand Down
7 changes: 4 additions & 3 deletions apps/dolly-frontend/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 4 additions & 3 deletions apps/dollystatus/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions apps/faste-data-frontend/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 4 additions & 3 deletions apps/generer-navn-service/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading

0 comments on commit f61ea98

Please sign in to comment.