Minor Fixes

* Fixes in bash scripts
* Minor fix in metricbeat config

metricbeat/metricbeat.yml

@@ -34,8 +34,8 @@ metricbeat.modules:
   enabled: true
 
 # ================================== Template =================================== #
-setup.template.name: "metricbeat-${METRICBEAT_INDEX_INFIX}-%{[agent.version]}"
-setup.template.pattern: "metricbeat-${METRICBEAT_INDEX_INFIX}-%{[agent.version]}-*"
+setup.template.name: "metricbeat-${METRICBEAT_INDEX_INFIX}-v%{[agent.version]}"
+setup.template.pattern: "metricbeat-${METRICBEAT_INDEX_INFIX}-v%{[agent.version]}-*"
 
 # =================================== Outputs =================================== #
 

opensearch/init-security.sh

@@ -14,9 +14,9 @@ admin_pw="${OPENSEARCH_ADMIN_PASSWORD:?admin password required}"
 kibanaserver_pw="${OPENSEARCH_KIBANASERVER_PASSWORD:?kibana server password required}"
 logginguser_pw="${OPENSEARCH_LOGGINGUSER_PASSWORD:?logging user password required}"
 
-admin_hash=$(${sec_plugin_path}/tools/hash.sh -p "${admin_pw}")
-dashboards_hash=$(${sec_plugin_path}/tools/hash.sh -p "${kibanaserver_pw}")
-logging_hash=$(${sec_plugin_path}/tools/hash.sh -p "${logginguser_pw}")
+admin_hash=$(${sec_plugin_path}/tools/hash.sh -p "${admin_pw}" | tr " " "\n" | tail -n 1)
+dashboards_hash=$(${sec_plugin_path}/tools/hash.sh -p "${kibanaserver_pw}" | tr " " "\n" | tail -n 1)
+logging_hash=$(${sec_plugin_path}/tools/hash.sh -p "${logginguser_pw}" | tr " " "\n" | tail -n 1)
 
 # write the passwords to 'internal_users.yml'
 # (the lines to be replaced are marked with comments)

scripts/generate-ssl.sh

-#!/bin/sh
+#!/bin/bash
 #
 # script for generating SSL keys and certificates