Skip to content

Commit 6a7af1e

Browse files
author
Toby McLaughlin
committed
Update for 6.3 and open X-Pack
1 parent 3fb0553 commit 6a7af1e

2 files changed

Lines changed: 5 additions & 24 deletions

File tree

‎.env‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
TAG=6.2.1
2-
ELASTIC_VERSION=6.2.1
3-
ELASTIC_PASSWORD=changeme
1+
TAG=6.3.0
2+
ELASTIC_VERSION=6.3.0

‎docker-compose.yml‎

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,22 @@ services:
1818
# ELASTIC_VERSION=6.0.0-beta1 TAG=6.0.0-beta1-3eab5b40 docker-compose up
1919
#
2020
elasticsearch:
21-
image: docker.elastic.co/elasticsearch/elasticsearch-platinum:${TAG}
21+
image: docker.elastic.co/elasticsearch/elasticsearch:${TAG}
2222
container_name: elasticsearch
23-
environment: ['http.host=0.0.0.0', 'transport.host=127.0.0.1', 'ELASTIC_PASSWORD=${ELASTIC_PASSWORD}']
23+
environment: ['http.host=0.0.0.0', 'transport.host=127.0.0.1']
2424
ports: ['127.0.0.1:9200:9200']
2525
networks: ['stack']
2626

2727
kibana:
2828
image: docker.elastic.co/kibana/kibana:${TAG}
2929
container_name: kibana
30-
environment:
31-
- ELASTICSEARCH_USERNAME=kibana
32-
- ELASTICSEARCH_PASSWORD=${ELASTIC_PASSWORD}
3330
ports: ['127.0.0.1:5601:5601']
3431
networks: ['stack']
3532
depends_on: ['elasticsearch']
3633

3734
logstash:
3835
image: docker.elastic.co/logstash/logstash:${TAG}
3936
container_name: logstash
40-
environment:
41-
- 'xpack.monitoring.elasticsearch.password=${ELASTIC_PASSWORD}'
4237
# Provide a simple pipeline configuration for Logstash with a bind-mounted file.
4338
volumes:
4439
- ./config/logstash.conf:/usr/share/logstash/pipeline/logstash.conf
@@ -48,7 +43,6 @@ services:
4843
auditbeat:
4944
image: docker.elastic.co/beats/auditbeat:${TAG}
5045
container_name: auditbeat
51-
command: -e -E 'output.elasticsearch.password=${ELASTIC_PASSWORD}'
5246
cap_add: ['AUDIT_CONTROL', 'AUDIT_READ']
5347
# Auditbeat must run in the main process namespace.
5448
pid: host
@@ -58,7 +52,6 @@ services:
5852
filebeat:
5953
image: docker.elastic.co/beats/filebeat:${TAG}
6054
container_name: filebeat
61-
command: -e -E 'output.elasticsearch.password=${ELASTIC_PASSWORD}'
6255
# If the host system has logs at "/var/log", mount them at "/mnt/log"
6356
# inside the container, where Filebeat can find them.
6457
# volumes: ['/var/log:/mnt/log:ro']
@@ -68,7 +61,6 @@ services:
6861
heartbeat:
6962
image: docker.elastic.co/beats/heartbeat:${TAG}
7063
container_name: heartbeat
71-
command: -e -E 'output.elasticsearch.password=${ELASTIC_PASSWORD}'
7264
networks: ['stack']
7365
depends_on: ['elasticsearch', 'setup_heartbeat']
7466

@@ -83,7 +75,6 @@ services:
8375
# - /proc:/hostfs/proc:ro
8476
# - /sys/fs/cgroup:/hostfs/sys/fs/cgroup:ro
8577
# - /:/hostfs:ro
86-
command: -e -E 'output.elasticsearch.password=${ELASTIC_PASSWORD}' # -system.hostfs=/hostfs
8778
networks: ['stack']
8879
depends_on: ['elasticsearch', 'setup_metricbeat']
8980

@@ -101,15 +92,14 @@ services:
10192
# that the other containers are connected to, and thus can't resolve the
10293
# hostname "elasticsearch". Instead, we'll tell it to find Elasticsearch
10394
# on "localhost", which is the Docker host machine in this context.
104-
command: -e -E 'output.elasticsearch.hosts=["localhost:9200"]' -E 'output.elasticsearch.password=${ELASTIC_PASSWORD}'
95+
command: -e -E 'output.elasticsearch.hosts=["localhost:9200"]'
10596
depends_on: ['elasticsearch']
10697

10798
apm_server:
10899
image: docker.elastic.co/apm/apm-server:${TAG}
109100
container_name: apm_server
110101
ports: ['127.0.0.1:8200:8200']
111102
networks: ['stack']
112-
command: -e -E 'output.elasticsearch.password=${ELASTIC_PASSWORD}'
113103
depends_on: ['elasticsearch','setup_apm_server']
114104

115105
# Run a short-lived container to set up Logstash.
@@ -120,7 +110,6 @@ services:
120110
# The script may have CR/LF line endings if using Docker for Windows, so
121111
# make sure that they don't confuse Bash.
122112
command: ['/bin/bash', '-c', 'cat /usr/local/bin/setup-logstash.sh | tr -d "\r" | bash']
123-
environment: ['ELASTIC_PASSWORD=${ELASTIC_PASSWORD}']
124113
networks: ['stack']
125114
depends_on: ['elasticsearch']
126115

@@ -129,7 +118,6 @@ services:
129118
container_name: setup_kibana
130119
volumes: ['./scripts/setup-kibana.sh:/usr/local/bin/setup-kibana.sh:ro']
131120
command: ['/bin/bash', '-c', 'cat /usr/local/bin/setup-kibana.sh | tr -d "\r" | bash']
132-
environment: ['ELASTIC_PASSWORD=${ELASTIC_PASSWORD}']
133121
networks: ['stack']
134122
depends_on: ['elasticsearch']
135123

@@ -138,7 +126,6 @@ services:
138126
container_name: setup_auditbeat
139127
volumes: ['./scripts/setup-beat.sh:/usr/local/bin/setup-beat.sh:ro']
140128
command: ['/bin/bash', '-c', 'cat /usr/local/bin/setup-beat.sh | tr -d "\r" | bash -s auditbeat']
141-
environment: ['ELASTIC_PASSWORD=${ELASTIC_PASSWORD}']
142129
networks: ['stack']
143130
depends_on: ['kibana']
144131

@@ -147,7 +134,6 @@ services:
147134
container_name: setup_filebeat
148135
volumes: ['./scripts/setup-beat.sh:/usr/local/bin/setup-beat.sh:ro']
149136
command: ['/bin/bash', '-c', 'cat /usr/local/bin/setup-beat.sh | tr -d "\r" | bash -s filebeat']
150-
environment: ['ELASTIC_PASSWORD=${ELASTIC_PASSWORD}']
151137
networks: ['stack']
152138
depends_on: ['kibana']
153139

@@ -156,7 +142,6 @@ services:
156142
container_name: setup_heartbeat
157143
volumes: ['./scripts/setup-beat.sh:/usr/local/bin/setup-beat.sh:ro']
158144
command: ['/bin/bash', '-c', 'cat /usr/local/bin/setup-beat.sh | tr -d "\r" | bash -s heartbeat']
159-
environment: ['ELASTIC_PASSWORD=${ELASTIC_PASSWORD}']
160145
networks: ['stack']
161146
depends_on: ['kibana']
162147

@@ -165,7 +150,6 @@ services:
165150
container_name: setup_metricbeat
166151
volumes: ['./scripts/setup-beat.sh:/usr/local/bin/setup-beat.sh:ro']
167152
command: ['/bin/bash', '-c', 'cat /usr/local/bin/setup-beat.sh | tr -d "\r" | bash -s metricbeat']
168-
environment: ['ELASTIC_PASSWORD=${ELASTIC_PASSWORD}']
169153
networks: ['stack']
170154
depends_on: ['kibana']
171155

@@ -175,7 +159,6 @@ services:
175159
cap_add: ['NET_RAW', 'NET_ADMIN']
176160
volumes: ['./scripts/setup-beat.sh:/usr/local/bin/setup-beat.sh:ro']
177161
command: ['/bin/bash', '-c', 'cat /usr/local/bin/setup-beat.sh | tr -d "\r" | bash -s packetbeat']
178-
environment: ['ELASTIC_PASSWORD=${ELASTIC_PASSWORD}']
179162
networks: ['stack']
180163
depends_on: ['kibana']
181164

@@ -184,7 +167,6 @@ services:
184167
container_name: setup_apm_server
185168
volumes: ['./scripts/setup-beat.sh:/usr/local/bin/setup-beat.sh:ro']
186169
command: ['/bin/bash', '-c', 'cat /usr/local/bin/setup-beat.sh | tr -d "\r" | bash -s apm-server']
187-
environment: ['ELASTIC_PASSWORD=${ELASTIC_PASSWORD}']
188170
networks: ['stack']
189171
depends_on: ['elasticsearch','kibana']
190172

0 commit comments

Comments
 (0)