From 9f81fcdd2f00d19374a1332eb0ce54572589ba75 Mon Sep 17 00:00:00 2001
From: David <david.kaltschmidt@gmail.com>
Date: Tue, 12 Nov 2019 09:45:12 +0100
Subject: [PATCH] Devenv: fix kibana in elastic7 docker block (#20308)

* Devenv: fix kibana in elastic7 docker block

* Remove network host mode for metricbeat container
---
 devenv/docker/blocks/elastic7/docker-compose.yaml | 3 ++-
 devenv/docker/blocks/elastic7/metricbeat.yml      | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/devenv/docker/blocks/elastic7/docker-compose.yaml b/devenv/docker/blocks/elastic7/docker-compose.yaml
index bbf40cbea59..d4d981c6b55 100644
--- a/devenv/docker/blocks/elastic7/docker-compose.yaml
+++ b/devenv/docker/blocks/elastic7/docker-compose.yaml
@@ -26,7 +26,6 @@
 
   metricbeat7:
     image: docker.elastic.co/beats/metricbeat-oss:7.0.0
-    network_mode: host
     command: metricbeat -e -strict.perms=false
     user: root
     volumes:
@@ -37,5 +36,7 @@
     image: docker.elastic.co/kibana/kibana-oss:7.0.0
     ports:
       - "5601:5601"
+    links:
+      - elasticsearch7
     environment:
       ELASTICSEARCH_HOSTS: http://elasticsearch7:9200
diff --git a/devenv/docker/blocks/elastic7/metricbeat.yml b/devenv/docker/blocks/elastic7/metricbeat.yml
index 4788c0cdd9a..ee635be8d70 100644
--- a/devenv/docker/blocks/elastic7/metricbeat.yml
+++ b/devenv/docker/blocks/elastic7/metricbeat.yml
@@ -28,11 +28,11 @@ processors:
   - add_cloud_metadata: ~
 
 output.elasticsearch:
-  hosts: ["localhost:12200"]
+  hosts: ["elasticsearch7:9200"]
   index: "metricbeat-%{+yyyy.MM.dd}"
 
 setup.template.name: "metricbeat"
 setup.template.pattern: "metricbeat-*"
 setup.template.settings:
   index.number_of_shards: 1
-  index.number_of_replicas: 1
\ No newline at end of file
+  index.number_of_replicas: 1