From fa91462d53345720d4868697b3c53af9831bb967 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 11 Nov 2019 17:06:03 +0100 Subject: [PATCH] Devenv: fix connection in elastic 5 and 6 blocks (#20304) * Docker block: fix failed connection in elastic5 block * Fix docker block elastic6 data link * Fix elastic7 datagenerator --- devenv/docker/blocks/elastic5/docker-compose.yaml | 4 ++-- devenv/docker/blocks/elastic6/docker-compose.yaml | 6 ++++-- devenv/docker/blocks/elastic7/docker-compose.yaml | 6 ++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/devenv/docker/blocks/elastic5/docker-compose.yaml b/devenv/docker/blocks/elastic5/docker-compose.yaml index 3a2ef39faba..3a3afa62fc8 100644 --- a/devenv/docker/blocks/elastic5/docker-compose.yaml +++ b/devenv/docker/blocks/elastic5/docker-compose.yaml @@ -9,7 +9,7 @@ image: grafana/fake-data-gen links: - elasticsearch5 - # network_mode: bridge environment: + FD_SERVER: elasticsearch5 FD_DATASOURCE: elasticsearch - FD_PORT: 10200 + FD_PORT: 9200 diff --git a/devenv/docker/blocks/elastic6/docker-compose.yaml b/devenv/docker/blocks/elastic6/docker-compose.yaml index 4d4f2ca898f..13d29569bad 100644 --- a/devenv/docker/blocks/elastic6/docker-compose.yaml +++ b/devenv/docker/blocks/elastic6/docker-compose.yaml @@ -9,10 +9,12 @@ fake-elastic6-data: image: grafana/fake-data-gen - network_mode: bridge + links: + - elasticsearch6 environment: + FD_SERVER: elasticsearch6 FD_DATASOURCE: elasticsearch6 - FD_PORT: 11200 + FD_PORT: 9200 filebeat6: image: docker.elastic.co/beats/filebeat-oss:6.7.1 diff --git a/devenv/docker/blocks/elastic7/docker-compose.yaml b/devenv/docker/blocks/elastic7/docker-compose.yaml index 45e2836f870..bbf40cbea59 100644 --- a/devenv/docker/blocks/elastic7/docker-compose.yaml +++ b/devenv/docker/blocks/elastic7/docker-compose.yaml @@ -9,10 +9,12 @@ fake-elastic7-data: image: grafana/fake-data-gen - network_mode: bridge + links: + - elasticsearch7 environment: + FD_SERVER: elasticsearch7 FD_DATASOURCE: elasticsearch7 - FD_PORT: 12200 + FD_PORT: 9200 filebeat7: image: docker.elastic.co/beats/filebeat-oss:7.0.0