Skip to content

Commit 1148fb7

Browse files
espenwaagaespenwaaga
committed
Chore: Oppdatere healtcheck for samtlige applikasjoner. Starter fortere, og blir unhealty senere
1 parent 2193bab commit 1148fb7

File tree

1 file changed

+62
-42
lines changed

1 file changed

+62
-42
lines changed

‎resources/pipeline/compose.yml‎

Lines changed: 62 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ services:
3232
interval: 10s
3333
timeout: 5s
3434
retries: 10
35+
start_period: 15s
3536
postgres:
3637
image: $POSTGRES_IMAGE
3738
container_name: postgres
@@ -48,9 +49,9 @@ services:
4849
healthcheck:
4950
test: [ "CMD-SHELL", "while ! /usr/bin/pg_isready -U admin -t 1; do sleep 1; done" ]
5051
interval: 2s
51-
retries: 1
52+
retries: 10
5253
timeout: 30s
53-
start_period: 10s
54+
start_period: 5s
5455
vtp:
5556
<<: *default-konfigurasjon
5657
image: $VTP_IMAGE
@@ -71,12 +72,13 @@ services:
7172
- "127.0.0.1:8389:8389"
7273
healthcheck:
7374
test: ["CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8060/rest/isReady"]
74-
interval: 5s
75+
interval: 3s
7576
timeout: 5s
76-
retries: 10
77+
retries: 20
78+
start_period: 5s
7779
depends_on:
7880
kafka:
79-
condition: service_started
81+
condition: service_healthy
8082
fptilgang:
8183
<<: *default-konfigurasjon
8284
image: $FPTILGANG_IMAGE
@@ -108,9 +110,10 @@ services:
108110
- "127.0.0.1:8050:8080"
109111
healthcheck:
110112
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fptilgang/internal/health/isReady" ]
111-
interval: 5s
113+
interval: 3s
112114
timeout: 5s
113-
retries: 10
115+
retries: 20
116+
start_period: 4s
114117
depends_on:
115118
audit.nais:
116119
condition: service_started
@@ -134,9 +137,10 @@ services:
134137
- "127.0.0.1:8015:8080"
135138
healthcheck:
136139
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fpabakus/internal/health/isReady" ]
137-
interval: 5s
140+
interval: 3s
138141
timeout: 5s
139-
retries: 10
142+
retries: 30
143+
start_period: 5s
140144
depends_on:
141145
audit.nais:
142146
condition: service_started
@@ -160,9 +164,10 @@ services:
160164
- "127.0.0.1:8016:8080"
161165
healthcheck:
162166
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fpkalkulus/internal/health/isReady" ]
163-
interval: 5s
167+
interval: 3s
164168
timeout: 5s
165-
retries: 10
169+
retries: 20
170+
start_period: 5s
166171
depends_on:
167172
audit.nais:
168173
condition: service_started
@@ -198,9 +203,10 @@ services:
198203
#- "127.0.0.1:5005:5005"
199204
healthcheck:
200205
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fpsak/internal/health/isReady" ]
201-
interval: 10s
206+
interval: 3s
202207
timeout: 5s
203208
retries: 30
209+
start_period: 5s
204210
depends_on:
205211
audit.nais:
206212
condition: service_started
@@ -417,9 +423,10 @@ services:
417423
- "127.0.0.1:8090:8080"
418424
healthcheck:
419425
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fpfordel/internal/health/isReady" ]
420-
interval: 15s
421-
timeout: 10s
422-
retries: 10
426+
interval: 3s
427+
timeout: 5s
428+
retries: 30
429+
start_period: 10s
423430
depends_on:
424431
oracle:
425432
condition: service_healthy
@@ -447,9 +454,10 @@ services:
447454
- "127.0.0.1:8010:8080"
448455
healthcheck:
449456
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fpformidling/internal/health/isReady" ]
450-
interval: 5s
457+
interval: 3s
451458
timeout: 5s
452-
retries: 10
459+
retries: 30
460+
start_period: 5s
453461
depends_on:
454462
vtp:
455463
condition: service_started
@@ -470,9 +478,10 @@ services:
470478
- "127.0.0.1:8291:8080"
471479
healthcheck:
472480
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/actuator/info" ]
473-
interval: 5s
481+
interval: 3s
474482
timeout: 5s
475-
retries: 10
483+
retries: 20
484+
start_period: 5s
476485
fpoppdrag:
477486
<<: *default-konfigurasjon
478487
image: $FPOPPDRAG_IMAGE
@@ -490,9 +499,10 @@ services:
490499
- "127.0.0.1:8070:8080"
491500
healthcheck:
492501
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fpoppdrag/internal/health/isReady" ]
493-
interval: 5s
502+
interval: 3s
494503
timeout: 5s
495-
retries: 10
504+
retries: 20
505+
start_period: 5s
496506
depends_on:
497507
oracle:
498508
condition: service_healthy
@@ -528,14 +538,17 @@ services:
528538
- "127.0.0.1:8030:8080"
529539
healthcheck:
530540
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fptilbake/internal/health/isReady" ]
531-
interval: 5s
541+
interval: 3s
532542
timeout: 5s
533-
retries: 10
543+
retries: 30
544+
start_period: 5s
534545
depends_on:
535546
oracle:
536547
condition: service_healthy
537548
vtp:
538549
condition: service_healthy
550+
kafka:
551+
condition: service_started
539552
fpoppdrag:
540553
condition: service_started
541554
fprisk:
@@ -556,9 +569,10 @@ services:
556569
- "127.0.0.1:8075:8080"
557570
healthcheck:
558571
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fprisk/internal/health/isReady" ]
559-
interval: 5s
572+
interval: 3s
560573
timeout: 5s
561-
retries: 10
574+
retries: 30
575+
start_period: 5s
562576
depends_on:
563577
oracle:
564578
condition: service_healthy
@@ -581,9 +595,10 @@ services:
581595
- "127.0.0.1:8065:8080"
582596
healthcheck:
583597
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fpabonnent/internal/health/isReady" ]
584-
interval: 5s
598+
interval: 3s
585599
timeout: 5s
586-
retries: 10
600+
retries: 30
601+
start_period: 5s
587602
depends_on:
588603
oracle:
589604
condition: service_healthy
@@ -609,9 +624,10 @@ services:
609624
- "127.0.0.1:8071:8080"
610625
healthcheck:
611626
test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8080/fplos/internal/health/isReady"]
612-
interval: 5s
627+
interval: 3s
613628
timeout: 5s
614-
retries: 10
629+
retries: 30
630+
start_period: 5s
615631
depends_on:
616632
oracle:
617633
condition: service_healthy
@@ -633,9 +649,10 @@ services:
633649
- "127.0.0.1:8889:8080"
634650
healthcheck:
635651
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fpoversikt/internal/health/isReady" ]
636-
interval: 15s
637-
timeout: 10s
638-
retries: 10
652+
interval: 3s
653+
timeout: 5s
654+
retries: 30
655+
start_period: 5s
639656
depends_on:
640657
postgres:
641658
condition: service_healthy
@@ -658,9 +675,10 @@ services:
658675
- "127.0.0.1:9191:8080"
659676
healthcheck:
660677
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fpgrunndata/internal/health/isReady" ]
661-
interval: 5s
662-
timeout: 10s
663-
retries: 10
678+
interval: 3s
679+
timeout: 5s
680+
retries: 20
681+
start_period: 5s
664682
fpsoknad:
665683
<<: *default-konfigurasjon
666684
image: $FPSOKNAD_IMAGE
@@ -678,9 +696,10 @@ services:
678696
- "127.0.0.1:8999:8080"
679697
healthcheck:
680698
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fpsoknad/internal/health/isReady" ]
681-
interval: 15s
682-
timeout: 10s
683-
retries: 10
699+
interval: 3s
700+
timeout: 5s
701+
retries: 30
702+
start_period: 5s
684703
depends_on:
685704
vtp:
686705
condition: service_healthy
@@ -719,9 +738,10 @@ services:
719738
- "127.0.0.1:8040:8080"
720739
healthcheck:
721740
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fpinntektsmelding/internal/health/isReady" ]
722-
interval: 15s
723-
timeout: 10s
724-
retries: 10
741+
interval: 3s
742+
timeout: 5s
743+
retries: 30
744+
start_period: 5s
725745
depends_on:
726746
postgres:
727747
condition: service_healthy
@@ -1151,5 +1171,5 @@ services:
11511171
test: ["CMD-SHELL", "nc -z kafka 9094 || exit 1"]
11521172
interval: 1s
11531173
timeout: 1s
1154-
retries: 10
1174+
retries: 20
11551175
start_period: 2s

0 commit comments

Comments
 (0)