From 20d0cd1e97efb717f41060b71fb76e80c2357a40 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Wed, 18 Sep 2024 15:55:04 -0300 Subject: [PATCH 1/4] Fix deb package generation --- dev-tools/build-packages/deb/debian/postinst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/build-packages/deb/debian/postinst b/dev-tools/build-packages/deb/debian/postinst index 87f734aad01b..3c5f0e031b39 100644 --- a/dev-tools/build-packages/deb/debian/postinst +++ b/dev-tools/build-packages/deb/debian/postinst @@ -35,7 +35,7 @@ configure) service wazuh-dashboard restart >/dev/null 2>&1 fi fi - if [ ! -f "${INSTALLATION_DIR}"/config/opensearch_dashboards.keystore ]; then + if [ ! -f "${CONFIG_DIR}"/opensearch_dashboards.keystore ]; then runuser "${NAME}" --shell="/bin/bash" --command="${INSTALLATION_DIR}/bin/opensearch-dashboards-keystore create" >/dev/null 2>&1 runuser "${NAME}" --shell="/bin/bash" --command="echo kibanaserver | ${INSTALLATION_DIR}/bin/opensearch-dashboards-keystore add opensearch.username --stdin" >/dev/null 2>&1 runuser "${NAME}" --shell="/bin/bash" --command="echo kibanaserver | ${INSTALLATION_DIR}/bin/opensearch-dashboards-keystore add opensearch.password --stdin" >/dev/null 2>&1 From 398a9479eda7a66a357e7ad0297dcd2378b6ec49 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Wed, 18 Sep 2024 15:55:13 -0300 Subject: [PATCH 2/4] Fix RPM package generation --- dev-tools/build-packages/rpm/wazuh-dashboard.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/build-packages/rpm/wazuh-dashboard.spec b/dev-tools/build-packages/rpm/wazuh-dashboard.spec index 2c9496aaa053..b6ca32c3c761 100644 --- a/dev-tools/build-packages/rpm/wazuh-dashboard.spec +++ b/dev-tools/build-packages/rpm/wazuh-dashboard.spec @@ -130,7 +130,7 @@ fi setcap 'cap_net_bind_service=+ep' %{INSTALL_DIR}/node/bin/node setcap 'cap_net_bind_service=+ep' %{INSTALL_DIR}/node/fallback/bin/node -if [ ! -f %{INSTALLATION_DIR}/config/opensearch_dashboards.keystore ]; then +if [ ! -f %{CONFIG_DIR}/opensearch_dashboards.keystore ]; then runuser %{USER} --shell="/bin/bash" --command="%{INSTALL_DIR}/bin/opensearch-dashboards-keystore create" > /dev/null 2>&1 runuser %{USER} --shell="/bin/bash" --command="echo kibanaserver | %{INSTALL_DIR}/bin/opensearch-dashboards-keystore add opensearch.username --stdin" > /dev/null 2>&1 runuser %{USER} --shell="/bin/bash" --command="echo kibanaserver | %{INSTALL_DIR}/bin/opensearch-dashboards-keystore add opensearch.password --stdin" > /dev/null 2>&1 From 1f08cd29c4e10136bcc3cc39bdac6285342b3e2d Mon Sep 17 00:00:00 2001 From: Nicolas Date: Wed, 18 Sep 2024 16:09:55 -0300 Subject: [PATCH 3/4] Update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5eefd63c1afe..b16261b3d879 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ All notable changes to the Wazuh app project will be documented in this file. - Changed link to sample data in the dashboards section and references to Opensearch Dashboards [#311](https://github.com/wazuh/wazuh-dashboard/pull/311) +### Fixed + +- Fixed bug that caused the terminal to freeze on deb upgrades [#301](https://github.com/wazuh/wazuh-dashboard/pull/301) + ## Wazuh dashboard v4.9.0 - OpenSearch Dashboards 2.13.0 - Revision 07 ### Added From 935ccab72ebffa556c903c75f136329e35aeda8d Mon Sep 17 00:00:00 2001 From: Nicolas Date: Thu, 19 Sep 2024 07:40:28 -0300 Subject: [PATCH 4/4] Upgrade snapshots --- .../dashboard_listing.test.tsx.snap | 44 ++++++++++++++----- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/src/plugins/dashboard/public/application/components/dashboard_listing/__snapshots__/dashboard_listing.test.tsx.snap b/src/plugins/dashboard/public/application/components/dashboard_listing/__snapshots__/dashboard_listing.test.tsx.snap index 7e6c08f6fcae..a9576bfbe5a0 100644 --- a/src/plugins/dashboard/public/application/components/dashboard_listing/__snapshots__/dashboard_listing.test.tsx.snap +++ b/src/plugins/dashboard/public/application/components/dashboard_listing/__snapshots__/dashboard_listing.test.tsx.snap @@ -2236,17 +2236,22 @@ exports[`dashboard listing render table listing with initial filters from URL 1`

@@ -3440,17 +3445,22 @@ exports[`dashboard listing renders call to action when no dashboards exist 1`] =

@@ -4644,17 +4654,22 @@ exports[`dashboard listing renders table rows 1`] = `

@@ -5848,17 +5863,22 @@ exports[`dashboard listing renders warning when listingLimit is exceeded 1`] = `