Update to Elastic Stack 6.5.1 (elastic#69)

dadoonet · fxdgear · commit e35a5e60c35b · 2018-12-11T09:25:30.000-07:00
* Update to Elastic Stack 6.5.1 Update to latest version. * Update to 6.5.2 * Fix the Kibana check Closes elastic#66. * Activate monitoring for beats components Closes elastic#37
diff --git a/.env b/.env
@@ -1,2 +1,2 @@
-TAG=6.3.0
-ELASTIC_VERSION=6.3.0
+TAG=6.5.2
+ELASTIC_VERSION=6.5.2
diff --git a/config/auditbeat/auditbeat.yml b/config/auditbeat/auditbeat.yml
@@ -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
diff --git a/config/filebeat/filebeat.yml b/config/filebeat/filebeat.yml
@@ -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
diff --git a/config/heartbeat/heartbeat.yml b/config/heartbeat/heartbeat.yml
@@ -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
diff --git a/config/metricbeat/metricbeat.yml b/config/metricbeat/metricbeat.yml
@@ -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
diff --git a/config/packetbeat/packetbeat.yml b/config/packetbeat/packetbeat.yml
@@ -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
diff --git a/scripts/setup-beat.sh b/scripts/setup-beat.sh
@@ -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
+	  echo "Waiting for kibana..."
+	  sleep 1
 done
-sleep 5
 
 chmod go-w /usr/share/$beat/$beat.yml
 
