Rename indexer configuration nodes

alpine/SPECS/wazuh-agent/APKBUILD

@@ -7,7 +7,7 @@ pkgdesc="Wazuh helps you to gain security visibility into your infrastructure."
 url="https://www.wazuh.com/"
 arch="${architecture}"
 license="GPL"
-depends="bash busybox procps"
+depends="busybox procps"
 makedepends="make cmake git openssl-dev libgcc gcc automake autoconf libtool"
 checkdepends=""
 install="${pkgname}.pre-install ${pkgname}.post-install ${pkgname}.pre-upgrade ${pkgname}.post-upgrade ${pkgname}.pre-deinstall ${pkgname}.post-deinstall"

documentation-templates/wazuh/config.yml

@@ -1,28 +1,28 @@
 nodes:
   # Wazuh indexer nodes
   indexer:
-    - name: node-1
-      ip: <indexer-node-ip>
-    #- name: node-2
-    #  ip: <indexer-node-ip>
-    #- name: node-3
-    #  ip: <indexer-node-ip>
+    - name: indexer-1
+      ip: "<indexer-1-ip>"
+    #- name: indexer-2
+    #  ip: "<indexer-2-ip>"
+    #- name: indexer-3
+    #  ip: "<indexer-3-ip>"
 
   # Wazuh server nodes
   # If there is more than one Wazuh server
   # node, each one must have a node_type
   server:
-    - name: wazuh-1
-      ip: <wazuh-manager-ip>
+    - name: server-1
+      ip: "<wazuh-server-1-ip>"
     #  node_type: master
-    #- name: wazuh-2
-    #  ip: <wazuh-manager-ip>
+    #- name: server-2
+    #  ip: "<wazuh-server-2-ip>"
     #  node_type: worker
-    #- name: wazuh-3
-    #  ip: <wazuh-manager-ip>
+    #- name: server-3
+    #  ip: "<wazuh-server-3-ip>"
     #  node_type: worker
 
   # Wazuh dashboard nodes
   dashboard:
     - name: dashboard
-      ip: <dashboard-node-ip>
+      ip: "<dashboard-node-ip>"

hp-ux/generate_wazuh_packages.sh

@@ -44,7 +44,7 @@ build_environment() {
 
     if [ -n "${ftp_ip}" ] && [ -n "${ftp_port}" ] && [ -n "${ftp_user}" ] && [ -n "${ftp_pass}" ]
     then
-        fpt_connection="-b 64 -p ${ftp_ip}:${ftp_port}:${ftp_user}:${ftp_pass}"
+        fpt_connection="-p ${ftp_ip}:${ftp_port}:${ftp_user}:${ftp_pass}"
     fi
 
     echo "fpt_connection: $fpt_connection"

stack/dashboard/base/builder.sh

@@ -15,7 +15,7 @@ architecture="$1"
 revision="$2"
 future="$3"
 reference="$4"
-opensearch_version="2.3.0"
+opensearch_version="2.4.1"
 base_dir=/opt/wazuh-dashboard-base
 
 # -----------------------------------------------------------------------------
@@ -59,13 +59,16 @@ cp ./etc/custom_welcome/light_theme.style.css ./src/core/server/core_app/assets/
 cp ./etc/custom_welcome/*svg ./src/core/server/core_app/assets/
 cp ./etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg ./src/core/server/core_app/assets/default_branding/opensearch_logo_default_mode.svg
 cp ./etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg ./src/core/server/core_app/assets/default_branding/opensearch_logo_dark_mode.svg
+cp ./etc/custom_welcome/Assets/default_branding/home.svg ./src/core/server/core_app/assets/default_branding/
+cp ./etc/custom_welcome/Assets/default_branding/home_dark_mode.svg ./src/core/server/core_app/assets/default_branding/
 cp ./etc/custom_welcome/Assets/Favicons/* ./src/core/server/core_app/assets/favicons/
 cp ./etc/custom_welcome/Assets/Favicons/favicon.ico ./src/core/server/core_app/assets/favicons/favicon.ico
 cp ./etc/http_service.js ./src/core/server/http/http_service.js
 cp ./etc/template.js ./src/core/server/rendering/views/template.js
 cp ./etc/styles.js ./src/core/server/rendering/views/styles.js
 # Replace App Title
 sed -i "s|defaultValue: ''|defaultValue: \'Wazuh\'|g" ./src/core/server/opensearch_dashboards_config.js
+sed -i "90s|defaultValue: true|defaultValue: false|g" ./src/core/server/opensearch_dashboards_config.js
 # Replace config path
 sed -i "s'\$DIR/config'/etc/wazuh-dashboard'g" ./bin/opensearch-dashboards
 sed -i "s'\$DIR/config'/etc/wazuh-dashboard'g" ./bin/opensearch-dashboards-keystore
@@ -90,6 +93,9 @@ sed -i 's|OPENSEARCH_DASHBOARDS_ASK_OPENSEARCH_LINK="https://github.com/opensear
 sed -i 's|OPENSEARCH_DASHBOARDS_FEEDBACK_LINK="https://github.com/opensearch-project"|OPENSEARCH_DASHBOARDS_FEEDBACK_LINK="https://wazuh.com/community/join-us-on-slack"|' ./src/core/target/public/core.entry.js
 ## Help link - Open an issue in GitHub
 sed -i 's|GITHUB_CREATE_ISSUE_LINK="https://github.com/opensearch-project/OpenSearch-Dashboards/issues/new/choose"|GITHUB_CREATE_ISSUE_LINK="https://github.com/wazuh/wazuh/issues/new/choose"|' ./src/core/target/public/core.entry.js
+# Replace home logo
+sed -i 's|DEFAULT_MARK="opensearch_mark_default_mode.svg"|DEFAULT_MARK="home.svg"|g' ./src/core/target/public/core.entry.js
+sed -i 's|DEFAULT_DARK_MARK="opensearch_mark_dark_mode.svg"|DEFAULT_DARK_MARK="home_dark_mode.svg"|g' ./src/core/target/public/core.entry.js
 # Build the compressed files
 gzip -c ./src/core/target/public/core.entry.js > ./src/core/target/public/core.entry.js.gz
 brotli -c ./src/core/target/public/core.entry.js > ./src/core/target/public/core.entry.js.br
@@ -105,16 +111,19 @@ brotli -c ./src/plugins/dashboard/target/public/dashboard.chunk.1.js > ./src/plu
 # Remove `home` button from the sidebar menu
 sed -i 's|\["EuiHorizontalRule"\],{margin:"none"})),external_osdSharedDeps_React_default.a.createElement(external_osdSharedDeps_ElasticEui_\["EuiFlexItem"\],{grow:false,style:{flexShrink:0}},external_osdSharedDeps_React_default.a.createElement(external_osdSharedDeps_ElasticEui_\["EuiCollapsibleNavGroup"\]|["EuiHorizontalRule"],{margin:"none"})),false\&\&external_osdSharedDeps_React_default.a.createElem(external_osdSharedDeps_ElasticEui_["EuiFlexItem"],{grow:false,style:{flexShrink:0}},external_osdSharedDeps_React_default.a.createElement(external_osdSharedDeps_ElasticEui_["EuiCollapsibleNavGroup"]|' ./src/core/target/public/core.entry.js
 # Replace OpenSearch login default configuration title with Wazuh login title text
-sed -i 's|Please login to OpenSearch Dashboards||g' ./plugins/securityDashboards/server/index.js
-sed -i 's|If you have forgotten your username or password, please ask your system administrator||g' ./plugins/securityDashboards/server/index.js
+sed -i 's|Log in to OpenSearch Dashboards||g' ./plugins/securityDashboards/server/index.js
+sed -i 's|If you have forgotten your username or password, contact your system administrator.||g' ./plugins/securityDashboards/server/index.js
 # Replace OpenSearch login logo with Wazuh login logo
 sed -i 's|opensearch_logo_h_default.a|"/ui/Wazuh-Logo.svg"|g' ./plugins/securityDashboards/target/public/securityDashboards.chunk.5.js
 # Replace OpenSearch login title with Wazuh login title
-sed -i 's|Please login to OpenSearch Dashboards||g' ./plugins/securityDashboards/target/public/securityDashboards.chunk.5.js
+sed -i 's|Log in to OpenSearch Dashboards||g' ./plugins/securityDashboards/target/public/securityDashboards.chunk.5.js
 # Replace OpenSearch login subtitle with Wazuh login subtitle
-sed -i 's|If you have forgotten your username or password, please ask your system administrator||g' ./plugins/securityDashboards/target/public/securityDashboards.chunk.5.js
+sed -i 's|If you have forgotten your username or password, contact your system administrator.||g' ./plugins/securityDashboards/target/public/securityDashboards.chunk.5.js
 # Disable first time pop-up tenant selector
 sed -i 's|setShouldShowTenantPopup(shouldShowTenantPopup)|setShouldShowTenantPopup(false)|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js
+# Replace home logo
+sed -i 's|DEFAULT_MARK="opensearch_mark_default_mode.svg"|DEFAULT_MARK="home.svg"|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js
+sed -i 's|DEFAULT_DARK_MARK="opensearch_mark_dark_mode.svg"|DEFAULT_DARK_MARK="home_dark_mode.svg"|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js
 gzip -c ./plugins/securityDashboards/target/public/securityDashboards.plugin.js > ./plugins/securityDashboards/target/public/securityDashboards.plugin.js.gz
 brotli -c ./plugins/securityDashboards/target/public/securityDashboards.plugin.js > ./plugins/securityDashboards/target/public/securityDashboards.plugin.js.br
 # Generate compressed files
@@ -133,6 +142,8 @@ mv ./package.json.tmp ./package.json
 /bin/bash ./bin/opensearch-dashboards-plugin remove queryWorkbenchDashboards --allow-root
 /bin/bash ./bin/opensearch-dashboards-plugin remove anomalyDetectionDashboards --allow-root
 /bin/bash ./bin/opensearch-dashboards-plugin remove observabilityDashboards --allow-root
+/bin/bash ./bin/opensearch-dashboards-plugin remove securityAnalyticsDashboards --allow-root
+/bin/bash ./bin/opensearch-dashboards-plugin remove searchRelevanceDashboards --allow-root
 
 find -type d -exec chmod 750 {} \;
 find -type f -perm 644 -exec chmod 640 {} \;

stack/dashboard/deb/debian/rules

@@ -113,7 +113,7 @@ override_dh_fixperms:
 # -----------------------------------------------------------------------------
 
 override_dh_strip:
-	dh_strip --no-automatic-dbgsym
+	dh_strip --no-automatic-dbgsym -XlibGLESv2.so -XlibEGL.so
 
 # -----------------------------------------------------------------------------
 

stack/indexer/base/builder.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -x
+
 # Wazuh-indexer base builder
 # Copyright (C) 2022, Wazuh Inc.
 #
@@ -14,7 +16,7 @@ architecture="$1"
 revision="$2"
 future="$3"
 reference="$4"
-opensearch_version="2.3.0"
+opensearch_version="2.4.1"
 base_dir=/opt/wazuh-indexer-base
 
 # -----------------------------------------------------------------------------

stack/indexer/base/files/etc/wazuh-indexer/opensearch.yml

@@ -1,14 +1,14 @@
 network.host: "0.0.0.0"
-node.name: "node-1"
+node.name: "indexer-1"
 cluster.initial_master_nodes:
-- "node-1"
-#- "node-2"
-#- "node-3"
+- "indexer-1"
+#- "indexer-2"
+#- "indexer-3"
 cluster.name: "wazuh-cluster"
 #discovery.seed_hosts:
-#  - "node-1-ip"
-#  - "node-2-ip"
-#  - "node-3-ip"
+#  - "indexer-1-ip"
+#  - "indexer-2-ip"
+#  - "indexer-3-ip"
 node.max_local_storage_nodes: "3"
 path.data: /var/lib/wazuh-indexer
 path.logs: /var/log/wazuh-indexer
@@ -28,9 +28,9 @@ plugins.security.authcz.admin_dn:
 plugins.security.check_snapshot_restore_write_privileges: true
 plugins.security.enable_snapshot_restore_privilege: true
 plugins.security.nodes_dn:
-- "CN=node-1,OU=Wazuh,O=Wazuh,L=California,C=US"
-#- "CN=node-2,OU=Wazuh,O=Wazuh,L=California,C=US"
-#- "CN=node-3,OU=Wazuh,O=Wazuh,L=California,C=US"
+- "CN=indexer-1,OU=Wazuh,O=Wazuh,L=California,C=US"
+#- "CN=indexer-2,OU=Wazuh,O=Wazuh,L=California,C=US"
+#- "CN=indexer-3,OU=Wazuh,O=Wazuh,L=California,C=US"
 plugins.security.restapi.roles_enabled:
 - "all_access"
 - "security_rest_api_access"