update comment and change back to double equal

Author: ceelias

.shellcheckrc

@@ -2,5 +2,5 @@
 disable=SC1091
 # Disables the check for expanding an array, as it predictably gives first element
 disable=SC2128
-# Disbale check for var not set in same file
+# Disabales check for var not set in same file
 disable=SC2154

monitoring/bin/common.sh

@@ -21,10 +21,10 @@ if [ "$SAS_MONITORING_COMMON_SOURCED" = "" ]; then
     export MON_NS="${MON_NS:-monitoring}"
     export TLS_ENABLE="${MON_TLS_ENABLE:-${TLS_ENABLE:-true}}"
 
-    if [ "$AIRGAP_DEPLOYMENT" = "true" ]; then
+    if [ "$AIRGAP_DEPLOYMENT" == "true" ]; then
 
         #Special processing to handle Viya-level deployment script
-        if [ "$(basename "$0")" = "deploy_monitoring_viya.sh" ]; then
+        if [ "$(basename "$0")" == "deploy_monitoring_viya.sh" ]; then
             V4M_NS="$VIYA_NS"
         else
             export V4M_NS=$MON_NS

monitoring/bin/create_logging_datasource.sh

@@ -79,7 +79,7 @@ log_debug "Grafana Pod [$grafanaPod]"
 pluginInstalled=$(kubectl exec -n "$MON_NS" "$grafanaPod" -- bash -c "grafana cli plugins ls |grep -c opensearch-datasource|| true")
 log_debug "Grafana OpenSearch Datasource Plugin installed? [$pluginInstalled]"
 
-if [ "$pluginInstalled" = "0" ]; then
+if [ "$pluginInstalled" == "0" ]; then
 
     log_info "Installing OpenSearch Datasource plugin"
     pluginVersion="${GRAFANA_DATASOURCE_PLUGIN_VERSION:-2.17.4}"

monitoring/bin/deploy_dashboards.sh

@@ -76,52 +76,52 @@ if [ "$1" != "" ]; then
 fi
 
 log_info "Deploying dashboards to the [$DASH_NS] namespace ..."
-if [ "$WELCOME_DASH" = "true" ]; then
+if [ "$WELCOME_DASH" == "true" ]; then
     log_verbose "Deploying welcome dashboards"
     deploy_dashboards "welcome"
 fi
 
-if [ "$KUBE_DASH" = "true" ]; then
+if [ "$KUBE_DASH" == "true" ]; then
     log_verbose "Deploying Kubernetes cluster dashboards"
     deploy_dashboards "kube"
 fi
 
-if [ "$ISTIO_DASH" = "true" ]; then
+if [ "$ISTIO_DASH" == "true" ]; then
     log_verbose "Deploying Istio dashboards"
     deploy_dashboards "istio"
 fi
 
-if [ "$LOGGING_DASH" = "true" ]; then
+if [ "$LOGGING_DASH" == "true" ]; then
     log_verbose "Deploying Logging dashboards"
     deploy_dashboards "logging"
 fi
 
-if [ "$VIYA_DASH" = "true" ]; then
+if [ "$VIYA_DASH" == "true" ]; then
     log_verbose "Deploying SAS Viya dashboards"
     deploy_dashboards "viya"
 fi
 
-if [ "$VIYA_LOGS_DASH" = "true" ]; then
+if [ "$VIYA_LOGS_DASH" == "true" ]; then
     log_verbose "Deploying SAS Viya dashboards with log support"
     deploy_dashboards "viya-logs"
 fi
 
-if [ "$PGMONITOR_DASH" = "true" ]; then
+if [ "$PGMONITOR_DASH" == "true" ]; then
     log_verbose "Deploying Postgres dashboards"
     deploy_dashboards "pgmonitor"
 fi
 
-if [ "$RABBITMQ_DASH" = "true" ]; then
+if [ "$RABBITMQ_DASH" == "true" ]; then
     log_verbose "Deploying RabbitMQ dashboards"
     deploy_dashboards "rabbitmq"
 fi
 
-if [ "$NGINX_DASH" = "true" ]; then
+if [ "$NGINX_DASH" == "true" ]; then
     log_verbose "Deploying NGINX dashboards"
     deploy_dashboards "nginx"
 fi
 
-if [ "$USER_DASH" = "true" ]; then
+if [ "$USER_DASH" == "true" ]; then
     userDashDir="$USER_DIR/monitoring/dashboards"
     if [ -d "$userDashDir" ]; then
         log_verbose "Deploying user dashboards from [$userDashDir]"

monitoring/bin/deploy_monitoring_cluster.sh

@@ -8,7 +8,7 @@ source monitoring/bin/common.sh
 source bin/service-url-include.sh
 source bin/autogenerate-include.sh
 
-if [ "$OPENSHIFT_CLUSTER" = "true" ]; then
+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"
@@ -35,7 +35,7 @@ autogeneratedYAMLFile="$TMP_DIR/autogenerate-prom-operator.yaml"
 
 AUTOGENERATE_STORAGECLASS="${AUTOGENERATE_STORAGECLASS:-false}"
 
-if [ "$AUTOGENERATE_STORAGECLASS" = "true" ]; then
+if [ "$AUTOGENERATE_STORAGECLASS" == "true" ]; then
 
     if [ ! -f "$autogeneratedYAMLFile" ]; then
         log_debug "Creating file [$autogeneratedYAMLFile]"
@@ -65,7 +65,7 @@ if [ ! -f "$PROM_OPER_USER_YAML" ]; then
     PROM_OPER_USER_YAML=$TMP_DIR/empty.yaml
 fi
 
-if [ "$HELM_DEBUG" = "true" ]; then
+if [ "$HELM_DEBUG" == "true" ]; then
     helmDebug="--debug"
 fi
 
@@ -95,7 +95,7 @@ helmRepoAdd prometheus-community https://prometheus-community.github.io/helm-cha
 
 istioValuesFile=$TMP_DIR/empty.yaml
 # Istio - Federate data from Istio's Prometheus instance
-if [ "$ISTIO_ENABLED" = "true" ]; then
+if [ "$ISTIO_ENABLED" == "true" ]; then
     log_verbose "Including Istio metric federation"
     istioValuesFile=$TMP_DIR/values-prom-operator-tmp.yaml
 else
@@ -105,13 +105,13 @@ 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
+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
+        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.
@@ -140,7 +140,7 @@ kubectl delete daemonset -n "$MON_NS" -l app=prometheus-node-exporter --ignore-n
 
 # Optional workload node placement support
 MON_NODE_PLACEMENT_ENABLE=${MON_NODE_PLACEMENT_ENABLE:-${NODE_PLACEMENT_ENABLE:-false}}
-if [ "$MON_NODE_PLACEMENT_ENABLE" = "true" ]; then
+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
@@ -151,7 +151,7 @@ fi
 # Optional TLS Support
 tlsValuesFile=$TMP_DIR/empty.yaml
 tlsPromAlertingEndpointFile=$TMP_DIR/empty.yaml
-if [ "$TLS_ENABLE" = "true" ]; then
+if [ "$TLS_ENABLE" == "true" ]; then
     apps=(prometheus alertmanager grafana)
     create_tls_certs "$MON_NS" monitoring "${apps[@]}"
 
@@ -161,7 +161,7 @@ if [ "$TLS_ENABLE" = "true" ]; then
 
     log_verbose "Provisioning TLS-enabled Prometheus datasource for Grafana"
     grafanaDS=grafana-datasource-prom-https.yaml
-    if [ "$MON_TLS_PATH_INGRESS" = "true" ]; then
+    if [ "$MON_TLS_PATH_INGRESS" == "true" ]; then
         grafanaDS=grafana-datasource-prom-https-path.yaml
         tlsPromAlertingEndpointFile=monitoring/tls/prom-alertendpoint-path-https.yaml
     fi
@@ -179,7 +179,7 @@ fi
 
 AUTOGENERATE_INGRESS="${AUTOGENERATE_INGRESS:-false}"
 
-if [ "$AUTOGENERATE_INGRESS" = "true" ]; then
+if [ "$AUTOGENERATE_INGRESS" == "true" ]; then
 
     if [ ! -f "$autogeneratedYAMLFile" ]; then
         log_debug "Creating file [$autogeneratedYAMLFile]"
@@ -188,7 +188,7 @@ if [ "$AUTOGENERATE_INGRESS" = "true" ]; then
         log_debug "File [$autogeneratedYAMLFile] already exists"
     fi
 
-    if [ "$MON_TLS_PATH_INGRESS" != "true" ] && [ "$ROUTING" = "path" ]; then
+    if [ "$MON_TLS_PATH_INGRESS" != "true" ] && [ "$ROUTING" == "path" ]; then
         log_error "Environment variable MON_TLS_PATH_INGRESS must be set to 'true' when ROUTING='path'."
         exit 1
     fi
@@ -209,7 +209,7 @@ if [ "$AUTOGENERATE_INGRESS" = "true" ]; then
     # Don't assign the variable to itself
     ALERTMANAGER_PATH="${ALERTMANAGER_PATH:-alertmanager}"
     if [ -z "$ALERTMANAGER_FQDN" ]; then
-        if [ "$ROUTING" = "host" ]; then
+        if [ "$ROUTING" == "host" ]; then
             ALERTMANAGER_FQDN="$ALERTMANAGER_PATH.$BASE_DOMAIN"
         else
             ALERTMANAGER_FQDN="$BASE_DOMAIN"
@@ -225,7 +225,7 @@ if [ "$AUTOGENERATE_INGRESS" = "true" ]; then
     # Don't assign the variable to itself
     GRAFANA_PATH="${GRAFANA_PATH:-grafana}"
     if [ -z "$GRAFANA_FQDN" ]; then
-        if [ "$ROUTING" = "host" ]; then
+        if [ "$ROUTING" == "host" ]; then
             GRAFANA_FQDN="$GRAFANA_PATH.$BASE_DOMAIN"
         else
             GRAFANA_FQDN="$BASE_DOMAIN"
@@ -240,7 +240,7 @@ if [ "$AUTOGENERATE_INGRESS" = "true" ]; then
     # Don't assign the variable to itself
     PROMETHEUS_PATH="${PROMETHEUS_PATH:-prometheus}"
     if [ -z "$PROMETHEUS_FQDN" ]; then
-        if [ "$ROUTING" = "host" ]; then
+        if [ "$ROUTING" == "host" ]; then
             PROMETHEUS_FQDN="$PROMETHEUS_PATH.$BASE_DOMAIN"
         else
             PROMETHEUS_FQDN="$BASE_DOMAIN"
@@ -261,7 +261,7 @@ if [ "$AUTOGENERATE_INGRESS" = "true" ]; then
     yq -i '.prometheus.ingress.enabled=env(PROMETHEUS_INGRESS_ENABLE)' "$autogeneratedYAMLFile"
 
     ###hosts, paths and fqdn
-    if [ "$ROUTING" = "host" ]; then
+    if [ "$ROUTING" == "host" ]; then
         yq -i '.alertmanager.ingress.hosts.[0]=env(ALERTMANAGER_FQDN)' "$autogeneratedYAMLFile"
         yq -i '.alertmanager.ingress.tls.[0].hosts.[0]=env(ALERTMANAGER_FQDN)' "$autogeneratedYAMLFile"
         exturl="https://$ALERTMANAGER_FQDN" yq -i '.alertmanager.alertmanagerSpec.externalUrl=env(exturl)' "$autogeneratedYAMLFile"
@@ -315,7 +315,7 @@ fi
 
 nodePortValuesFile=$TMP_DIR/empty.yaml
 PROM_NODEPORT_ENABLE=${PROM_NODEPORT_ENABLE:-false}
-if [ "$PROM_NODEPORT_ENABLE" = "true" ]; then
+if [ "$PROM_NODEPORT_ENABLE" == "true" ]; then
     log_debug "Enabling NodePort access for Prometheus and Alertmanager"
     nodePortValuesFile=monitoring/values-prom-nodeport.yaml
 fi
@@ -333,7 +333,7 @@ if helm3ReleaseExists "$promRelease" "$MON_NS"; then
     log_verbose "Upgrading via Helm ($(date) - timeout 20m)"
 else
     grafanaPwd="$GRAFANA_ADMIN_PASSWORD"
-    if [ "$grafanaPwd" = "" ]; then
+    if [ "$grafanaPwd" == "" ]; then
         log_debug "Generating random Grafana admin password"
         showPass="true"
         grafanaPwd="$(randomPassword)"
@@ -342,14 +342,14 @@ else
 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
+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
+if [ "$TRACING_ENABLE" == "false" ]; then
     tempoDSFile=$TMP_DIR/empty.yaml
 else
     TEMPO_USER_YAML="${TEMPO_USER_YAML:-$USER_DIR/monitoring/user-values-tempo.yaml}"
@@ -415,7 +415,7 @@ enable_pod_token_automount "$MON_NS" deployment v4m-operator
 log_info "Deploying ServiceMonitors and Prometheus rules"
 log_verbose "Deploying cluster ServiceMonitors"
 
-if [ "$TRACING_ENABLE" = "true" ]; then
+if [ "$TRACING_ENABLE" == "true" ]; then
     log_info "Tracing enabled..."
 
     #Generate yaml file with all container-related keys
@@ -448,7 +448,7 @@ if kubectl get ns "$NGINX_NS" 2> /dev/null; then
     nginxFound=true
 fi
 
-if [ "$nginxFound" = "true" ]; then
+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
 fi
@@ -473,7 +473,7 @@ done
 
 # Elasticsearch Datasource for Grafana
 LOGGING_DATASOURCE="${LOGGING_DATASOURCE:-false}"
-if [ "$LOGGING_DATASOURCE" = "true" ]; then
+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
@@ -544,7 +544,7 @@ log_notice ""
 #log_notice "================================================================================"
 #log_notice ""
 
-if [ "$showPass" = "true" ]; then
+if [ "$showPass" == "true" ]; then
     # Find the grafana pod
 
     log_notice " Generated Grafana admin password is: $grafanaPwd"