Skip to content

Commit 43bfbb9

Browse files
antoinebhsantoinebhs
authored
Move logstash to Kibana profile (#411)
* Move logstash, socat, logspout to kibana profile. This avoids cluttering elastic search indices with filebeat-* indices when the study profile is started * Use `required: false` introduced in docker compose 2.20.0 to keep the previous behavior even when logspout is in a different profile. To use `required: false`, `condition` is set to its default value `service_started` Signed-off-by: BOUHOURS Antoine <[email protected]>
1 parent c0e7d50 commit 43bfbb9

File tree

6 files changed

+137
-44
lines changed

6 files changed

+137
-44
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ _Everything described in this section is inside the folder `explicit-profiles`._
8080
Here's the summary of the profiles and what services they includes:
8181
| Component \ Service | _(none)_ | merging | study | study-light | dynamic-mapping | dynamic-simulation | suite | import | kibana | pgadmin | metrics |
8282
|---|---|---|---|---|---|---|---|---|---|---|---|
83-
| rabbitmq<br/>postgres<br/>elasticsearch<br/>logstash<br/>socat<br/>logspout | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | |
84-
| kibana | | | | | | | | | ✅ | | |
83+
| rabbitmq<br/>postgres<br/>elasticsearch | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | |
84+
| kibana<br/>logstash<br/>socat<br/>logspout | | | | | | | | | ✅ | | |
8585
| pgadmin | | | | | | | | | | ✅ | |
8686
| apps&#8209;metadata&#8209;server<br/>mock&#8209;user&#8209;service<br/>gateway<br/>actions&#8209;server<br/>case&#8209;server<br/>config&#8209;notification&#8209;server<br/>config&#8209;server<br/>filter&#8209;server<br/>loadflow&#8209;server<br/>network&#8209;conversion&#8209;server<br/>network&#8209;store&#8209;server<br/>report&#8209;server<br/>user&#8209;admin&#8209;server | | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | | |
8787
| griddyna&#8209;app<br/>dynamic&#8209;mapping&#8209;server | | | | | ✅ | ✅ | ✅ | | | | |

‎docker-compose/docker-compose.base.yml‎

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ services:
1818
- $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
1919
- $GRIDSUITE_DATABASES/cases:/cases:Z
2020
depends_on:
21-
- logspout
21+
logspout:
22+
condition: "service_started"
23+
required: false
2224
restart: unless-stopped
2325
environment:
2426
- JAVA_TOOL_OPTIONS=-Xmx576m #deployment: 768m
@@ -49,7 +51,9 @@ services:
4951
- $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
5052
restart: unless-stopped
5153
depends_on:
52-
- logspout
54+
logspout:
55+
condition: "service_started"
56+
required: false
5357
environment:
5458
- JAVA_TOOL_OPTIONS=-Xmx576m
5559
command: --server.port=80 --spring.config.additional-location=/config/
@@ -79,7 +83,9 @@ services:
7983
- $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
8084
restart: unless-stopped
8185
depends_on:
82-
- logspout
86+
logspout:
87+
condition: "service_started"
88+
required: false
8389
command: --server.port=80 --spring.config.additional-location=/config/
8490
sysctls:
8591
- net.ipv4.ip_unprivileged_port_start=0 # for docker < 20.03.0
@@ -109,7 +115,9 @@ services:
109115
- $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
110116
restart: unless-stopped
111117
depends_on:
112-
- logspout
118+
logspout:
119+
condition: "service_started"
120+
required: false
113121
command: --server.port=80 --spring.config.additional-location=/config/
114122
sysctls:
115123
- net.ipv4.ip_unprivileged_port_start=0 # for docker < 20.03.0
@@ -139,7 +147,9 @@ services:
139147
- $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
140148
restart: unless-stopped
141149
depends_on:
142-
- logspout
150+
logspout:
151+
condition: "service_started"
152+
required: false
143153
command: --server.port=80 --spring.config.additional-location=/config/
144154
sysctls:
145155
- net.ipv4.ip_unprivileged_port_start=0 # for docker < 20.03.0
@@ -169,7 +179,9 @@ services:
169179
- $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
170180
restart: unless-stopped
171181
depends_on:
172-
- logspout
182+
logspout:
183+
condition: "service_started"
184+
required: false
173185
environment:
174186
- JAVA_TOOL_OPTIONS=-Xmx1086m #deployment: 1408m
175187
command: --server.port=80 --spring.config.additional-location=/config/
@@ -199,7 +211,9 @@ services:
199211
- $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
200212
restart: unless-stopped
201213
depends_on:
202-
- logspout
214+
logspout:
215+
condition: "service_started"
216+
required: false
203217
environment:
204218
- JAVA_TOOL_OPTIONS=-Xmx768m #deployment: 1408m
205219
command: --server.port=80 --spring.config.additional-location=/config/
@@ -230,7 +244,9 @@ services:
230244
- $PWD/../../k8s/resources/common/config/loadflow-server-config.yml:/home/powsybl/.itools/config.yml:Z
231245
restart: unless-stopped
232246
depends_on:
233-
- logspout
247+
logspout:
248+
condition: "service_started"
249+
required: false
234250
environment:
235251
- JAVA_TOOL_OPTIONS=-Xmx768m #deployment: 1408m
236252
command: --server.port=80 --spring.config.additional-location=/config/
@@ -317,7 +333,9 @@ services:
317333
- $PWD/../allowed-issuers.yml:/config/allowed-issuers.yml:Z
318334
restart: unless-stopped
319335
depends_on:
320-
- logspout
336+
logspout:
337+
condition: "service_started"
338+
required: false
321339
environment:
322340
- JAVA_TOOL_OPTIONS=-Xmx96m
323341
command: --server.port=80 --spring.config.additional-location=/config/
@@ -399,7 +417,9 @@ services:
399417
- CLIENT_LOGOUT_REDIRECT_URI_10=http://localhost:3004/logout-callback
400418
- CLIENT_SILENT_REDIRECT_URI_10=http://localhost:3004/silent-renew-callback
401419
depends_on:
402-
- logspout
420+
logspout:
421+
condition: "service_started"
422+
required: false
403423
restart: unless-stopped
404424

405425
apps-metadata-server:
@@ -421,7 +441,9 @@ services:
421441
- $PWD/../version.json:/opt/bitnami/apache/htdocs/version.json:Z
422442
- $PWD/../gridapps-metadata-httpd.conf:/opt/bitnami/apache/conf/bitnami/bitnami.conf:Z
423443
depends_on:
424-
- logspout
444+
logspout:
445+
condition: "service_started"
446+
required: false
425447
memswap_limit: 128m
426448
deploy:
427449
resources:

‎docker-compose/dynamic-mapping/docker-compose.override.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ services:
1414
- $PWD/../dynamic-mapping/griddyna-app-idpSettings.json:/opt/bitnami/apache/htdocs/griddyna/idpSettings.json:Z
1515
- $PWD/../env.json:/opt/bitnami/apache/htdocs/griddyna/env.json:Z
1616
depends_on:
17-
- logspout
17+
logspout:
18+
condition: "service_started"
19+
required: false
1820
memswap_limit: 128m
1921
deploy:
2022
resources:
@@ -36,7 +38,9 @@ services:
3638
- $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
3739
restart: unless-stopped
3840
depends_on:
39-
- logspout
41+
logspout:
42+
condition: "service_started"
43+
required: false
4044
environment:
4145
- JAVA_TOOL_OPTIONS=-Xmx576m
4246
command: --server.port=80 --spring.config.additional-location=/config/

‎docker-compose/merging/docker-compose.override.yml‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ services:
1414
- $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
1515
restart: unless-stopped
1616
depends_on:
17-
- logspout
17+
logspout:
18+
condition: "service_started"
19+
required: false
1820
environment:
1921
- JAVA_TOOL_OPTIONS=-Xmx576m
2022
command: --server.port=80 --spring.config.additional-location=/config/
@@ -38,7 +40,9 @@ services:
3840
- $PWD/../../k8s/resources/merging/config/merge-notification-server-application.yml:/config/specific/application.yml:Z
3941
- $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
4042
depends_on:
41-
- logspout
43+
logspout:
44+
condition: "service_started"
45+
required: false
4246
environment:
4347
- JAVA_TOOL_OPTIONS=-Xmx96m
4448
command: --server.port=80 --spring.config.additional-location=/config/
@@ -64,7 +68,9 @@ services:
6468
- $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
6569
- $PWD/../../k8s/resources/merging/config/balances-adjustment-server-config.yml:/home/powsybl/.itools/config.yml:Z
6670
depends_on:
67-
- logspout
71+
logspout:
72+
condition: "service_started"
73+
required: false
6874
environment:
6975
- JAVA_TOOL_OPTIONS=-Xmx576m
7076
command: --server.port=80 --spring.config.additional-location=/config/
@@ -89,7 +95,9 @@ services:
8995
- $PWD/../../k8s/resources/merging/config/case-validation-server-application.yml:/config/specific/application.yml:Z
9096
- $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
9197
depends_on:
92-
- logspout
98+
logspout:
99+
condition: "service_started"
100+
required: false
93101
environment:
94102
- JAVA_TOOL_OPTIONS=-Xmx96m
95103
command: --server.port=80 --spring.config.additional-location=/config/
@@ -115,7 +123,9 @@ services:
115123
- $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
116124
restart: unless-stopped
117125
depends_on:
118-
- logspout
126+
logspout:
127+
condition: "service_started"
128+
required: false
119129
environment:
120130
- JAVA_TOOL_OPTIONS=-Xmx96m
121131
command: --server.port=80 --spring.config.additional-location=/config/
@@ -144,7 +154,9 @@ services:
144154
- $PWD/../merging/case-import-job/case-import-job-config.yml:/root/.itools/config.yml:Z
145155
- $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
146156
depends_on:
147-
- logspout
157+
logspout:
158+
condition: "service_started"
159+
required: false
148160
sysctls:
149161
- net.ipv4.ip_unprivileged_port_start=0 # for docker < 20.03.0
150162

@@ -165,7 +177,9 @@ services:
165177
- $PWD/../merging/cgmes-assembling-job/cgmes-assembling-job-config.yml:/root/.itools/config.yml:Z
166178
- $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
167179
depends_on:
168-
- logspout
180+
logspout:
181+
condition: "service_started"
182+
required: false
169183
sysctls:
170184
- net.ipv4.ip_unprivileged_port_start=0 # for docker < 20.03.0
171185

@@ -181,7 +195,9 @@ services:
181195
- $PWD/../merging/gridmerge-app-idpSettings.json:/opt/bitnami/apache/htdocs/gridmerge/idpSettings.json:Z
182196
- $PWD/../env.json:/opt/bitnami/apache/htdocs/gridmerge/env.json:Z
183197
depends_on:
184-
- logspout
198+
logspout:
199+
condition: "service_started"
200+
required: false
185201
memswap_limit: 128m
186202
deploy:
187203
resources:

0 commit comments

Comments
 (0)