Skip to content
This repository has been archived by the owner on Apr 12, 2022. It is now read-only.

Commit

Permalink
Update to Elastic Stack 6.5.1 (#69)
Browse files Browse the repository at this point in the history 
* Update to Elastic Stack 6.5.1

Update to latest version.

* Update to 6.5.2

* Fix the Kibana check

Closes #66.

* Activate monitoring for beats components

Closes #37
  • Loading branch information
@dadoonet @fxdgear
dadoonet authored and fxdgear committed Dec 11, 2018
1 parent f9d13bd commit e35a5e6
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .env
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
TAG=6.3.0
ELASTIC_VERSION=6.3.0
TAG=6.5.2
ELASTIC_VERSION=6.5.2
2 changes: 2 additions & 0 deletions config/auditbeat/auditbeat.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ setup.kibana:
protocol: "http"
ssl.enabled: false
ssl.certificate_authorities: ["/usr/share/auditbeat/certs/ca/ca.crt"]

xpack.monitoring.enabled: true
2 changes: 2 additions & 0 deletions config/filebeat/filebeat.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ setup.kibana:
protocol: "http"
ssl.enabled: false
ssl.certificate_authorities: ["/usr/share/filebeat/certs/ca/ca.crt"]

xpack.monitoring.enabled: true
2 changes: 2 additions & 0 deletions config/heartbeat/heartbeat.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,5 @@ setup.kibana:
protocol: "http"
ssl.enabled: false
ssl.certificate_authorities: ["/usr/share/heartbeat/certs/ca/ca.crt"]

xpack.monitoring.enabled: true
2 changes: 2 additions & 0 deletions config/metricbeat/metricbeat.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@ setup.kibana:
protocol: "http"
ssl.enabled: false
ssl.certificate_authorities: ["/usr/share/metricbeat/certs/ca/ca.crt"]

xpack.monitoring.enabled: true
2 changes: 2 additions & 0 deletions config/packetbeat/packetbeat.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,5 @@ setup.kibana:
protocol: "http"
ssl.enabled: false
ssl.certificate_authorities: ["/usr/share/packetbeat/certs/ca/ca.crt"]

xpack.monitoring.enabled: true
7 changes: 3 additions & 4 deletions scripts/setup-beat.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ set -euo pipefail

beat=$1

until curl -s -k http://kibana:5601; do
echo "Waiting for kibana..."
sleep 5
until curl -s "http://kibana:5601/login" | grep "Loading Kibana" > /dev/null; do

This comment has been minimized.

Sign in to view

Copy link
@mdiehm

mdiehm Dec 12, 2018

Could you provide why you choose to fix this in this way? In the beats repo it seems that the -f flag is used extensively for health checks of that kind. Why use the output instead of the return code. What if that string changes again...

This comment has been minimized.

Sign in to view

Copy link
@fxdgear

fxdgear Dec 12, 2018

Contributor

@dadoonet would you mind answering?

@mdiehm I see your PR for using the -f flag. I personally like that solution better. Would you mind updating your PR?

This comment has been minimized.

Sign in to view

Copy link
@dadoonet

dadoonet Dec 12, 2018

Author Member

Agreed. I'm just not good at writing shell scripts. 😉

This comment has been minimized.

Sign in to view

Copy link
@mdiehm

mdiehm Dec 13, 2018

@fxdgear i just updated the PR.
echo "Waiting for kibana..."
sleep 1
done
sleep 5

chmod go-w /usr/share/$beat/$beat.yml

Expand Down

0 comments on commit e35a5e6

Please sign in to comment.