Small changes before release 2.0.0

Author: Chris Wiechmann

elasticsearch/docker-compose.es02.yml

@@ -4,15 +4,15 @@ services:
   elasticsearch2:
     image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION}
     # Custom entrypoint to configured ES based on given ELASTICSEARCH_HOSTS
-    entrypoint: /usr/share/elasticsearch/scripts/elasticsearch-custom-entrypoint
+    entrypoint: /usr/share/elasticsearch/scripts/elasticsearch-custom-entrypoint.sh
     container_name: elasticsearch2
     environment:
       - "ES_JAVA_OPTS=${ES_JAVA_OPTS}"
       - cluster.name=${ELASTICSEARCH_CLUSTERNAME}
       - node.name=Elasticsearch2 # Don't change the format (name and number) as it is used to bootstrap the cluster and identify the node number
       - ELASTICSEARCH_HOSTS=${ELASTICSEARCH_HOSTS}
       - ELASTICSEARCH_ANONYMOUS_ENABLED=${ELASTICSEARCH_ANONYMOUS_ENABLED:-true}
-      - SELF_MONITORING_ENABLED=${SELF_MONITORING_ENABLED:-t}
+      - SELF_MONITORING_ENABLED=${SELF_MONITORING_ENABLED}
       - xpack.security.enabled=true
       - xpack.security.http.ssl.enabled=true
       - xpack.security.http.ssl.key=/usr/share/elasticsearch/${ELASTICSEARCH_KEY}

elasticsearch/docker-compose.es03.yml

@@ -4,7 +4,7 @@ services:
   elasticsearch3:
     image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION}
     # Custom entrypoint to configured ES based on given ELASTICSEARCH_HOSTS
-    entrypoint: /usr/share/elasticsearch/scripts/elasticsearch-custom-entrypoint
+    entrypoint: /usr/share/elasticsearch/scripts/elasticsearch-custom-entrypoint.sh
     container_name: elasticsearch3
     environment:
       - "ES_JAVA_OPTS=${ES_JAVA_OPTS}"

elasticsearch/docker-compose.es04.yml

@@ -4,7 +4,7 @@ services:
   elasticsearch4:
     image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION}
     # Custom entrypoint to configured ES based on given ELASTICSEARCH_HOSTS
-    entrypoint: /usr/share/elasticsearch/scripts/elasticsearch-custom-entrypoint
+    entrypoint: /usr/share/elasticsearch/scripts/elasticsearch-custom-entrypoint.sh
     container_name: elasticsearch4
     environment:
       - "ES_JAVA_OPTS=${ES_JAVA_OPTS}"

elasticsearch/docker-compose.es05.yml

@@ -4,7 +4,7 @@ services:
   elasticsearch4:
     image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION}
     # Custom entrypoint to configured ES based on given ELASTICSEARCH_HOSTS
-    entrypoint: /usr/share/elasticsearch/scripts/elasticsearch-custom-entrypoint
+    entrypoint: /usr/share/elasticsearch/scripts/elasticsearch-custom-entrypoint.sh
     container_name: elasticsearch5
     environment:
       - "ES_JAVA_OPTS=${ES_JAVA_OPTS}"

env-sample

@@ -47,7 +47,7 @@ APIGATEWAY_PAYLOADS_FOLDER=/home/localuser/Axway-x.y.z/apigateway/logs/payloads
 # this environment variable is used to locate the ElasticSearch cluster.
 # You may provide a single host or an array of hosts.
 # Example: ELASTICSEARCH_HOSTS=https://elasticsearch1:9200,https://elasticsearch2:9201
-# Used-By: Filebeat, API-Builder, Logstash
+# Used-By: Filebeat, API-Builder, Logstash, Metricbeat
 ELASTICSEARCH_HOSTS=https://elasticsearch1:9200
 
 # ----------------------------------------------------------------------------------------------