Shell script Tests fixed

Author: Chris Wiechmann

env-sample

@@ -389,8 +389,9 @@ ELASTIC_VERSION=7.10.0
 # ----------------------------------------------------------------------------------------------
 # This is the name how metricbeat reports metric information back to Elasticsearch.
 # Used-By: Metricbeat
-# Example
-# METRICBEAT_NODE_NAME=Logstash-2
+# Examples
+# METRICBEAT_NODE_NAME=Host-1
+# METRICBEAT_NODE_NAME=API-Gateway-1
 
 # ----------------------------------------------------------------------------------------------
 # By default Metricbeat will upload all required Dashboards automatically into Kibana. Metricbeat

metricbeat/scripts/metricbeat-entrypoint-test.bats

@@ -47,8 +47,8 @@ setup() {
     unset KIBANA_HOST
     run metricbeat/scripts/metricbeat-entrypoint.sh
     [ "$status" -eq 0 ]
-    [ "${lines[2]}" = 'Parameter KIBANA_HOST not given, using first Elasticsearch host' ]
-    [ "${lines[3]}" = 'KIBANA_HOST set to https://elasticsearch1.host:5601' ]
+    [ "${lines[2]}" = 'Parameter KIBANA_HOST not given, using https://kibana:5601 as default' ]
+    [ "${lines[3]}" = 'KIBANA_HOST set to https://kibana:5601' ]
 }
 
 @test "invoke metric-entrypoint with valid KIBANA_HOST (simuluated as valid host)" {

metricbeat/scripts/metricbeat-entrypoint.sh

@@ -112,7 +112,7 @@ elasticHosts=`echo ${ELASTICSEARCH_HOSTS} | awk '
 echo "Elasticsearch hosts: ${elasticHosts} will be monitored by Metricbeat"
 # Check if Kibana-Host is reachable and if not, disable Kibana-Monitoring
 curl -skf ${KIBANA_HOST} || rc=$?
-if [ \( "$rc" != "0" -o "$rc" != "" \) ] && [ "${SKIP_VALIDATION}" != true ]; then
+if [ \( "$rc" != "0" -a "$rc" != "" \) ] && [ "${SKIP_VALIDATION}" != true ]; then
     echo "KIBANA_HOST: ${KIBANA_HOST} is not reachable. Got returncode: ${rc} for command: curl -kv ${KIBANA_HOST}";
     echo "Metricbeat Kibana monitoring will be disabled on this host.";
     export METRICBEAT_KIBANA_ENABLED=false;