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

Jump to bottom

Merge 4.6.0 into 4.7.0 #2310

Merged
merged 13 commits into from
Jul 24, 2023
Merged

Merge 4.6.0 into 4.7.0 #2310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c63aa69
Bump reference to 4.5.0 version
wazuhci Jun 26, 2023
5a9f041
Merge branch '4.5.0' of https://github.com/wazuh/wazuh-packages into …
DFolchA Jul 13, 2023
a7a66ab
Merge pull request #2269 from wazuh/add-4.4.5-to-4.5.0
vikman90 Jul 13, 2023
3511e14
Update version to 4.5.2
DFolchA Jul 19, 2023
04fa506
Merge pull request #2296 from wazuh/bump-version-4.5.2
vikman90 Jul 19, 2023
d426722
Merge branch '4.5.0' into merge-4.5.0-into-4.5.1
Dwordcito Jul 21, 2023
74faa83
Merge pull request #2307 from wazuh/merge-4.5.0-into-4.5.1
TomasTurina Jul 21, 2023
d64af33
Merge branch '4.5.1' into merge-4.5.1-into-4.5.2
Dwordcito Jul 21, 2023
78c8cd4
Merge pull request #2308 from wazuh/merge-4.5.1-into-4.5.2
Dwordcito Jul 21, 2023
1f3d25d
Merge branch '4.5.2' into merge-4.5.2-into-4.6.0
Dwordcito Jul 21, 2023
64aa0b2
Merge pull request #2309 from wazuh/merge-4.5.2-into-4.6.0
Dwordcito Jul 22, 2023
fa67645
Merge branch '4.6.0' into merge-4.6.0-into-4.7.0
Dwordcito Jul 22, 2023
73e6f56
Update version in GH action
DFolchA Jul 24, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/build-deb-packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
run: |
MAJOR=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)
if [ "${{ steps.changes.outputs.deb_images }}" == "true" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$MAJOR" >> $GITHUB_ENV ; fi
if [ $MAJOR == "4.7" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi
if [ $MAJOR == "4.8" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi
echo "CONTAINER_NAME=deb_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV

- name: Download docker image for package building
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-rpm-packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
run: |
MAJOR=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION)
if [ "${{ steps.changes.outputs.rpm_images }}" == "true" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$MAJOR" >> $GITHUB_ENV ; fi
if [ $MAJOR == "4.7" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi
if [ $MAJOR == "4.8" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi
if [ "${{ matrix.ARCHITECTURE }}" == "x86_64" ]; then echo "CONTAINER_NAME=rpm_builder_x86" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=rpm_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; fi

- name: Download docker image for package building
Expand Down
5 changes: 4 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Change Log
All notable changes to this project will be documented in this file.

## [v4.7.0]

- https://github.com/wazuh/wazuh-packages/releases/tag/v4.7.0
Expand All @@ -9,6 +8,10 @@ All notable changes to this project will be documented in this file.

- https://github.com/wazuh/wazuh-packages/releases/tag/v4.6.0

## [4.5.2]

- https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.2

## [v4.5.1]

- https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.1
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ The following table shows the references for the versions of each component.
|-----------------|-----------------------|
| 4.3.x | 1.2.0 |
| 4.4.0 | 2.4.1 |
| 4.4.1 - 4.6.0 | 2.6.0 |
| 4.4.1 - 4.7.0 | 2.6.0 |

### Wazuh indexer

| Wazuh indexer | Opensearch |
|-----------------|-----------------------|
| 4.3.x | 1.2.4 |
| 4.4.0 | 2.4.1 |
| 4.4.1 - 4.6.0 | 2.6.0 |
| 4.4.1 - 4.7.0 | 2.6.0 |

## Contribute

Expand Down
2 changes: 2 additions & 0 deletions aix/SPECS/wazuh-agent-aix.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,8 @@ rm -fr %{buildroot}
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html
* Mon Sep 04 2023 support <[email protected]> - 4.6.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
* Fri Aug 04 2023 support <[email protected]> - 4.5.2
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
* Tue Aug 01 2023 support <[email protected]> - 4.5.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html
* Fri Jun 30 2023 support <[email protected]> - 4.5.0
Expand Down
16 changes: 11 additions & 5 deletions debs/SPECS/wazuh-agent/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ wazuh-agent (4.6.0-RELEASE) stable; urgency=low

-- Wazuh, Inc <[email protected]> Mon, 04 Sep 2023 11:56:07 +0000

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

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

-- Wazuh, Inc <[email protected]> Fri, 04 Aug 2023 00:00:00 +0000

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

* More info: https://documentation.wazuh.com/current/release-notes/release-4-5-1.html
Expand Down Expand Up @@ -180,13 +186,13 @@ wazuh-agent (4.2.0-RELEASE) stable; urgency=low

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

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

-- Wazuh, Inc <[email protected]> Thu, 22 Apr 2021 16:50:05 +0000

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

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

-- Wazuh, Inc <[email protected]> Mon, 29 Mar 2021 16:23:09 +0000

Expand All @@ -198,13 +204,13 @@ wazuh-agent (4.1.3-RELEASE) stable; urgency=low

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

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

-- Wazuh, Inc <[email protected]> Mon, 08 Mar 2021 14:00:25 +0000

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

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

-- Wazuh, Inc <[email protected]> Fri, 05 Mar 2021 13:24:41 +0000

Expand Down Expand Up @@ -264,7 +270,7 @@ wazuh-agent (4.0.0-RELEASE) stable; urgency=low

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

* More info: https://documentation.wazuh.com/current/release-notes/release-3-13-3.html
* More info: https://documentation.wazuh.com/current/release-notes/release-3-13-3.html

-- Wazuh, Inc <[email protected]> Sat, 24 Apr 2021 07:01:55 +0000

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

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

-- Wazuh, Inc <[email protected]> Mon, 04 Sep 2023 11:56:07 +0000
-- Wazuh, Inc <[email protected]> Fri, 08 Sep 2023 13:46:52 +0000

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

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

-- Wazuh, Inc <[email protected]> Fri, 04 Aug 2023 00:00:00 +0000

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

Expand All @@ -22,6 +28,12 @@ wazuh-manager (4.5.0-RELEASE) stable; urgency=low

-- Wazuh, Inc <[email protected]> Fri, 30 Jun 2023 11:56:07 +0000

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

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

-- Wazuh, Inc <[email protected]> Wed, 19 Jul 2023 15:56:43 +0000

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

* More info: https://documentation.wazuh.com/current/release-notes/release-4-4-4.html
Expand Down Expand Up @@ -174,13 +186,13 @@ wazuh-manager (4.2.0-RELEASE) stable; urgency=low

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

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

-- Wazuh, Inc <[email protected]> Thu, 22 Apr 2021 16:50:05 +0000

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

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

-- Wazuh, Inc <[email protected]> Mon, 29 Mar 2021 16:23:09 +0000

Expand All @@ -192,13 +204,13 @@ wazuh-manager (4.1.3-RELEASE) stable; urgency=low

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

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

-- Wazuh, Inc <[email protected]> Mon, 08 Mar 2021 14:00:25 +0000

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

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

-- Wazuh, Inc <[email protected]> Fri, 05 Mar 2021 13:24:41 +0000

Expand Down Expand Up @@ -258,7 +270,7 @@ wazuh-manager (4.0.0-RELEASE) stable; urgency=low

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

* More info: https://documentation.wazuh.com/current/release-notes/release-3-13-3.html
* More info: https://documentation.wazuh.com/current/release-notes/release-3-13-3.html

-- Wazuh, Inc <[email protected]> Sat, 24 Apr 2021 07:01:55 +0000

Expand Down
2 changes: 2 additions & 0 deletions rpms/SPECS/wazuh-agent.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,8 @@ rm -fr %{buildroot}
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html
* Mon Sep 04 2023 support <[email protected]> - 4.6.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
* Fri Aug 04 2023 support <[email protected]> - 4.5.2
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
* Tue Aug 01 2023 support <[email protected]> - 4.5.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html
* Fri Jun 30 2023 support <[email protected]> - 4.5.0
Expand Down
2 changes: 2 additions & 0 deletions rpms/SPECS/wazuh-manager.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,6 +826,8 @@ rm -fr %{buildroot}
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html
* Mon Sep 04 2023 support <[email protected]> - 4.6.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
* Fri Aug 04 2023 support <[email protected]> - 4.5.2
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
* Tue Aug 01 2023 support <[email protected]> - 4.5.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html
* Fri Jun 30 2023 support <[email protected]> - 4.5.0
Expand Down
8 changes: 4 additions & 4 deletions stack/dashboard/deb/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ wazuh-dashboard (4.6.0-RELEASE) stable; urgency=low

-- Wazuh, Inc <[email protected]> Mon, 04 Sep 2023 11:56:07 +0000

wazuh-dashboard (4.5.0-RELEASE) stable; urgency=low
wazuh-dashboard (4.5.2-RELEASE) stable; urgency=low

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

-- Wazuh, Inc <[email protected]> Fri, 08 Sep 2023 13:46:52 +0000
-- Wazuh, Inc <[email protected]> Fri, 04 Aug 2023 00:00:00 +0000

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

Expand All @@ -26,7 +26,7 @@ wazuh-dashboard (4.5.0-RELEASE) unstable; urgency=low

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

-- Wazuh, Inc <[email protected]> Fri, 30 Jun 2023 12:31:50 +0000
-- Wazuh, Inc <[email protected]> Wed, 19 Jul 2023 13:45:36 +0000

wazuh-dashboard (4.4.5-RELEASE) unstable; urgency=low

Expand Down
2 changes: 2 additions & 0 deletions stack/dashboard/rpm/wazuh-dashboard.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,8 @@ rm -fr %{buildroot}
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html
* Sat Oct 28 2023 support <[email protected]> - 4.6.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
* Fri Aug 04 2023 support <[email protected]> - 4.5.2
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
* Tue Aug 01 2023 support <[email protected]> - 4.5.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html
* Fri Jun 30 2023 support <[email protected]> - 4.5.0
Expand Down
6 changes: 6 additions & 0 deletions stack/indexer/deb/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ wazuh-indexer (4.6.0-RELEASE) stable; urgency=low

-- Wazuh, Inc <[email protected]> Mon, 04 Sep 2023 11:56:07 +0000

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

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

-- Wazuh, Inc <[email protected]> Fri, 04 Aug 2023 00:00:00 +0000

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

* More info: https://documentation.wazuh.com/current/release-notes/release-4-5-1.html
Expand Down
2 changes: 2 additions & 0 deletions stack/indexer/rpm/wazuh-indexer.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1398,6 +1398,8 @@ rm -fr %{buildroot}
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html
* Mon Sep 04 2023 support <[email protected]> - 4.6.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
* Fri Aug 04 2023 support <[email protected]> - 4.5.2
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
* Tue Aug 01 2023 support <[email protected]> - 4.5.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html
* Fri Jun 30 2023 support <[email protected]> - 4.5.0
Expand Down
8 changes: 4 additions & 4 deletions tests/unattended/unit/suites/test-dashboard.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ test-03-dashboard_install-yum() {
load-dashboard_install
sys_type="yum"
sep="-"
wazuh_version="1.13.2"
wazuh_version="4.5.2"
wazuh_revision="1"
dashboard_install
}
Expand All @@ -68,7 +68,7 @@ test-ASSERT-FAIL-04-dashboard_install-yum-error() {
load-dashboard_install
sys_type="yum"
sep="-"
wazuh_version="1.13.2"
wazuh_version="4.5.2"
wazuh_revision="1"
@mockfalse yum install wazuh-dashboard-1.13.2-1 -y
dashboard_install
Expand All @@ -78,7 +78,7 @@ test-05-dashboard_install-apt() {
load-dashboard_install
sys_type="apt-get"
sep="="
wazuh_version="1.13.2"
wazuh_version="4.5.2"
wazuh_revision="1"
dashboard_install
}
Expand All @@ -91,7 +91,7 @@ test-ASSERT-FAIL-06-dashboard_install-apt-error() {
load-dashboard_install
sys_type="apt-get"
sep="="
wazuh_version="1.13.2"
wazuh_version="4.5.2"
wazuh_revision="1"
@mockfalse apt install wazuh-dashboard=1.13.2-1 -y
dashboard_install
Expand Down
8 changes: 4 additions & 4 deletions tests/unattended/unit/suites/test-indexer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ test-03-indexer_install-yum() {
load-indexer_install
sys_type="yum"
sep="-"
wazuh_version="1.13.2"
wazuh_version="4.6.0"
wazuh_revision="1"
indexer_install
}
Expand All @@ -63,7 +63,7 @@ test-ASSERT-FAIL-04-indexer_install-yum-error() {
load-indexer_install
sys_type="yum"
sep="-"
wazuh_version="1.13.2"
wazuh_version="4.6.0"
wazuh_revision="1"
@mockfalse yum install wazuh-indexer-1.13.2-1 -y
indexer_install
Expand All @@ -73,7 +73,7 @@ test-05-indexer_install-apt() {
load-indexer_install
sys_type="apt-get"
sep="="
wazuh_version="1.13.2"
wazuh_version="4.6.0"
wazuh_revision="1"
indexer_install
}
Expand All @@ -87,7 +87,7 @@ test-ASSERT-FAIL-06-indexer_install-apt-error() {
load-indexer_install
sys_type="apt-get"
sep="="
wazuh_version="1.13.2"
wazuh_version="4.6.0"
wazuh_revision="1"
@mockfalse apt install wazuh-indexer=1.13.2-1 -y
indexer_install
Expand Down
Loading