Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 4.8.1 into 4.9.0 #3029

Merged
merged 8 commits into from
Jul 9, 2024
+29 −23
Merged

Merge 4.8.1 into 4.9.0 #3029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7e0f02a
Add condition when trying to change API user credentials
Enaraque Jun 17, 2024
334f1a7
Merge pull request #3005 from wazuh/troubleshooting/password-tool-sil…
c-bordon Jun 18, 2024
28d99fc
build: update 4.8.1 release date
vikman90 Jul 2, 2024
1fa0d22
Merge pull request #3025 from wazuh/change/3024-4.8.1-release-date
vikman90 Jul 2, 2024
1ec2959
build: update 4.8.1 release date rc2
TomasTurina Jul 4, 2024
da0c221
Merge pull request #3028 from wazuh/change/3026-4.8.1-release-date-rc2
TomasTurina Jul 4, 2024
38e5f18
Merge branch '4.8.1' into merge-4.8.1-into-4.9.0
vikman90 Jul 8, 2024
5ffc2a4
chore: update 4.9.0 release date
vikman90 Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions aix/SPECS/wazuh-agent-aix.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,9 +291,9 @@ rm -fr %{buildroot}
%attr(750, root, wazuh) %{_localstatedir}/wodles/*

%changelog
* Wed Jul 10 2024 support <[email protected]> - 4.9.0
* Fri Aug 02 2024 support <[email protected]> - 4.9.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
* Wed Jun 26 2024 support <[email protected]> - 4.8.1
* Thu Jul 11 2024 support <[email protected]> - 4.8.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
* Wed Jun 12 2024 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
Expand Down
4 changes: 2 additions & 2 deletions debs/SPECS/wazuh-agent/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ wazuh-agent (4.9.0-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html

-- Wazuh, Inc <[email protected]> Wed, 10 Jul 2024 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Fri, 02 Aug 2024 00:00:00 +0000

wazuh-agent (4.8.1-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html

-- Wazuh, Inc <[email protected]> Wed, 26 Jun 2024 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Thu, 11 Jul 2024 00:00:00 +0000

wazuh-agent (4.8.0-RELEASE) stable; urgency=low

Expand Down
2 changes: 1 addition & 1 deletion debs/SPECS/wazuh-agent/debian/copyright
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This work was packaged for Debian by:

Wazuh, Inc <[email protected]> on Wed, 10 Jul 2024 00:00:00 +0000
Wazuh, Inc <[email protected]> on Fri, 02 Aug 2024 00:00:00 +0000

It was downloaded from:

Expand Down
4 changes: 2 additions & 2 deletions debs/SPECS/wazuh-manager/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ wazuh-manager (4.9.0-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html

-- Wazuh, Inc <[email protected]> Wed, 10 Jul 2024 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Fri, 02 Aug 2024 00:00:00 +0000

wazuh-manager (4.8.1-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html

-- Wazuh, Inc <[email protected]> Wed, 26 Jun 2024 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Thu, 11 Jul 2024 00:00:00 +0000

wazuh-manager (4.8.0-RELEASE) stable; urgency=low

Expand Down
2 changes: 1 addition & 1 deletion debs/SPECS/wazuh-manager/debian/copyright
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This work was packaged for Debian by:

Wazuh, Inc <[email protected]> on Wed, 10 Jul 2024 00:00:00 +0000
Wazuh, Inc <[email protected]> on Fri, 02 Aug 2024 00:00:00 +0000

It was downloaded from:

Expand Down
4 changes: 2 additions & 2 deletions rpms/SPECS/wazuh-agent.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,9 +640,9 @@ rm -fr %{buildroot}
%attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/*

%changelog
* Wed Jul 10 2024 support <[email protected]> - 4.9.0
* Fri Aug 02 2024 support <[email protected]> - 4.9.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
* Wed Jun 26 2024 support <[email protected]> - 4.8.1
* Thu Jul 11 2024 support <[email protected]> - 4.8.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
* Wed Jun 12 2024 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
Expand Down
4 changes: 2 additions & 2 deletions rpms/SPECS/wazuh-manager.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,9 +887,9 @@ rm -fr %{buildroot}
%attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/*

%changelog
* Wed Jul 10 2024 support <[email protected]> - 4.9.0
* Fri Aug 02 2024 support <[email protected]> - 4.9.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
* Wed Jun 26 2024 support <[email protected]> - 4.8.1
* Thu Jul 11 2024 support <[email protected]> - 4.8.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
* Wed Jun 12 2024 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
Expand Down
2 changes: 1 addition & 1 deletion solaris/solaris10/pkginfo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARCH="i386"
CLASSES="none"
CATEGORY="system"
VENDOR="Wazuh, Inc <[email protected]>"
PSTAMP="10Jul2024"
PSTAMP="02Aug2024"
EMAIL="[email protected]"
ISTATES="S s 1 2 3"
RSTATES="S s 1 2 3"
Expand Down
4 changes: 2 additions & 2 deletions stack/dashboard/deb/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ wazuh-dashboard (4.9.0-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html

-- Wazuh, Inc <[email protected]> Wed, 10 Jul 2024 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Fri, 02 Aug 2024 00:00:00 +0000

wazuh-dashboard (4.8.1-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html

-- Wazuh, Inc <[email protected]> Wed, 26 Jun 2024 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Thu, 11 Jul 2024 00:00:00 +0000

wazuh-dashboard (4.8.0-RELEASE) stable; urgency=low

Expand Down
2 changes: 1 addition & 1 deletion stack/dashboard/deb/debian/copyright
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This work was packaged for Debian by:

Wazuh, Inc <[email protected]> on Wed, 10 Jul 2024 00:00:00 +0000
Wazuh, Inc <[email protected]> on Fri, 02 Aug 2024 00:00:00 +0000

It was downloaded from:

Expand Down
4 changes: 2 additions & 2 deletions stack/dashboard/rpm/wazuh-dashboard.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,9 +346,9 @@ rm -fr %{buildroot}
%config(noreplace) %attr(640, %{USER}, %{GROUP}) "%{CONFIG_DIR}/opensearch_dashboards.yml"

%changelog
* Wed Jul 10 2024 support <[email protected]> - 4.9.0
* Fri Aug 02 2024 support <[email protected]> - 4.9.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
* Wed Jun 26 2024 support <[email protected]> - 4.8.1
* Thu Jul 11 2024 support <[email protected]> - 4.8.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
* Wed Jun 12 2024 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
Expand Down
4 changes: 2 additions & 2 deletions stack/indexer/deb/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ wazuh-indexer (4.9.0-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html

-- Wazuh, Inc <[email protected]> Wed, 10 Jul 2024 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Fri, 02 Aug 2024 00:00:00 +0000

wazuh-indexer (4.8.1-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html

-- Wazuh, Inc <[email protected]> Wed, 26 Jun 2024 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Thu, 11 Jul 2024 00:00:00 +0000

wazuh-indexer (4.8.0-RELEASE) stable; urgency=low

Expand Down
2 changes: 1 addition & 1 deletion stack/indexer/deb/debian/copyright
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This work was packaged for Debian by:

Wazuh, Inc <[email protected]> on Wed, 10 Jul 2024 00:00:00 +0000
Wazuh, Inc <[email protected]> on Fri, 02 Aug 2024 00:00:00 +0000

It was downloaded from:

Expand Down
4 changes: 2 additions & 2 deletions stack/indexer/rpm/wazuh-indexer.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,9 +681,9 @@ rm -fr %{buildroot}


%changelog
* Wed Jul 10 2024 support <[email protected]> - 4.9.0
* Fri Aug 02 2024 support <[email protected]> - 4.9.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
* Wed Jun 26 2024 support <[email protected]> - 4.8.1
* Thu Jul 11 2024 support <[email protected]> - 4.8.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
* Wed Jun 12 2024 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
Expand Down
6 changes: 6 additions & 0 deletions unattended_installer/passwords_tool/passwordsMain.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@ function getHelp() {
echo -e ""
echo -e " -au, --admin-user <adminUser>"
echo -e " Admin user for Wazuh API, Required to change Wazuh API passwords."
echo -e " Requires -A|--api."
echo -e ""
echo -e " -ap, --admin-password <adminPassword>"
echo -e " Password for Wazuh API admin user, Required to change Wazuh API passwords."
echo -e " Requires -A|--api."
echo -e ""
echo -e " -u, --user <user>"
echo -e " Indicates the name of the user whose password will be changed."
Expand Down Expand Up @@ -217,6 +219,10 @@ function main() {
getHelp
fi

if [ -n "${adminUser}" ] && [ -n "${adminPassword}" ] && [ -z "${api}" ]; then
getHelp
fi

if [ -n "${nuser}" ]; then
if [ -n "${adminUser}" ] && [ -n "${adminPassword}" ]; then
passwords_getApiToken
Expand Down
Loading