Permanent fix for OpenSearch and temp fix for Dashboards startup conf…

…igurations (#1579) * Perma fix for OpenSearch and temp fix for Dashboards startup configurations Signed-off-by: Peter Zhu <[email protected]>
opensearch-project · Feb 1, 2022 · 305cc3f · 305cc3f
1 parent 4c3ae78
commit 305cc3f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint.sh b/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint.sh
@@ -160,8 +160,12 @@ function setupSecurityDashboardsPlugin {
         if [ "$DISABLE_SECURITY_DASHBOARDS_PLUGIN" = "true" ]; then
             echo "Disabling OpenSearch Security Dashboards Plugin"
             ./bin/opensearch-dashboards-plugin remove securityDashboards
-            cat $OPENSEARCH_DASHBOARDS_HOME/config/opensearch_dashboards.yml | sed "/^opensearch_security/d" | tee $OPENSEARCH_DASHBOARDS_HOME/config/opensearch_dashboards.yml
-            cat $OPENSEARCH_DASHBOARDS_HOME/config/opensearch_dashboards.yml | sed "s/https/http/g" | tee $OPENSEARCH_DASHBOARDS_HOME/config/opensearch_dashboards.yml
+
+            # Remove all security related parameters as well as changing HTTPS to HTTP
+            # Temporary fix before security-dashboards plugin implement a parameter to disable the plugin entirely
+            # https://github.com/opensearch-project/security-dashboards-plugin/issues/896
+            UPDATED_CONFIG=`cat $OPENSEARCH_DASHBOARDS_HOME/config/opensearch_dashboards.yml | sed "/^opensearch_security/d" | sed "s/https/http/g"`
+            echo "$UPDATED_CONFIG" > $OPENSEARCH_DASHBOARDS_HOME/config/opensearch_dashboards.yml
         fi
     fi
 }

diff --git a/docker/release/config/opensearch/opensearch-docker-entrypoint.sh b/docker/release/config/opensearch/opensearch-docker-entrypoint.sh
@@ -43,11 +43,10 @@ function setupSecurityPlugin {
 
         if [ "$DISABLE_SECURITY_PLUGIN" = "true" ]; then
             echo "Disabling OpenSearch Security Plugin"
-            cat $OPENSEARCH_HOME/config/opensearch.yml | sed "/plugins.security.disabled/d" | tee $OPENSEARCH_HOME/config/opensearch.yml
-            echo "plugins.security.disabled: true" >> $OPENSEARCH_HOME/config/opensearch.yml
+            opensearch_opt="-Eplugins.security.disabled=true"
+            opensearch_opts+=("${opensearch_opt}")
         else
             echo "Enabling OpenSearch Security Plugin"
-            cat $OPENSEARCH_HOME/config/opensearch.yml | sed "/plugins.security.disabled/d" | tee $OPENSEARCH_HOME/config/opensearch.yml
         fi
     fi
 }
@@ -82,7 +81,7 @@ function runOpensearch {
     #
     # e.g. Setting the env var cluster.name=testcluster
     # will cause OpenSearch to be invoked with -Ecluster.name=testcluster
-    local opensearch_opts=()
+    opensearch_opts=()
     while IFS='=' read -r envvar_key envvar_value
     do
         # OpenSearch settings need to have at least two dot separated lowercase