Skip to content

Commit

Permalink
fixes to work with 7.0.0-rc1
Browse files Browse the repository at this point in the history
  • Loading branch information
LeeDr committed Mar 27, 2019
1 parent 69b32c7 commit d99cf69
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 10 deletions.
7 changes: 7 additions & 0 deletions config/elasticsearch/elasticsearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ transport.host: 0.0.0.0
# set to 1 to allow single node clusters
# Details: https://github.com/elastic/elasticsearch/pull/17288
discovery.zen.minimum_master_nodes: 1

# the discovery.type setting below eliminated this error
# ERROR: [1] bootstrap checks failed
# [1]: the default discovery settings are unsuitable for production use; at least one of
# [discovery.seed_hosts, discovery.seed_providers, cluster.initial_master_nodes] must be configured
discovery.type: single-node

xpack.license.self_generated.type: trial
xpack.security.enabled: true
xpack.security.http.ssl.enabled: true
Expand Down
3 changes: 0 additions & 3 deletions config/filebeat/filebeat.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
keystore.path: "/usr/share/filebeat/config/filebeat.keystore"

filebeat.config:
prospectors:
path: ${path.config}/prospectors.d/*.yml
reload.enabled: false
modules:
path: ${path.config}/modules.d/*.yml
reload.enabled: false
Expand Down
2 changes: 1 addition & 1 deletion config/kibana/kibana.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

server.name: kibana
server.host: "0"
elasticsearch.url: https://elasticsearch:9200
elasticsearch.hosts: https://elasticsearch:9200
# elasticsearch.password is stored in `kibana.keystore`
elasticsearch.username: kibana
elasticsearch.ssl.certificateAuthorities: ["/certs/ssl/ca/ca.crt"]
Expand Down
4 changes: 2 additions & 2 deletions config/logstash/logstash.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
http.host: 0.0.0.0
# read password from logstash.keystore
xpack.monitoring.elasticsearch.password: ${ELASTIC_PASSWORD}
xpack.monitoring.elasticsearch.url: https://elasticsearch:9200
xpack.monitoring.elasticsearch.hosts: https://elasticsearch:9200
xpack.monitoring.elasticsearch.username: logstash_system
xpack.monitoring.elasticsearch.ssl.ca: /certs/ssl/ca/ca.crt
xpack.monitoring.elasticsearch.ssl.certificate_authority: /certs/ssl/ca/ca.crt
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ services:
image: docker.elastic.co/beats/filebeat:${TAG}
container_name: filebeat
hostname: filebeat
command: -e -c=config/filebeat.yml # -e flag to log to stderr and disable syslog/file output
command: --strict.perms=false -e -c=config/filebeat.yml # -e flag to log to stderr and disable syslog/file output
# If the host system has logs at "/var/log", mount them at "/mnt/log"
# inside the container, where Filebeat can find them.
# volumes: ['/var/log:/mnt/log:ro']
Expand All @@ -120,7 +120,7 @@ services:
image: docker.elastic.co/beats/heartbeat:${TAG}
container_name: heartbeat
hostname: heartbeat
command: -e -c=config/heartbeat.yml # -e flag to log to stderr and disable syslog/file output
command: --strict.perms=false -e -c=config/heartbeat.yml # -e flag to log to stderr and disable syslog/file output
volumes:
- 'hb_config:/usr/share/heartbeat/config'
- 'certs:/certs'
Expand All @@ -146,7 +146,7 @@ services:
# - /proc:/hostfs/proc:ro
# - /sys/fs/cgroup:/hostfs/sys/fs/cgroup:ro
# - /:/hostfs:ro
command: -e -c=config/metricbeat.yml # -e flag to log to stderr and disable syslog/file output
command: --strict.perms=false -e -c=config/metricbeat.yml # -e flag to log to stderr and disable syslog/file output
volumes:
- 'mb_config:/usr/share/metricbeat/config'
- 'certs:/certs'
Expand Down
2 changes: 1 addition & 1 deletion scripts/setup-elasticsearch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
configdir=/usr/share/elasticsearch/config
# Determine if x-pack is enabled
echo "Determining if x-pack is installed..."
if [[ -d /usr/share/elasticsearch/bin/x-pack ]]; then
if [[ -f bin/elasticsearch-users ]]; then
if [[ -n "$ELASTIC_PASSWORD" ]]; then

echo "=== CREATE Keystore ==="
Expand Down

0 comments on commit d99cf69

Please sign in to comment.