From 020031c81d71266550df7a476da6621a7f101242 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 17 May 2022 15:49:38 -0300 Subject: [PATCH 1/4] Modify Dashboard user parameter --- build-docker-images/wazuh-dashboard/Dockerfile | 5 ----- .../wazuh-dashboard/config/entrypoint.sh | 10 ++++++++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile index e53f84c7..6822025a 100644 --- a/build-docker-images/wazuh-dashboard/Dockerfile +++ b/build-docker-images/wazuh-dashboard/Dockerfile @@ -19,11 +19,6 @@ COPY config/config.sh . COPY config/config.yml / RUN bash config.sh -# Create and configure Wazuh dashboard keystore -RUN $INSTALL_DIR/bin/opensearch-dashboards-keystore create --allow-root && \ - echo kibanaserver | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.username --stdin --allow-root && \ - echo kibanaserver | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.password --stdin --allow-root - # Install Wazuh App RUN $INSTALL_DIR/bin/opensearch-dashboards-plugin install https://packages.wazuh.com/4.x/ui/dashboard/wazuh-${WAZUH_VERSION}.zip --allow-root diff --git a/build-docker-images/wazuh-dashboard/config/entrypoint.sh b/build-docker-images/wazuh-dashboard/config/entrypoint.sh index d25432fa..6d6b1932 100644 --- a/build-docker-images/wazuh-dashboard/config/entrypoint.sh +++ b/build-docker-images/wazuh-dashboard/config/entrypoint.sh @@ -1,6 +1,16 @@ #!/bin/bash # Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) +INSTALL_DIR=/usr/share/wazuh-dashboard +DASHBOARD_USERNAME="${DASHBOARD_USERNAME:-kibanaserver}" +DASHBOARD_PASSWORD="${DASHBOARD_PASSWORD:-kibanaserver}" + +# Create and configure Wazuh dashboard keystore + +$INSTALL_DIR/bin/opensearch-dashboards-keystore create --allow-root && \ +echo $DASHBOARD_USERNAME | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.username --stdin --allow-root && \ +echo $DASHBOARD_PASSWORD | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.password --stdin --allow-root + ############################################################################## # Start Wazuh dashboard ############################################################################## From f678aaf1e02187141981f57b64622fb1a4f05483 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 17 May 2022 17:34:24 -0300 Subject: [PATCH 2/4] Modify Dashboard user parameter --- build-docker-images/wazuh-dashboard/config/entrypoint.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build-docker-images/wazuh-dashboard/config/entrypoint.sh b/build-docker-images/wazuh-dashboard/config/entrypoint.sh index 6d6b1932..282f152c 100644 --- a/build-docker-images/wazuh-dashboard/config/entrypoint.sh +++ b/build-docker-images/wazuh-dashboard/config/entrypoint.sh @@ -7,7 +7,10 @@ DASHBOARD_PASSWORD="${DASHBOARD_PASSWORD:-kibanaserver}" # Create and configure Wazuh dashboard keystore -$INSTALL_DIR/bin/opensearch-dashboards-keystore create --allow-root && \ +$INSTALL_DIR/bin/opensearch-dashboards-keystore create --allow-root + +/wazuh_app_config.sh + echo $DASHBOARD_USERNAME | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.username --stdin --allow-root && \ echo $DASHBOARD_PASSWORD | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.password --stdin --allow-root @@ -15,6 +18,5 @@ echo $DASHBOARD_PASSWORD | $INSTALL_DIR/bin/opensearch-dashboards-keystore add o # Start Wazuh dashboard ############################################################################## -/wazuh_app_config.sh /usr/share/wazuh-dashboard/bin/opensearch-dashboards -c /usr/share/wazuh-dashboard/config/opensearch_dashboards.yml \ No newline at end of file From 7d06cb56efc51d61086ec70dbe6edf4aad45cc82 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 17 May 2022 17:58:22 -0300 Subject: [PATCH 3/4] Modify Dashboard user parameter --- build-docker-images/wazuh-dashboard/config/entrypoint.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/build-docker-images/wazuh-dashboard/config/entrypoint.sh b/build-docker-images/wazuh-dashboard/config/entrypoint.sh index 282f152c..6356110c 100644 --- a/build-docker-images/wazuh-dashboard/config/entrypoint.sh +++ b/build-docker-images/wazuh-dashboard/config/entrypoint.sh @@ -7,10 +7,8 @@ DASHBOARD_PASSWORD="${DASHBOARD_PASSWORD:-kibanaserver}" # Create and configure Wazuh dashboard keystore -$INSTALL_DIR/bin/opensearch-dashboards-keystore create --allow-root - -/wazuh_app_config.sh - +$INSTALL_DIR/bin/opensearch-dashboards-keystore create --allow-root && \ +sleep 10 && \ echo $DASHBOARD_USERNAME | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.username --stdin --allow-root && \ echo $DASHBOARD_PASSWORD | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.password --stdin --allow-root @@ -18,5 +16,6 @@ echo $DASHBOARD_PASSWORD | $INSTALL_DIR/bin/opensearch-dashboards-keystore add o # Start Wazuh dashboard ############################################################################## +/wazuh_app_config.sh /usr/share/wazuh-dashboard/bin/opensearch-dashboards -c /usr/share/wazuh-dashboard/config/opensearch_dashboards.yml \ No newline at end of file From bfeb4b007a6fc85a08fb3d76965dda79494c9396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Tue, 17 May 2022 19:45:53 -0300 Subject: [PATCH 4/4] Dashboard entrypoint update --- build-docker-images/wazuh-dashboard/config/entrypoint.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/build-docker-images/wazuh-dashboard/config/entrypoint.sh b/build-docker-images/wazuh-dashboard/config/entrypoint.sh index 6356110c..6d6b1932 100644 --- a/build-docker-images/wazuh-dashboard/config/entrypoint.sh +++ b/build-docker-images/wazuh-dashboard/config/entrypoint.sh @@ -8,7 +8,6 @@ DASHBOARD_PASSWORD="${DASHBOARD_PASSWORD:-kibanaserver}" # Create and configure Wazuh dashboard keystore $INSTALL_DIR/bin/opensearch-dashboards-keystore create --allow-root && \ -sleep 10 && \ echo $DASHBOARD_USERNAME | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.username --stdin --allow-root && \ echo $DASHBOARD_PASSWORD | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.password --stdin --allow-root