[UPGRADE] Log monitoring stack #691

gsmith-sas · 2024-11-04T22:51:58Z

No description provided.

…related Helm charts

….0 to 2.21.1

github-actions · 2024-11-04T22:52:16Z

`sh-checker report`

To get the full details, please check in the job output.

shellcheck errors


'shellcheck -e SC1004' returned error 1 finding the following syntactical issues:

----------

In logging/bin/deploy_esexporter.sh line 6:
cd "$(dirname $BASH_SOURCE)/../.."
              ^----------^ SC2128 (warning): Expanding an array without an index only gives the first element.
              ^----------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
cd "$(dirname "$BASH_SOURCE")/../.."


In logging/bin/deploy_esexporter.sh line 7:
source logging/bin/common.sh
       ^-------------------^ SC1091 (info): Not following: logging/bin/common.sh was not specified as input (see shellcheck -x).


In logging/bin/deploy_esexporter.sh line 8:
source logging/bin/secrets-include.sh
       ^----------------------------^ SC1091 (info): Not following: logging/bin/secrets-include.sh was not specified as input (see shellcheck -x).


In logging/bin/deploy_esexporter.sh line 10:
this_script=`basename "$0"`
            ^-------------^ SC2006 (style): Use $(...) notation instead of legacy backticks `...`.

Did you mean: 
this_script=$(basename "$0")


In logging/bin/deploy_esexporter.sh line 31:
if [ "$(kubectl get ns $LOG_NS -o name 2>/dev/null)" == "" ]; then
                       ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
if [ "$(kubectl get ns "$LOG_NS" -o name 2>/dev/null)" == "" ]; then


In logging/bin/deploy_esexporter.sh line 42:
if helm3ReleaseExists es-exporter $LOG_NS; then
                                  ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
if helm3ReleaseExists es-exporter "$LOG_NS"; then


In logging/bin/deploy_esexporter.sh line 45:
   if [ -z $(kubectl -n $LOG_NS get pods -l "app.kubernetes.io/name=prometheus-elasticsearch-exporter,searchbackend=opensearch" -o name 2>/dev/null) ]; then
           ^-- SC2046 (warning): Quote this to prevent word splitting.
                        ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
   if [ -z $(kubectl -n "$LOG_NS" get pods -l "app.kubernetes.io/name=prometheus-elasticsearch-exporter,searchbackend=opensearch" -o name 2>/dev/null) ]; then


In logging/bin/deploy_esexporter.sh line 47:
      helm -n $LOG_NS delete es-exporter
              ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
      helm -n "$LOG_NS" delete es-exporter


In logging/bin/deploy_esexporter.sh line 53:
      kubectl delete -n $monNamespace servicemonitor elasticsearch
                        ^-----------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
      kubectl delete -n "$monNamespace" servicemonitor elasticsearch


In logging/bin/deploy_esexporter.sh line 55:
      kubectl apply  -n $monNamespace -f monitoring/monitors/logging/serviceMonitor-elasticsearch-v2.yaml
                        ^-----------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
      kubectl apply  -n "$monNamespace" -f monitoring/monitors/logging/serviceMonitor-elasticsearch-v2.yaml


In logging/bin/deploy_esexporter.sh line 110:
helm2ReleaseCheck es-exporter-$LOG_NS
                              ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
helm2ReleaseCheck es-exporter-"$LOG_NS"


In logging/bin/deploy_esexporter.sh line 115:
chart2install="$(get_helmchart_reference $ESEXPORTER_HELM_CHART_REPO $ESEXPORTER_HELM_CHART_NAME $ESEXPORTER_HELM_CHART_VERSION)"
                                         ^-------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
                                                                     ^-------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
                                                                                                 ^----------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
chart2install="$(get_helmchart_reference "$ESEXPORTER_HELM_CHART_REPO" "$ESEXPORTER_HELM_CHART_NAME" "$ESEXPORTER_HELM_CHART_VERSION")"


In logging/bin/deploy_esexporter.sh line 116:
versionstring="$(get_helm_versionstring  $ESEXPORTER_HELM_CHART_VERSION)"
                                         ^----------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
versionstring="$(get_helm_versionstring  "$ESEXPORTER_HELM_CHART_VERSION")"


In logging/bin/deploy_esexporter.sh line 120:
helm $helmDebug upgrade --install es-exporter \
     ^--------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
helm "$helmDebug" upgrade --install es-exporter \


In logging/bin/deploy_esexporter.sh line 121:
 --namespace $LOG_NS \
             ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
 --namespace "$LOG_NS" \


In logging/bin/deploy_esexporter.sh line 122:
 -f $imageKeysFile \
    ^------------^ SC2154 (warning): imageKeysFile is referenced but not assigned.
    ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
 -f "$imageKeysFile" \


In logging/bin/deploy_esexporter.sh line 124:
 -f $wnpValuesFile \
    ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
 -f "$wnpValuesFile" \


In logging/bin/deploy_esexporter.sh line 125:
 -f $openshiftValuesFile \
    ^------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
 -f "$openshiftValuesFile" \


In logging/bin/deploy_esexporter.sh line 126:
 -f $ES_OPEN_EXPORTER_USER_YAML \
    ^-------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
 -f "$ES_OPEN_EXPORTER_USER_YAML" \


In logging/bin/deploy_esexporter.sh line 128:
 $versionstring \
 ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
 "$versionstring" \


In logging/bin/deploy_esexporter.sh line 129:
 $chart2install
 ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
 "$chart2install"


In monitoring/bin/deploy_monitoring_cluster.sh line 6:
cd "$(dirname $BASH_SOURCE)/../.."
              ^----------^ SC2128 (warning): Expanding an array without an index only gives the first element.
              ^----------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
cd "$(dirname "$BASH_SOURCE")/../.."


In monitoring/bin/deploy_monitoring_cluster.sh line 7:
source monitoring/bin/common.sh
       ^----------------------^ SC1091 (info): Not following: monitoring/bin/common.sh was not specified as input (see shellcheck -x).


In monitoring/bin/deploy_monitoring_cluster.sh line 8:
source bin/service-url-include.sh
       ^------------------------^ SC1091 (info): Not following: bin/service-url-include.sh was not specified as input (see shellcheck -x).


In monitoring/bin/deploy_monitoring_cluster.sh line 18:
source bin/tls-include.sh
       ^----------------^ SC1091 (info): Not following: bin/tls-include.sh was not specified as input (see shellcheck -x).


In monitoring/bin/deploy_monitoring_cluster.sh line 19:
if verify_cert_generator $MON_NS prometheus alertmanager grafana; then
                         ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
if verify_cert_generator "$MON_NS" prometheus alertmanager grafana; then


In monitoring/bin/deploy_monitoring_cluster.sh line 20:
  log_debug "cert generator check OK [$cert_generator_ok]"
                                      ^----------------^ SC2154 (warning): cert_generator_ok is referenced but not assigned.


In monitoring/bin/deploy_monitoring_cluster.sh line 22:
  log_error "One or more required TLS certs do not exist and the expected certificate generator mechanism [$cert_generator] is not available to create the missing certs"
                                                                                                           ^-------------^ SC2154 (warning): cert_generator is referenced but not assigned.


In monitoring/bin/deploy_monitoring_cluster.sh line 26:
helm2ReleaseCheck v4m-$MON_NS
                      ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
helm2ReleaseCheck v4m-"$MON_NS"


In monitoring/bin/deploy_monitoring_cluster.sh line 27:
helm2ReleaseCheck prometheus-$MON_NS
                             ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
helm2ReleaseCheck prometheus-"$MON_NS"


In monitoring/bin/deploy_monitoring_cluster.sh line 43:
if [ -z "$(kubectl get ns $MON_NS -o name 2>/dev/null)" ]; then
                          ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
if [ -z "$(kubectl get ns "$MON_NS" -o name 2>/dev/null)" ]; then


In monitoring/bin/deploy_monitoring_cluster.sh line 44:
  kubectl create ns $MON_NS
                    ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl create ns "$MON_NS"


In monitoring/bin/deploy_monitoring_cluster.sh line 47:
  disable_sa_token_automount $MON_NS default
                             ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  disable_sa_token_automount "$MON_NS" default


In monitoring/bin/deploy_monitoring_cluster.sh line 52:
generateImageKeysFile "$ALERTMANAGER_FULL_IMAGE"    "$imageKeysFile"  "ALERTMANAGER_"
                                                     ^------------^ SC2154 (warning): imageKeysFile is referenced but not assigned.


In monitoring/bin/deploy_monitoring_cluster.sh line 100:
    if kubectl get crd $crd.monitoring.coreos.com 1>/dev/null 2>&1; then
                       ^--^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
    if kubectl get crd "$crd".monitoring.coreos.com 1>/dev/null 2>&1; then


In monitoring/bin/deploy_monitoring_cluster.sh line 101:
      kubectl replace -f $crdURL
                         ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
      kubectl replace -f "$crdURL"


In monitoring/bin/deploy_monitoring_cluster.sh line 103:
      kubectl create -f $crdURL
                        ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
      kubectl create -f "$crdURL"


In monitoring/bin/deploy_monitoring_cluster.sh line 111:
kubectl delete daemonset -n $MON_NS -l app=prometheus-node-exporter --ignore-not-found
                            ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
kubectl delete daemonset -n "$MON_NS" -l app=prometheus-node-exporter --ignore-not-found


In monitoring/bin/deploy_monitoring_cluster.sh line 128:
  create_tls_certs $MON_NS monitoring ${apps[@]}
                   ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.
                                      ^--------^ SC2068 (error): Double quote array expansions to avoid re-splitting elements.

Did you mean: 
  create_tls_certs "$MON_NS" monitoring ${apps[@]}


In monitoring/bin/deploy_monitoring_cluster.sh line 140:
  kubectl delete cm -n $MON_NS --ignore-not-found grafana-datasource-prom-https
                       ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl delete cm -n "$MON_NS" --ignore-not-found grafana-datasource-prom-https


In monitoring/bin/deploy_monitoring_cluster.sh line 141:
  kubectl create cm -n $MON_NS grafana-datasource-prom-https --from-file monitoring/tls/$grafanaDS
                       ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl create cm -n "$MON_NS" grafana-datasource-prom-https --from-file monitoring/tls/$grafanaDS


In monitoring/bin/deploy_monitoring_cluster.sh line 142:
  kubectl label cm -n $MON_NS grafana-datasource-prom-https grafana_datasource=1 sas.com/monitoring-base=kube-viya-monitoring
                      ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl label cm -n "$MON_NS" grafana-datasource-prom-https grafana_datasource=1 sas.com/monitoring-base=kube-viya-monitoring


In monitoring/bin/deploy_monitoring_cluster.sh line 146:
  kubectl delete cm -n $MON_NS node-exporter-tls-web-config --ignore-not-found
                       ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl delete cm -n "$MON_NS" node-exporter-tls-web-config --ignore-not-found


In monitoring/bin/deploy_monitoring_cluster.sh line 148:
  kubectl create cm -n $MON_NS node-exporter-tls-web-config --from-file monitoring/tls/node-exporter-web.yaml
                       ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl create cm -n "$MON_NS" node-exporter-tls-web-config --from-file monitoring/tls/node-exporter-web.yaml


In monitoring/bin/deploy_monitoring_cluster.sh line 149:
  kubectl label cm -n $MON_NS node-exporter-tls-web-config sas.com/monitoring-base=kube-viya-monitoring
                      ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl label cm -n "$MON_NS" node-exporter-tls-web-config sas.com/monitoring-base=kube-viya-monitoring


In monitoring/bin/deploy_monitoring_cluster.sh line 159:
if helm3ReleaseExists prometheus-operator $MON_NS; then
                                          ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
if helm3ReleaseExists prometheus-operator "$MON_NS"; then


In monitoring/bin/deploy_monitoring_cluster.sh line 168:
if helm3ReleaseExists $promRelease $MON_NS; then
                                   ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
if helm3ReleaseExists $promRelease "$MON_NS"; then


In monitoring/bin/deploy_monitoring_cluster.sh line 182:
  kubectl delete -n $MON_NS --ignore-not-found \
                    ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl delete -n "$MON_NS" --ignore-not-found \


In monitoring/bin/deploy_monitoring_cluster.sh line 201:
chart2install="$(get_helmchart_reference $KUBE_PROM_STACK_CHART_REPO $KUBE_PROM_STACK_CHART_NAME $KUBE_PROM_STACK_CHART_VERSION)"
                                         ^-------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
                                                                     ^-------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
                                                                                                 ^----------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
chart2install="$(get_helmchart_reference "$KUBE_PROM_STACK_CHART_REPO" "$KUBE_PROM_STACK_CHART_NAME" "$KUBE_PROM_STACK_CHART_VERSION")"


In monitoring/bin/deploy_monitoring_cluster.sh line 202:
versionstring="$(get_helm_versionstring  $KUBE_PROM_STACK_CHART_VERSION)"
                                         ^----------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
versionstring="$(get_helm_versionstring  "$KUBE_PROM_STACK_CHART_VERSION")"


In monitoring/bin/deploy_monitoring_cluster.sh line 205:
helm $helmDebug upgrade --install $promRelease \
     ^--------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
helm "$helmDebug" upgrade --install $promRelease \


In monitoring/bin/deploy_monitoring_cluster.sh line 206:
  --namespace $MON_NS \
              ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  --namespace "$MON_NS" \


In monitoring/bin/deploy_monitoring_cluster.sh line 207:
  -f $imageKeysFile \
     ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  -f "$imageKeysFile" \


In monitoring/bin/deploy_monitoring_cluster.sh line 209:
  -f $istioValuesFile \
     ^--------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  -f "$istioValuesFile" \


In monitoring/bin/deploy_monitoring_cluster.sh line 210:
  -f $tlsValuesFile \
     ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  -f "$tlsValuesFile" \


In monitoring/bin/deploy_monitoring_cluster.sh line 211:
  -f $tlsPromAlertingEndpointFile \
     ^--------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  -f "$tlsPromAlertingEndpointFile" \


In monitoring/bin/deploy_monitoring_cluster.sh line 212:
  -f $nodePortValuesFile \
     ^-----------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  -f "$nodePortValuesFile" \


In monitoring/bin/deploy_monitoring_cluster.sh line 213:
  -f $wnpValuesFile \
     ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  -f "$wnpValuesFile" \


In monitoring/bin/deploy_monitoring_cluster.sh line 214:
  -f $PROM_OPER_USER_YAML \
     ^------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  -f "$PROM_OPER_USER_YAML" \


In monitoring/bin/deploy_monitoring_cluster.sh line 215:
  -f $tempoDSFile \
     ^----------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  -f "$tempoDSFile" \


In monitoring/bin/deploy_monitoring_cluster.sh line 225:
  $versionstring \
  ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  "$versionstring" \


In monitoring/bin/deploy_monitoring_cluster.sh line 226:
  $chart2install
  ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  "$chart2install"


In monitoring/bin/deploy_monitoring_cluster.sh line 232:
  kubectl patch servicemonitor -n $MON_NS $promName-grafana --type=json \
                                  ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl patch servicemonitor -n "$MON_NS" $promName-grafana --type=json \


In monitoring/bin/deploy_monitoring_cluster.sh line 237:
disable_sa_token_automount $MON_NS v4m-grafana
                           ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
disable_sa_token_automount "$MON_NS" v4m-grafana


In monitoring/bin/deploy_monitoring_cluster.sh line 238:
disable_sa_token_automount $MON_NS sas-ops-acct      #Used w/Prometheus
                           ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
disable_sa_token_automount "$MON_NS" sas-ops-acct      #Used w/Prometheus


In monitoring/bin/deploy_monitoring_cluster.sh line 239:
disable_sa_token_automount $MON_NS v4m-node-exporter
                           ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
disable_sa_token_automount "$MON_NS" v4m-node-exporter


In monitoring/bin/deploy_monitoring_cluster.sh line 240:
disable_sa_token_automount $MON_NS v4m-alertmanager
                           ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
disable_sa_token_automount "$MON_NS" v4m-alertmanager


In monitoring/bin/deploy_monitoring_cluster.sh line 243:
disable_sa_token_automount $MON_NS v4m-kube-state-metrics
                           ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
disable_sa_token_automount "$MON_NS" v4m-kube-state-metrics


In monitoring/bin/deploy_monitoring_cluster.sh line 244:
enable_pod_token_automount $MON_NS deployment v4m-kube-state-metrics
                           ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
enable_pod_token_automount "$MON_NS" deployment v4m-kube-state-metrics


In monitoring/bin/deploy_monitoring_cluster.sh line 245:
disable_sa_token_automount $MON_NS v4m-operator
                           ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
disable_sa_token_automount "$MON_NS" v4m-operator


In monitoring/bin/deploy_monitoring_cluster.sh line 246:
enable_pod_token_automount $MON_NS deployment v4m-operator
                           ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
enable_pod_token_automount "$MON_NS" deployment v4m-operator


In monitoring/bin/deploy_monitoring_cluster.sh line 263:
  chart2install="$(get_helmchart_reference $TEMPO_CHART_REPO $TEMPO_CHART_NAME $TEMPO_CHART_VERSION)"
                                           ^---------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
                                                             ^---------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
                                                                               ^------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  chart2install="$(get_helmchart_reference "$TEMPO_CHART_REPO" "$TEMPO_CHART_NAME" "$TEMPO_CHART_VERSION")"


In monitoring/bin/deploy_monitoring_cluster.sh line 264:
  versionstring="$(get_helm_versionstring  $TEMPO_CHART_VERSION)"
                                           ^------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  versionstring="$(get_helm_versionstring  "$TEMPO_CHART_VERSION")"


In monitoring/bin/deploy_monitoring_cluster.sh line 270:
    -f $imageKeysFile \
       ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
    -f "$imageKeysFile" \


In monitoring/bin/deploy_monitoring_cluster.sh line 273:
    $versionstring \
    ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
    "$versionstring" \


In monitoring/bin/deploy_monitoring_cluster.sh line 274:
    $chart2install
    ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
    "$chart2install"


In monitoring/bin/deploy_monitoring_cluster.sh line 279:
kubectl get ns $NGINX_NS 2>/dev/null
               ^-------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
kubectl get ns "$NGINX_NS" 2>/dev/null


In monitoring/bin/deploy_monitoring_cluster.sh line 280:
if [ $? == 0 ]; then
     ^-- SC2181 (style): Check exit code directly with e.g. 'if mycmd;', not indirectly with $?.


In monitoring/bin/deploy_monitoring_cluster.sh line 287:
  kubectl apply -n $NGINX_NS -f monitoring/monitors/kube/podMonitor-nginx.yaml 2>/dev/null
                   ^-------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl apply -n "$NGINX_NS" -f monitoring/monitors/kube/podMonitor-nginx.yaml 2>/dev/null


In monitoring/bin/deploy_monitoring_cluster.sh line 291:
kubectl apply -n $MON_NS -f monitoring/monitors/kube/podMonitor-eventrouter.yaml 2>/dev/null
                 ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
kubectl apply -n "$MON_NS" -f monitoring/monitors/kube/podMonitor-eventrouter.yaml 2>/dev/null


In monitoring/bin/deploy_monitoring_cluster.sh line 294:
kubectl apply -n $MON_NS -f monitoring/monitors/logging/serviceMonitor-elasticsearch-v2.yaml
                 ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
kubectl apply -n "$MON_NS" -f monitoring/monitors/logging/serviceMonitor-elasticsearch-v2.yaml


In monitoring/bin/deploy_monitoring_cluster.sh line 297:
kubectl apply -n $MON_NS -f monitoring/monitors/logging/serviceMonitor-fluent-bit.yaml
                 ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
kubectl apply -n "$MON_NS" -f monitoring/monitors/logging/serviceMonitor-fluent-bit.yaml


In monitoring/bin/deploy_monitoring_cluster.sh line 298:
kubectl apply -n $MON_NS -f monitoring/monitors/logging/serviceMonitor-fluent-bit-v2.yaml
                 ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
kubectl apply -n "$MON_NS" -f monitoring/monitors/logging/serviceMonitor-fluent-bit-v2.yaml


In monitoring/bin/deploy_monitoring_cluster.sh line 303:
  kubectl apply -n $MON_NS -f $f
                   ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.
                              ^-- SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl apply -n "$MON_NS" -f "$f"


In monitoring/bin/deploy_monitoring_cluster.sh line 338:
   kubectl -n $MON_NS delete configmap  v4m-cluster-total         --ignore-not-found
              ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
   kubectl -n "$MON_NS" delete configmap  v4m-cluster-total         --ignore-not-found


In monitoring/bin/deploy_monitoring_cluster.sh line 339:
   kubectl -n $MON_NS delete configmap  v4m-namespace-by-pod      --ignore-not-found
              ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
   kubectl -n "$MON_NS" delete configmap  v4m-namespace-by-pod      --ignore-not-found


In monitoring/bin/deploy_monitoring_cluster.sh line 340:
   kubectl -n $MON_NS delete configmap  v4m-namespace-by-workload --ignore-not-found
              ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
   kubectl -n "$MON_NS" delete configmap  v4m-namespace-by-workload --ignore-not-found


In monitoring/bin/deploy_monitoring_cluster.sh line 341:
   kubectl -n $MON_NS delete configmap  v4m-prometheus            --ignore-not-found
              ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
   kubectl -n "$MON_NS" delete configmap  v4m-prometheus            --ignore-not-found


In monitoring/bin/deploy_monitoring_cluster.sh line 353:
gf_url=$(get_service_url $MON_NS v4m-grafana  "$TLS_ENABLE")
                         ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
gf_url=$(get_service_url "$MON_NS" v4m-grafana  "$TLS_ENABLE")


In monitoring/bin/deploy_monitoring_cluster.sh line 359:
if helm3ReleaseExists v4m $MON_NS; then
                          ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
if helm3ReleaseExists v4m "$MON_NS"; then


In monitoring/bin/deploy_monitoring_cluster.sh line 371:
if [ ! -z "$gf_url" ]; then
     ^-- SC2236 (style): Use -n instead of ! -z.

For more information:
  https://www.shellcheck.net/wiki/SC2068 -- Double quote array expansions to ...
  https://www.shellcheck.net/wiki/SC2046 -- Quote this to prevent word splitt...
  https://www.shellcheck.net/wiki/SC2128 -- Expanding an array without an ind...
----------

You can address the above issues in one of three ways:
1. Manually correct the issue in the offending shell script;
2. Disable specific issues by adding the comment:
  # shellcheck disable=NNNN
above the line that contains the issue, where NNNN is the error code;
3. Add '-e NNNN' to the SHELLCHECK_OPTS setting in your .yml action file.

shfmt errors


'shfmt -s' returned error 1 finding the following formatting issues:

----------
diff logging/bin/deploy_esexporter.sh.orig logging/bin/deploy_esexporter.sh
--- logging/bin/deploy_esexporter.sh.orig
+++ logging/bin/deploy_esexporter.sh
@@ -7,7 +7,7 @@
 source logging/bin/common.sh
 source logging/bin/secrets-include.sh
 
-this_script=`basename "$0"`
+this_script=$(basename "$0")
 
 log_debug "Script [$this_script] has started [$(date)]"
 
@@ -14,8 +14,8 @@
 ELASTICSEARCH_EXPORTER_ENABLED=${ELASTICSEARCH_EXPORTER_ENABLED:-true}
 
 if [ "$ELASTICSEARCH_EXPORTER_ENABLED" != "true" ]; then
-  log_verbose "Environment variable [ELASTICSEARCH_EXPORTER_ENABLED] is not set to 'true'; exiting WITHOUT deploying Elasticsearch Exporter"
-  exit
+	log_verbose "Environment variable [ELASTICSEARCH_EXPORTER_ENABLED] is not set to 'true'; exiting WITHOUT deploying Elasticsearch Exporter"
+	exit
 fi
 
 set -e
@@ -29,33 +29,35 @@
 
 # Confirm namespace exists
 if [ "$(kubectl get ns $LOG_NS -o name 2>/dev/null)" == "" ]; then
-  log_error "Namespace [$LOG_NS] does NOT exist."
-  exit 1
+	log_error "Namespace [$LOG_NS] does NOT exist."
+	exit 1
 fi
 
 # get credentials
 get_credentials_from_secret metricgetter
 rc=$?
-if [ "$rc" != "0" ] ;then log_debug "RC=$rc"; exit $rc;fi
-
+if [ "$rc" != "0" ]; then
+	log_debug "RC=$rc"
+	exit $rc
+fi
 
 if helm3ReleaseExists es-exporter $LOG_NS; then
-   #remove an existing instance if it does NOT have the most current set of labels
-   # NOTE: pod label 'app' changed to 'app.kubernetes.io/name' w/Helm chart 6.x
-   if [ -z $(kubectl -n $LOG_NS get pods -l "app.kubernetes.io/name=prometheus-elasticsearch-exporter,searchbackend=opensearch" -o name 2>/dev/null) ]; then
-      log_debug "Removing an outdated version of Helm release [es-exporter]"
-      helm -n $LOG_NS delete es-exporter
-   fi
-
-   monNamespace=$(kubectl get servicemonitor -A --field-selector=metadata.name=elasticsearch -l sas.com/monitoring-base=kube-viya-monitoring -o=custom-columns=NAMESPACE:.metadata.namespace --no-headers)
-   if [ -n "$monNamespace" ]; then
-      log_debug "Removing obsolete serviceMonitor [$monNamespace/elasticsearch]"
-      kubectl delete -n $monNamespace servicemonitor elasticsearch
-      log_debuge "Deploying an updated serviceMonitor for Elasticsearch  [$monNamespace/elasticsearch-v2]"
-      kubectl apply  -n $monNamespace -f monitoring/monitors/logging/serviceMonitor-elasticsearch-v2.yaml
-   fi
-else
-   log_debug "No existing Helm release [es-exporter] found."
+	#remove an existing instance if it does NOT have the most current set of labels
+	# NOTE: pod label 'app' changed to 'app.kubernetes.io/name' w/Helm chart 6.x
+	if [ -z $(kubectl -n $LOG_NS get pods -l "app.kubernetes.io/name=prometheus-elasticsearch-exporter,searchbackend=opensearch" -o name 2>/dev/null) ]; then
+		log_debug "Removing an outdated version of Helm release [es-exporter]"
+		helm -n $LOG_NS delete es-exporter
+	fi
+
+	monNamespace=$(kubectl get servicemonitor -A --field-selector=metadata.name=elasticsearch -l sas.com/monitoring-base=kube-viya-monitoring -o=custom-columns=NAMESPACE:.metadata.namespace --no-headers)
+	if [ -n "$monNamespace" ]; then
+		log_debug "Removing obsolete serviceMonitor [$monNamespace/elasticsearch]"
+		kubectl delete -n $monNamespace servicemonitor elasticsearch
+		log_debuge "Deploying an updated serviceMonitor for Elasticsearch  [$monNamespace/elasticsearch-v2]"
+		kubectl apply -n $monNamespace -f monitoring/monitors/logging/serviceMonitor-elasticsearch-v2.yaml
+	fi
+else
+	log_debug "No existing Helm release [es-exporter] found."
 fi
 
 # enable debug on Helm via env var
@@ -62,7 +64,7 @@
 export HELM_DEBUG="${HELM_DEBUG:-false}"
 
 if [ "$HELM_DEBUG" == "true" ]; then
-  helmDebug="--debug"
+	helmDebug="--debug"
 fi
 
 helmRepoAdd prometheus-community https://prometheus-community.github.io/helm-charts
@@ -80,8 +82,8 @@
 # Load any user customizations/overrides
 ES_OPEN_EXPORTER_USER_YAML="${ES_OPEN_EXPORTER_USER_YAML:-$USER_DIR/logging/user-values-es-exporter.yaml}"
 if [ ! -f "$ES_OPEN_EXPORTER_USER_YAML" ]; then
-  log_debug "[$ES_OPEN_EXPORTER_USER_YAML] not found. Using $TMP_DIR/empty.yaml"
-  ES_OPEN_EXPORTER_USER_YAML=$TMP_DIR/empty.yaml
+	log_debug "[$ES_OPEN_EXPORTER_USER_YAML] not found. Using $TMP_DIR/empty.yaml"
+	ES_OPEN_EXPORTER_USER_YAML=$TMP_DIR/empty.yaml
 fi
 
 # Enable workload node placement?
@@ -89,44 +91,42 @@
 
 # Optional workload node placement support
 if [ "$LOG_NODE_PLACEMENT_ENABLE" == "true" ]; then
-  log_verbose "Enabling elasticsearch exporter for workload node placement"
-  wnpValuesFile="logging/node-placement/values-elasticsearch-exporter-wnp.yaml"
-else
-  log_debug "Workload node placement support is disabled for the elasticsearch exporter"
-  wnpValuesFile="$TMP_DIR/empty.yaml"
-fi
-
+	log_verbose "Enabling elasticsearch exporter for workload node placement"
+	wnpValuesFile="logging/node-placement/values-elasticsearch-exporter-wnp.yaml"
+else
+	log_debug "Workload node placement support is disabled for the elasticsearch exporter"
+	wnpValuesFile="$TMP_DIR/empty.yaml"
+fi
 
 # Point to OpenShift response file or dummy as appropriate
 if [ "$OPENSHIFT_CLUSTER" == "true" ]; then
-  log_verbose "Deploying Elasticsearch metric exporter onto OpenShift cluster"
-  openshiftValuesFile="logging/openshift/values-elasticsearch-exporter.yaml"
-else
-  log_debug "Elasticsearch metric exporter is NOT being deployed on OpenShift cluster"
-  openshiftValuesFile="$TMP_DIR/empty.yaml"
+	log_verbose "Deploying Elasticsearch metric exporter onto OpenShift cluster"
+	openshiftValuesFile="logging/openshift/values-elasticsearch-exporter.yaml"
+else
+	log_debug "Elasticsearch metric exporter is NOT being deployed on OpenShift cluster"
+	openshiftValuesFile="$TMP_DIR/empty.yaml"
 fi
 
 # Elasticsearch metric exporter
 helm2ReleaseCheck es-exporter-$LOG_NS
 
-
 ## Get Helm Chart Name
 log_debug "Elasticsearch Exporter Helm Chart: repo [$ESEXPORTER_HELM_CHART_REPO] name [$ESEXPORTER_HELM_CHART_NAME] version [$ESEXPORTER_HELM_CHART_VERSION]"
 chart2install="$(get_helmchart_reference $ESEXPORTER_HELM_CHART_REPO $ESEXPORTER_HELM_CHART_NAME $ESEXPORTER_HELM_CHART_VERSION)"
-versionstring="$(get_helm_versionstring  $ESEXPORTER_HELM_CHART_VERSION)"
+versionstring="$(get_helm_versionstring $ESEXPORTER_HELM_CHART_VERSION)"
 
 log_debug "Installing Helm chart from artifact [$chart2install]"
 
 helm $helmDebug upgrade --install es-exporter \
- --namespace $LOG_NS \
- -f $imageKeysFile \
- -f $primaryValuesFile \
- -f $wnpValuesFile \
- -f $openshiftValuesFile \
- -f $ES_OPEN_EXPORTER_USER_YAML \
- --set fullnameOverride=v4m-es-exporter  \
- $versionstring \
- $chart2install
+	--namespace $LOG_NS \
+	-f $imageKeysFile \
+	-f $primaryValuesFile \
+	-f $wnpValuesFile \
+	-f $openshiftValuesFile \
+	-f $ES_OPEN_EXPORTER_USER_YAML \
+	--set fullnameOverride=v4m-es-exporter \
+	$versionstring \
+	$chart2install
 
 log_info "Elasticsearch metric exporter has been deployed"
 
diff monitoring/bin/deploy_monitoring_cluster.sh.orig monitoring/bin/deploy_monitoring_cluster.sh
--- monitoring/bin/deploy_monitoring_cluster.sh.orig
+++ monitoring/bin/deploy_monitoring_cluster.sh
@@ -8,19 +8,19 @@
 source bin/service-url-include.sh
 
 if [ "$OPENSHIFT_CLUSTER" == "true" ]; then
-  if [ "${CHECK_OPENSHIFT_CLUSTER:-true}" == "true" ]; then
-    log_error "This script should not be run on OpenShift clusters"
-    log_error "Run monitoring/bin/deploy_monitoring_openshift.sh instead"
-    exit 1
-  fi
+	if [ "${CHECK_OPENSHIFT_CLUSTER:-true}" == "true" ]; then
+		log_error "This script should not be run on OpenShift clusters"
+		log_error "Run monitoring/bin/deploy_monitoring_openshift.sh instead"
+		exit 1
+	fi
 fi
 
 source bin/tls-include.sh
 if verify_cert_generator $MON_NS prometheus alertmanager grafana; then
-  log_debug "cert generator check OK [$cert_generator_ok]"
-else
-  log_error "One or more required TLS certs do not exist and the expected certificate generator mechanism [$cert_generator] is not available to create the missing certs"
-  exit 1
+	log_debug "cert generator check OK [$cert_generator_ok]"
+else
+	log_error "One or more required TLS certs do not exist and the expected certificate generator mechanism [$cert_generator] is not available to create the missing certs"
+	exit 1
 fi
 
 helm2ReleaseCheck v4m-$MON_NS
@@ -32,32 +32,31 @@
 
 PROM_OPER_USER_YAML="${PROM_OPER_USER_YAML:-$USER_DIR/monitoring/user-values-prom-operator.yaml}"
 if [ ! -f "$PROM_OPER_USER_YAML" ]; then
-  log_debug "[$PROM_OPER_USER_YAML] not found. Using $TMP_DIR/empty.yaml"
-  PROM_OPER_USER_YAML=$TMP_DIR/empty.yaml
+	log_debug "[$PROM_OPER_USER_YAML] not found. Using $TMP_DIR/empty.yaml"
+	PROM_OPER_USER_YAML=$TMP_DIR/empty.yaml
 fi
 
 if [ "$HELM_DEBUG" == "true" ]; then
-  helmDebug="--debug"
+	helmDebug="--debug"
 fi
 
 if [ -z "$(kubectl get ns $MON_NS -o name 2>/dev/null)" ]; then
-  kubectl create ns $MON_NS
-
-  #Container Security: Disable serviceAccount Token Automounting
-  disable_sa_token_automount $MON_NS default
+	kubectl create ns $MON_NS
+
+	#Container Security: Disable serviceAccount Token Automounting
+	disable_sa_token_automount $MON_NS default
 fi
 
 #Generate yaml file with all container-related keys
-generateImageKeysFile "$PROMOP_FULL_IMAGE"          "monitoring/prom-operator_container_image.template"
-generateImageKeysFile "$ALERTMANAGER_FULL_IMAGE"    "$imageKeysFile"  "ALERTMANAGER_"
-generateImageKeysFile "$ADMWEBHOOK_FULL_IMAGE"      "$imageKeysFile"  "ADMWEBHOOK_"
-generateImageKeysFile "$KSM_FULL_IMAGE"             "$imageKeysFile"  "KSM_"
-generateImageKeysFile "$NODEXPORT_FULL_IMAGE"       "$imageKeysFile"  "NODEXPORT_"
-generateImageKeysFile "$PROMETHEUS_FULL_IMAGE"      "$imageKeysFile"  "PROMETHEUS_"
-generateImageKeysFile "$CONFIGRELOAD_FULL_IMAGE"    "$imageKeysFile"  "CONFIGRELOAD_"
-generateImageKeysFile "$GRAFANA_FULL_IMAGE"         "$imageKeysFile"  "GRAFANA_"
-generateImageKeysFile "$GRAFANA_SIDECAR_FULL_IMAGE" "$imageKeysFile"  "SIDECAR_"
-
+generateImageKeysFile "$PROMOP_FULL_IMAGE" "monitoring/prom-operator_container_image.template"
+generateImageKeysFile "$ALERTMANAGER_FULL_IMAGE" "$imageKeysFile" "ALERTMANAGER_"
+generateImageKeysFile "$ADMWEBHOOK_FULL_IMAGE" "$imageKeysFile" "ADMWEBHOOK_"
+generateImageKeysFile "$KSM_FULL_IMAGE" "$imageKeysFile" "KSM_"
+generateImageKeysFile "$NODEXPORT_FULL_IMAGE" "$imageKeysFile" "NODEXPORT_"
+generateImageKeysFile "$PROMETHEUS_FULL_IMAGE" "$imageKeysFile" "PROMETHEUS_"
+generateImageKeysFile "$CONFIGRELOAD_FULL_IMAGE" "$imageKeysFile" "CONFIGRELOAD_"
+generateImageKeysFile "$GRAFANA_FULL_IMAGE" "$imageKeysFile" "GRAFANA_"
+generateImageKeysFile "$GRAFANA_SIDECAR_FULL_IMAGE" "$imageKeysFile" "SIDECAR_"
 
 set -e
 log_notice "Deploying monitoring to the [$MON_NS] namespace..."
@@ -68,43 +67,43 @@
 istioValuesFile=$TMP_DIR/empty.yaml
 # Istio - Federate data from Istio's Prometheus instance
 if [ "$ISTIO_ENABLED" == "true" ]; then
-  log_verbose "Including Istio metric federation"
-  istioValuesFile=$TMP_DIR/values-prom-operator-tmp.yaml
-else
-  log_debug "ISTIO_ENABLED flag not set"
-  log_debug "Skipping deployment of federated scrape of Istio Prometheus instance"
+	log_verbose "Including Istio metric federation"
+	istioValuesFile=$TMP_DIR/values-prom-operator-tmp.yaml
+else
+	log_debug "ISTIO_ENABLED flag not set"
+	log_debug "Skipping deployment of federated scrape of Istio Prometheus instance"
 fi
 
 # Check if Prometheus Operator CRDs are already installed
 PROM_OPERATOR_CRD_UPDATE=${PROM_OPERATOR_CRD_UPDATE:-true}
 if [ "$PROM_OPERATOR_CRD_UPDATE" == "true" ]; then
-  log_verbose "Updating Prometheus Operator custom resource definitions"
-  crds=( alertmanagerconfigs alertmanagers prometheuses prometheusrules podmonitors servicemonitors thanosrulers probes )
-  for crd in "${crds[@]}"; do
-    
-    ## Determine CRD URL - if in an airgap environment, look for them in USER_DIR.
-    if [ "$AIRGAP_DEPLOYMENT" == "true" ]; then
-      crdURL=$USER_DIR/monitoring/prometheus-operator-crd/$PROM_OPERATOR_CRD_VERSION/monitoring.coreos.com_$crd.yaml
-
-      ## Fail if the CRDs could not be located.
-      if [ ! -f "$crdURL" ]; then
-        log_error "Unable to locate file: [monitoring.coreos.com_$crd.yaml] in"
-        log_error "[$USER_DIR/monitoring/prometheus-operator-crd/$PROM_OPERATOR_CRD_VERSION] directory"
-        log_error "Please make sure to provide all Prometheus Operator CRDs before running the deployment"
-        exit 1
-      fi
-    else
-      crdURL="https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/$PROM_OPERATOR_CRD_VERSION/example/prometheus-operator-crd/monitoring.coreos.com_$crd.yaml"
-    fi 
-
-    if kubectl get crd $crd.monitoring.coreos.com 1>/dev/null 2>&1; then
-      kubectl replace -f $crdURL
-    else
-      kubectl create -f $crdURL
-    fi
-  done
-else
-  log_debug "Prometheus Operator CRD update disabled"
+	log_verbose "Updating Prometheus Operator custom resource definitions"
+	crds=(alertmanagerconfigs alertmanagers prometheuses prometheusrules podmonitors servicemonitors thanosrulers probes)
+	for crd in "${crds[@]}"; do
+
+		## Determine CRD URL - if in an airgap environment, look for them in USER_DIR.
+		if [ "$AIRGAP_DEPLOYMENT" == "true" ]; then
+			crdURL=$USER_DIR/monitoring/prometheus-operator-crd/$PROM_OPERATOR_CRD_VERSION/monitoring.coreos.com_$crd.yaml
+
+			## Fail if the CRDs could not be located.
+			if [ ! -f "$crdURL" ]; then
+				log_error "Unable to locate file: [monitoring.coreos.com_$crd.yaml] in"
+				log_error "[$USER_DIR/monitoring/prometheus-operator-crd/$PROM_OPERATOR_CRD_VERSION] directory"
+				log_error "Please make sure to provide all Prometheus Operator CRDs before running the deployment"
+				exit 1
+			fi
+		else
+			crdURL="https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/$PROM_OPERATOR_CRD_VERSION/example/prometheus-operator-crd/monitoring.coreos.com_$crd.yaml"
+		fi
+
+		if kubectl get crd $crd.monitoring.coreos.com 1>/dev/null 2>&1; then
+			kubectl replace -f $crdURL
+		else
+			kubectl create -f $crdURL
+		fi
+	done
+else
+	log_debug "Prometheus Operator CRD update disabled"
 fi
 
 # Remove existing DaemonSets in case of an upgrade-in-place
@@ -113,11 +112,11 @@
 # Optional workload node placement support
 MON_NODE_PLACEMENT_ENABLE=${MON_NODE_PLACEMENT_ENABLE:-${NODE_PLACEMENT_ENABLE:-false}}
 if [ "$MON_NODE_PLACEMENT_ENABLE" == "true" ]; then
-  log_verbose "Enabling monitoring components for workload node placement"
-  wnpValuesFile="monitoring/node-placement/values-prom-operator-wnp.yaml"
-else
-  log_debug "Workload node placement support is disabled"
-  wnpValuesFile="$TMP_DIR/empty.yaml"
+	log_verbose "Enabling monitoring components for workload node placement"
+	wnpValuesFile="monitoring/node-placement/values-prom-operator-wnp.yaml"
+else
+	log_debug "Workload node placement support is disabled"
+	wnpValuesFile="$TMP_DIR/empty.yaml"
 fi
 
 # Optional TLS Support
@@ -124,118 +123,118 @@
 tlsValuesFile=$TMP_DIR/empty.yaml
 tlsPromAlertingEndpointFile=$TMP_DIR/empty.yaml
 if [ "$TLS_ENABLE" == "true" ]; then
-  apps=( prometheus alertmanager grafana )
-  create_tls_certs $MON_NS monitoring ${apps[@]}
-
-  tlsValuesFile=monitoring/tls/values-prom-operator-tls.yaml
-  tlsPromAlertingEndpointFile=monitoring/tls/prom-alertendpoint-host-https.yaml
-  log_debug "Including TLS response file $tlsValuesFile"
-
-  log_verbose "Provisioning TLS-enabled Prometheus datasource for Grafana"
-  grafanaDS=grafana-datasource-prom-https.yaml
-  if [ "$MON_TLS_PATH_INGRESS" == "true" ]; then
-    grafanaDS=grafana-datasource-prom-https-path.yaml
-    tlsPromAlertingEndpointFile=monitoring/tls/prom-alertendpoint-path-https.yaml
-  fi
-  kubectl delete cm -n $MON_NS --ignore-not-found grafana-datasource-prom-https
-  kubectl create cm -n $MON_NS grafana-datasource-prom-https --from-file monitoring/tls/$grafanaDS
-  kubectl label cm -n $MON_NS grafana-datasource-prom-https grafana_datasource=1 sas.com/monitoring-base=kube-viya-monitoring
-
-  # node-exporter TLS
-  log_verbose "Enabling Prometheus node-exporter for TLS"
-  kubectl delete cm -n $MON_NS node-exporter-tls-web-config --ignore-not-found
-  sleep 1
-  kubectl create cm -n $MON_NS node-exporter-tls-web-config --from-file monitoring/tls/node-exporter-web.yaml
-  kubectl label cm -n $MON_NS node-exporter-tls-web-config sas.com/monitoring-base=kube-viya-monitoring
+	apps=(prometheus alertmanager grafana)
+	create_tls_certs $MON_NS monitoring ${apps[@]}
+
+	tlsValuesFile=monitoring/tls/values-prom-operator-tls.yaml
+	tlsPromAlertingEndpointFile=monitoring/tls/prom-alertendpoint-host-https.yaml
+	log_debug "Including TLS response file $tlsValuesFile"
+
+	log_verbose "Provisioning TLS-enabled Prometheus datasource for Grafana"
+	grafanaDS=grafana-datasource-prom-https.yaml
+	if [ "$MON_TLS_PATH_INGRESS" == "true" ]; then
+		grafanaDS=grafana-datasource-prom-https-path.yaml
+		tlsPromAlertingEndpointFile=monitoring/tls/prom-alertendpoint-path-https.yaml
+	fi
+	kubectl delete cm -n $MON_NS --ignore-not-found grafana-datasource-prom-https
+	kubectl create cm -n $MON_NS grafana-datasource-prom-https --from-file monitoring/tls/$grafanaDS
+	kubectl label cm -n $MON_NS grafana-datasource-prom-https grafana_datasource=1 sas.com/monitoring-base=kube-viya-monitoring
+
+	# node-exporter TLS
+	log_verbose "Enabling Prometheus node-exporter for TLS"
+	kubectl delete cm -n $MON_NS node-exporter-tls-web-config --ignore-not-found
+	sleep 1
+	kubectl create cm -n $MON_NS node-exporter-tls-web-config --from-file monitoring/tls/node-exporter-web.yaml
+	kubectl label cm -n $MON_NS node-exporter-tls-web-config sas.com/monitoring-base=kube-viya-monitoring
 fi
 
 nodePortValuesFile=$TMP_DIR/empty.yaml
 PROM_NODEPORT_ENABLE=${PROM_NODEPORT_ENABLE:-false}
 if [ "$PROM_NODEPORT_ENABLE" == "true" ]; then
-  log_debug "Enabling NodePort access for Prometheus and Alertmanager"
-  nodePortValuesFile=monitoring/values-prom-nodeport.yaml
+	log_debug "Enabling NodePort access for Prometheus and Alertmanager"
+	nodePortValuesFile=monitoring/values-prom-nodeport.yaml
 fi
 
 if helm3ReleaseExists prometheus-operator $MON_NS; then
-  promRelease=prometheus-operator
-  promName=prometheus-operator
-else
-  promRelease=v4m-prometheus-operator
-  promName=v4m
+	promRelease=prometheus-operator
+	promName=prometheus-operator
+else
+	promRelease=v4m-prometheus-operator
+	promName=v4m
 fi
 log_verbose "User response file: [$PROM_OPER_USER_YAML]"
 log_info "Deploying the kube-prometheus stack. This may take a few minutes ..."
 if helm3ReleaseExists $promRelease $MON_NS; then
-  log_verbose "Upgrading via Helm ($(date) - timeout 20m)"
-else
-  grafanaPwd="$GRAFANA_ADMIN_PASSWORD"
-  if [ "$grafanaPwd" == "" ]; then
-    log_debug "Generating random Grafana admin password"
-    showPass="true"
-    grafanaPwd="$(randomPassword)"
-  fi
-  log_verbose "Installing via Helm ($(date) - timeout 20m)"
+	log_verbose "Upgrading via Helm ($(date) - timeout 20m)"
+else
+	grafanaPwd="$GRAFANA_ADMIN_PASSWORD"
+	if [ "$grafanaPwd" == "" ]; then
+		log_debug "Generating random Grafana admin password"
+		showPass="true"
+		grafanaPwd="$(randomPassword)"
+	fi
+	log_verbose "Installing via Helm ($(date) - timeout 20m)"
 fi
 
 # See https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack#from-21x-to-22x
-if [ "$V4M_CURRENT_VERSION_MAJOR" == "1" ] && [[ "$V4M_CURRENT_VERSION_MINOR" =~ [0-5] ]]; then
-  kubectl delete -n $MON_NS --ignore-not-found \
-    deployments.apps \
-    -l app.kubernetes.io/instance=v4m-prometheus-operator,app.kubernetes.io/name=kube-state-metrics
+if [ "$V4M_CURRENT_VERSION_MAJOR" == "1" ] && [[ $V4M_CURRENT_VERSION_MINOR =~ [0-5] ]]; then
+	kubectl delete -n $MON_NS --ignore-not-found \
+		deployments.apps \
+		-l app.kubernetes.io/instance=v4m-prometheus-operator,app.kubernetes.io/name=kube-state-metrics
 fi
 
 TRACING_ENABLE="${TRACING_ENABLE:-false}"
 if [ "$TRACING_ENABLE" == "false" ]; then
-  tempoDSFile=$TMP_DIR/empty.yaml
-else
-  TEMPO_USER_YAML="${TEMPO_USER_YAML:-$USER_DIR/monitoring/user-values-tempo.yaml}"
-  if [ ! -f "$TEMPO_USER_YAML" ]; then
-    log_debug "[$TEMPO_USER_YAML] not found. Using $TMP_DIR/empty.yaml"
-    TEMPO_USER_YAML=$TMP_DIR/empty.yaml
-  fi
-  tempoDSFile="monitoring/grafana-datasource-tempo.yaml"
-fi 
+	tempoDSFile=$TMP_DIR/empty.yaml
+else
+	TEMPO_USER_YAML="${TEMPO_USER_YAML:-$USER_DIR/monitoring/user-values-tempo.yaml}"
+	if [ ! -f "$TEMPO_USER_YAML" ]; then
+		log_debug "[$TEMPO_USER_YAML] not found. Using $TMP_DIR/empty.yaml"
+		TEMPO_USER_YAML=$TMP_DIR/empty.yaml
+	fi
+	tempoDSFile="monitoring/grafana-datasource-tempo.yaml"
+fi
 
 # Get Helm Chart Name
 log_debug "Kube-Prometheus Stack Helm Chart: repo [$KUBE_PROM_STACK_CHART_REPO] name [$KUBE_PROM_STACK_CHART_NAME] version [$KUBE_PROM_STACK_CHART_VERSION]"
 chart2install="$(get_helmchart_reference $KUBE_PROM_STACK_CHART_REPO $KUBE_PROM_STACK_CHART_NAME $KUBE_PROM_STACK_CHART_VERSION)"
-versionstring="$(get_helm_versionstring  $KUBE_PROM_STACK_CHART_VERSION)"
+versionstring="$(get_helm_versionstring $KUBE_PROM_STACK_CHART_VERSION)"
 log_debug "Installing Helm chart from artifact [$chart2install]"
 
 helm $helmDebug upgrade --install $promRelease \
-  --namespace $MON_NS \
-  -f $imageKeysFile \
-  -f monitoring/values-prom-operator.yaml \
-  -f $istioValuesFile \
-  -f $tlsValuesFile \
-  -f $tlsPromAlertingEndpointFile \
-  -f $nodePortValuesFile \
-  -f $wnpValuesFile \
-  -f $PROM_OPER_USER_YAML \
-  -f $tempoDSFile \
-  --atomic \
-  --timeout 20m \
-  --set nameOverride=$promName \
-  --set fullnameOverride=$promName \
-  --set prometheus-node-exporter.fullnameOverride=$promName-node-exporter \
-  --set kube-state-metrics.fullnameOverride=$promName-kube-state-metrics \
-  --set grafana.fullnameOverride=$promName-grafana \
-  --set grafana.adminPassword="$grafanaPwd" \
-  --set prometheus.prometheusSpec.alertingEndpoints[0].namespace="$MON_NS" \
-  $versionstring \
-  $chart2install
+	--namespace $MON_NS \
+	-f $imageKeysFile \
+	-f monitoring/values-prom-operator.yaml \
+	-f $istioValuesFile \
+	-f $tlsValuesFile \
+	-f $tlsPromAlertingEndpointFile \
+	-f $nodePortValuesFile \
+	-f $wnpValuesFile \
+	-f $PROM_OPER_USER_YAML \
+	-f $tempoDSFile \
+	--atomic \
+	--timeout 20m \
+	--set nameOverride=$promName \
+	--set fullnameOverride=$promName \
+	--set prometheus-node-exporter.fullnameOverride=$promName-node-exporter \
+	--set kube-state-metrics.fullnameOverride=$promName-kube-state-metrics \
+	--set grafana.fullnameOverride=$promName-grafana \
+	--set grafana.adminPassword="$grafanaPwd" \
+	--set prometheus.prometheusSpec.alertingEndpoints[0].namespace="$MON_NS" \
+	$versionstring \
+	$chart2install
 
 sleep 2
 
 if [ "$TLS_ENABLE" == "true" ]; then
-  log_verbose "Patching Grafana ServiceMonitor for TLS"
-  kubectl patch servicemonitor -n $MON_NS $promName-grafana --type=json \
-    -p='[{"op": "replace", "path": "/spec/endpoints/0/scheme", "value":"https"},{"op": "replace", "path": "/spec/endpoints/0/tlsConfig", "value":{}},{"op": "replace", "path": "/spec/endpoints/0/tlsConfig/insecureSkipVerify", "value":true}]'
+	log_verbose "Patching Grafana ServiceMonitor for TLS"
+	kubectl patch servicemonitor -n $MON_NS $promName-grafana --type=json \
+		-p='[{"op": "replace", "path": "/spec/endpoints/0/scheme", "value":"https"},{"op": "replace", "path": "/spec/endpoints/0/tlsConfig", "value":{}},{"op": "replace", "path": "/spec/endpoints/0/tlsConfig/insecureSkipVerify", "value":true}]'
 fi
 
 #Container Security: Disable serviceAccount Token Automounting
 disable_sa_token_automount $MON_NS v4m-grafana
-disable_sa_token_automount $MON_NS sas-ops-acct      #Used w/Prometheus
+disable_sa_token_automount $MON_NS sas-ops-acct #Used w/Prometheus
 disable_sa_token_automount $MON_NS v4m-node-exporter
 disable_sa_token_automount $MON_NS v4m-alertmanager
 
@@ -249,29 +248,29 @@
 log_verbose "Deploying cluster ServiceMonitors"
 
 if [ "$TRACING_ENABLE" == "true" ]; then
-  log_info "Tracing enabled..."
-
-  #Generate yaml file with all container-related keys
-  generateImageKeysFile "$TEMPO_FULL_IMAGE" "monitoring/tempo_container_image.template"
-
-  # Add the grafana helm chart repo
-  helmRepoAdd grafana https://grafana.github.io/helm-charts
-  helm repo update
-
-  # Get Helm Chart Name
-  log_debug "Tempo Helm Chart: repo [$TEMPO_CHART_REPO] name [$TEMPO_CHART_NAME] version [$TEMPO_CHART_VERSION]"
-  chart2install="$(get_helmchart_reference $TEMPO_CHART_REPO $TEMPO_CHART_NAME $TEMPO_CHART_VERSION)"
-  versionstring="$(get_helm_versionstring  $TEMPO_CHART_VERSION)"
-  log_debug "Installing Helm chart from artifact [$chart2install]"
-
-  log_info "Installing tempo"
-  helm upgrade --install v4m-tempo \
-    -n "$MON_NS" \
-    -f $imageKeysFile \
-    -f monitoring/values-tempo.yaml \
-    -f "$TEMPO_USER_YAML" \
-    $versionstring \
-    $chart2install
+	log_info "Tracing enabled..."
+
+	#Generate yaml file with all container-related keys
+	generateImageKeysFile "$TEMPO_FULL_IMAGE" "monitoring/tempo_container_image.template"
+
+	# Add the grafana helm chart repo
+	helmRepoAdd grafana https://grafana.github.io/helm-charts
+	helm repo update
+
+	# Get Helm Chart Name
+	log_debug "Tempo Helm Chart: repo [$TEMPO_CHART_REPO] name [$TEMPO_CHART_NAME] version [$TEMPO_CHART_VERSION]"
+	chart2install="$(get_helmchart_reference $TEMPO_CHART_REPO $TEMPO_CHART_NAME $TEMPO_CHART_VERSION)"
+	versionstring="$(get_helm_versionstring $TEMPO_CHART_VERSION)"
+	log_debug "Installing Helm chart from artifact [$chart2install]"
+
+	log_info "Installing tempo"
+	helm upgrade --install v4m-tempo \
+		-n "$MON_NS" \
+		-f $imageKeysFile \
+		-f monitoring/values-tempo.yaml \
+		-f "$TEMPO_USER_YAML" \
+		$versionstring \
+		$chart2install
 fi
 
 # NGINX
@@ -278,13 +277,13 @@
 set +e
 kubectl get ns $NGINX_NS 2>/dev/null
 if [ $? == 0 ]; then
-  nginxFound=true
+	nginxFound=true
 fi
 set -e
 
 if [ "$nginxFound" == "true" ]; then
-  log_verbose "NGINX found. Deploying podMonitor to [$NGINX_NS] namespace"
-  kubectl apply -n $NGINX_NS -f monitoring/monitors/kube/podMonitor-nginx.yaml 2>/dev/null
+	log_verbose "NGINX found. Deploying podMonitor to [$NGINX_NS] namespace"
+	kubectl apply -n $NGINX_NS -f monitoring/monitors/kube/podMonitor-nginx.yaml 2>/dev/null
 fi
 
 # Eventrouter ServiceMonitor
@@ -300,25 +299,25 @@
 # Rules
 log_verbose "Adding Prometheus recording rules"
 for f in monitoring/rules/viya/rules-*.yaml; do
-  kubectl apply -n $MON_NS -f $f
+	kubectl apply -n $MON_NS -f $f
 done
 
 # Elasticsearch Datasource for Grafana
 LOGGING_DATASOURCE="${LOGGING_DATASOURCE:-false}"
 if [ "$LOGGING_DATASOURCE" == "true" ]; then
-  set +e
-  log_debug "Creating the logging data source using the create_logging_datasource script"
-  monitoring/bin/create_logging_datasource.sh
-
-  if (( $? == 1 )); then
-    log_warn "Unable to configure the logging data source at this time."
-    log_warn "Please address the errors and re-run the follow command to create the data source at a later time:"
-    log_warn "monitoring/bin/create_logging_datasource.sh"
-  fi
-  set -e
-else
-  log_debug "LOGGING_DATASOURCE not set"
-  log_debug "Skipping creation of logging data source for Grafana"
+	set +e
+	log_debug "Creating the logging data source using the create_logging_datasource script"
+	monitoring/bin/create_logging_datasource.sh
+
+	if (($? == 1)); then
+		log_warn "Unable to configure the logging data source at this time."
+		log_warn "Please address the errors and re-run the follow command to create the data source at a later time:"
+		log_warn "monitoring/bin/create_logging_datasource.sh"
+	fi
+	set -e
+else
+	log_debug "LOGGING_DATASOURCE not set"
+	log_debug "Skipping creation of logging data source for Grafana"
 fi
 
 echo ""
@@ -332,16 +331,16 @@
 # when these issues have been resolved.
 V4M_TEMP_REPLACE_PROBLEMATIC_MIXIN_DASHBOARDS="${V4M_TEMP_REPLACE_PROBLEMATIC_MIXIN_DASHBOARDS:-true}"
 if [ "$V4M_TEMP_REPLACE_PROBLEMATIC_MIXIN_DASHBOARDS" == "true" ]; then
-   log_info "Replacing some Kube-Prometheus Stack-supplied Grafana dashboards with our own versions due to incompatabilities."
-
-   # remove configMaps definining exising Grafana dashboards
-   kubectl -n $MON_NS delete configmap  v4m-cluster-total         --ignore-not-found
-   kubectl -n $MON_NS delete configmap  v4m-namespace-by-pod      --ignore-not-found
-   kubectl -n $MON_NS delete configmap  v4m-namespace-by-workload --ignore-not-found
-   kubectl -n $MON_NS delete configmap  v4m-prometheus            --ignore-not-found
-
-   # deploy our versions of these dashboards
-   monitoring/bin/deploy_dashboards.sh monitoring/dashboards/mixinfixes
+	log_info "Replacing some Kube-Prometheus Stack-supplied Grafana dashboards with our own versions due to incompatabilities."
+
+	# remove configMaps definining exising Grafana dashboards
+	kubectl -n $MON_NS delete configmap v4m-cluster-total --ignore-not-found
+	kubectl -n $MON_NS delete configmap v4m-namespace-by-pod --ignore-not-found
+	kubectl -n $MON_NS delete configmap v4m-namespace-by-workload --ignore-not-found
+	kubectl -n $MON_NS delete configmap v4m-prometheus --ignore-not-found
+
+	# deploy our versions of these dashboards
+	monitoring/bin/deploy_dashboards.sh monitoring/dashboards/mixinfixes
 
 fi
 
@@ -350,7 +349,7 @@
 get_ingress_ports
 
 # get URLs for Grafana, Prometheus and AlertManager
-gf_url=$(get_service_url $MON_NS v4m-grafana  "$TLS_ENABLE")
+gf_url=$(get_service_url $MON_NS v4m-grafana "$TLS_ENABLE")
 # pr_url=$(get_url $MON_NS v4m-prometheus  "$TLS_ENABLE")
 # am_url=$(get_url $MON_NS v4m-alertmanager  "$TLS_ENABLE")
 set -e
@@ -357,12 +356,12 @@
 
 # If a deployment with the old name exists, remove it first
 if helm3ReleaseExists v4m $MON_NS; then
-  log_verbose "Removing outdated SAS Viya Monitoring Helm chart release from [$MON_NS] namespace"
-  helm uninstall -n "$MON_NS" "v4m"
+	log_verbose "Removing outdated SAS Viya Monitoring Helm chart release from [$MON_NS] namespace"
+	helm uninstall -n "$MON_NS" "v4m"
 fi
 
 if ! deployV4MInfo "$MON_NS" "v4m-metrics"; then
-  log_warn "Unable to update SAS Viya Monitoring Helm chart release"
+	log_warn "Unable to update SAS Viya Monitoring Helm chart release"
 fi
 
 # Print URL to access web apps
@@ -369,13 +368,13 @@
 log_notice ""
 log_notice "GRAFANA: "
 if [ ! -z "$gf_url" ]; then
-   log_notice "  $gf_url"
-else
-   log_notice " It was not possible to determine the URL needed to access Grafana. Note  "
-   log_notice " that this is not necessarily a sign of a problem; it may only reflect an "
-   log_notice " ingress or network access configuration that this script does not handle."
-fi
-   log_notice ""
+	log_notice "  $gf_url"
+else
+	log_notice " It was not possible to determine the URL needed to access Grafana. Note  "
+	log_notice " that this is not necessarily a sign of a problem; it may only reflect an "
+	log_notice " ingress or network access configuration that this script does not handle."
+fi
+log_notice ""
 
 #log_notice ""
 #log_notice "================================================================================"
@@ -398,14 +397,12 @@
 #log_notice ""
 
 if [ "$showPass" == "true" ]; then
-  # Find the grafana pod
- 
-  log_notice " Generated Grafana admin password is: $grafanaPwd"
-  log_notice " To change the password, run the following script (replace myNewPassword with an updated password):"
-  log_notice " monitoring/bin/change_grafana_admin_password.sh -p myNewPassword"
+	# Find the grafana pod
+
+	log_notice " Generated Grafana admin password is: $grafanaPwd"
+	log_notice " To change the password, run the following script (replace myNewPassword with an updated password):"
+	log_notice " monitoring/bin/change_grafana_admin_password.sh -p myNewPassword"
 fi
 
 log_message ""
 log_notice " Successfully deployed components to the [$MON_NS] namespace"
-
-
----------

You can reformat the above files to meet shfmt's requirements by typing:

  shfmt -s -w filename

github-actions · 2024-11-04T23:10:03Z

`sh-checker report`

To get the full details, please check in the job output.

shellcheck errors


'shellcheck -e SC1004' returned error 1 finding the following syntactical issues:

----------

In logging/bin/deploy_esexporter.sh line 6:
cd "$(dirname $BASH_SOURCE)/../.."
              ^----------^ SC2128 (warning): Expanding an array without an index only gives the first element.
              ^----------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
cd "$(dirname "$BASH_SOURCE")/../.."


In logging/bin/deploy_esexporter.sh line 7:
source logging/bin/common.sh
       ^-------------------^ SC1091 (info): Not following: logging/bin/common.sh was not specified as input (see shellcheck -x).


In logging/bin/deploy_esexporter.sh line 8:
source logging/bin/secrets-include.sh
       ^----------------------------^ SC1091 (info): Not following: logging/bin/secrets-include.sh was not specified as input (see shellcheck -x).


In logging/bin/deploy_esexporter.sh line 10:
this_script=`basename "$0"`
            ^-------------^ SC2006 (style): Use $(...) notation instead of legacy backticks `...`.

Did you mean: 
this_script=$(basename "$0")


In logging/bin/deploy_esexporter.sh line 31:
if [ "$(kubectl get ns $LOG_NS -o name 2>/dev/null)" == "" ]; then
                       ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
if [ "$(kubectl get ns "$LOG_NS" -o name 2>/dev/null)" == "" ]; then


In logging/bin/deploy_esexporter.sh line 42:
if helm3ReleaseExists es-exporter $LOG_NS; then
                                  ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
if helm3ReleaseExists es-exporter "$LOG_NS"; then


In logging/bin/deploy_esexporter.sh line 45:
   if [ -z $(kubectl -n $LOG_NS get pods -l "app.kubernetes.io/name=prometheus-elasticsearch-exporter,searchbackend=opensearch" -o name 2>/dev/null) ]; then
           ^-- SC2046 (warning): Quote this to prevent word splitting.
                        ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
   if [ -z $(kubectl -n "$LOG_NS" get pods -l "app.kubernetes.io/name=prometheus-elasticsearch-exporter,searchbackend=opensearch" -o name 2>/dev/null) ]; then


In logging/bin/deploy_esexporter.sh line 47:
      helm -n $LOG_NS delete es-exporter
              ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
      helm -n "$LOG_NS" delete es-exporter


In logging/bin/deploy_esexporter.sh line 53:
      kubectl delete -n $monNamespace servicemonitor elasticsearch
                        ^-----------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
      kubectl delete -n "$monNamespace" servicemonitor elasticsearch


In logging/bin/deploy_esexporter.sh line 55:
      kubectl apply  -n $monNamespace -f monitoring/monitors/logging/serviceMonitor-elasticsearch-v2.yaml
                        ^-----------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
      kubectl apply  -n "$monNamespace" -f monitoring/monitors/logging/serviceMonitor-elasticsearch-v2.yaml


In logging/bin/deploy_esexporter.sh line 106:
helm2ReleaseCheck es-exporter-$LOG_NS
                              ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
helm2ReleaseCheck es-exporter-"$LOG_NS"


In logging/bin/deploy_esexporter.sh line 111:
chart2install="$(get_helmchart_reference $ESEXPORTER_HELM_CHART_REPO $ESEXPORTER_HELM_CHART_NAME $ESEXPORTER_HELM_CHART_VERSION)"
                                         ^-------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
                                                                     ^-------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
                                                                                                 ^----------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
chart2install="$(get_helmchart_reference "$ESEXPORTER_HELM_CHART_REPO" "$ESEXPORTER_HELM_CHART_NAME" "$ESEXPORTER_HELM_CHART_VERSION")"


In logging/bin/deploy_esexporter.sh line 112:
versionstring="$(get_helm_versionstring  $ESEXPORTER_HELM_CHART_VERSION)"
                                         ^----------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
versionstring="$(get_helm_versionstring  "$ESEXPORTER_HELM_CHART_VERSION")"


In logging/bin/deploy_esexporter.sh line 116:
helm $helmDebug upgrade --install es-exporter \
     ^--------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
helm "$helmDebug" upgrade --install es-exporter \


In logging/bin/deploy_esexporter.sh line 117:
 --namespace $LOG_NS \
             ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
 --namespace "$LOG_NS" \


In logging/bin/deploy_esexporter.sh line 118:
 -f $imageKeysFile \
    ^------------^ SC2154 (warning): imageKeysFile is referenced but not assigned.
    ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
 -f "$imageKeysFile" \


In logging/bin/deploy_esexporter.sh line 120:
 -f $wnpValuesFile \
    ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
 -f "$wnpValuesFile" \


In logging/bin/deploy_esexporter.sh line 121:
 -f $openshiftValuesFile \
    ^------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
 -f "$openshiftValuesFile" \


In logging/bin/deploy_esexporter.sh line 122:
 -f $ES_OPEN_EXPORTER_USER_YAML \
    ^-------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
 -f "$ES_OPEN_EXPORTER_USER_YAML" \


In logging/bin/deploy_esexporter.sh line 124:
 $versionstring \
 ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
 "$versionstring" \


In logging/bin/deploy_esexporter.sh line 125:
 $chart2install
 ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
 "$chart2install"


In monitoring/bin/deploy_monitoring_cluster.sh line 6:
cd "$(dirname $BASH_SOURCE)/../.."
              ^----------^ SC2128 (warning): Expanding an array without an index only gives the first element.
              ^----------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
cd "$(dirname "$BASH_SOURCE")/../.."


In monitoring/bin/deploy_monitoring_cluster.sh line 7:
source monitoring/bin/common.sh
       ^----------------------^ SC1091 (info): Not following: monitoring/bin/common.sh was not specified as input (see shellcheck -x).


In monitoring/bin/deploy_monitoring_cluster.sh line 8:
source bin/service-url-include.sh
       ^------------------------^ SC1091 (info): Not following: bin/service-url-include.sh was not specified as input (see shellcheck -x).


In monitoring/bin/deploy_monitoring_cluster.sh line 18:
source bin/tls-include.sh
       ^----------------^ SC1091 (info): Not following: bin/tls-include.sh was not specified as input (see shellcheck -x).


In monitoring/bin/deploy_monitoring_cluster.sh line 19:
if verify_cert_generator $MON_NS prometheus alertmanager grafana; then
                         ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
if verify_cert_generator "$MON_NS" prometheus alertmanager grafana; then


In monitoring/bin/deploy_monitoring_cluster.sh line 20:
  log_debug "cert generator check OK [$cert_generator_ok]"
                                      ^----------------^ SC2154 (warning): cert_generator_ok is referenced but not assigned.


In monitoring/bin/deploy_monitoring_cluster.sh line 22:
  log_error "One or more required TLS certs do not exist and the expected certificate generator mechanism [$cert_generator] is not available to create the missing certs"
                                                                                                           ^-------------^ SC2154 (warning): cert_generator is referenced but not assigned.


In monitoring/bin/deploy_monitoring_cluster.sh line 26:
helm2ReleaseCheck v4m-$MON_NS
                      ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
helm2ReleaseCheck v4m-"$MON_NS"


In monitoring/bin/deploy_monitoring_cluster.sh line 27:
helm2ReleaseCheck prometheus-$MON_NS
                             ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
helm2ReleaseCheck prometheus-"$MON_NS"


In monitoring/bin/deploy_monitoring_cluster.sh line 43:
if [ -z "$(kubectl get ns $MON_NS -o name 2>/dev/null)" ]; then
                          ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
if [ -z "$(kubectl get ns "$MON_NS" -o name 2>/dev/null)" ]; then


In monitoring/bin/deploy_monitoring_cluster.sh line 44:
  kubectl create ns $MON_NS
                    ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl create ns "$MON_NS"


In monitoring/bin/deploy_monitoring_cluster.sh line 47:
  disable_sa_token_automount $MON_NS default
                             ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  disable_sa_token_automount "$MON_NS" default


In monitoring/bin/deploy_monitoring_cluster.sh line 52:
generateImageKeysFile "$ALERTMANAGER_FULL_IMAGE"    "$imageKeysFile"  "ALERTMANAGER_"
                                                     ^------------^ SC2154 (warning): imageKeysFile is referenced but not assigned.


In monitoring/bin/deploy_monitoring_cluster.sh line 100:
    if kubectl get crd $crd.monitoring.coreos.com 1>/dev/null 2>&1; then
                       ^--^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
    if kubectl get crd "$crd".monitoring.coreos.com 1>/dev/null 2>&1; then


In monitoring/bin/deploy_monitoring_cluster.sh line 101:
      kubectl replace -f $crdURL
                         ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
      kubectl replace -f "$crdURL"


In monitoring/bin/deploy_monitoring_cluster.sh line 103:
      kubectl create -f $crdURL
                        ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
      kubectl create -f "$crdURL"


In monitoring/bin/deploy_monitoring_cluster.sh line 111:
kubectl delete daemonset -n $MON_NS -l app=prometheus-node-exporter --ignore-not-found
                            ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
kubectl delete daemonset -n "$MON_NS" -l app=prometheus-node-exporter --ignore-not-found


In monitoring/bin/deploy_monitoring_cluster.sh line 128:
  create_tls_certs $MON_NS monitoring ${apps[@]}
                   ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.
                                      ^--------^ SC2068 (error): Double quote array expansions to avoid re-splitting elements.

Did you mean: 
  create_tls_certs "$MON_NS" monitoring ${apps[@]}


In monitoring/bin/deploy_monitoring_cluster.sh line 140:
  kubectl delete cm -n $MON_NS --ignore-not-found grafana-datasource-prom-https
                       ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl delete cm -n "$MON_NS" --ignore-not-found grafana-datasource-prom-https


In monitoring/bin/deploy_monitoring_cluster.sh line 141:
  kubectl create cm -n $MON_NS grafana-datasource-prom-https --from-file monitoring/tls/$grafanaDS
                       ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl create cm -n "$MON_NS" grafana-datasource-prom-https --from-file monitoring/tls/$grafanaDS


In monitoring/bin/deploy_monitoring_cluster.sh line 142:
  kubectl label cm -n $MON_NS grafana-datasource-prom-https grafana_datasource=1 sas.com/monitoring-base=kube-viya-monitoring
                      ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl label cm -n "$MON_NS" grafana-datasource-prom-https grafana_datasource=1 sas.com/monitoring-base=kube-viya-monitoring


In monitoring/bin/deploy_monitoring_cluster.sh line 146:
  kubectl delete cm -n $MON_NS node-exporter-tls-web-config --ignore-not-found
                       ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl delete cm -n "$MON_NS" node-exporter-tls-web-config --ignore-not-found


In monitoring/bin/deploy_monitoring_cluster.sh line 148:
  kubectl create cm -n $MON_NS node-exporter-tls-web-config --from-file monitoring/tls/node-exporter-web.yaml
                       ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl create cm -n "$MON_NS" node-exporter-tls-web-config --from-file monitoring/tls/node-exporter-web.yaml


In monitoring/bin/deploy_monitoring_cluster.sh line 149:
  kubectl label cm -n $MON_NS node-exporter-tls-web-config sas.com/monitoring-base=kube-viya-monitoring
                      ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl label cm -n "$MON_NS" node-exporter-tls-web-config sas.com/monitoring-base=kube-viya-monitoring


In monitoring/bin/deploy_monitoring_cluster.sh line 159:
if helm3ReleaseExists prometheus-operator $MON_NS; then
                                          ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
if helm3ReleaseExists prometheus-operator "$MON_NS"; then


In monitoring/bin/deploy_monitoring_cluster.sh line 168:
if helm3ReleaseExists $promRelease $MON_NS; then
                                   ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
if helm3ReleaseExists $promRelease "$MON_NS"; then


In monitoring/bin/deploy_monitoring_cluster.sh line 182:
  kubectl delete -n $MON_NS --ignore-not-found \
                    ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl delete -n "$MON_NS" --ignore-not-found \


In monitoring/bin/deploy_monitoring_cluster.sh line 201:
chart2install="$(get_helmchart_reference $KUBE_PROM_STACK_CHART_REPO $KUBE_PROM_STACK_CHART_NAME $KUBE_PROM_STACK_CHART_VERSION)"
                                         ^-------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
                                                                     ^-------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
                                                                                                 ^----------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
chart2install="$(get_helmchart_reference "$KUBE_PROM_STACK_CHART_REPO" "$KUBE_PROM_STACK_CHART_NAME" "$KUBE_PROM_STACK_CHART_VERSION")"


In monitoring/bin/deploy_monitoring_cluster.sh line 202:
versionstring="$(get_helm_versionstring  $KUBE_PROM_STACK_CHART_VERSION)"
                                         ^----------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
versionstring="$(get_helm_versionstring  "$KUBE_PROM_STACK_CHART_VERSION")"


In monitoring/bin/deploy_monitoring_cluster.sh line 205:
helm $helmDebug upgrade --install $promRelease \
     ^--------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
helm "$helmDebug" upgrade --install $promRelease \


In monitoring/bin/deploy_monitoring_cluster.sh line 206:
  --namespace $MON_NS \
              ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  --namespace "$MON_NS" \


In monitoring/bin/deploy_monitoring_cluster.sh line 207:
  -f $imageKeysFile \
     ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  -f "$imageKeysFile" \


In monitoring/bin/deploy_monitoring_cluster.sh line 209:
  -f $istioValuesFile \
     ^--------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  -f "$istioValuesFile" \


In monitoring/bin/deploy_monitoring_cluster.sh line 210:
  -f $tlsValuesFile \
     ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  -f "$tlsValuesFile" \


In monitoring/bin/deploy_monitoring_cluster.sh line 211:
  -f $tlsPromAlertingEndpointFile \
     ^--------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  -f "$tlsPromAlertingEndpointFile" \


In monitoring/bin/deploy_monitoring_cluster.sh line 212:
  -f $nodePortValuesFile \
     ^-----------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  -f "$nodePortValuesFile" \


In monitoring/bin/deploy_monitoring_cluster.sh line 213:
  -f $wnpValuesFile \
     ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  -f "$wnpValuesFile" \


In monitoring/bin/deploy_monitoring_cluster.sh line 214:
  -f $PROM_OPER_USER_YAML \
     ^------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  -f "$PROM_OPER_USER_YAML" \


In monitoring/bin/deploy_monitoring_cluster.sh line 215:
  -f $tempoDSFile \
     ^----------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  -f "$tempoDSFile" \


In monitoring/bin/deploy_monitoring_cluster.sh line 225:
  $versionstring \
  ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  "$versionstring" \


In monitoring/bin/deploy_monitoring_cluster.sh line 226:
  $chart2install
  ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  "$chart2install"


In monitoring/bin/deploy_monitoring_cluster.sh line 232:
  kubectl patch servicemonitor -n $MON_NS $promName-grafana --type=json \
                                  ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl patch servicemonitor -n "$MON_NS" $promName-grafana --type=json \


In monitoring/bin/deploy_monitoring_cluster.sh line 237:
disable_sa_token_automount $MON_NS v4m-grafana
                           ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
disable_sa_token_automount "$MON_NS" v4m-grafana


In monitoring/bin/deploy_monitoring_cluster.sh line 238:
disable_sa_token_automount $MON_NS sas-ops-acct      #Used w/Prometheus
                           ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
disable_sa_token_automount "$MON_NS" sas-ops-acct      #Used w/Prometheus


In monitoring/bin/deploy_monitoring_cluster.sh line 239:
disable_sa_token_automount $MON_NS v4m-node-exporter
                           ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
disable_sa_token_automount "$MON_NS" v4m-node-exporter


In monitoring/bin/deploy_monitoring_cluster.sh line 240:
disable_sa_token_automount $MON_NS v4m-alertmanager
                           ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
disable_sa_token_automount "$MON_NS" v4m-alertmanager


In monitoring/bin/deploy_monitoring_cluster.sh line 243:
disable_sa_token_automount $MON_NS v4m-kube-state-metrics
                           ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
disable_sa_token_automount "$MON_NS" v4m-kube-state-metrics


In monitoring/bin/deploy_monitoring_cluster.sh line 244:
enable_pod_token_automount $MON_NS deployment v4m-kube-state-metrics
                           ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
enable_pod_token_automount "$MON_NS" deployment v4m-kube-state-metrics


In monitoring/bin/deploy_monitoring_cluster.sh line 245:
disable_sa_token_automount $MON_NS v4m-operator
                           ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
disable_sa_token_automount "$MON_NS" v4m-operator


In monitoring/bin/deploy_monitoring_cluster.sh line 246:
enable_pod_token_automount $MON_NS deployment v4m-operator
                           ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
enable_pod_token_automount "$MON_NS" deployment v4m-operator


In monitoring/bin/deploy_monitoring_cluster.sh line 263:
  chart2install="$(get_helmchart_reference $TEMPO_CHART_REPO $TEMPO_CHART_NAME $TEMPO_CHART_VERSION)"
                                           ^---------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
                                                             ^---------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
                                                                               ^------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  chart2install="$(get_helmchart_reference "$TEMPO_CHART_REPO" "$TEMPO_CHART_NAME" "$TEMPO_CHART_VERSION")"


In monitoring/bin/deploy_monitoring_cluster.sh line 264:
  versionstring="$(get_helm_versionstring  $TEMPO_CHART_VERSION)"
                                           ^------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  versionstring="$(get_helm_versionstring  "$TEMPO_CHART_VERSION")"


In monitoring/bin/deploy_monitoring_cluster.sh line 270:
    -f $imageKeysFile \
       ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
    -f "$imageKeysFile" \


In monitoring/bin/deploy_monitoring_cluster.sh line 273:
    $versionstring \
    ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
    "$versionstring" \


In monitoring/bin/deploy_monitoring_cluster.sh line 274:
    $chart2install
    ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
    "$chart2install"


In monitoring/bin/deploy_monitoring_cluster.sh line 279:
kubectl get ns $NGINX_NS 2>/dev/null
               ^-------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
kubectl get ns "$NGINX_NS" 2>/dev/null


In monitoring/bin/deploy_monitoring_cluster.sh line 280:
if [ $? == 0 ]; then
     ^-- SC2181 (style): Check exit code directly with e.g. 'if mycmd;', not indirectly with $?.


In monitoring/bin/deploy_monitoring_cluster.sh line 287:
  kubectl apply -n $NGINX_NS -f monitoring/monitors/kube/podMonitor-nginx.yaml 2>/dev/null
                   ^-------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl apply -n "$NGINX_NS" -f monitoring/monitors/kube/podMonitor-nginx.yaml 2>/dev/null


In monitoring/bin/deploy_monitoring_cluster.sh line 291:
kubectl apply -n $MON_NS -f monitoring/monitors/kube/podMonitor-eventrouter.yaml 2>/dev/null
                 ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
kubectl apply -n "$MON_NS" -f monitoring/monitors/kube/podMonitor-eventrouter.yaml 2>/dev/null


In monitoring/bin/deploy_monitoring_cluster.sh line 294:
kubectl apply -n $MON_NS -f monitoring/monitors/logging/serviceMonitor-elasticsearch-v2.yaml
                 ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
kubectl apply -n "$MON_NS" -f monitoring/monitors/logging/serviceMonitor-elasticsearch-v2.yaml


In monitoring/bin/deploy_monitoring_cluster.sh line 297:
kubectl apply -n $MON_NS -f monitoring/monitors/logging/serviceMonitor-fluent-bit.yaml
                 ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
kubectl apply -n "$MON_NS" -f monitoring/monitors/logging/serviceMonitor-fluent-bit.yaml


In monitoring/bin/deploy_monitoring_cluster.sh line 298:
kubectl apply -n $MON_NS -f monitoring/monitors/logging/serviceMonitor-fluent-bit-v2.yaml
                 ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
kubectl apply -n "$MON_NS" -f monitoring/monitors/logging/serviceMonitor-fluent-bit-v2.yaml


In monitoring/bin/deploy_monitoring_cluster.sh line 303:
  kubectl apply -n $MON_NS -f $f
                   ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.
                              ^-- SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl apply -n "$MON_NS" -f "$f"


In monitoring/bin/deploy_monitoring_cluster.sh line 338:
   kubectl -n $MON_NS delete configmap  v4m-cluster-total         --ignore-not-found
              ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
   kubectl -n "$MON_NS" delete configmap  v4m-cluster-total         --ignore-not-found


In monitoring/bin/deploy_monitoring_cluster.sh line 339:
   kubectl -n $MON_NS delete configmap  v4m-namespace-by-pod      --ignore-not-found
              ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
   kubectl -n "$MON_NS" delete configmap  v4m-namespace-by-pod      --ignore-not-found


In monitoring/bin/deploy_monitoring_cluster.sh line 340:
   kubectl -n $MON_NS delete configmap  v4m-namespace-by-workload --ignore-not-found
              ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
   kubectl -n "$MON_NS" delete configmap  v4m-namespace-by-workload --ignore-not-found


In monitoring/bin/deploy_monitoring_cluster.sh line 341:
   kubectl -n $MON_NS delete configmap  v4m-prometheus            --ignore-not-found
              ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
   kubectl -n "$MON_NS" delete configmap  v4m-prometheus            --ignore-not-found


In monitoring/bin/deploy_monitoring_cluster.sh line 353:
gf_url=$(get_service_url $MON_NS v4m-grafana  "$TLS_ENABLE")
                         ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
gf_url=$(get_service_url "$MON_NS" v4m-grafana  "$TLS_ENABLE")


In monitoring/bin/deploy_monitoring_cluster.sh line 359:
if helm3ReleaseExists v4m $MON_NS; then
                          ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
if helm3ReleaseExists v4m "$MON_NS"; then


In monitoring/bin/deploy_monitoring_cluster.sh line 371:
if [ ! -z "$gf_url" ]; then
     ^-- SC2236 (style): Use -n instead of ! -z.

For more information:
  https://www.shellcheck.net/wiki/SC2068 -- Double quote array expansions to ...
  https://www.shellcheck.net/wiki/SC2046 -- Quote this to prevent word splitt...
  https://www.shellcheck.net/wiki/SC2128 -- Expanding an array without an ind...
----------

You can address the above issues in one of three ways:
1. Manually correct the issue in the offending shell script;
2. Disable specific issues by adding the comment:
  # shellcheck disable=NNNN
above the line that contains the issue, where NNNN is the error code;
3. Add '-e NNNN' to the SHELLCHECK_OPTS setting in your .yml action file.

shfmt errors


'shfmt -s' returned error 1 finding the following formatting issues:

----------
diff logging/bin/deploy_esexporter.sh.orig logging/bin/deploy_esexporter.sh
--- logging/bin/deploy_esexporter.sh.orig
+++ logging/bin/deploy_esexporter.sh
@@ -7,7 +7,7 @@
 source logging/bin/common.sh
 source logging/bin/secrets-include.sh
 
-this_script=`basename "$0"`
+this_script=$(basename "$0")
 
 log_debug "Script [$this_script] has started [$(date)]"
 
@@ -14,8 +14,8 @@
 ELASTICSEARCH_EXPORTER_ENABLED=${ELASTICSEARCH_EXPORTER_ENABLED:-true}
 
 if [ "$ELASTICSEARCH_EXPORTER_ENABLED" != "true" ]; then
-  log_verbose "Environment variable [ELASTICSEARCH_EXPORTER_ENABLED] is not set to 'true'; exiting WITHOUT deploying Elasticsearch Exporter"
-  exit
+	log_verbose "Environment variable [ELASTICSEARCH_EXPORTER_ENABLED] is not set to 'true'; exiting WITHOUT deploying Elasticsearch Exporter"
+	exit
 fi
 
 set -e
@@ -29,33 +29,35 @@
 
 # Confirm namespace exists
 if [ "$(kubectl get ns $LOG_NS -o name 2>/dev/null)" == "" ]; then
-  log_error "Namespace [$LOG_NS] does NOT exist."
-  exit 1
+	log_error "Namespace [$LOG_NS] does NOT exist."
+	exit 1
 fi
 
 # get credentials
 get_credentials_from_secret metricgetter
 rc=$?
-if [ "$rc" != "0" ] ;then log_debug "RC=$rc"; exit $rc;fi
-
+if [ "$rc" != "0" ]; then
+	log_debug "RC=$rc"
+	exit $rc
+fi
 
 if helm3ReleaseExists es-exporter $LOG_NS; then
-   #remove an existing instance if it does NOT have the most current set of labels
-   # NOTE: pod label 'app' changed to 'app.kubernetes.io/name' w/Helm chart 6.x
-   if [ -z $(kubectl -n $LOG_NS get pods -l "app.kubernetes.io/name=prometheus-elasticsearch-exporter,searchbackend=opensearch" -o name 2>/dev/null) ]; then
-      log_debug "Removing an outdated version of Helm release [es-exporter]"
-      helm -n $LOG_NS delete es-exporter
-   fi
-
-   monNamespace=$(kubectl get servicemonitor -A --field-selector=metadata.name=elasticsearch -l sas.com/monitoring-base=kube-viya-monitoring -o=custom-columns=NAMESPACE:.metadata.namespace --no-headers)
-   if [ -n "$monNamespace" ]; then
-      log_debug "Removing obsolete serviceMonitor [$monNamespace/elasticsearch]"
-      kubectl delete -n $monNamespace servicemonitor elasticsearch
-      log_debug "Deploying an updated serviceMonitor for Elasticsearch  [$monNamespace/elasticsearch-v2]"
-      kubectl apply  -n $monNamespace -f monitoring/monitors/logging/serviceMonitor-elasticsearch-v2.yaml
-   fi
-else
-   log_debug "No existing Helm release [es-exporter] found."
+	#remove an existing instance if it does NOT have the most current set of labels
+	# NOTE: pod label 'app' changed to 'app.kubernetes.io/name' w/Helm chart 6.x
+	if [ -z $(kubectl -n $LOG_NS get pods -l "app.kubernetes.io/name=prometheus-elasticsearch-exporter,searchbackend=opensearch" -o name 2>/dev/null) ]; then
+		log_debug "Removing an outdated version of Helm release [es-exporter]"
+		helm -n $LOG_NS delete es-exporter
+	fi
+
+	monNamespace=$(kubectl get servicemonitor -A --field-selector=metadata.name=elasticsearch -l sas.com/monitoring-base=kube-viya-monitoring -o=custom-columns=NAMESPACE:.metadata.namespace --no-headers)
+	if [ -n "$monNamespace" ]; then
+		log_debug "Removing obsolete serviceMonitor [$monNamespace/elasticsearch]"
+		kubectl delete -n $monNamespace servicemonitor elasticsearch
+		log_debug "Deploying an updated serviceMonitor for Elasticsearch  [$monNamespace/elasticsearch-v2]"
+		kubectl apply -n $monNamespace -f monitoring/monitors/logging/serviceMonitor-elasticsearch-v2.yaml
+	fi
+else
+	log_debug "No existing Helm release [es-exporter] found."
 fi
 
 # enable debug on Helm via env var
@@ -62,7 +64,7 @@
 export HELM_DEBUG="${HELM_DEBUG:-false}"
 
 if [ "$HELM_DEBUG" == "true" ]; then
-  helmDebug="--debug"
+	helmDebug="--debug"
 fi
 
 helmRepoAdd prometheus-community https://prometheus-community.github.io/helm-charts
@@ -76,8 +78,8 @@
 # Load any user customizations/overrides
 ES_OPEN_EXPORTER_USER_YAML="${ES_OPEN_EXPORTER_USER_YAML:-$USER_DIR/logging/user-values-es-exporter.yaml}"
 if [ ! -f "$ES_OPEN_EXPORTER_USER_YAML" ]; then
-  log_debug "[$ES_OPEN_EXPORTER_USER_YAML] not found. Using $TMP_DIR/empty.yaml"
-  ES_OPEN_EXPORTER_USER_YAML=$TMP_DIR/empty.yaml
+	log_debug "[$ES_OPEN_EXPORTER_USER_YAML] not found. Using $TMP_DIR/empty.yaml"
+	ES_OPEN_EXPORTER_USER_YAML=$TMP_DIR/empty.yaml
 fi
 
 # Enable workload node placement?
@@ -85,44 +87,42 @@
 
 # Optional workload node placement support
 if [ "$LOG_NODE_PLACEMENT_ENABLE" == "true" ]; then
-  log_verbose "Enabling elasticsearch exporter for workload node placement"
-  wnpValuesFile="logging/node-placement/values-elasticsearch-exporter-wnp.yaml"
-else
-  log_debug "Workload node placement support is disabled for the elasticsearch exporter"
-  wnpValuesFile="$TMP_DIR/empty.yaml"
-fi
-
+	log_verbose "Enabling elasticsearch exporter for workload node placement"
+	wnpValuesFile="logging/node-placement/values-elasticsearch-exporter-wnp.yaml"
+else
+	log_debug "Workload node placement support is disabled for the elasticsearch exporter"
+	wnpValuesFile="$TMP_DIR/empty.yaml"
+fi
 
 # Point to OpenShift response file or dummy as appropriate
 if [ "$OPENSHIFT_CLUSTER" == "true" ]; then
-  log_verbose "Deploying Elasticsearch metric exporter onto OpenShift cluster"
-  openshiftValuesFile="logging/openshift/values-elasticsearch-exporter.yaml"
-else
-  log_debug "Elasticsearch metric exporter is NOT being deployed on OpenShift cluster"
-  openshiftValuesFile="$TMP_DIR/empty.yaml"
+	log_verbose "Deploying Elasticsearch metric exporter onto OpenShift cluster"
+	openshiftValuesFile="logging/openshift/values-elasticsearch-exporter.yaml"
+else
+	log_debug "Elasticsearch metric exporter is NOT being deployed on OpenShift cluster"
+	openshiftValuesFile="$TMP_DIR/empty.yaml"
 fi
 
 # Elasticsearch metric exporter
 helm2ReleaseCheck es-exporter-$LOG_NS
 
-
 ## Get Helm Chart Name
 log_debug "Elasticsearch Exporter Helm Chart: repo [$ESEXPORTER_HELM_CHART_REPO] name [$ESEXPORTER_HELM_CHART_NAME] version [$ESEXPORTER_HELM_CHART_VERSION]"
 chart2install="$(get_helmchart_reference $ESEXPORTER_HELM_CHART_REPO $ESEXPORTER_HELM_CHART_NAME $ESEXPORTER_HELM_CHART_VERSION)"
-versionstring="$(get_helm_versionstring  $ESEXPORTER_HELM_CHART_VERSION)"
+versionstring="$(get_helm_versionstring $ESEXPORTER_HELM_CHART_VERSION)"
 
 log_debug "Installing Helm chart from artifact [$chart2install]"
 
 helm $helmDebug upgrade --install es-exporter \
- --namespace $LOG_NS \
- -f $imageKeysFile \
- -f $primaryValuesFile \
- -f $wnpValuesFile \
- -f $openshiftValuesFile \
- -f $ES_OPEN_EXPORTER_USER_YAML \
- --set fullnameOverride=v4m-es-exporter  \
- $versionstring \
- $chart2install
+	--namespace $LOG_NS \
+	-f $imageKeysFile \
+	-f $primaryValuesFile \
+	-f $wnpValuesFile \
+	-f $openshiftValuesFile \
+	-f $ES_OPEN_EXPORTER_USER_YAML \
+	--set fullnameOverride=v4m-es-exporter \
+	$versionstring \
+	$chart2install
 
 log_info "Elasticsearch metric exporter has been deployed"
 
diff monitoring/bin/deploy_monitoring_cluster.sh.orig monitoring/bin/deploy_monitoring_cluster.sh
--- monitoring/bin/deploy_monitoring_cluster.sh.orig
+++ monitoring/bin/deploy_monitoring_cluster.sh
@@ -8,19 +8,19 @@
 source bin/service-url-include.sh
 
 if [ "$OPENSHIFT_CLUSTER" == "true" ]; then
-  if [ "${CHECK_OPENSHIFT_CLUSTER:-true}" == "true" ]; then
-    log_error "This script should not be run on OpenShift clusters"
-    log_error "Run monitoring/bin/deploy_monitoring_openshift.sh instead"
-    exit 1
-  fi
+	if [ "${CHECK_OPENSHIFT_CLUSTER:-true}" == "true" ]; then
+		log_error "This script should not be run on OpenShift clusters"
+		log_error "Run monitoring/bin/deploy_monitoring_openshift.sh instead"
+		exit 1
+	fi
 fi
 
 source bin/tls-include.sh
 if verify_cert_generator $MON_NS prometheus alertmanager grafana; then
-  log_debug "cert generator check OK [$cert_generator_ok]"
-else
-  log_error "One or more required TLS certs do not exist and the expected certificate generator mechanism [$cert_generator] is not available to create the missing certs"
-  exit 1
+	log_debug "cert generator check OK [$cert_generator_ok]"
+else
+	log_error "One or more required TLS certs do not exist and the expected certificate generator mechanism [$cert_generator] is not available to create the missing certs"
+	exit 1
 fi
 
 helm2ReleaseCheck v4m-$MON_NS
@@ -32,32 +32,31 @@
 
 PROM_OPER_USER_YAML="${PROM_OPER_USER_YAML:-$USER_DIR/monitoring/user-values-prom-operator.yaml}"
 if [ ! -f "$PROM_OPER_USER_YAML" ]; then
-  log_debug "[$PROM_OPER_USER_YAML] not found. Using $TMP_DIR/empty.yaml"
-  PROM_OPER_USER_YAML=$TMP_DIR/empty.yaml
+	log_debug "[$PROM_OPER_USER_YAML] not found. Using $TMP_DIR/empty.yaml"
+	PROM_OPER_USER_YAML=$TMP_DIR/empty.yaml
 fi
 
 if [ "$HELM_DEBUG" == "true" ]; then
-  helmDebug="--debug"
+	helmDebug="--debug"
 fi
 
 if [ -z "$(kubectl get ns $MON_NS -o name 2>/dev/null)" ]; then
-  kubectl create ns $MON_NS
-
-  #Container Security: Disable serviceAccount Token Automounting
-  disable_sa_token_automount $MON_NS default
+	kubectl create ns $MON_NS
+
+	#Container Security: Disable serviceAccount Token Automounting
+	disable_sa_token_automount $MON_NS default
 fi
 
 #Generate yaml file with all container-related keys
-generateImageKeysFile "$PROMOP_FULL_IMAGE"          "monitoring/prom-operator_container_image.template"
-generateImageKeysFile "$ALERTMANAGER_FULL_IMAGE"    "$imageKeysFile"  "ALERTMANAGER_"
-generateImageKeysFile "$ADMWEBHOOK_FULL_IMAGE"      "$imageKeysFile"  "ADMWEBHOOK_"
-generateImageKeysFile "$KSM_FULL_IMAGE"             "$imageKeysFile"  "KSM_"
-generateImageKeysFile "$NODEXPORT_FULL_IMAGE"       "$imageKeysFile"  "NODEXPORT_"
-generateImageKeysFile "$PROMETHEUS_FULL_IMAGE"      "$imageKeysFile"  "PROMETHEUS_"
-generateImageKeysFile "$CONFIGRELOAD_FULL_IMAGE"    "$imageKeysFile"  "CONFIGRELOAD_"
-generateImageKeysFile "$GRAFANA_FULL_IMAGE"         "$imageKeysFile"  "GRAFANA_"
-generateImageKeysFile "$GRAFANA_SIDECAR_FULL_IMAGE" "$imageKeysFile"  "SIDECAR_"
-
+generateImageKeysFile "$PROMOP_FULL_IMAGE" "monitoring/prom-operator_container_image.template"
+generateImageKeysFile "$ALERTMANAGER_FULL_IMAGE" "$imageKeysFile" "ALERTMANAGER_"
+generateImageKeysFile "$ADMWEBHOOK_FULL_IMAGE" "$imageKeysFile" "ADMWEBHOOK_"
+generateImageKeysFile "$KSM_FULL_IMAGE" "$imageKeysFile" "KSM_"
+generateImageKeysFile "$NODEXPORT_FULL_IMAGE" "$imageKeysFile" "NODEXPORT_"
+generateImageKeysFile "$PROMETHEUS_FULL_IMAGE" "$imageKeysFile" "PROMETHEUS_"
+generateImageKeysFile "$CONFIGRELOAD_FULL_IMAGE" "$imageKeysFile" "CONFIGRELOAD_"
+generateImageKeysFile "$GRAFANA_FULL_IMAGE" "$imageKeysFile" "GRAFANA_"
+generateImageKeysFile "$GRAFANA_SIDECAR_FULL_IMAGE" "$imageKeysFile" "SIDECAR_"
 
 set -e
 log_notice "Deploying monitoring to the [$MON_NS] namespace..."
@@ -68,43 +67,43 @@
 istioValuesFile=$TMP_DIR/empty.yaml
 # Istio - Federate data from Istio's Prometheus instance
 if [ "$ISTIO_ENABLED" == "true" ]; then
-  log_verbose "Including Istio metric federation"
-  istioValuesFile=$TMP_DIR/values-prom-operator-tmp.yaml
-else
-  log_debug "ISTIO_ENABLED flag not set"
-  log_debug "Skipping deployment of federated scrape of Istio Prometheus instance"
+	log_verbose "Including Istio metric federation"
+	istioValuesFile=$TMP_DIR/values-prom-operator-tmp.yaml
+else
+	log_debug "ISTIO_ENABLED flag not set"
+	log_debug "Skipping deployment of federated scrape of Istio Prometheus instance"
 fi
 
 # Check if Prometheus Operator CRDs are already installed
 PROM_OPERATOR_CRD_UPDATE=${PROM_OPERATOR_CRD_UPDATE:-true}
 if [ "$PROM_OPERATOR_CRD_UPDATE" == "true" ]; then
-  log_verbose "Updating Prometheus Operator custom resource definitions"
-  crds=( alertmanagerconfigs alertmanagers prometheuses prometheusrules podmonitors servicemonitors thanosrulers probes )
-  for crd in "${crds[@]}"; do
-    
-    ## Determine CRD URL - if in an airgap environment, look for them in USER_DIR.
-    if [ "$AIRGAP_DEPLOYMENT" == "true" ]; then
-      crdURL=$USER_DIR/monitoring/prometheus-operator-crd/$PROM_OPERATOR_CRD_VERSION/monitoring.coreos.com_$crd.yaml
-
-      ## Fail if the CRDs could not be located.
-      if [ ! -f "$crdURL" ]; then
-        log_error "Unable to locate file: [monitoring.coreos.com_$crd.yaml] in"
-        log_error "[$USER_DIR/monitoring/prometheus-operator-crd/$PROM_OPERATOR_CRD_VERSION] directory"
-        log_error "Please make sure to provide all Prometheus Operator CRDs before running the deployment"
-        exit 1
-      fi
-    else
-      crdURL="https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/$PROM_OPERATOR_CRD_VERSION/example/prometheus-operator-crd/monitoring.coreos.com_$crd.yaml"
-    fi 
-
-    if kubectl get crd $crd.monitoring.coreos.com 1>/dev/null 2>&1; then
-      kubectl replace -f $crdURL
-    else
-      kubectl create -f $crdURL
-    fi
-  done
-else
-  log_debug "Prometheus Operator CRD update disabled"
+	log_verbose "Updating Prometheus Operator custom resource definitions"
+	crds=(alertmanagerconfigs alertmanagers prometheuses prometheusrules podmonitors servicemonitors thanosrulers probes)
+	for crd in "${crds[@]}"; do
+
+		## Determine CRD URL - if in an airgap environment, look for them in USER_DIR.
+		if [ "$AIRGAP_DEPLOYMENT" == "true" ]; then
+			crdURL=$USER_DIR/monitoring/prometheus-operator-crd/$PROM_OPERATOR_CRD_VERSION/monitoring.coreos.com_$crd.yaml
+
+			## Fail if the CRDs could not be located.
+			if [ ! -f "$crdURL" ]; then
+				log_error "Unable to locate file: [monitoring.coreos.com_$crd.yaml] in"
+				log_error "[$USER_DIR/monitoring/prometheus-operator-crd/$PROM_OPERATOR_CRD_VERSION] directory"
+				log_error "Please make sure to provide all Prometheus Operator CRDs before running the deployment"
+				exit 1
+			fi
+		else
+			crdURL="https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/$PROM_OPERATOR_CRD_VERSION/example/prometheus-operator-crd/monitoring.coreos.com_$crd.yaml"
+		fi
+
+		if kubectl get crd $crd.monitoring.coreos.com 1>/dev/null 2>&1; then
+			kubectl replace -f $crdURL
+		else
+			kubectl create -f $crdURL
+		fi
+	done
+else
+	log_debug "Prometheus Operator CRD update disabled"
 fi
 
 # Remove existing DaemonSets in case of an upgrade-in-place
@@ -113,11 +112,11 @@
 # Optional workload node placement support
 MON_NODE_PLACEMENT_ENABLE=${MON_NODE_PLACEMENT_ENABLE:-${NODE_PLACEMENT_ENABLE:-false}}
 if [ "$MON_NODE_PLACEMENT_ENABLE" == "true" ]; then
-  log_verbose "Enabling monitoring components for workload node placement"
-  wnpValuesFile="monitoring/node-placement/values-prom-operator-wnp.yaml"
-else
-  log_debug "Workload node placement support is disabled"
-  wnpValuesFile="$TMP_DIR/empty.yaml"
+	log_verbose "Enabling monitoring components for workload node placement"
+	wnpValuesFile="monitoring/node-placement/values-prom-operator-wnp.yaml"
+else
+	log_debug "Workload node placement support is disabled"
+	wnpValuesFile="$TMP_DIR/empty.yaml"
 fi
 
 # Optional TLS Support
@@ -124,118 +123,118 @@
 tlsValuesFile=$TMP_DIR/empty.yaml
 tlsPromAlertingEndpointFile=$TMP_DIR/empty.yaml
 if [ "$TLS_ENABLE" == "true" ]; then
-  apps=( prometheus alertmanager grafana )
-  create_tls_certs $MON_NS monitoring ${apps[@]}
-
-  tlsValuesFile=monitoring/tls/values-prom-operator-tls.yaml
-  tlsPromAlertingEndpointFile=monitoring/tls/prom-alertendpoint-host-https.yaml
-  log_debug "Including TLS response file $tlsValuesFile"
-
-  log_verbose "Provisioning TLS-enabled Prometheus datasource for Grafana"
-  grafanaDS=grafana-datasource-prom-https.yaml
-  if [ "$MON_TLS_PATH_INGRESS" == "true" ]; then
-    grafanaDS=grafana-datasource-prom-https-path.yaml
-    tlsPromAlertingEndpointFile=monitoring/tls/prom-alertendpoint-path-https.yaml
-  fi
-  kubectl delete cm -n $MON_NS --ignore-not-found grafana-datasource-prom-https
-  kubectl create cm -n $MON_NS grafana-datasource-prom-https --from-file monitoring/tls/$grafanaDS
-  kubectl label cm -n $MON_NS grafana-datasource-prom-https grafana_datasource=1 sas.com/monitoring-base=kube-viya-monitoring
-
-  # node-exporter TLS
-  log_verbose "Enabling Prometheus node-exporter for TLS"
-  kubectl delete cm -n $MON_NS node-exporter-tls-web-config --ignore-not-found
-  sleep 1
-  kubectl create cm -n $MON_NS node-exporter-tls-web-config --from-file monitoring/tls/node-exporter-web.yaml
-  kubectl label cm -n $MON_NS node-exporter-tls-web-config sas.com/monitoring-base=kube-viya-monitoring
+	apps=(prometheus alertmanager grafana)
+	create_tls_certs $MON_NS monitoring ${apps[@]}
+
+	tlsValuesFile=monitoring/tls/values-prom-operator-tls.yaml
+	tlsPromAlertingEndpointFile=monitoring/tls/prom-alertendpoint-host-https.yaml
+	log_debug "Including TLS response file $tlsValuesFile"
+
+	log_verbose "Provisioning TLS-enabled Prometheus datasource for Grafana"
+	grafanaDS=grafana-datasource-prom-https.yaml
+	if [ "$MON_TLS_PATH_INGRESS" == "true" ]; then
+		grafanaDS=grafana-datasource-prom-https-path.yaml
+		tlsPromAlertingEndpointFile=monitoring/tls/prom-alertendpoint-path-https.yaml
+	fi
+	kubectl delete cm -n $MON_NS --ignore-not-found grafana-datasource-prom-https
+	kubectl create cm -n $MON_NS grafana-datasource-prom-https --from-file monitoring/tls/$grafanaDS
+	kubectl label cm -n $MON_NS grafana-datasource-prom-https grafana_datasource=1 sas.com/monitoring-base=kube-viya-monitoring
+
+	# node-exporter TLS
+	log_verbose "Enabling Prometheus node-exporter for TLS"
+	kubectl delete cm -n $MON_NS node-exporter-tls-web-config --ignore-not-found
+	sleep 1
+	kubectl create cm -n $MON_NS node-exporter-tls-web-config --from-file monitoring/tls/node-exporter-web.yaml
+	kubectl label cm -n $MON_NS node-exporter-tls-web-config sas.com/monitoring-base=kube-viya-monitoring
 fi
 
 nodePortValuesFile=$TMP_DIR/empty.yaml
 PROM_NODEPORT_ENABLE=${PROM_NODEPORT_ENABLE:-false}
 if [ "$PROM_NODEPORT_ENABLE" == "true" ]; then
-  log_debug "Enabling NodePort access for Prometheus and Alertmanager"
-  nodePortValuesFile=monitoring/values-prom-nodeport.yaml
+	log_debug "Enabling NodePort access for Prometheus and Alertmanager"
+	nodePortValuesFile=monitoring/values-prom-nodeport.yaml
 fi
 
 if helm3ReleaseExists prometheus-operator $MON_NS; then
-  promRelease=prometheus-operator
-  promName=prometheus-operator
-else
-  promRelease=v4m-prometheus-operator
-  promName=v4m
+	promRelease=prometheus-operator
+	promName=prometheus-operator
+else
+	promRelease=v4m-prometheus-operator
+	promName=v4m
 fi
 log_verbose "User response file: [$PROM_OPER_USER_YAML]"
 log_info "Deploying the kube-prometheus stack. This may take a few minutes ..."
 if helm3ReleaseExists $promRelease $MON_NS; then
-  log_verbose "Upgrading via Helm ($(date) - timeout 20m)"
-else
-  grafanaPwd="$GRAFANA_ADMIN_PASSWORD"
-  if [ "$grafanaPwd" == "" ]; then
-    log_debug "Generating random Grafana admin password"
-    showPass="true"
-    grafanaPwd="$(randomPassword)"
-  fi
-  log_verbose "Installing via Helm ($(date) - timeout 20m)"
+	log_verbose "Upgrading via Helm ($(date) - timeout 20m)"
+else
+	grafanaPwd="$GRAFANA_ADMIN_PASSWORD"
+	if [ "$grafanaPwd" == "" ]; then
+		log_debug "Generating random Grafana admin password"
+		showPass="true"
+		grafanaPwd="$(randomPassword)"
+	fi
+	log_verbose "Installing via Helm ($(date) - timeout 20m)"
 fi
 
 # See https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack#from-21x-to-22x
-if [ "$V4M_CURRENT_VERSION_MAJOR" == "1" ] && [[ "$V4M_CURRENT_VERSION_MINOR" =~ [0-5] ]]; then
-  kubectl delete -n $MON_NS --ignore-not-found \
-    deployments.apps \
-    -l app.kubernetes.io/instance=v4m-prometheus-operator,app.kubernetes.io/name=kube-state-metrics
+if [ "$V4M_CURRENT_VERSION_MAJOR" == "1" ] && [[ $V4M_CURRENT_VERSION_MINOR =~ [0-5] ]]; then
+	kubectl delete -n $MON_NS --ignore-not-found \
+		deployments.apps \
+		-l app.kubernetes.io/instance=v4m-prometheus-operator,app.kubernetes.io/name=kube-state-metrics
 fi
 
 TRACING_ENABLE="${TRACING_ENABLE:-false}"
 if [ "$TRACING_ENABLE" == "false" ]; then
-  tempoDSFile=$TMP_DIR/empty.yaml
-else
-  TEMPO_USER_YAML="${TEMPO_USER_YAML:-$USER_DIR/monitoring/user-values-tempo.yaml}"
-  if [ ! -f "$TEMPO_USER_YAML" ]; then
-    log_debug "[$TEMPO_USER_YAML] not found. Using $TMP_DIR/empty.yaml"
-    TEMPO_USER_YAML=$TMP_DIR/empty.yaml
-  fi
-  tempoDSFile="monitoring/grafana-datasource-tempo.yaml"
-fi 
+	tempoDSFile=$TMP_DIR/empty.yaml
+else
+	TEMPO_USER_YAML="${TEMPO_USER_YAML:-$USER_DIR/monitoring/user-values-tempo.yaml}"
+	if [ ! -f "$TEMPO_USER_YAML" ]; then
+		log_debug "[$TEMPO_USER_YAML] not found. Using $TMP_DIR/empty.yaml"
+		TEMPO_USER_YAML=$TMP_DIR/empty.yaml
+	fi
+	tempoDSFile="monitoring/grafana-datasource-tempo.yaml"
+fi
 
 # Get Helm Chart Name
 log_debug "Kube-Prometheus Stack Helm Chart: repo [$KUBE_PROM_STACK_CHART_REPO] name [$KUBE_PROM_STACK_CHART_NAME] version [$KUBE_PROM_STACK_CHART_VERSION]"
 chart2install="$(get_helmchart_reference $KUBE_PROM_STACK_CHART_REPO $KUBE_PROM_STACK_CHART_NAME $KUBE_PROM_STACK_CHART_VERSION)"
-versionstring="$(get_helm_versionstring  $KUBE_PROM_STACK_CHART_VERSION)"
+versionstring="$(get_helm_versionstring $KUBE_PROM_STACK_CHART_VERSION)"
 log_debug "Installing Helm chart from artifact [$chart2install]"
 
 helm $helmDebug upgrade --install $promRelease \
-  --namespace $MON_NS \
-  -f $imageKeysFile \
-  -f monitoring/values-prom-operator.yaml \
-  -f $istioValuesFile \
-  -f $tlsValuesFile \
-  -f $tlsPromAlertingEndpointFile \
-  -f $nodePortValuesFile \
-  -f $wnpValuesFile \
-  -f $PROM_OPER_USER_YAML \
-  -f $tempoDSFile \
-  --atomic \
-  --timeout 20m \
-  --set nameOverride=$promName \
-  --set fullnameOverride=$promName \
-  --set prometheus-node-exporter.fullnameOverride=$promName-node-exporter \
-  --set kube-state-metrics.fullnameOverride=$promName-kube-state-metrics \
-  --set grafana.fullnameOverride=$promName-grafana \
-  --set grafana.adminPassword="$grafanaPwd" \
-  --set prometheus.prometheusSpec.alertingEndpoints[0].namespace="$MON_NS" \
-  $versionstring \
-  $chart2install
+	--namespace $MON_NS \
+	-f $imageKeysFile \
+	-f monitoring/values-prom-operator.yaml \
+	-f $istioValuesFile \
+	-f $tlsValuesFile \
+	-f $tlsPromAlertingEndpointFile \
+	-f $nodePortValuesFile \
+	-f $wnpValuesFile \
+	-f $PROM_OPER_USER_YAML \
+	-f $tempoDSFile \
+	--atomic \
+	--timeout 20m \
+	--set nameOverride=$promName \
+	--set fullnameOverride=$promName \
+	--set prometheus-node-exporter.fullnameOverride=$promName-node-exporter \
+	--set kube-state-metrics.fullnameOverride=$promName-kube-state-metrics \
+	--set grafana.fullnameOverride=$promName-grafana \
+	--set grafana.adminPassword="$grafanaPwd" \
+	--set prometheus.prometheusSpec.alertingEndpoints[0].namespace="$MON_NS" \
+	$versionstring \
+	$chart2install
 
 sleep 2
 
 if [ "$TLS_ENABLE" == "true" ]; then
-  log_verbose "Patching Grafana ServiceMonitor for TLS"
-  kubectl patch servicemonitor -n $MON_NS $promName-grafana --type=json \
-    -p='[{"op": "replace", "path": "/spec/endpoints/0/scheme", "value":"https"},{"op": "replace", "path": "/spec/endpoints/0/tlsConfig", "value":{}},{"op": "replace", "path": "/spec/endpoints/0/tlsConfig/insecureSkipVerify", "value":true}]'
+	log_verbose "Patching Grafana ServiceMonitor for TLS"
+	kubectl patch servicemonitor -n $MON_NS $promName-grafana --type=json \
+		-p='[{"op": "replace", "path": "/spec/endpoints/0/scheme", "value":"https"},{"op": "replace", "path": "/spec/endpoints/0/tlsConfig", "value":{}},{"op": "replace", "path": "/spec/endpoints/0/tlsConfig/insecureSkipVerify", "value":true}]'
 fi
 
 #Container Security: Disable serviceAccount Token Automounting
 disable_sa_token_automount $MON_NS v4m-grafana
-disable_sa_token_automount $MON_NS sas-ops-acct      #Used w/Prometheus
+disable_sa_token_automount $MON_NS sas-ops-acct #Used w/Prometheus
 disable_sa_token_automount $MON_NS v4m-node-exporter
 disable_sa_token_automount $MON_NS v4m-alertmanager
 
@@ -249,29 +248,29 @@
 log_verbose "Deploying cluster ServiceMonitors"
 
 if [ "$TRACING_ENABLE" == "true" ]; then
-  log_info "Tracing enabled..."
-
-  #Generate yaml file with all container-related keys
-  generateImageKeysFile "$TEMPO_FULL_IMAGE" "monitoring/tempo_container_image.template"
-
-  # Add the grafana helm chart repo
-  helmRepoAdd grafana https://grafana.github.io/helm-charts
-  helm repo update
-
-  # Get Helm Chart Name
-  log_debug "Tempo Helm Chart: repo [$TEMPO_CHART_REPO] name [$TEMPO_CHART_NAME] version [$TEMPO_CHART_VERSION]"
-  chart2install="$(get_helmchart_reference $TEMPO_CHART_REPO $TEMPO_CHART_NAME $TEMPO_CHART_VERSION)"
-  versionstring="$(get_helm_versionstring  $TEMPO_CHART_VERSION)"
-  log_debug "Installing Helm chart from artifact [$chart2install]"
-
-  log_info "Installing tempo"
-  helm upgrade --install v4m-tempo \
-    -n "$MON_NS" \
-    -f $imageKeysFile \
-    -f monitoring/values-tempo.yaml \
-    -f "$TEMPO_USER_YAML" \
-    $versionstring \
-    $chart2install
+	log_info "Tracing enabled..."
+
+	#Generate yaml file with all container-related keys
+	generateImageKeysFile "$TEMPO_FULL_IMAGE" "monitoring/tempo_container_image.template"
+
+	# Add the grafana helm chart repo
+	helmRepoAdd grafana https://grafana.github.io/helm-charts
+	helm repo update
+
+	# Get Helm Chart Name
+	log_debug "Tempo Helm Chart: repo [$TEMPO_CHART_REPO] name [$TEMPO_CHART_NAME] version [$TEMPO_CHART_VERSION]"
+	chart2install="$(get_helmchart_reference $TEMPO_CHART_REPO $TEMPO_CHART_NAME $TEMPO_CHART_VERSION)"
+	versionstring="$(get_helm_versionstring $TEMPO_CHART_VERSION)"
+	log_debug "Installing Helm chart from artifact [$chart2install]"
+
+	log_info "Installing tempo"
+	helm upgrade --install v4m-tempo \
+		-n "$MON_NS" \
+		-f $imageKeysFile \
+		-f monitoring/values-tempo.yaml \
+		-f "$TEMPO_USER_YAML" \
+		$versionstring \
+		$chart2install
 fi
 
 # NGINX
@@ -278,13 +277,13 @@
 set +e
 kubectl get ns $NGINX_NS 2>/dev/null
 if [ $? == 0 ]; then
-  nginxFound=true
+	nginxFound=true
 fi
 set -e
 
 if [ "$nginxFound" == "true" ]; then
-  log_verbose "NGINX found. Deploying podMonitor to [$NGINX_NS] namespace"
-  kubectl apply -n $NGINX_NS -f monitoring/monitors/kube/podMonitor-nginx.yaml 2>/dev/null
+	log_verbose "NGINX found. Deploying podMonitor to [$NGINX_NS] namespace"
+	kubectl apply -n $NGINX_NS -f monitoring/monitors/kube/podMonitor-nginx.yaml 2>/dev/null
 fi
 
 # Eventrouter ServiceMonitor
@@ -300,25 +299,25 @@
 # Rules
 log_verbose "Adding Prometheus recording rules"
 for f in monitoring/rules/viya/rules-*.yaml; do
-  kubectl apply -n $MON_NS -f $f
+	kubectl apply -n $MON_NS -f $f
 done
 
 # Elasticsearch Datasource for Grafana
 LOGGING_DATASOURCE="${LOGGING_DATASOURCE:-false}"
 if [ "$LOGGING_DATASOURCE" == "true" ]; then
-  set +e
-  log_debug "Creating the logging data source using the create_logging_datasource script"
-  monitoring/bin/create_logging_datasource.sh
-
-  if (( $? == 1 )); then
-    log_warn "Unable to configure the logging data source at this time."
-    log_warn "Please address the errors and re-run the follow command to create the data source at a later time:"
-    log_warn "monitoring/bin/create_logging_datasource.sh"
-  fi
-  set -e
-else
-  log_debug "LOGGING_DATASOURCE not set"
-  log_debug "Skipping creation of logging data source for Grafana"
+	set +e
+	log_debug "Creating the logging data source using the create_logging_datasource script"
+	monitoring/bin/create_logging_datasource.sh
+
+	if (($? == 1)); then
+		log_warn "Unable to configure the logging data source at this time."
+		log_warn "Please address the errors and re-run the follow command to create the data source at a later time:"
+		log_warn "monitoring/bin/create_logging_datasource.sh"
+	fi
+	set -e
+else
+	log_debug "LOGGING_DATASOURCE not set"
+	log_debug "Skipping creation of logging data source for Grafana"
 fi
 
 echo ""
@@ -332,16 +331,16 @@
 # when these issues have been resolved.
 V4M_TEMP_REPLACE_PROBLEMATIC_MIXIN_DASHBOARDS="${V4M_TEMP_REPLACE_PROBLEMATIC_MIXIN_DASHBOARDS:-true}"
 if [ "$V4M_TEMP_REPLACE_PROBLEMATIC_MIXIN_DASHBOARDS" == "true" ]; then
-   log_info "Replacing some Kube-Prometheus Stack-supplied Grafana dashboards with our own versions due to incompatabilities."
-
-   # remove configMaps definining exising Grafana dashboards
-   kubectl -n $MON_NS delete configmap  v4m-cluster-total         --ignore-not-found
-   kubectl -n $MON_NS delete configmap  v4m-namespace-by-pod      --ignore-not-found
-   kubectl -n $MON_NS delete configmap  v4m-namespace-by-workload --ignore-not-found
-   kubectl -n $MON_NS delete configmap  v4m-prometheus            --ignore-not-found
-
-   # deploy our versions of these dashboards
-   monitoring/bin/deploy_dashboards.sh monitoring/dashboards/mixinfixes
+	log_info "Replacing some Kube-Prometheus Stack-supplied Grafana dashboards with our own versions due to incompatabilities."
+
+	# remove configMaps definining exising Grafana dashboards
+	kubectl -n $MON_NS delete configmap v4m-cluster-total --ignore-not-found
+	kubectl -n $MON_NS delete configmap v4m-namespace-by-pod --ignore-not-found
+	kubectl -n $MON_NS delete configmap v4m-namespace-by-workload --ignore-not-found
+	kubectl -n $MON_NS delete configmap v4m-prometheus --ignore-not-found
+
+	# deploy our versions of these dashboards
+	monitoring/bin/deploy_dashboards.sh monitoring/dashboards/mixinfixes
 
 fi
 
@@ -350,7 +349,7 @@
 get_ingress_ports
 
 # get URLs for Grafana, Prometheus and AlertManager
-gf_url=$(get_service_url $MON_NS v4m-grafana  "$TLS_ENABLE")
+gf_url=$(get_service_url $MON_NS v4m-grafana "$TLS_ENABLE")
 # pr_url=$(get_url $MON_NS v4m-prometheus  "$TLS_ENABLE")
 # am_url=$(get_url $MON_NS v4m-alertmanager  "$TLS_ENABLE")
 set -e
@@ -357,12 +356,12 @@
 
 # If a deployment with the old name exists, remove it first
 if helm3ReleaseExists v4m $MON_NS; then
-  log_verbose "Removing outdated SAS Viya Monitoring Helm chart release from [$MON_NS] namespace"
-  helm uninstall -n "$MON_NS" "v4m"
+	log_verbose "Removing outdated SAS Viya Monitoring Helm chart release from [$MON_NS] namespace"
+	helm uninstall -n "$MON_NS" "v4m"
 fi
 
 if ! deployV4MInfo "$MON_NS" "v4m-metrics"; then
-  log_warn "Unable to update SAS Viya Monitoring Helm chart release"
+	log_warn "Unable to update SAS Viya Monitoring Helm chart release"
 fi
 
 # Print URL to access web apps
@@ -369,13 +368,13 @@
 log_notice ""
 log_notice "GRAFANA: "
 if [ ! -z "$gf_url" ]; then
-   log_notice "  $gf_url"
-else
-   log_notice " It was not possible to determine the URL needed to access Grafana. Note  "
-   log_notice " that this is not necessarily a sign of a problem; it may only reflect an "
-   log_notice " ingress or network access configuration that this script does not handle."
-fi
-   log_notice ""
+	log_notice "  $gf_url"
+else
+	log_notice " It was not possible to determine the URL needed to access Grafana. Note  "
+	log_notice " that this is not necessarily a sign of a problem; it may only reflect an "
+	log_notice " ingress or network access configuration that this script does not handle."
+fi
+log_notice ""
 
 #log_notice ""
 #log_notice "================================================================================"
@@ -398,14 +397,12 @@
 #log_notice ""
 
 if [ "$showPass" == "true" ]; then
-  # Find the grafana pod
- 
-  log_notice " Generated Grafana admin password is: $grafanaPwd"
-  log_notice " To change the password, run the following script (replace myNewPassword with an updated password):"
-  log_notice " monitoring/bin/change_grafana_admin_password.sh -p myNewPassword"
+	# Find the grafana pod
+
+	log_notice " Generated Grafana admin password is: $grafanaPwd"
+	log_notice " To change the password, run the following script (replace myNewPassword with an updated password):"
+	log_notice " monitoring/bin/change_grafana_admin_password.sh -p myNewPassword"
 fi
 
 log_message ""
 log_notice " Successfully deployed components to the [$MON_NS] namespace"
-
-
----------

You can reformat the above files to meet shfmt's requirements by typing:

  shfmt -s -w filename

github-actions · 2024-11-05T19:21:29Z

`sh-checker report`

To get the full details, please check in the job output.

shellcheck errors


'shellcheck -e SC1004' returned error 1 finding the following syntactical issues:

----------

In logging/bin/deploy_esexporter.sh line 6:
cd "$(dirname $BASH_SOURCE)/../.."
              ^----------^ SC2128 (warning): Expanding an array without an index only gives the first element.
              ^----------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
cd "$(dirname "$BASH_SOURCE")/../.."


In logging/bin/deploy_esexporter.sh line 7:
source logging/bin/common.sh
       ^-------------------^ SC1091 (info): Not following: logging/bin/common.sh was not specified as input (see shellcheck -x).


In logging/bin/deploy_esexporter.sh line 8:
source logging/bin/secrets-include.sh
       ^----------------------------^ SC1091 (info): Not following: logging/bin/secrets-include.sh was not specified as input (see shellcheck -x).


In logging/bin/deploy_esexporter.sh line 10:
this_script=`basename "$0"`
            ^-------------^ SC2006 (style): Use $(...) notation instead of legacy backticks `...`.

Did you mean: 
this_script=$(basename "$0")


In logging/bin/deploy_esexporter.sh line 31:
if [ "$(kubectl get ns $LOG_NS -o name 2>/dev/null)" == "" ]; then
                       ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
if [ "$(kubectl get ns "$LOG_NS" -o name 2>/dev/null)" == "" ]; then


In logging/bin/deploy_esexporter.sh line 42:
if helm3ReleaseExists es-exporter $LOG_NS; then
                                  ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
if helm3ReleaseExists es-exporter "$LOG_NS"; then


In logging/bin/deploy_esexporter.sh line 45:
   if [ -z $(kubectl -n $LOG_NS get pods -l "app.kubernetes.io/name=prometheus-elasticsearch-exporter,searchbackend=opensearch" -o name 2>/dev/null) ]; then
           ^-- SC2046 (warning): Quote this to prevent word splitting.
                        ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
   if [ -z $(kubectl -n "$LOG_NS" get pods -l "app.kubernetes.io/name=prometheus-elasticsearch-exporter,searchbackend=opensearch" -o name 2>/dev/null) ]; then


In logging/bin/deploy_esexporter.sh line 47:
      helm -n $LOG_NS delete es-exporter
              ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
      helm -n "$LOG_NS" delete es-exporter


In logging/bin/deploy_esexporter.sh line 53:
      kubectl delete -n $monNamespace servicemonitor elasticsearch
                        ^-----------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
      kubectl delete -n "$monNamespace" servicemonitor elasticsearch


In logging/bin/deploy_esexporter.sh line 55:
      kubectl apply  -n $monNamespace -f monitoring/monitors/logging/serviceMonitor-elasticsearch-v2.yaml
                        ^-----------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
      kubectl apply  -n "$monNamespace" -f monitoring/monitors/logging/serviceMonitor-elasticsearch-v2.yaml


In logging/bin/deploy_esexporter.sh line 106:
helm2ReleaseCheck es-exporter-$LOG_NS
                              ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
helm2ReleaseCheck es-exporter-"$LOG_NS"


In logging/bin/deploy_esexporter.sh line 111:
chart2install="$(get_helmchart_reference $ESEXPORTER_HELM_CHART_REPO $ESEXPORTER_HELM_CHART_NAME $ESEXPORTER_HELM_CHART_VERSION)"
                                         ^-------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
                                                                     ^-------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
                                                                                                 ^----------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
chart2install="$(get_helmchart_reference "$ESEXPORTER_HELM_CHART_REPO" "$ESEXPORTER_HELM_CHART_NAME" "$ESEXPORTER_HELM_CHART_VERSION")"


In logging/bin/deploy_esexporter.sh line 112:
versionstring="$(get_helm_versionstring  $ESEXPORTER_HELM_CHART_VERSION)"
                                         ^----------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
versionstring="$(get_helm_versionstring  "$ESEXPORTER_HELM_CHART_VERSION")"


In logging/bin/deploy_esexporter.sh line 116:
helm $helmDebug upgrade --install es-exporter \
     ^--------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
helm "$helmDebug" upgrade --install es-exporter \


In logging/bin/deploy_esexporter.sh line 117:
 --namespace $LOG_NS \
             ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
 --namespace "$LOG_NS" \


In logging/bin/deploy_esexporter.sh line 118:
 -f $imageKeysFile \
    ^------------^ SC2154 (warning): imageKeysFile is referenced but not assigned.
    ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
 -f "$imageKeysFile" \


In logging/bin/deploy_esexporter.sh line 120:
 -f $wnpValuesFile \
    ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
 -f "$wnpValuesFile" \


In logging/bin/deploy_esexporter.sh line 121:
 -f $openshiftValuesFile \
    ^------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
 -f "$openshiftValuesFile" \


In logging/bin/deploy_esexporter.sh line 122:
 -f $ES_OPEN_EXPORTER_USER_YAML \
    ^-------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
 -f "$ES_OPEN_EXPORTER_USER_YAML" \


In logging/bin/deploy_esexporter.sh line 124:
 $versionstring \
 ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
 "$versionstring" \


In logging/bin/deploy_esexporter.sh line 125:
 $chart2install
 ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
 "$chart2install"


In monitoring/bin/deploy_monitoring_cluster.sh line 6:
cd "$(dirname $BASH_SOURCE)/../.."
              ^----------^ SC2128 (warning): Expanding an array without an index only gives the first element.
              ^----------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
cd "$(dirname "$BASH_SOURCE")/../.."


In monitoring/bin/deploy_monitoring_cluster.sh line 7:
source monitoring/bin/common.sh
       ^----------------------^ SC1091 (info): Not following: monitoring/bin/common.sh was not specified as input (see shellcheck -x).


In monitoring/bin/deploy_monitoring_cluster.sh line 8:
source bin/service-url-include.sh
       ^------------------------^ SC1091 (info): Not following: bin/service-url-include.sh was not specified as input (see shellcheck -x).


In monitoring/bin/deploy_monitoring_cluster.sh line 18:
source bin/tls-include.sh
       ^----------------^ SC1091 (info): Not following: bin/tls-include.sh was not specified as input (see shellcheck -x).


In monitoring/bin/deploy_monitoring_cluster.sh line 19:
if verify_cert_generator $MON_NS prometheus alertmanager grafana; then
                         ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
if verify_cert_generator "$MON_NS" prometheus alertmanager grafana; then


In monitoring/bin/deploy_monitoring_cluster.sh line 20:
  log_debug "cert generator check OK [$cert_generator_ok]"
                                      ^----------------^ SC2154 (warning): cert_generator_ok is referenced but not assigned.


In monitoring/bin/deploy_monitoring_cluster.sh line 22:
  log_error "One or more required TLS certs do not exist and the expected certificate generator mechanism [$cert_generator] is not available to create the missing certs"
                                                                                                           ^-------------^ SC2154 (warning): cert_generator is referenced but not assigned.


In monitoring/bin/deploy_monitoring_cluster.sh line 26:
helm2ReleaseCheck v4m-$MON_NS
                      ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
helm2ReleaseCheck v4m-"$MON_NS"


In monitoring/bin/deploy_monitoring_cluster.sh line 27:
helm2ReleaseCheck prometheus-$MON_NS
                             ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
helm2ReleaseCheck prometheus-"$MON_NS"


In monitoring/bin/deploy_monitoring_cluster.sh line 43:
if [ -z "$(kubectl get ns $MON_NS -o name 2>/dev/null)" ]; then
                          ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
if [ -z "$(kubectl get ns "$MON_NS" -o name 2>/dev/null)" ]; then


In monitoring/bin/deploy_monitoring_cluster.sh line 44:
  kubectl create ns $MON_NS
                    ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl create ns "$MON_NS"


In monitoring/bin/deploy_monitoring_cluster.sh line 47:
  disable_sa_token_automount $MON_NS default
                             ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  disable_sa_token_automount "$MON_NS" default


In monitoring/bin/deploy_monitoring_cluster.sh line 52:
generateImageKeysFile "$ALERTMANAGER_FULL_IMAGE"    "$imageKeysFile"  "ALERTMANAGER_"
                                                     ^------------^ SC2154 (warning): imageKeysFile is referenced but not assigned.


In monitoring/bin/deploy_monitoring_cluster.sh line 100:
    if kubectl get crd $crd.monitoring.coreos.com 1>/dev/null 2>&1; then
                       ^--^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
    if kubectl get crd "$crd".monitoring.coreos.com 1>/dev/null 2>&1; then


In monitoring/bin/deploy_monitoring_cluster.sh line 101:
      kubectl replace -f $crdURL
                         ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
      kubectl replace -f "$crdURL"


In monitoring/bin/deploy_monitoring_cluster.sh line 103:
      kubectl create -f $crdURL
                        ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
      kubectl create -f "$crdURL"


In monitoring/bin/deploy_monitoring_cluster.sh line 111:
kubectl delete daemonset -n $MON_NS -l app=prometheus-node-exporter --ignore-not-found
                            ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
kubectl delete daemonset -n "$MON_NS" -l app=prometheus-node-exporter --ignore-not-found


In monitoring/bin/deploy_monitoring_cluster.sh line 128:
  create_tls_certs $MON_NS monitoring ${apps[@]}
                   ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.
                                      ^--------^ SC2068 (error): Double quote array expansions to avoid re-splitting elements.

Did you mean: 
  create_tls_certs "$MON_NS" monitoring ${apps[@]}


In monitoring/bin/deploy_monitoring_cluster.sh line 140:
  kubectl delete cm -n $MON_NS --ignore-not-found grafana-datasource-prom-https
                       ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl delete cm -n "$MON_NS" --ignore-not-found grafana-datasource-prom-https


In monitoring/bin/deploy_monitoring_cluster.sh line 141:
  kubectl create cm -n $MON_NS grafana-datasource-prom-https --from-file monitoring/tls/$grafanaDS
                       ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl create cm -n "$MON_NS" grafana-datasource-prom-https --from-file monitoring/tls/$grafanaDS


In monitoring/bin/deploy_monitoring_cluster.sh line 142:
  kubectl label cm -n $MON_NS grafana-datasource-prom-https grafana_datasource=1 sas.com/monitoring-base=kube-viya-monitoring
                      ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl label cm -n "$MON_NS" grafana-datasource-prom-https grafana_datasource=1 sas.com/monitoring-base=kube-viya-monitoring


In monitoring/bin/deploy_monitoring_cluster.sh line 146:
  kubectl delete cm -n $MON_NS node-exporter-tls-web-config --ignore-not-found
                       ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl delete cm -n "$MON_NS" node-exporter-tls-web-config --ignore-not-found


In monitoring/bin/deploy_monitoring_cluster.sh line 148:
  kubectl create cm -n $MON_NS node-exporter-tls-web-config --from-file monitoring/tls/node-exporter-web.yaml
                       ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl create cm -n "$MON_NS" node-exporter-tls-web-config --from-file monitoring/tls/node-exporter-web.yaml


In monitoring/bin/deploy_monitoring_cluster.sh line 149:
  kubectl label cm -n $MON_NS node-exporter-tls-web-config sas.com/monitoring-base=kube-viya-monitoring
                      ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl label cm -n "$MON_NS" node-exporter-tls-web-config sas.com/monitoring-base=kube-viya-monitoring


In monitoring/bin/deploy_monitoring_cluster.sh line 159:
if helm3ReleaseExists prometheus-operator $MON_NS; then
                                          ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
if helm3ReleaseExists prometheus-operator "$MON_NS"; then


In monitoring/bin/deploy_monitoring_cluster.sh line 168:
if helm3ReleaseExists $promRelease $MON_NS; then
                                   ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
if helm3ReleaseExists $promRelease "$MON_NS"; then


In monitoring/bin/deploy_monitoring_cluster.sh line 182:
  kubectl delete -n $MON_NS --ignore-not-found \
                    ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl delete -n "$MON_NS" --ignore-not-found \


In monitoring/bin/deploy_monitoring_cluster.sh line 201:
chart2install="$(get_helmchart_reference $KUBE_PROM_STACK_CHART_REPO $KUBE_PROM_STACK_CHART_NAME $KUBE_PROM_STACK_CHART_VERSION)"
                                         ^-------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
                                                                     ^-------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
                                                                                                 ^----------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
chart2install="$(get_helmchart_reference "$KUBE_PROM_STACK_CHART_REPO" "$KUBE_PROM_STACK_CHART_NAME" "$KUBE_PROM_STACK_CHART_VERSION")"


In monitoring/bin/deploy_monitoring_cluster.sh line 202:
versionstring="$(get_helm_versionstring  $KUBE_PROM_STACK_CHART_VERSION)"
                                         ^----------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
versionstring="$(get_helm_versionstring  "$KUBE_PROM_STACK_CHART_VERSION")"


In monitoring/bin/deploy_monitoring_cluster.sh line 205:
helm $helmDebug upgrade --install $promRelease \
     ^--------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
helm "$helmDebug" upgrade --install $promRelease \


In monitoring/bin/deploy_monitoring_cluster.sh line 206:
  --namespace $MON_NS \
              ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  --namespace "$MON_NS" \


In monitoring/bin/deploy_monitoring_cluster.sh line 207:
  -f $imageKeysFile \
     ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  -f "$imageKeysFile" \


In monitoring/bin/deploy_monitoring_cluster.sh line 209:
  -f $istioValuesFile \
     ^--------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  -f "$istioValuesFile" \


In monitoring/bin/deploy_monitoring_cluster.sh line 210:
  -f $tlsValuesFile \
     ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  -f "$tlsValuesFile" \


In monitoring/bin/deploy_monitoring_cluster.sh line 211:
  -f $tlsPromAlertingEndpointFile \
     ^--------------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  -f "$tlsPromAlertingEndpointFile" \


In monitoring/bin/deploy_monitoring_cluster.sh line 212:
  -f $nodePortValuesFile \
     ^-----------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  -f "$nodePortValuesFile" \


In monitoring/bin/deploy_monitoring_cluster.sh line 213:
  -f $wnpValuesFile \
     ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  -f "$wnpValuesFile" \


In monitoring/bin/deploy_monitoring_cluster.sh line 214:
  -f $PROM_OPER_USER_YAML \
     ^------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  -f "$PROM_OPER_USER_YAML" \


In monitoring/bin/deploy_monitoring_cluster.sh line 215:
  -f $tempoDSFile \
     ^----------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  -f "$tempoDSFile" \


In monitoring/bin/deploy_monitoring_cluster.sh line 225:
  $versionstring \
  ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  "$versionstring" \


In monitoring/bin/deploy_monitoring_cluster.sh line 226:
  $chart2install
  ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  "$chart2install"


In monitoring/bin/deploy_monitoring_cluster.sh line 232:
  kubectl patch servicemonitor -n $MON_NS $promName-grafana --type=json \
                                  ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl patch servicemonitor -n "$MON_NS" $promName-grafana --type=json \


In monitoring/bin/deploy_monitoring_cluster.sh line 237:
disable_sa_token_automount $MON_NS v4m-grafana
                           ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
disable_sa_token_automount "$MON_NS" v4m-grafana


In monitoring/bin/deploy_monitoring_cluster.sh line 238:
disable_sa_token_automount $MON_NS sas-ops-acct      #Used w/Prometheus
                           ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
disable_sa_token_automount "$MON_NS" sas-ops-acct      #Used w/Prometheus


In monitoring/bin/deploy_monitoring_cluster.sh line 239:
disable_sa_token_automount $MON_NS v4m-node-exporter
                           ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
disable_sa_token_automount "$MON_NS" v4m-node-exporter


In monitoring/bin/deploy_monitoring_cluster.sh line 240:
disable_sa_token_automount $MON_NS v4m-alertmanager
                           ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
disable_sa_token_automount "$MON_NS" v4m-alertmanager


In monitoring/bin/deploy_monitoring_cluster.sh line 243:
disable_sa_token_automount $MON_NS v4m-kube-state-metrics
                           ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
disable_sa_token_automount "$MON_NS" v4m-kube-state-metrics


In monitoring/bin/deploy_monitoring_cluster.sh line 244:
enable_pod_token_automount $MON_NS deployment v4m-kube-state-metrics
                           ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
enable_pod_token_automount "$MON_NS" deployment v4m-kube-state-metrics


In monitoring/bin/deploy_monitoring_cluster.sh line 245:
disable_sa_token_automount $MON_NS v4m-operator
                           ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
disable_sa_token_automount "$MON_NS" v4m-operator


In monitoring/bin/deploy_monitoring_cluster.sh line 246:
enable_pod_token_automount $MON_NS deployment v4m-operator
                           ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
enable_pod_token_automount "$MON_NS" deployment v4m-operator


In monitoring/bin/deploy_monitoring_cluster.sh line 263:
  chart2install="$(get_helmchart_reference $TEMPO_CHART_REPO $TEMPO_CHART_NAME $TEMPO_CHART_VERSION)"
                                           ^---------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
                                                             ^---------------^ SC2086 (info): Double quote to prevent globbing and word splitting.
                                                                               ^------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  chart2install="$(get_helmchart_reference "$TEMPO_CHART_REPO" "$TEMPO_CHART_NAME" "$TEMPO_CHART_VERSION")"


In monitoring/bin/deploy_monitoring_cluster.sh line 264:
  versionstring="$(get_helm_versionstring  $TEMPO_CHART_VERSION)"
                                           ^------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  versionstring="$(get_helm_versionstring  "$TEMPO_CHART_VERSION")"


In monitoring/bin/deploy_monitoring_cluster.sh line 270:
    -f $imageKeysFile \
       ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
    -f "$imageKeysFile" \


In monitoring/bin/deploy_monitoring_cluster.sh line 273:
    $versionstring \
    ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
    "$versionstring" \


In monitoring/bin/deploy_monitoring_cluster.sh line 274:
    $chart2install
    ^------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
    "$chart2install"


In monitoring/bin/deploy_monitoring_cluster.sh line 279:
kubectl get ns $NGINX_NS 2>/dev/null
               ^-------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
kubectl get ns "$NGINX_NS" 2>/dev/null


In monitoring/bin/deploy_monitoring_cluster.sh line 280:
if [ $? == 0 ]; then
     ^-- SC2181 (style): Check exit code directly with e.g. 'if mycmd;', not indirectly with $?.


In monitoring/bin/deploy_monitoring_cluster.sh line 287:
  kubectl apply -n $NGINX_NS -f monitoring/monitors/kube/podMonitor-nginx.yaml 2>/dev/null
                   ^-------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl apply -n "$NGINX_NS" -f monitoring/monitors/kube/podMonitor-nginx.yaml 2>/dev/null


In monitoring/bin/deploy_monitoring_cluster.sh line 291:
kubectl apply -n $MON_NS -f monitoring/monitors/kube/podMonitor-eventrouter.yaml 2>/dev/null
                 ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
kubectl apply -n "$MON_NS" -f monitoring/monitors/kube/podMonitor-eventrouter.yaml 2>/dev/null


In monitoring/bin/deploy_monitoring_cluster.sh line 295:
kubectl delete -n $MON_NS servicemonitor elasticsearch --ignore-not-found
                  ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
kubectl delete -n "$MON_NS" servicemonitor elasticsearch --ignore-not-found


In monitoring/bin/deploy_monitoring_cluster.sh line 296:
kubectl apply -n $MON_NS -f monitoring/monitors/logging/serviceMonitor-elasticsearch-v2.yaml
                 ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
kubectl apply -n "$MON_NS" -f monitoring/monitors/logging/serviceMonitor-elasticsearch-v2.yaml


In monitoring/bin/deploy_monitoring_cluster.sh line 299:
kubectl apply -n $MON_NS -f monitoring/monitors/logging/serviceMonitor-fluent-bit.yaml
                 ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
kubectl apply -n "$MON_NS" -f monitoring/monitors/logging/serviceMonitor-fluent-bit.yaml


In monitoring/bin/deploy_monitoring_cluster.sh line 300:
kubectl apply -n $MON_NS -f monitoring/monitors/logging/serviceMonitor-fluent-bit-v2.yaml
                 ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
kubectl apply -n "$MON_NS" -f monitoring/monitors/logging/serviceMonitor-fluent-bit-v2.yaml


In monitoring/bin/deploy_monitoring_cluster.sh line 305:
  kubectl apply -n $MON_NS -f $f
                   ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.
                              ^-- SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
  kubectl apply -n "$MON_NS" -f "$f"


In monitoring/bin/deploy_monitoring_cluster.sh line 340:
   kubectl -n $MON_NS delete configmap  v4m-cluster-total         --ignore-not-found
              ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
   kubectl -n "$MON_NS" delete configmap  v4m-cluster-total         --ignore-not-found


In monitoring/bin/deploy_monitoring_cluster.sh line 341:
   kubectl -n $MON_NS delete configmap  v4m-namespace-by-pod      --ignore-not-found
              ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
   kubectl -n "$MON_NS" delete configmap  v4m-namespace-by-pod      --ignore-not-found


In monitoring/bin/deploy_monitoring_cluster.sh line 342:
   kubectl -n $MON_NS delete configmap  v4m-namespace-by-workload --ignore-not-found
              ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
   kubectl -n "$MON_NS" delete configmap  v4m-namespace-by-workload --ignore-not-found


In monitoring/bin/deploy_monitoring_cluster.sh line 343:
   kubectl -n $MON_NS delete configmap  v4m-prometheus            --ignore-not-found
              ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
   kubectl -n "$MON_NS" delete configmap  v4m-prometheus            --ignore-not-found


In monitoring/bin/deploy_monitoring_cluster.sh line 355:
gf_url=$(get_service_url $MON_NS v4m-grafana  "$TLS_ENABLE")
                         ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
gf_url=$(get_service_url "$MON_NS" v4m-grafana  "$TLS_ENABLE")


In monitoring/bin/deploy_monitoring_cluster.sh line 361:
if helm3ReleaseExists v4m $MON_NS; then
                          ^-----^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
if helm3ReleaseExists v4m "$MON_NS"; then


In monitoring/bin/deploy_monitoring_cluster.sh line 373:
if [ ! -z "$gf_url" ]; then
     ^-- SC2236 (style): Use -n instead of ! -z.

For more information:
  https://www.shellcheck.net/wiki/SC2068 -- Double quote array expansions to ...
  https://www.shellcheck.net/wiki/SC2046 -- Quote this to prevent word splitt...
  https://www.shellcheck.net/wiki/SC2128 -- Expanding an array without an ind...
----------

You can address the above issues in one of three ways:
1. Manually correct the issue in the offending shell script;
2. Disable specific issues by adding the comment:
  # shellcheck disable=NNNN
above the line that contains the issue, where NNNN is the error code;
3. Add '-e NNNN' to the SHELLCHECK_OPTS setting in your .yml action file.

shfmt errors


'shfmt -s' returned error 1 finding the following formatting issues:

----------
diff logging/bin/deploy_esexporter.sh.orig logging/bin/deploy_esexporter.sh
--- logging/bin/deploy_esexporter.sh.orig
+++ logging/bin/deploy_esexporter.sh
@@ -7,7 +7,7 @@
 source logging/bin/common.sh
 source logging/bin/secrets-include.sh
 
-this_script=`basename "$0"`
+this_script=$(basename "$0")
 
 log_debug "Script [$this_script] has started [$(date)]"
 
@@ -14,8 +14,8 @@
 ELASTICSEARCH_EXPORTER_ENABLED=${ELASTICSEARCH_EXPORTER_ENABLED:-true}
 
 if [ "$ELASTICSEARCH_EXPORTER_ENABLED" != "true" ]; then
-  log_verbose "Environment variable [ELASTICSEARCH_EXPORTER_ENABLED] is not set to 'true'; exiting WITHOUT deploying Elasticsearch Exporter"
-  exit
+	log_verbose "Environment variable [ELASTICSEARCH_EXPORTER_ENABLED] is not set to 'true'; exiting WITHOUT deploying Elasticsearch Exporter"
+	exit
 fi
 
 set -e
@@ -29,33 +29,35 @@
 
 # Confirm namespace exists
 if [ "$(kubectl get ns $LOG_NS -o name 2>/dev/null)" == "" ]; then
-  log_error "Namespace [$LOG_NS] does NOT exist."
-  exit 1
+	log_error "Namespace [$LOG_NS] does NOT exist."
+	exit 1
 fi
 
 # get credentials
 get_credentials_from_secret metricgetter
 rc=$?
-if [ "$rc" != "0" ] ;then log_debug "RC=$rc"; exit $rc;fi
-
+if [ "$rc" != "0" ]; then
+	log_debug "RC=$rc"
+	exit $rc
+fi
 
 if helm3ReleaseExists es-exporter $LOG_NS; then
-   #remove an existing instance if it does NOT have the most current set of labels
-   # NOTE: pod label 'app' changed to 'app.kubernetes.io/name' w/Helm chart 6.x
-   if [ -z $(kubectl -n $LOG_NS get pods -l "app.kubernetes.io/name=prometheus-elasticsearch-exporter,searchbackend=opensearch" -o name 2>/dev/null) ]; then
-      log_debug "Removing an outdated version of Helm release [es-exporter]"
-      helm -n $LOG_NS delete es-exporter
-   fi
-
-   monNamespace=$(kubectl get servicemonitor -A --field-selector=metadata.name=elasticsearch -l sas.com/monitoring-base=kube-viya-monitoring -o=custom-columns=NAMESPACE:.metadata.namespace --no-headers)
-   if [ -n "$monNamespace" ]; then
-      log_debug "Removing obsolete serviceMonitor [$monNamespace/elasticsearch]"
-      kubectl delete -n $monNamespace servicemonitor elasticsearch
-      log_debug "Deploying an updated serviceMonitor for Elasticsearch  [$monNamespace/elasticsearch-v2]"
-      kubectl apply  -n $monNamespace -f monitoring/monitors/logging/serviceMonitor-elasticsearch-v2.yaml
-   fi
-else
-   log_debug "No existing Helm release [es-exporter] found."
+	#remove an existing instance if it does NOT have the most current set of labels
+	# NOTE: pod label 'app' changed to 'app.kubernetes.io/name' w/Helm chart 6.x
+	if [ -z $(kubectl -n $LOG_NS get pods -l "app.kubernetes.io/name=prometheus-elasticsearch-exporter,searchbackend=opensearch" -o name 2>/dev/null) ]; then
+		log_debug "Removing an outdated version of Helm release [es-exporter]"
+		helm -n $LOG_NS delete es-exporter
+	fi
+
+	monNamespace=$(kubectl get servicemonitor -A --field-selector=metadata.name=elasticsearch -l sas.com/monitoring-base=kube-viya-monitoring -o=custom-columns=NAMESPACE:.metadata.namespace --no-headers)
+	if [ -n "$monNamespace" ]; then
+		log_debug "Removing obsolete serviceMonitor [$monNamespace/elasticsearch]"
+		kubectl delete -n $monNamespace servicemonitor elasticsearch
+		log_debug "Deploying an updated serviceMonitor for Elasticsearch  [$monNamespace/elasticsearch-v2]"
+		kubectl apply -n $monNamespace -f monitoring/monitors/logging/serviceMonitor-elasticsearch-v2.yaml
+	fi
+else
+	log_debug "No existing Helm release [es-exporter] found."
 fi
 
 # enable debug on Helm via env var
@@ -62,7 +64,7 @@
 export HELM_DEBUG="${HELM_DEBUG:-false}"
 
 if [ "$HELM_DEBUG" == "true" ]; then
-  helmDebug="--debug"
+	helmDebug="--debug"
 fi
 
 helmRepoAdd prometheus-community https://prometheus-community.github.io/helm-charts
@@ -76,8 +78,8 @@
 # Load any user customizations/overrides
 ES_OPEN_EXPORTER_USER_YAML="${ES_OPEN_EXPORTER_USER_YAML:-$USER_DIR/logging/user-values-es-exporter.yaml}"
 if [ ! -f "$ES_OPEN_EXPORTER_USER_YAML" ]; then
-  log_debug "[$ES_OPEN_EXPORTER_USER_YAML] not found. Using $TMP_DIR/empty.yaml"
-  ES_OPEN_EXPORTER_USER_YAML=$TMP_DIR/empty.yaml
+	log_debug "[$ES_OPEN_EXPORTER_USER_YAML] not found. Using $TMP_DIR/empty.yaml"
+	ES_OPEN_EXPORTER_USER_YAML=$TMP_DIR/empty.yaml
 fi
 
 # Enable workload node placement?
@@ -85,44 +87,42 @@
 
 # Optional workload node placement support
 if [ "$LOG_NODE_PLACEMENT_ENABLE" == "true" ]; then
-  log_verbose "Enabling elasticsearch exporter for workload node placement"
-  wnpValuesFile="logging/node-placement/values-elasticsearch-exporter-wnp.yaml"
-else
-  log_debug "Workload node placement support is disabled for the elasticsearch exporter"
-  wnpValuesFile="$TMP_DIR/empty.yaml"
-fi
-
+	log_verbose "Enabling elasticsearch exporter for workload node placement"
+	wnpValuesFile="logging/node-placement/values-elasticsearch-exporter-wnp.yaml"
+else
+	log_debug "Workload node placement support is disabled for the elasticsearch exporter"
+	wnpValuesFile="$TMP_DIR/empty.yaml"
+fi
 
 # Point to OpenShift response file or dummy as appropriate
 if [ "$OPENSHIFT_CLUSTER" == "true" ]; then
-  log_verbose "Deploying Elasticsearch metric exporter onto OpenShift cluster"
-  openshiftValuesFile="logging/openshift/values-elasticsearch-exporter.yaml"
-else
-  log_debug "Elasticsearch metric exporter is NOT being deployed on OpenShift cluster"
-  openshiftValuesFile="$TMP_DIR/empty.yaml"
+	log_verbose "Deploying Elasticsearch metric exporter onto OpenShift cluster"
+	openshiftValuesFile="logging/openshift/values-elasticsearch-exporter.yaml"
+else
+	log_debug "Elasticsearch metric exporter is NOT being deployed on OpenShift cluster"
+	openshiftValuesFile="$TMP_DIR/empty.yaml"
 fi
 
 # Elasticsearch metric exporter
 helm2ReleaseCheck es-exporter-$LOG_NS
 
-
 ## Get Helm Chart Name
 log_debug "Elasticsearch Exporter Helm Chart: repo [$ESEXPORTER_HELM_CHART_REPO] name [$ESEXPORTER_HELM_CHART_NAME] version [$ESEXPORTER_HELM_CHART_VERSION]"
 chart2install="$(get_helmchart_reference $ESEXPORTER_HELM_CHART_REPO $ESEXPORTER_HELM_CHART_NAME $ESEXPORTER_HELM_CHART_VERSION)"
-versionstring="$(get_helm_versionstring  $ESEXPORTER_HELM_CHART_VERSION)"
+versionstring="$(get_helm_versionstring $ESEXPORTER_HELM_CHART_VERSION)"
 
 log_debug "Installing Helm chart from artifact [$chart2install]"
 
 helm $helmDebug upgrade --install es-exporter \
- --namespace $LOG_NS \
- -f $imageKeysFile \
- -f $primaryValuesFile \
- -f $wnpValuesFile \
- -f $openshiftValuesFile \
- -f $ES_OPEN_EXPORTER_USER_YAML \
- --set fullnameOverride=v4m-es-exporter  \
- $versionstring \
- $chart2install
+	--namespace $LOG_NS \
+	-f $imageKeysFile \
+	-f $primaryValuesFile \
+	-f $wnpValuesFile \
+	-f $openshiftValuesFile \
+	-f $ES_OPEN_EXPORTER_USER_YAML \
+	--set fullnameOverride=v4m-es-exporter \
+	$versionstring \
+	$chart2install
 
 log_info "Elasticsearch metric exporter has been deployed"
 
diff monitoring/bin/deploy_monitoring_cluster.sh.orig monitoring/bin/deploy_monitoring_cluster.sh
--- monitoring/bin/deploy_monitoring_cluster.sh.orig
+++ monitoring/bin/deploy_monitoring_cluster.sh
@@ -8,19 +8,19 @@
 source bin/service-url-include.sh
 
 if [ "$OPENSHIFT_CLUSTER" == "true" ]; then
-  if [ "${CHECK_OPENSHIFT_CLUSTER:-true}" == "true" ]; then
-    log_error "This script should not be run on OpenShift clusters"
-    log_error "Run monitoring/bin/deploy_monitoring_openshift.sh instead"
-    exit 1
-  fi
+	if [ "${CHECK_OPENSHIFT_CLUSTER:-true}" == "true" ]; then
+		log_error "This script should not be run on OpenShift clusters"
+		log_error "Run monitoring/bin/deploy_monitoring_openshift.sh instead"
+		exit 1
+	fi
 fi
 
 source bin/tls-include.sh
 if verify_cert_generator $MON_NS prometheus alertmanager grafana; then
-  log_debug "cert generator check OK [$cert_generator_ok]"
-else
-  log_error "One or more required TLS certs do not exist and the expected certificate generator mechanism [$cert_generator] is not available to create the missing certs"
-  exit 1
+	log_debug "cert generator check OK [$cert_generator_ok]"
+else
+	log_error "One or more required TLS certs do not exist and the expected certificate generator mechanism [$cert_generator] is not available to create the missing certs"
+	exit 1
 fi
 
 helm2ReleaseCheck v4m-$MON_NS
@@ -32,32 +32,31 @@
 
 PROM_OPER_USER_YAML="${PROM_OPER_USER_YAML:-$USER_DIR/monitoring/user-values-prom-operator.yaml}"
 if [ ! -f "$PROM_OPER_USER_YAML" ]; then
-  log_debug "[$PROM_OPER_USER_YAML] not found. Using $TMP_DIR/empty.yaml"
-  PROM_OPER_USER_YAML=$TMP_DIR/empty.yaml
+	log_debug "[$PROM_OPER_USER_YAML] not found. Using $TMP_DIR/empty.yaml"
+	PROM_OPER_USER_YAML=$TMP_DIR/empty.yaml
 fi
 
 if [ "$HELM_DEBUG" == "true" ]; then
-  helmDebug="--debug"
+	helmDebug="--debug"
 fi
 
 if [ -z "$(kubectl get ns $MON_NS -o name 2>/dev/null)" ]; then
-  kubectl create ns $MON_NS
-
-  #Container Security: Disable serviceAccount Token Automounting
-  disable_sa_token_automount $MON_NS default
+	kubectl create ns $MON_NS
+
+	#Container Security: Disable serviceAccount Token Automounting
+	disable_sa_token_automount $MON_NS default
 fi
 
 #Generate yaml file with all container-related keys
-generateImageKeysFile "$PROMOP_FULL_IMAGE"          "monitoring/prom-operator_container_image.template"
-generateImageKeysFile "$ALERTMANAGER_FULL_IMAGE"    "$imageKeysFile"  "ALERTMANAGER_"
-generateImageKeysFile "$ADMWEBHOOK_FULL_IMAGE"      "$imageKeysFile"  "ADMWEBHOOK_"
-generateImageKeysFile "$KSM_FULL_IMAGE"             "$imageKeysFile"  "KSM_"
-generateImageKeysFile "$NODEXPORT_FULL_IMAGE"       "$imageKeysFile"  "NODEXPORT_"
-generateImageKeysFile "$PROMETHEUS_FULL_IMAGE"      "$imageKeysFile"  "PROMETHEUS_"
-generateImageKeysFile "$CONFIGRELOAD_FULL_IMAGE"    "$imageKeysFile"  "CONFIGRELOAD_"
-generateImageKeysFile "$GRAFANA_FULL_IMAGE"         "$imageKeysFile"  "GRAFANA_"
-generateImageKeysFile "$GRAFANA_SIDECAR_FULL_IMAGE" "$imageKeysFile"  "SIDECAR_"
-
+generateImageKeysFile "$PROMOP_FULL_IMAGE" "monitoring/prom-operator_container_image.template"
+generateImageKeysFile "$ALERTMANAGER_FULL_IMAGE" "$imageKeysFile" "ALERTMANAGER_"
+generateImageKeysFile "$ADMWEBHOOK_FULL_IMAGE" "$imageKeysFile" "ADMWEBHOOK_"
+generateImageKeysFile "$KSM_FULL_IMAGE" "$imageKeysFile" "KSM_"
+generateImageKeysFile "$NODEXPORT_FULL_IMAGE" "$imageKeysFile" "NODEXPORT_"
+generateImageKeysFile "$PROMETHEUS_FULL_IMAGE" "$imageKeysFile" "PROMETHEUS_"
+generateImageKeysFile "$CONFIGRELOAD_FULL_IMAGE" "$imageKeysFile" "CONFIGRELOAD_"
+generateImageKeysFile "$GRAFANA_FULL_IMAGE" "$imageKeysFile" "GRAFANA_"
+generateImageKeysFile "$GRAFANA_SIDECAR_FULL_IMAGE" "$imageKeysFile" "SIDECAR_"
 
 set -e
 log_notice "Deploying monitoring to the [$MON_NS] namespace..."
@@ -68,43 +67,43 @@
 istioValuesFile=$TMP_DIR/empty.yaml
 # Istio - Federate data from Istio's Prometheus instance
 if [ "$ISTIO_ENABLED" == "true" ]; then
-  log_verbose "Including Istio metric federation"
-  istioValuesFile=$TMP_DIR/values-prom-operator-tmp.yaml
-else
-  log_debug "ISTIO_ENABLED flag not set"
-  log_debug "Skipping deployment of federated scrape of Istio Prometheus instance"
+	log_verbose "Including Istio metric federation"
+	istioValuesFile=$TMP_DIR/values-prom-operator-tmp.yaml
+else
+	log_debug "ISTIO_ENABLED flag not set"
+	log_debug "Skipping deployment of federated scrape of Istio Prometheus instance"
 fi
 
 # Check if Prometheus Operator CRDs are already installed
 PROM_OPERATOR_CRD_UPDATE=${PROM_OPERATOR_CRD_UPDATE:-true}
 if [ "$PROM_OPERATOR_CRD_UPDATE" == "true" ]; then
-  log_verbose "Updating Prometheus Operator custom resource definitions"
-  crds=( alertmanagerconfigs alertmanagers prometheuses prometheusrules podmonitors servicemonitors thanosrulers probes )
-  for crd in "${crds[@]}"; do
-    
-    ## Determine CRD URL - if in an airgap environment, look for them in USER_DIR.
-    if [ "$AIRGAP_DEPLOYMENT" == "true" ]; then
-      crdURL=$USER_DIR/monitoring/prometheus-operator-crd/$PROM_OPERATOR_CRD_VERSION/monitoring.coreos.com_$crd.yaml
-
-      ## Fail if the CRDs could not be located.
-      if [ ! -f "$crdURL" ]; then
-        log_error "Unable to locate file: [monitoring.coreos.com_$crd.yaml] in"
-        log_error "[$USER_DIR/monitoring/prometheus-operator-crd/$PROM_OPERATOR_CRD_VERSION] directory"
-        log_error "Please make sure to provide all Prometheus Operator CRDs before running the deployment"
-        exit 1
-      fi
-    else
-      crdURL="https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/$PROM_OPERATOR_CRD_VERSION/example/prometheus-operator-crd/monitoring.coreos.com_$crd.yaml"
-    fi 
-
-    if kubectl get crd $crd.monitoring.coreos.com 1>/dev/null 2>&1; then
-      kubectl replace -f $crdURL
-    else
-      kubectl create -f $crdURL
-    fi
-  done
-else
-  log_debug "Prometheus Operator CRD update disabled"
+	log_verbose "Updating Prometheus Operator custom resource definitions"
+	crds=(alertmanagerconfigs alertmanagers prometheuses prometheusrules podmonitors servicemonitors thanosrulers probes)
+	for crd in "${crds[@]}"; do
+
+		## Determine CRD URL - if in an airgap environment, look for them in USER_DIR.
+		if [ "$AIRGAP_DEPLOYMENT" == "true" ]; then
+			crdURL=$USER_DIR/monitoring/prometheus-operator-crd/$PROM_OPERATOR_CRD_VERSION/monitoring.coreos.com_$crd.yaml
+
+			## Fail if the CRDs could not be located.
+			if [ ! -f "$crdURL" ]; then
+				log_error "Unable to locate file: [monitoring.coreos.com_$crd.yaml] in"
+				log_error "[$USER_DIR/monitoring/prometheus-operator-crd/$PROM_OPERATOR_CRD_VERSION] directory"
+				log_error "Please make sure to provide all Prometheus Operator CRDs before running the deployment"
+				exit 1
+			fi
+		else
+			crdURL="https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/$PROM_OPERATOR_CRD_VERSION/example/prometheus-operator-crd/monitoring.coreos.com_$crd.yaml"
+		fi
+
+		if kubectl get crd $crd.monitoring.coreos.com 1>/dev/null 2>&1; then
+			kubectl replace -f $crdURL
+		else
+			kubectl create -f $crdURL
+		fi
+	done
+else
+	log_debug "Prometheus Operator CRD update disabled"
 fi
 
 # Remove existing DaemonSets in case of an upgrade-in-place
@@ -113,11 +112,11 @@
 # Optional workload node placement support
 MON_NODE_PLACEMENT_ENABLE=${MON_NODE_PLACEMENT_ENABLE:-${NODE_PLACEMENT_ENABLE:-false}}
 if [ "$MON_NODE_PLACEMENT_ENABLE" == "true" ]; then
-  log_verbose "Enabling monitoring components for workload node placement"
-  wnpValuesFile="monitoring/node-placement/values-prom-operator-wnp.yaml"
-else
-  log_debug "Workload node placement support is disabled"
-  wnpValuesFile="$TMP_DIR/empty.yaml"
+	log_verbose "Enabling monitoring components for workload node placement"
+	wnpValuesFile="monitoring/node-placement/values-prom-operator-wnp.yaml"
+else
+	log_debug "Workload node placement support is disabled"
+	wnpValuesFile="$TMP_DIR/empty.yaml"
 fi
 
 # Optional TLS Support
@@ -124,118 +123,118 @@
 tlsValuesFile=$TMP_DIR/empty.yaml
 tlsPromAlertingEndpointFile=$TMP_DIR/empty.yaml
 if [ "$TLS_ENABLE" == "true" ]; then
-  apps=( prometheus alertmanager grafana )
-  create_tls_certs $MON_NS monitoring ${apps[@]}
-
-  tlsValuesFile=monitoring/tls/values-prom-operator-tls.yaml
-  tlsPromAlertingEndpointFile=monitoring/tls/prom-alertendpoint-host-https.yaml
-  log_debug "Including TLS response file $tlsValuesFile"
-
-  log_verbose "Provisioning TLS-enabled Prometheus datasource for Grafana"
-  grafanaDS=grafana-datasource-prom-https.yaml
-  if [ "$MON_TLS_PATH_INGRESS" == "true" ]; then
-    grafanaDS=grafana-datasource-prom-https-path.yaml
-    tlsPromAlertingEndpointFile=monitoring/tls/prom-alertendpoint-path-https.yaml
-  fi
-  kubectl delete cm -n $MON_NS --ignore-not-found grafana-datasource-prom-https
-  kubectl create cm -n $MON_NS grafana-datasource-prom-https --from-file monitoring/tls/$grafanaDS
-  kubectl label cm -n $MON_NS grafana-datasource-prom-https grafana_datasource=1 sas.com/monitoring-base=kube-viya-monitoring
-
-  # node-exporter TLS
-  log_verbose "Enabling Prometheus node-exporter for TLS"
-  kubectl delete cm -n $MON_NS node-exporter-tls-web-config --ignore-not-found
-  sleep 1
-  kubectl create cm -n $MON_NS node-exporter-tls-web-config --from-file monitoring/tls/node-exporter-web.yaml
-  kubectl label cm -n $MON_NS node-exporter-tls-web-config sas.com/monitoring-base=kube-viya-monitoring
+	apps=(prometheus alertmanager grafana)
+	create_tls_certs $MON_NS monitoring ${apps[@]}
+
+	tlsValuesFile=monitoring/tls/values-prom-operator-tls.yaml
+	tlsPromAlertingEndpointFile=monitoring/tls/prom-alertendpoint-host-https.yaml
+	log_debug "Including TLS response file $tlsValuesFile"
+
+	log_verbose "Provisioning TLS-enabled Prometheus datasource for Grafana"
+	grafanaDS=grafana-datasource-prom-https.yaml
+	if [ "$MON_TLS_PATH_INGRESS" == "true" ]; then
+		grafanaDS=grafana-datasource-prom-https-path.yaml
+		tlsPromAlertingEndpointFile=monitoring/tls/prom-alertendpoint-path-https.yaml
+	fi
+	kubectl delete cm -n $MON_NS --ignore-not-found grafana-datasource-prom-https
+	kubectl create cm -n $MON_NS grafana-datasource-prom-https --from-file monitoring/tls/$grafanaDS
+	kubectl label cm -n $MON_NS grafana-datasource-prom-https grafana_datasource=1 sas.com/monitoring-base=kube-viya-monitoring
+
+	# node-exporter TLS
+	log_verbose "Enabling Prometheus node-exporter for TLS"
+	kubectl delete cm -n $MON_NS node-exporter-tls-web-config --ignore-not-found
+	sleep 1
+	kubectl create cm -n $MON_NS node-exporter-tls-web-config --from-file monitoring/tls/node-exporter-web.yaml
+	kubectl label cm -n $MON_NS node-exporter-tls-web-config sas.com/monitoring-base=kube-viya-monitoring
 fi
 
 nodePortValuesFile=$TMP_DIR/empty.yaml
 PROM_NODEPORT_ENABLE=${PROM_NODEPORT_ENABLE:-false}
 if [ "$PROM_NODEPORT_ENABLE" == "true" ]; then
-  log_debug "Enabling NodePort access for Prometheus and Alertmanager"
-  nodePortValuesFile=monitoring/values-prom-nodeport.yaml
+	log_debug "Enabling NodePort access for Prometheus and Alertmanager"
+	nodePortValuesFile=monitoring/values-prom-nodeport.yaml
 fi
 
 if helm3ReleaseExists prometheus-operator $MON_NS; then
-  promRelease=prometheus-operator
-  promName=prometheus-operator
-else
-  promRelease=v4m-prometheus-operator
-  promName=v4m
+	promRelease=prometheus-operator
+	promName=prometheus-operator
+else
+	promRelease=v4m-prometheus-operator
+	promName=v4m
 fi
 log_verbose "User response file: [$PROM_OPER_USER_YAML]"
 log_info "Deploying the kube-prometheus stack. This may take a few minutes ..."
 if helm3ReleaseExists $promRelease $MON_NS; then
-  log_verbose "Upgrading via Helm ($(date) - timeout 20m)"
-else
-  grafanaPwd="$GRAFANA_ADMIN_PASSWORD"
-  if [ "$grafanaPwd" == "" ]; then
-    log_debug "Generating random Grafana admin password"
-    showPass="true"
-    grafanaPwd="$(randomPassword)"
-  fi
-  log_verbose "Installing via Helm ($(date) - timeout 20m)"
+	log_verbose "Upgrading via Helm ($(date) - timeout 20m)"
+else
+	grafanaPwd="$GRAFANA_ADMIN_PASSWORD"
+	if [ "$grafanaPwd" == "" ]; then
+		log_debug "Generating random Grafana admin password"
+		showPass="true"
+		grafanaPwd="$(randomPassword)"
+	fi
+	log_verbose "Installing via Helm ($(date) - timeout 20m)"
 fi
 
 # See https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack#from-21x-to-22x
-if [ "$V4M_CURRENT_VERSION_MAJOR" == "1" ] && [[ "$V4M_CURRENT_VERSION_MINOR" =~ [0-5] ]]; then
-  kubectl delete -n $MON_NS --ignore-not-found \
-    deployments.apps \
-    -l app.kubernetes.io/instance=v4m-prometheus-operator,app.kubernetes.io/name=kube-state-metrics
+if [ "$V4M_CURRENT_VERSION_MAJOR" == "1" ] && [[ $V4M_CURRENT_VERSION_MINOR =~ [0-5] ]]; then
+	kubectl delete -n $MON_NS --ignore-not-found \
+		deployments.apps \
+		-l app.kubernetes.io/instance=v4m-prometheus-operator,app.kubernetes.io/name=kube-state-metrics
 fi
 
 TRACING_ENABLE="${TRACING_ENABLE:-false}"
 if [ "$TRACING_ENABLE" == "false" ]; then
-  tempoDSFile=$TMP_DIR/empty.yaml
-else
-  TEMPO_USER_YAML="${TEMPO_USER_YAML:-$USER_DIR/monitoring/user-values-tempo.yaml}"
-  if [ ! -f "$TEMPO_USER_YAML" ]; then
-    log_debug "[$TEMPO_USER_YAML] not found. Using $TMP_DIR/empty.yaml"
-    TEMPO_USER_YAML=$TMP_DIR/empty.yaml
-  fi
-  tempoDSFile="monitoring/grafana-datasource-tempo.yaml"
-fi 
+	tempoDSFile=$TMP_DIR/empty.yaml
+else
+	TEMPO_USER_YAML="${TEMPO_USER_YAML:-$USER_DIR/monitoring/user-values-tempo.yaml}"
+	if [ ! -f "$TEMPO_USER_YAML" ]; then
+		log_debug "[$TEMPO_USER_YAML] not found. Using $TMP_DIR/empty.yaml"
+		TEMPO_USER_YAML=$TMP_DIR/empty.yaml
+	fi
+	tempoDSFile="monitoring/grafana-datasource-tempo.yaml"
+fi
 
 # Get Helm Chart Name
 log_debug "Kube-Prometheus Stack Helm Chart: repo [$KUBE_PROM_STACK_CHART_REPO] name [$KUBE_PROM_STACK_CHART_NAME] version [$KUBE_PROM_STACK_CHART_VERSION]"
 chart2install="$(get_helmchart_reference $KUBE_PROM_STACK_CHART_REPO $KUBE_PROM_STACK_CHART_NAME $KUBE_PROM_STACK_CHART_VERSION)"
-versionstring="$(get_helm_versionstring  $KUBE_PROM_STACK_CHART_VERSION)"
+versionstring="$(get_helm_versionstring $KUBE_PROM_STACK_CHART_VERSION)"
 log_debug "Installing Helm chart from artifact [$chart2install]"
 
 helm $helmDebug upgrade --install $promRelease \
-  --namespace $MON_NS \
-  -f $imageKeysFile \
-  -f monitoring/values-prom-operator.yaml \
-  -f $istioValuesFile \
-  -f $tlsValuesFile \
-  -f $tlsPromAlertingEndpointFile \
-  -f $nodePortValuesFile \
-  -f $wnpValuesFile \
-  -f $PROM_OPER_USER_YAML \
-  -f $tempoDSFile \
-  --atomic \
-  --timeout 20m \
-  --set nameOverride=$promName \
-  --set fullnameOverride=$promName \
-  --set prometheus-node-exporter.fullnameOverride=$promName-node-exporter \
-  --set kube-state-metrics.fullnameOverride=$promName-kube-state-metrics \
-  --set grafana.fullnameOverride=$promName-grafana \
-  --set grafana.adminPassword="$grafanaPwd" \
-  --set prometheus.prometheusSpec.alertingEndpoints[0].namespace="$MON_NS" \
-  $versionstring \
-  $chart2install
+	--namespace $MON_NS \
+	-f $imageKeysFile \
+	-f monitoring/values-prom-operator.yaml \
+	-f $istioValuesFile \
+	-f $tlsValuesFile \
+	-f $tlsPromAlertingEndpointFile \
+	-f $nodePortValuesFile \
+	-f $wnpValuesFile \
+	-f $PROM_OPER_USER_YAML \
+	-f $tempoDSFile \
+	--atomic \
+	--timeout 20m \
+	--set nameOverride=$promName \
+	--set fullnameOverride=$promName \
+	--set prometheus-node-exporter.fullnameOverride=$promName-node-exporter \
+	--set kube-state-metrics.fullnameOverride=$promName-kube-state-metrics \
+	--set grafana.fullnameOverride=$promName-grafana \
+	--set grafana.adminPassword="$grafanaPwd" \
+	--set prometheus.prometheusSpec.alertingEndpoints[0].namespace="$MON_NS" \
+	$versionstring \
+	$chart2install
 
 sleep 2
 
 if [ "$TLS_ENABLE" == "true" ]; then
-  log_verbose "Patching Grafana ServiceMonitor for TLS"
-  kubectl patch servicemonitor -n $MON_NS $promName-grafana --type=json \
-    -p='[{"op": "replace", "path": "/spec/endpoints/0/scheme", "value":"https"},{"op": "replace", "path": "/spec/endpoints/0/tlsConfig", "value":{}},{"op": "replace", "path": "/spec/endpoints/0/tlsConfig/insecureSkipVerify", "value":true}]'
+	log_verbose "Patching Grafana ServiceMonitor for TLS"
+	kubectl patch servicemonitor -n $MON_NS $promName-grafana --type=json \
+		-p='[{"op": "replace", "path": "/spec/endpoints/0/scheme", "value":"https"},{"op": "replace", "path": "/spec/endpoints/0/tlsConfig", "value":{}},{"op": "replace", "path": "/spec/endpoints/0/tlsConfig/insecureSkipVerify", "value":true}]'
 fi
 
 #Container Security: Disable serviceAccount Token Automounting
 disable_sa_token_automount $MON_NS v4m-grafana
-disable_sa_token_automount $MON_NS sas-ops-acct      #Used w/Prometheus
+disable_sa_token_automount $MON_NS sas-ops-acct #Used w/Prometheus
 disable_sa_token_automount $MON_NS v4m-node-exporter
 disable_sa_token_automount $MON_NS v4m-alertmanager
 
@@ -249,29 +248,29 @@
 log_verbose "Deploying cluster ServiceMonitors"
 
 if [ "$TRACING_ENABLE" == "true" ]; then
-  log_info "Tracing enabled..."
-
-  #Generate yaml file with all container-related keys
-  generateImageKeysFile "$TEMPO_FULL_IMAGE" "monitoring/tempo_container_image.template"
-
-  # Add the grafana helm chart repo
-  helmRepoAdd grafana https://grafana.github.io/helm-charts
-  helm repo update
-
-  # Get Helm Chart Name
-  log_debug "Tempo Helm Chart: repo [$TEMPO_CHART_REPO] name [$TEMPO_CHART_NAME] version [$TEMPO_CHART_VERSION]"
-  chart2install="$(get_helmchart_reference $TEMPO_CHART_REPO $TEMPO_CHART_NAME $TEMPO_CHART_VERSION)"
-  versionstring="$(get_helm_versionstring  $TEMPO_CHART_VERSION)"
-  log_debug "Installing Helm chart from artifact [$chart2install]"
-
-  log_info "Installing tempo"
-  helm upgrade --install v4m-tempo \
-    -n "$MON_NS" \
-    -f $imageKeysFile \
-    -f monitoring/values-tempo.yaml \
-    -f "$TEMPO_USER_YAML" \
-    $versionstring \
-    $chart2install
+	log_info "Tracing enabled..."
+
+	#Generate yaml file with all container-related keys
+	generateImageKeysFile "$TEMPO_FULL_IMAGE" "monitoring/tempo_container_image.template"
+
+	# Add the grafana helm chart repo
+	helmRepoAdd grafana https://grafana.github.io/helm-charts
+	helm repo update
+
+	# Get Helm Chart Name
+	log_debug "Tempo Helm Chart: repo [$TEMPO_CHART_REPO] name [$TEMPO_CHART_NAME] version [$TEMPO_CHART_VERSION]"
+	chart2install="$(get_helmchart_reference $TEMPO_CHART_REPO $TEMPO_CHART_NAME $TEMPO_CHART_VERSION)"
+	versionstring="$(get_helm_versionstring $TEMPO_CHART_VERSION)"
+	log_debug "Installing Helm chart from artifact [$chart2install]"
+
+	log_info "Installing tempo"
+	helm upgrade --install v4m-tempo \
+		-n "$MON_NS" \
+		-f $imageKeysFile \
+		-f monitoring/values-tempo.yaml \
+		-f "$TEMPO_USER_YAML" \
+		$versionstring \
+		$chart2install
 fi
 
 # NGINX
@@ -278,13 +277,13 @@
 set +e
 kubectl get ns $NGINX_NS 2>/dev/null
 if [ $? == 0 ]; then
-  nginxFound=true
+	nginxFound=true
 fi
 set -e
 
 if [ "$nginxFound" == "true" ]; then
-  log_verbose "NGINX found. Deploying podMonitor to [$NGINX_NS] namespace"
-  kubectl apply -n $NGINX_NS -f monitoring/monitors/kube/podMonitor-nginx.yaml 2>/dev/null
+	log_verbose "NGINX found. Deploying podMonitor to [$NGINX_NS] namespace"
+	kubectl apply -n $NGINX_NS -f monitoring/monitors/kube/podMonitor-nginx.yaml 2>/dev/null
 fi
 
 # Eventrouter ServiceMonitor
@@ -302,25 +301,25 @@
 # Rules
 log_verbose "Adding Prometheus recording rules"
 for f in monitoring/rules/viya/rules-*.yaml; do
-  kubectl apply -n $MON_NS -f $f
+	kubectl apply -n $MON_NS -f $f
 done
 
 # Elasticsearch Datasource for Grafana
 LOGGING_DATASOURCE="${LOGGING_DATASOURCE:-false}"
 if [ "$LOGGING_DATASOURCE" == "true" ]; then
-  set +e
-  log_debug "Creating the logging data source using the create_logging_datasource script"
-  monitoring/bin/create_logging_datasource.sh
-
-  if (( $? == 1 )); then
-    log_warn "Unable to configure the logging data source at this time."
-    log_warn "Please address the errors and re-run the follow command to create the data source at a later time:"
-    log_warn "monitoring/bin/create_logging_datasource.sh"
-  fi
-  set -e
-else
-  log_debug "LOGGING_DATASOURCE not set"
-  log_debug "Skipping creation of logging data source for Grafana"
+	set +e
+	log_debug "Creating the logging data source using the create_logging_datasource script"
+	monitoring/bin/create_logging_datasource.sh
+
+	if (($? == 1)); then
+		log_warn "Unable to configure the logging data source at this time."
+		log_warn "Please address the errors and re-run the follow command to create the data source at a later time:"
+		log_warn "monitoring/bin/create_logging_datasource.sh"
+	fi
+	set -e
+else
+	log_debug "LOGGING_DATASOURCE not set"
+	log_debug "Skipping creation of logging data source for Grafana"
 fi
 
 echo ""
@@ -334,16 +333,16 @@
 # when these issues have been resolved.
 V4M_TEMP_REPLACE_PROBLEMATIC_MIXIN_DASHBOARDS="${V4M_TEMP_REPLACE_PROBLEMATIC_MIXIN_DASHBOARDS:-true}"
 if [ "$V4M_TEMP_REPLACE_PROBLEMATIC_MIXIN_DASHBOARDS" == "true" ]; then
-   log_info "Replacing some Kube-Prometheus Stack-supplied Grafana dashboards with our own versions due to incompatabilities."
-
-   # remove configMaps definining exising Grafana dashboards
-   kubectl -n $MON_NS delete configmap  v4m-cluster-total         --ignore-not-found
-   kubectl -n $MON_NS delete configmap  v4m-namespace-by-pod      --ignore-not-found
-   kubectl -n $MON_NS delete configmap  v4m-namespace-by-workload --ignore-not-found
-   kubectl -n $MON_NS delete configmap  v4m-prometheus            --ignore-not-found
-
-   # deploy our versions of these dashboards
-   monitoring/bin/deploy_dashboards.sh monitoring/dashboards/mixinfixes
+	log_info "Replacing some Kube-Prometheus Stack-supplied Grafana dashboards with our own versions due to incompatabilities."
+
+	# remove configMaps definining exising Grafana dashboards
+	kubectl -n $MON_NS delete configmap v4m-cluster-total --ignore-not-found
+	kubectl -n $MON_NS delete configmap v4m-namespace-by-pod --ignore-not-found
+	kubectl -n $MON_NS delete configmap v4m-namespace-by-workload --ignore-not-found
+	kubectl -n $MON_NS delete configmap v4m-prometheus --ignore-not-found
+
+	# deploy our versions of these dashboards
+	monitoring/bin/deploy_dashboards.sh monitoring/dashboards/mixinfixes
 
 fi
 
@@ -352,7 +351,7 @@
 get_ingress_ports
 
 # get URLs for Grafana, Prometheus and AlertManager
-gf_url=$(get_service_url $MON_NS v4m-grafana  "$TLS_ENABLE")
+gf_url=$(get_service_url $MON_NS v4m-grafana "$TLS_ENABLE")
 # pr_url=$(get_url $MON_NS v4m-prometheus  "$TLS_ENABLE")
 # am_url=$(get_url $MON_NS v4m-alertmanager  "$TLS_ENABLE")
 set -e
@@ -359,12 +358,12 @@
 
 # If a deployment with the old name exists, remove it first
 if helm3ReleaseExists v4m $MON_NS; then
-  log_verbose "Removing outdated SAS Viya Monitoring Helm chart release from [$MON_NS] namespace"
-  helm uninstall -n "$MON_NS" "v4m"
+	log_verbose "Removing outdated SAS Viya Monitoring Helm chart release from [$MON_NS] namespace"
+	helm uninstall -n "$MON_NS" "v4m"
 fi
 
 if ! deployV4MInfo "$MON_NS" "v4m-metrics"; then
-  log_warn "Unable to update SAS Viya Monitoring Helm chart release"
+	log_warn "Unable to update SAS Viya Monitoring Helm chart release"
 fi
 
 # Print URL to access web apps
@@ -371,13 +370,13 @@
 log_notice ""
 log_notice "GRAFANA: "
 if [ ! -z "$gf_url" ]; then
-   log_notice "  $gf_url"
-else
-   log_notice " It was not possible to determine the URL needed to access Grafana. Note  "
-   log_notice " that this is not necessarily a sign of a problem; it may only reflect an "
-   log_notice " ingress or network access configuration that this script does not handle."
-fi
-   log_notice ""
+	log_notice "  $gf_url"
+else
+	log_notice " It was not possible to determine the URL needed to access Grafana. Note  "
+	log_notice " that this is not necessarily a sign of a problem; it may only reflect an "
+	log_notice " ingress or network access configuration that this script does not handle."
+fi
+log_notice ""
 
 #log_notice ""
 #log_notice "================================================================================"
@@ -400,14 +399,12 @@
 #log_notice ""
 
 if [ "$showPass" == "true" ]; then
-  # Find the grafana pod
- 
-  log_notice " Generated Grafana admin password is: $grafanaPwd"
-  log_notice " To change the password, run the following script (replace myNewPassword with an updated password):"
-  log_notice " monitoring/bin/change_grafana_admin_password.sh -p myNewPassword"
+	# Find the grafana pod
+
+	log_notice " Generated Grafana admin password is: $grafanaPwd"
+	log_notice " To change the password, run the following script (replace myNewPassword with an updated password):"
+	log_notice " monitoring/bin/change_grafana_admin_password.sh -p myNewPassword"
 fi
 
 log_message ""
 log_notice " Successfully deployed components to the [$MON_NS] namespace"
-
-
----------

You can reformat the above files to meet shfmt's requirements by typing:

  shfmt -s -w filename

gsmith-sas added 4 commits November 1, 2024 14:29

[UPGRADE] OpenSearch/OpenSearch Dashboards 2.17.1; Fluent Bit 3.1.9; …

eaf8f2a

…related Helm charts

[UPGRADE] Elasticsearch Exporter and associated serviceMonitor

5fbc0b4

Updated CHANGELOG.md

deee71a

[UPGRADE] OpenSearch Data Source Plugin to Grafana upgraded from 2.18…

1372708

….0 to 2.21.1

gsmith-sas added 2 commits November 4, 2024 17:56

Code cleanup

19b4513

Corrected typo

c725929

Remove obsolete version of Elasticsearch serviceMonitor

76f4fe1

gsmith-sas requested a review from cumcke November 6, 2024 19:08

cumcke approved these changes Nov 6, 2024

View reviewed changes

gsmith-sas merged commit 4f822dc into main Nov 14, 2024
1 of 2 checks passed

gsmith-sas deleted the uplog branch November 14, 2024 20:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[UPGRADE] Log monitoring stack #691

[UPGRADE] Log monitoring stack #691

gsmith-sas commented Nov 4, 2024

github-actions bot commented Nov 4, 2024

github-actions bot commented Nov 4, 2024

github-actions bot commented Nov 5, 2024

[UPGRADE] Log monitoring stack #691

[UPGRADE] Log monitoring stack #691

Conversation

gsmith-sas commented Nov 4, 2024

github-actions bot commented Nov 4, 2024

sh-checker report

github-actions bot commented Nov 4, 2024

sh-checker report

github-actions bot commented Nov 5, 2024

sh-checker report

`sh-checker report`

`sh-checker report`

`sh-checker report`