Bugfixes detected in RC5

Author: Chris Wiechmann

README.md

@@ -144,10 +144,11 @@ Watch this video for a demonstration: [Setup Single Node Elasticsearch cluster](
 Open the `.env` file and configure the ELASTICSEARCH_HOSTS. At this point please configure only one Elasticsearch node. You can start with a single node and add more nodes later. More about this topic [Multi-Node Deployment](#setup-elasticsearch-multi-node) later in the documenation.  
 This URL is used by all Elasticsearch clients (Logstash, API-Builder, Filebeat) of the solution to establish communication.  
 If you use an external Elasticsearch cluster, please specify the node(s) that are given to you.  
-Please keep in mind that the hostnames must be resolvable within the docker containers. You can also assign the cluster name here if the default: `axway-apim-elasticsearch` is not appropriate. Example:  
+Please keep in mind that the hostnames must be resolvable within the docker containers. Some parameters to consider to change before starting the cluster::  
 ```
 ELASTICSEARCH_HOSTS=https://my-elasticsearch-host.com:9200
 ELASTICSEARCH_CLUSTERNAME=axway-apim-elasticsearch-prod
+ES_JAVA_OPTS="-Xms8g -Xmx8g"
 ```
 With the following command you initialize a new Elasticsearch Cluster which is going through an appropriate bootstrapping. Later you can add more nodes to this single node cluster. Please do not use the init extension when restarting the node:  
 ```

docker-compose.yml

@@ -57,11 +57,7 @@ services:
   # This is the API-Builder project exposing the API-Gateway Manager REST-API
   apibuilder4elastic:
     image: cwiechmann/apibuilder4elastic:v2.0.0
-    restart: always
-    deploy:
-      restart_policy:
-        delay: 20s
-        window: 120s
+    restart: on-failure:10
     container_name: apibuilder4elastic
     environment:
       - ELASTICSEARCH_HOSTS=${ELASTICSEARCH_HOSTS}
@@ -95,6 +91,7 @@ services:
   # Metricbeat monitoring Memcache, API-Builder and Logstash
   metricbeat:
     image: docker.elastic.co/beats/metricbeat:${ELASTIC_VERSION}
+    restart: on-failure:10
     entrypoint: /usr/local/scripts/metricbeat-entrypoint.sh
     container_name: metricbeat
     # Define a fixed hostname to be reported back to Kibana
@@ -110,6 +107,7 @@ services:
       - METRICBEAT_PASSWORD=${METRICBEAT_PASSWORD}
       - METRICBEAT_ENABLED=${METRICBEAT_ENABLED}
       - METRICBEAT_SETUP_DASHBOARDS=${METRICBEAT_SETUP_DASHBOARDS}
+      - ELASTICSEARCH_ANONYMOUS_ENABLED=${ELASTICSEARCH_ANONYMOUS_ENABLED}
     ports:
       - 9000:9000
     volumes:

elasticsearch/docker-compose.es01.yml

@@ -9,7 +9,7 @@ services:
     environment:
       - "ES_JAVA_OPTS=${ES_JAVA_OPTS}"
       - cluster.name=${ELASTICSEARCH_CLUSTERNAME}
-      - node.name=Elasticsearch 1
+      - node.name=Elasticsearch1 # 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}
@@ -61,6 +61,7 @@ services:
   # Metricbeat monitoring Elasticsearch node 1
   metricbeatES:
     image: docker.elastic.co/beats/metricbeat:${ELASTIC_VERSION}
+    restart: on-failure:10
     entrypoint: /usr/local/scripts/metricbeat-entrypoint.sh
     container_name: metricbeatES1
     hostname: Elasticsearch1
@@ -75,6 +76,7 @@ services:
       - METRICBEAT_PASSWORD=${METRICBEAT_PASSWORD}
       - METRICBEAT_ENABLED=${METRICBEAT_ENABLED}
       - METRICBEAT_SETUP_DASHBOARDS=${METRICBEAT_SETUP_DASHBOARDS}
+      - ELASTICSEARCH_ANONYMOUS_ENABLED=${ELASTICSEARCH_ANONYMOUS_ENABLED}
     volumes:
       - type: volume
         source: metricbeatdata

elasticsearch/docker-compose.es02.yml

@@ -9,7 +9,7 @@ services:
     environment:
       - "ES_JAVA_OPTS=${ES_JAVA_OPTS}"
       - cluster.name=${ELASTICSEARCH_CLUSTERNAME}
-      - node.name=Elasticsearch 2
+      - 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}
@@ -61,6 +61,7 @@ services:
   # Metricbeat monitoring Elasticsearch node 1
   metricbeatES:
     image: docker.elastic.co/beats/metricbeat:${ELASTIC_VERSION}
+    restart: on-failure:10
     entrypoint: /usr/local/scripts/metricbeat-entrypoint.sh
     container_name: metricbeatES2
     hostname: Elasticsearch2
@@ -75,6 +76,7 @@ services:
       - METRICBEAT_PASSWORD=${METRICBEAT_PASSWORD}
       - METRICBEAT_ENABLED=${METRICBEAT_ENABLED}
       - METRICBEAT_SETUP_DASHBOARDS=${METRICBEAT_SETUP_DASHBOARDS}
+      - ELASTICSEARCH_ANONYMOUS_ENABLED=${ELASTICSEARCH_ANONYMOUS_ENABLED}
     volumes:
       - type: volume
         source: metricbeatdata

elasticsearch/docker-compose.es03.yml

@@ -9,7 +9,7 @@ services:
     environment:
       - "ES_JAVA_OPTS=${ES_JAVA_OPTS}"
       - cluster.name=${ELASTICSEARCH_CLUSTERNAME}
-      - node.name=Elasticsearch 3
+      - node.name=Elasticsearch3 # 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}
@@ -61,6 +61,7 @@ services:
   # Metricbeat monitoring Elasticsearch node 1
   metricbeatES:
     image: docker.elastic.co/beats/metricbeat:${ELASTIC_VERSION}
+    restart: on-failure:10
     entrypoint: /usr/local/scripts/metricbeat-entrypoint.sh
     container_name: metricbeatES3
     hostname: Elasticsearch3
@@ -75,6 +76,7 @@ services:
       - METRICBEAT_PASSWORD=${METRICBEAT_PASSWORD}
       - METRICBEAT_ENABLED=${METRICBEAT_ENABLED}
       - METRICBEAT_SETUP_DASHBOARDS=${METRICBEAT_SETUP_DASHBOARDS}
+      - ELASTICSEARCH_ANONYMOUS_ENABLED=${ELASTICSEARCH_ANONYMOUS_ENABLED}
     volumes:
       - type: volume
         source: metricbeatdata

elasticsearch/docker-compose.es04.yml

@@ -9,7 +9,7 @@ services:
     environment:
       - "ES_JAVA_OPTS=${ES_JAVA_OPTS}"
       - cluster.name=${ELASTICSEARCH_CLUSTERNAME}
-      - node.name=Elasticsearch 4
+      - node.name=Elasticsearch4 # 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}
@@ -61,6 +61,7 @@ services:
   # Metricbeat monitoring Elasticsearch node 1
   metricbeatES:
     image: docker.elastic.co/beats/metricbeat:${ELASTIC_VERSION}
+    restart: on-failure:10
     entrypoint: /usr/local/scripts/metricbeat-entrypoint.sh
     container_name: metricbeatES4
     hostname: Elasticsearch4
@@ -75,6 +76,7 @@ services:
       - METRICBEAT_PASSWORD=${METRICBEAT_PASSWORD}
       - METRICBEAT_ENABLED=${METRICBEAT_ENABLED}
       - METRICBEAT_SETUP_DASHBOARDS=${METRICBEAT_SETUP_DASHBOARDS}
+      - ELASTICSEARCH_ANONYMOUS_ENABLED=${ELASTICSEARCH_ANONYMOUS_ENABLED}
     volumes:
       - type: volume
         source: metricbeatdata

elasticsearch/docker-compose.es05.yml

@@ -9,7 +9,7 @@ services:
     environment:
       - "ES_JAVA_OPTS=${ES_JAVA_OPTS}"
       - cluster.name=${ELASTICSEARCH_CLUSTERNAME}
-      - node.name=Elasticsearch 5
+      - node.name=Elasticsearch5 # 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}
@@ -61,6 +61,7 @@ services:
   # Metricbeat monitoring Elasticsearch node 1
   metricbeatES:
     image: docker.elastic.co/beats/metricbeat:${ELASTIC_VERSION}
+    restart: on-failure:10
     entrypoint: /usr/local/scripts/metricbeat-entrypoint.sh
     container_name: metricbeatES5
     hostname: Elasticsearch5
@@ -75,6 +76,7 @@ services:
       - METRICBEAT_PASSWORD=${METRICBEAT_PASSWORD}
       - METRICBEAT_ENABLED=${METRICBEAT_ENABLED}
       - METRICBEAT_SETUP_DASHBOARDS=${METRICBEAT_SETUP_DASHBOARDS}
+      - ELASTICSEARCH_ANONYMOUS_ENABLED=${ELASTICSEARCH_ANONYMOUS_ENABLED}
     volumes:
       - type: volume
         source: metricbeatdata

elasticsearch/scripts/custom-entrypoint.sh

@@ -19,9 +19,11 @@ do
     # It is assumed, that node-names are sequentially counted elasticsearch1, elasticsearch2, ...
     if [ "${initCluster}" = "true" ]; then
         if [ "${initialMasterNodes}" == "" ]; then
+            echo "Init Elasticsearch cluster using nodeBasename: ${nodeBasename} and count: ${count}"
             initialMasterNodes="-E cluster.initial_master_nodes=${nodeBasename}${count}"
-        else 
-            initialMasterNodes="${initialMasterNodes},${nodeBasename}${count}"
+        else
+            echo "Init Elasticsearch cluster with given initialMasterNodes: ${initialMasterNodes}"
+            initialMasterNodes="-E cluster.initial_master_nodes=${initialMasterNodes}"
         fi
     fi
     # Use all declared hosts as seed hosts if 

env-sample

@@ -227,7 +227,7 @@ ELASTICSEARCH_CLUSTER_UUID=
 # GATEWAY_REGION=US-DC1
 
 # ----------------------------------------------------------------------------------------------
-# This tells Filebeat where Logstash is running. 
+# This tells Filebeat where Logstash or multiple instances are running. 
 # When using the default docker-compose.yml the following default will work.
 # If you are running Logstash somewhere else, e.g. as a service in K8S you need to change this 
 # parameter.

filebeat/docker-compose.filebeat.yml

@@ -46,10 +46,11 @@ services:
         max-size: "10m"
 
   # Metricbeat monitoring Filebeat, API-Gateway, API-Manager and perhaps later Cassandra
-  metricbeatFilebeat:
+  gatewayMetricbeat:
     image: docker.elastic.co/beats/metricbeat:${ELASTIC_VERSION}
+    restart: on-failure:10
     entrypoint: /usr/local/scripts/metricbeat-entrypoint.sh
-    container_name: metricbeatFilebeat
+    container_name: gatewayMetricbeat
     command: --strict.perms=false -c configs/metricbeat.filebeat-gateway.yml -e -system.hostfs=/hostfs
     user: root # Required to monitor docker containers
     environment:
@@ -61,6 +62,7 @@ services:
       - METRICBEAT_PASSWORD=${METRICBEAT_PASSWORD}
       - METRICBEAT_ENABLED=${METRICBEAT_ENABLED}
       - METRICBEAT_SETUP_DASHBOARDS=${METRICBEAT_SETUP_DASHBOARDS}
+      - ELASTICSEARCH_ANONYMOUS_ENABLED=${ELASTICSEARCH_ANONYMOUS_ENABLED}
     volumes:
       - type: volume
         source: metricbeatdata