Minor updates

.env-example

@@ -1,4 +1,4 @@
-ELK_VERSION=7.15.0
+ELK_VERSION=7.16.0
 ELASTIC_USERNAME=elastic
 ELASTIC_PASSWORD=some_password
 KIBANA_URL=https://0.0.0.0:5601

docker-compose.yml

@@ -71,6 +71,11 @@ services:
     ports:
       - "9200:9200"
       - "9300:9300"
+    healthcheck:
+      test: curl -s https://elasticsearch:9200 >/dev/null; if [[ $$? == 52 ]]; then echo 0; else echo 1; fi
+      interval: 30s
+      timeout: 10s
+      retries: 5
     ulimits:
       memlock:
         soft: -1
@@ -104,6 +109,11 @@ services:
         target: ${KIBANA_DIR}/config/kibana.crt
       - source: kibana.key
         target: ${KIBANA_DIR}/config/kibana.key
+    healthcheck:
+      test: curl -s https://kibana:5601 >/dev/null; if [[ $$? == 52 ]]; then echo 0; else echo 1; fi
+      interval: 30s
+      timeout: 10s
+      retries: 5
     ports:
       - "5601:5601"
     networks:
@@ -224,6 +234,7 @@ services:
       - elk
     depends_on: 
       - logstash
+      - kibana
 
   filebeat:
     container_name: filebeat

elasticsearch/config/elasticsearch.yml

@@ -8,7 +8,6 @@ xpack.license.self_generated.type: trial
 
 # Security
 xpack.security.enabled: true
-xpack.monitoring.collection.enabled: true
 xpack.security.authc.token.enabled: true
 xpack.security.authc.api_key.enabled: true
 

metricbeat/config/metricbeat.yml

@@ -3,15 +3,15 @@ setup.dashboards.enabled: true
 # Forcing Elasticsearch index template 
 setup.template.overwrite: true
 
-setup.kibana.host: "https://kibana:5601"
+setup.kibana.host: "kibana:5601"
 setup.kibana.protocol: "https"
 setup.kibana.ssl.enabled: true
 setup.kibana.username: '${ELASTIC_USERNAME:}'
 setup.kibana.password: '${ELASTIC_PASSWORD:}'
 setup.kibana.ssl.certificate_authorities: ["/etc/pki/ca-trust/source/anchors/ca.crt"]
 setup.kibana.ssl.certificate: ${CONFIG_DIR}/metricbeat.crt
 setup.kibana.ssl.key: ${CONFIG_DIR}/metricbeat.key
-setup.kibana.ssl.verification_mode: none
+setup.kibana.ssl.verification_mode: "none"
 
 metricbeat.autodiscover:
   providers:

setup/setup.sh

@@ -16,7 +16,7 @@ BUNDLE_ZIP=$OUTPUT_DIR/bundle.zip
 CERT_KEYSTORES_ZIP=$OUTPUT_DIR/cert_keystores.zip
 HTTP_ZIP=$OUTPUT_DIR/http.zip
 
-yum install unzip openssl -y
+apt-get install unzip openssl -y
 
 create_self_signed_ca()
 {