From fb84ad8f6b16779d5476cbcf51450dc479408ce2 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Fri, 29 May 2020 16:23:39 +0100 Subject: [PATCH] fix: apm-server running issues See https://github.com/elastic/beats/issues/18858 --- scripts/modules/elastic_stack.py | 3 +++ scripts/tests/localsetup_tests.py | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/scripts/modules/elastic_stack.py b/scripts/modules/elastic_stack.py index c3f5217b1..bf0ef8986 100644 --- a/scripts/modules/elastic_stack.py +++ b/scripts/modules/elastic_stack.py @@ -460,6 +460,9 @@ def _content(self): cap_drop=["ALL"], command=command, depends_on=self.depends_on, + environment=[ + "BEATS_STRICT_PERM=false" # Workaround https://github.com/elastic/beats/issues/18858 + ], healthcheck=curl_healthcheck(self.SERVICE_PORT, path=healthcheck_path), labels=["co.elastic.apm.stack-version=" + self.version], ports=ports diff --git a/scripts/tests/localsetup_tests.py b/scripts/tests/localsetup_tests.py index bb5c92248..33a87fe6e 100644 --- a/scripts/tests/localsetup_tests.py +++ b/scripts/tests/localsetup_tests.py @@ -688,6 +688,9 @@ def test_start_6_2_default(self): depends_on: elasticsearch: {condition: service_healthy} kibana: {condition: service_healthy} + environment: [ + BEATS_STRICT_PERM=false + ] healthcheck: interval: 10s retries: 12 @@ -766,6 +769,9 @@ def test_start_6_3_default(self): depends_on: elasticsearch: {condition: service_healthy} kibana: {condition: service_healthy} + environment: [ + BEATS_STRICT_PERM=false + ] healthcheck: interval: 10s retries: 12 @@ -867,6 +873,9 @@ def test_start_master_default(self): depends_on: elasticsearch: {condition: service_healthy} kibana: {condition: service_healthy} + environment: [ + BEATS_STRICT_PERM=false + ] healthcheck: interval: 10s retries: 12