Skip to content

Commit 7a9bc0f

Browse files
drizzenticdrizzentic
authored
Merge pull request #339 from jembi/fix-minio-clickhouse-network
Add datalake network to clickhouse
2 parents bb22490 + 6655f1c commit 7a9bc0f

File tree

9 files changed

+18
-31
lines changed

9 files changed

+18
-31
lines changed

‎analytics-datastore-clickhouse/docker-compose.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ services:
2222
public:
2323
reverse-proxy:
2424
default:
25+
datalake:
2526

2627

2728
volumes:

‎datalake/docker-compose.cluster.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ services:
1010
minio-02:
1111
image: ${MINIO_IMAGE}
1212
entrypoint: sh
13-
command: -c 'mkdir -p /data1/loki /data2/loki && minio server --console-address ":9001" http://minio-0{1...4}/data{1...2}'
13+
command: -c 'mkdir -p /data1/loki /data2/loki && minio server --console-address ":9001" --address ":9090" http://minio-0{1...4}/data{1...2}'
1414
environment:
1515
MINIO_ROOT_USER: ${MO_SECURITY_ADMIN_USER}
1616
MINIO_ROOT_PASSWORD: ${MO_SECURITY_ADMIN_PASSWORD}
1717
healthcheck:
18-
test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/live" ]
18+
test: [ "CMD", "curl", "-f", "http://localhost:9090/minio/health/live" ]
1919
interval: 30s
2020
timeout: 20s
2121
retries: 3
@@ -32,12 +32,12 @@ services:
3232
minio-03:
3333
image: ${MINIO_IMAGE}
3434
entrypoint: sh
35-
command: -c 'mkdir -p /data1/loki /data2/loki && minio server --console-address ":9001" http://minio-0{1...4}/data{1...2}'
35+
command: -c 'mkdir -p /data1/loki /data2/loki && minio server --console-address ":9001" --address ":9090" http://minio-0{1...4}/data{1...2}'
3636
environment:
3737
MINIO_ROOT_USER: ${MO_SECURITY_ADMIN_USER}
3838
MINIO_ROOT_PASSWORD: ${MO_SECURITY_ADMIN_PASSWORD}
3939
healthcheck:
40-
test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/live" ]
40+
test: [ "CMD", "curl", "-f", "http://localhost:9090/minio/health/live" ]
4141
interval: 30s
4242
timeout: 20s
4343
retries: 3
@@ -54,12 +54,12 @@ services:
5454
minio-04:
5555
image: ${MINIO_IMAGE}
5656
entrypoint: sh
57-
command: -c 'mkdir -p /data1/loki /data2/loki && minio server --console-address ":9001" http://minio-0{1...4}/data{1...2}'
57+
command: -c 'mkdir -p /data1/loki /data2/loki && minio server --console-address ":9001" --address ":9090" http://minio-0{1...4}/data{1...2}'
5858
environment:
5959
MINIO_ROOT_USER: ${MO_SECURITY_ADMIN_USER}
6060
MINIO_ROOT_PASSWORD: ${MO_SECURITY_ADMIN_PASSWORD}
6161
healthcheck:
62-
test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/live" ]
62+
test: [ "CMD", "curl", "-f", "http://localhost:9090/minio/health/live" ]
6363
interval: 30s
6464
timeout: 20s
6565
retries: 3

‎monitoring/loki/loki-config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ storage_config:
3939
resync_interval: 30s
4040
shared_store: s3
4141
aws:
42-
s3: http://${MO_SECURITY_ADMIN_USER}:${MO_SECURITY_ADMIN_PASSWORD}@minio-01.:9000/loki
42+
s3: http://${MO_SECURITY_ADMIN_USER}:${MO_SECURITY_ADMIN_PASSWORD}@minio-01.:9090/loki
4343
s3forcepathstyle: true
4444

4545
compactor:

‎openfn/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ services:
3131
- WORKER_SECRET=${OPENFN_WORKER_SECRET}
3232
- KAFKA_TRIGGERS_ENABLED=${OPENFN_KAFKA_TRIGGERS_ENABLED}
3333
healthcheck:
34-
test: '${ DOCKER_WEB_HEALTHCHECK_TEST:-curl localhost:4000/health_check}'
34+
test: '${DOCKER_WEB_HEALTHCHECK_TEST:-curl localhost:4000/health_check}'
3535
interval: '10s'
3636
timeout: '3s'
3737
start_period: '5s'

‎test/cucumber/features/cluster-mode/clickhouse.cluster.feature‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ Feature: Analytics Datastore Clickhouse?
66
When I launch the platform with params
77
Then The service "analytics-datastore-clickhouse-01" should be started with 1 replica
88
And The service "analytics-datastore-clickhouse-01" should be connected to the networks
9-
| clickhouse_public | clickhouse_default |
9+
| clickhouse_public | clickhouse_default | minio_public |
1010
And The service "analytics-datastore-clickhouse-02" should be started with 1 replica
1111
And The service "analytics-datastore-clickhouse-02" should be connected to the networks
12-
| clickhouse_public | clickhouse_default |
12+
| clickhouse_public | clickhouse_default | minio_public |
1313
And The service "analytics-datastore-clickhouse-03" should be started with 1 replica
1414
And The service "analytics-datastore-clickhouse-03" should be connected to the networks
15-
| clickhouse_public | clickhouse_default |
15+
| clickhouse_public | clickhouse_default | minio_public |
1616
And The service "analytics-datastore-clickhouse-04" should be started with 1 replica
1717
And The service "analytics-datastore-clickhouse-04" should be connected to the networks
18-
| clickhouse_public | clickhouse_default |
18+
| clickhouse_public | clickhouse_default | minio_public |
1919
And The service "clickhouse-config-importer" should be removed
2020
And There should be 4 services
2121

@@ -30,4 +30,4 @@ Feature: Analytics Datastore Clickhouse?
3030
And There should be 0 volume
3131
And There should be 0 config
3232
And There should not be network
33-
| clickhouse_public |
33+
| clickhouse_public | minio_public |

‎test/cucumber/features/cluster-mode/monitoring.feature‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,7 @@ Feature: Monitoring package?
1414
And The service "node-exporter" should be started with 3 replica
1515
And The service "loki" should be started with 1 replica
1616
And The service "promtail" should be started with 3 replica
17-
And The service "minio-01" should be started with 1 replica
18-
And The service "minio-01" should be connected to the networks
1917
| reverse-proxy_public | monitoring_default |
20-
And The service "minio-02" should be started with 1 replica
21-
And The service "minio-03" should be started with 1 replica
22-
And The service "minio-04" should be started with 1 replica
2318
And The service "prometheus_backup" should be started with 1 replica
2419
And The service "prometheus_backup" should be connected to the networks
2520
| prometheus_public | monitoring_default |
@@ -33,10 +28,6 @@ Feature: Monitoring package?
3328
And The service "node-exporter" should be removed
3429
And The service "loki" should be removed
3530
And The service "promtail" should be removed
36-
And The service "minio-01" should be removed
37-
And The service "minio-02" should be removed
38-
And The service "minio-03" should be removed
39-
And The service "minio-04" should be removed
4031
And The service "prometheus_backup" should be removed
4132
And There should be 0 service
4233
And There should be 0 volume

‎test/cucumber/features/single-mode/clickhouse.feature‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Feature: Analytics Datastore Clickhouse?
66
When I launch the platform with params
77
Then The service "analytics-datastore-clickhouse" should be started with 1 replica
88
And The service "analytics-datastore-clickhouse" should be connected to the networks
9-
| clickhouse_public | clickhouse_default |
9+
| clickhouse_public | clickhouse_default | minio_public |
1010
And The service "clickhouse-config-importer" should be removed
1111
And There should be 1 service
1212
And There should be 1 volume
@@ -19,4 +19,4 @@ Feature: Analytics Datastore Clickhouse?
1919
And There should be 0 volume
2020
And There should be 0 config
2121
And There should not be network
22-
| clickhouse_public |
22+
| clickhouse_public | minio_public |

‎test/cucumber/features/single-mode/monitoring.feature‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,11 @@ Feature: Monitoring package?
1111
And The service "cadvisor" should have healthy containers
1212
And The service "loki" should be started with 1 replica
1313
And The service "promtail" should be started with 1 replica
14-
And The service "minio-01" should be started with 1 replica
1514
And The service "grafana" should be connected to the networks
1615
| reverse-proxy_public | keycloak_public | monitoring_default |
1716
And The service "prometheus" should be connected to the networks
1817
| prometheus_public | monitoring_default |
19-
And The service "minio-01" should be connected to the networks
20-
| reverse-proxy_public | monitoring_default |
21-
And There should be 6 volumes
18+
And There should be 3 volumes
2219

2320
Scenario: Destroy Monitoring package
2421
Given I use parameters "package destroy -n=monitoring --dev --env-file=.env.local"
@@ -29,7 +26,6 @@ Feature: Monitoring package?
2926
And The service "node-exporter" should be removed
3027
And The service "loki" should be removed
3128
And The service "promtail" should be removed
32-
And The service "minio-01" should be removed
3329
And There should be 0 service
3430
And There should be 0 volume
3531
And There should be 0 config

‎test/cucumber/features/single-mode/recipe.feature‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,9 @@ Feature: CDR-DW recipe?
2828
And The service "cadvisor" should have healthy containers
2929
And The service "loki" should be started with 1 replica
3030
And The service "promtail" should be started with 1 replica
31-
And The service "minio-01" should be started with 1 replica
3231
And The service "dashboard-visualiser-superset" should be started with 1 replica
3332
And The service "analytics-datastore-clickhouse" should be started with 1 replica
34-
And The service "openfn" should be started with 1 replica
33+
And The service "minio-01" should be started with 1 replica
3534

3635
Scenario: Send Fhir bundle and store the clinical data in the Fhir datastore, the patient info in the CR
3736
Given I have configured the cdr

0 commit comments

Comments
 (0)