Skip to content

Commit

Permalink
fix: apm-server running issues
Browse files Browse the repository at this point in the history
  • Loading branch information
v1v committed May 29, 2020
1 parent a261d48 commit fb84ad8
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
3 changes: 3 additions & 0 deletions scripts/modules/elastic_stack.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions scripts/tests/localsetup_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit fb84ad8

Please sign in to comment.