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.

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.7.1 into 4.8.0 #2648

Merged
merged 28 commits into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
86e6c15
Updated Filebeat module version to 0.3
c-bordon Nov 14, 2023
bc50b70
Merge pull request #2605 from wazuh/change/2604-update-filebeat-modul…
c-bordon Nov 14, 2023
8d4574c
Added permissions change for merged.mg files in upgrade
mjcr99 Nov 17, 2023
13d1b77
Updated action-wait-for-workflow version
mjcr99 Nov 20, 2023
a0d2168
Merge pull request #2611 from wazuh/fix5929-change-mergedmg-permissions
vikman90 Nov 20, 2023
f1b3813
Removed PDF report dependencies
davidcr01 Nov 21, 2023
4f3d5e0
Update build.sh
ed108206 Nov 21, 2023
daf3929
Update wazuh-manager.spec
ed108206 Nov 21, 2023
6ca7f4b
Update rules
ed108206 Nov 21, 2023
67ac826
Changed REVISION debs name
mjcr99 Nov 22, 2023
0809738
Changed REVISION rpms name
mjcr99 Nov 22, 2023
b688b64
Added validation for CentOS Repos
c-bordon Nov 22, 2023
7f129ef
Merge pull request #2619 from wazuh/remove-report-dependencies-4.7.0
teddytpc1 Nov 22, 2023
dff2d82
Fix some SPECS versions in the new SCA file from macOS 14
jotacarma90 Nov 22, 2023
3a4da62
Merge branch '4.7.0' into merge-4.7.0-into-4.7.1
davidcr01 Nov 22, 2023
fab52f5
Merge pull request #2626 from wazuh/merge-4.7.0-into-4.7.1
teddytpc1 Nov 22, 2023
e20815e
Improved message of CentOS key import failure
davidcr01 Nov 22, 2023
fde94b8
Merge pull request #2627 from wazuh/enhancement/2625-improve-message-…
teddytpc1 Nov 22, 2023
59c131a
Merge pull request #2624 from wazuh/17149-create-sca-policy-for-macos-14
vikman90 Nov 23, 2023
af4fb8e
Update the release ETA for 4.7.0
vikman90 Nov 23, 2023
e757b56
Fix 4.6.0 release date
vikman90 Nov 23, 2023
26c2b9a
Merge pull request #2631 from wazuh/change-2926-eta-4.7.0
vikman90 Nov 23, 2023
eed7115
Merge pull request #2618 from wazuh/fix/2333-branch-name-causes-test-…
vikman90 Nov 23, 2023
52e116a
Merge branch '4.7.0' into '4.7.1'
JcabreraC Nov 24, 2023
541a8f1
Merge pull request #2633 from wazuh/merge-4.7.0-into-4.7.1
JcabreraC Nov 24, 2023
fd72f2c
Update ETA date for 4.7.1
vikman90 Nov 27, 2023
d345399
Merge pull request #2644 from wazuh/2643-update-eta-4.7.1
Dwordcito Nov 27, 2023
250ccd1
Merge branch '4.7.1' into merge-4.7.1-into-4.8.0
TomasTurina Nov 27, 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
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_agent_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || ((steps.changes.outputs.deb_images_manager_amd64 == 'true' || steps.changes.outputs.deb_images_agent_amd64 == 'true') && matrix.ARCHITECTURE == 'amd64')
working-directory: ./debs
run: |
REVISION="${{ github.head_ref }}"
REVISION=$( echo ${{ github.head_ref }} | sed 's/-/./g; s/\//./g' )
bash generate_debian_package.sh -b ${{ env.VERSION }} -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} -r $REVISION
echo "PACKAGE_NAME=$(ls ./output | grep .deb | head -n 1)" >> $GITHUB_ENV

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-rpm-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_agent_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || ((steps.changes.outputs.rpm_images_manager_x86_64 == 'true' || steps.changes.outputs.rpm_images_agent_x86_64 == 'true') && matrix.ARCHITECTURE == 'x86_64')
working-directory: ./rpms
run: |
REVISION=$( echo ${{ github.head_ref }} | sed 's/-/./g' )
REVISION=$( echo ${{ github.head_ref }} | sed 's/-/./g; s/\//./g' )
bash generate_rpm_package.sh -b ${{ env.VERSION }} -t ${{ matrix.TYPE }} -a ${{ matrix.ARCHITECTURE }} --dev -j 2 --dont-build-docker --tag ${{ env.TAG }} -r $REVISION
echo "PACKAGE_NAME=$(ls ./output | grep .rpm | head -n 1)" >> $GITHUB_ENV

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-install-deb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
skip_after_successful_duplicate: 'false'

- name: Wait for the package to be built
uses: ArcticLampyrid/[email protected].3
uses: ArcticLampyrid/[email protected].4
id: wait-for-build
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
if: steps.changes.outputs.deb_packages == 'true' || (steps.changes.outputs.deb_images_agent_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.deb_images_amd64 == 'true' && matrix.ARCHITECTURE == 'amd64')
run: |
VERSION=$(cat $GITHUB_WORKSPACE/VERSION)
REVISION=$( echo ${{ github.head_ref }})
REVISION=$( echo ${{ github.head_ref }} | sed 's/-/./g; s/\//./g' )
echo "PACKAGE_NAME=wazuh-${{ matrix.type }}_${VERSION}-${REVISION}_${{ matrix.arch }}.deb" >> $GITHUB_ENV

- name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-install-rpm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
skip_after_successful_duplicate: 'false'

- name: Wait for the package to be built
uses: ArcticLampyrid/[email protected].3
uses: ArcticLampyrid/[email protected].4
id: wait-for-build
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
if : steps.changes.outputs.rpm_packages == 'true' || (steps.changes.outputs.rpm_images_agent_i386 == 'true' && matrix.ARCHITECTURE == 'i386') || (steps.changes.outputs.rpm_images_x86_64 == 'true' && matrix.ARCHITECTURE == 'x86_64')
run: |
VERSION=$(cat $GITHUB_WORKSPACE/VERSION)
REVISION=$( echo ${{ github.head_ref }} | sed 's/-/./g' )
REVISION=$( echo ${{ github.head_ref }} | sed 's/-/./g; s/\//./g' )
echo "PACKAGE_NAME=wazuh-${{ matrix.type }}-${VERSION}-${REVISION}.${{matrix.system.ARCH}}.rpm" >> $GITHUB_ENV

- name: Download the Wazuh ${{ matrix.type }} package for ${{ matrix.system.NAME }}
Expand Down
4 changes: 2 additions & 2 deletions aix/SPECS/wazuh-agent-aix.spec
Original file line number Diff line number Diff line change
Expand Up @@ -292,11 +292,11 @@ rm -fr %{buildroot}
%changelog
* Fri Dec 15 2023 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Thu Dec 07 2023 support <[email protected]> - 4.7.1
* Tue Dec 05 2023 support <[email protected]> - 4.7.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html
* Tue Nov 21 2023 support <[email protected]> - 4.7.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html
* Tue Oct 24 2023 support <[email protected]> - 4.6.0
* Tue Oct 31 2023 support <[email protected]> - 4.6.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
* Tue Oct 24 2023 support <[email protected]> - 4.5.4
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html
Expand Down
4 changes: 2 additions & 2 deletions debs/SPECS/wazuh-agent/debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ wazuh-agent (4.7.1-RELEASE) stable; urgency=low

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

-- Wazuh, Inc <[email protected]> Thu, 07 Dec 2023 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Tue, 05 Dec 2023 00:00:00 +0000

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

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

-- Wazuh, Inc <[email protected]> Tue, 21 Nov 2023 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Tue, 05 Nov 2023 00:00:00 +0000

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

Expand Down
2 changes: 1 addition & 1 deletion debs/SPECS/wazuh-agent/debian/copyright
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 Tue, 21 Nov 2023 00:00:00 +0000
Wazuh, Inc <[email protected]> on Mon, 27 Nov 2023 00:00:00 +0000

It was downloaded from:

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

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

-- Wazuh, Inc <[email protected]> Thu, 07 Dec 2023 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Tue, 05 Dec 2023 00:00:00 +0000

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

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

-- Wazuh, Inc <[email protected]> Tue, 21 Nov 2023 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Tue, 05 Nov 2023 00:00:00 +0000

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

Expand Down
2 changes: 1 addition & 1 deletion debs/SPECS/wazuh-manager/debian/copyright
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 Tue, 21 Nov 2023 00:00:00 +0000
Wazuh, Inc <[email protected]> on Mon, 27 Nov 2023 00:00:00 +0000

It was downloaded from:

Expand Down
2 changes: 2 additions & 0 deletions debs/SPECS/wazuh-manager/debian/postinst
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@ case "$1" in
chmod 0660 ${DIR}/logs/active-responses.log
chmod 0640 ${DIR}/logs/integrations.log

# Set merged.mg permissions to new ones
find ${DIR}/etc/shared/ -type f -name 'merged.mg' -exec chmod 644 {} \;

if [ -f ${DIR}/etc/shared/ar.conf ]; then
chown root:wazuh ${DIR}/etc/shared/ar.conf
Expand Down
2 changes: 2 additions & 0 deletions debs/SPECS/wazuh-manager/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ override_dh_install:
mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/20
mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/21
mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/22
mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/23
mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/7
mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/8
mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/9
Expand Down Expand Up @@ -173,6 +174,7 @@ override_dh_install:
cp etc/templates/config/darwin/20/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/20
cp etc/templates/config/darwin/21/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/21
cp etc/templates/config/darwin/22/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/22
cp etc/templates/config/darwin/23/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/23

cp etc/templates/config/debian/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian
cp etc/templates/config/debian/7/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/7
Expand Down
9 changes: 5 additions & 4 deletions macos/package_files/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ function build() {
configure

if [ -z "${USER_BINARYINSTALL}" ]; then
make -C ${SOURCES_PATH}/src deps TARGET=agent
make -C ${SOURCES_PATH}/src deps TARGET=agent

echo "Generating Wazuh executables"
make -j$JOBS -C ${SOURCES_PATH}/src DYLD_FORCE_FLAT_NAMESPACE=1 TARGET=agent build
echo "Generating Wazuh executables"
make -j$JOBS -C ${SOURCES_PATH}/src DYLD_FORCE_FLAT_NAMESPACE=1 TARGET=agent build
fi

echo "Running install script"
Expand All @@ -60,7 +60,7 @@ function build() {
find ${SOURCES_PATH}/src/init/ -name *.sh -type f -exec install -m 0640 {} ${INSTALLATION_SCRIPTS_DIR}/src/init \;

mkdir -p ${INSTALLATION_SCRIPTS_DIR}/sca/generic
mkdir -p ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/{15,16,17,18,20,21,22}
mkdir -p ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/{15,16,17,18,20,21,22,23}

cp -r ${SOURCES_PATH}/ruleset/sca/darwin ${INSTALLATION_SCRIPTS_DIR}/sca
cp -r ${SOURCES_PATH}/ruleset/sca/generic ${INSTALLATION_SCRIPTS_DIR}/sca
Expand All @@ -73,6 +73,7 @@ function build() {
cp ${SOURCES_PATH}/etc/templates/config/darwin/20/sca.files ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/20/
cp ${SOURCES_PATH}/etc/templates/config/darwin/21/sca.files ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/21/
cp ${SOURCES_PATH}/etc/templates/config/darwin/22/sca.files ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/22/
cp ${SOURCES_PATH}/etc/templates/config/darwin/23/sca.files ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/23/

cp ${SOURCES_PATH}/src/VERSION ${INSTALLATION_SCRIPTS_DIR}/src/
cp ${SOURCES_PATH}/src/REVISION ${INSTALLATION_SCRIPTS_DIR}/src/
Expand Down
4 changes: 2 additions & 2 deletions rpms/SPECS/wazuh-agent.spec
Original file line number Diff line number Diff line change
Expand Up @@ -627,11 +627,11 @@ rm -fr %{buildroot}
%changelog
* Fri Dec 15 2023 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Thu Dec 07 2023 support <[email protected]> - 4.7.1
* Tue Dec 05 2023 support <[email protected]> - 4.7.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html
* Tue Nov 21 2023 support <[email protected]> - 4.7.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html
* Tue Oct 24 2023 support <[email protected]> - 4.6.0
* Tue Oct 31 2023 support <[email protected]> - 4.6.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
* Tue Oct 24 2023 support <[email protected]> - 4.5.4
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html
Expand Down
11 changes: 8 additions & 3 deletions rpms/SPECS/wazuh-manager.spec
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/packages_files/manager_installation_
mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/{applications,generic}
mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/amzn/{1,2,2023}
mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/centos/{8,7,6,5}
mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/darwin/{15,16,17,18,19,20,21,22}
mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/darwin/{15,16,17,18,19,20,21,22,23}
mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/debian/{7,8,9,10,11}
mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/ubuntu/{12,14,16,18,20,22}/04
mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/rhel/{9,8,7,6,5}
Expand Down Expand Up @@ -334,6 +334,9 @@ fi
rm -f %{_localstatedir}/etc/shared/ar.conf >/dev/null 2>&1
rm -f %{_localstatedir}/etc/shared/merged.mg >/dev/null 2>&1

# Set merged.mg permissions to new ones
find %{_localstatedir}/etc/shared/ -type f -name 'merged.mg' -exec chmod 644 {} \;

#AlmaLinux
if [ -r "/etc/almalinux-release" ]; then
DIST_NAME=almalinux
Expand Down Expand Up @@ -787,6 +790,8 @@ rm -fr %{buildroot}
%attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/darwin/21/*
%dir %attr(750, wazuh, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/darwin/22
%attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/darwin/22/*
%dir %attr(750, wazuh, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/darwin/23
%attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/darwin/23/*
%dir %attr(750, wazuh, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/debian
%attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/debian/*
%dir %attr(750, wazuh, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/rhel
Expand Down Expand Up @@ -850,11 +855,11 @@ rm -fr %{buildroot}
%changelog
* Fri Dec 15 2023 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Thu Dec 07 2023 support <[email protected]> - 4.7.1
* Tue Dec 05 2023 support <[email protected]> - 4.7.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html
* Tue Nov 21 2023 support <[email protected]> - 4.7.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html
* Tue Oct 24 2023 support <[email protected]> - 4.6.0
* Tue Oct 31 2023 support <[email protected]> - 4.6.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
* Tue Oct 24 2023 support <[email protected]> - 4.5.4
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html
Expand Down
6 changes: 4 additions & 2 deletions stack/dashboard/deb/debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,20 @@ wazuh-dashboard (4.7.1-RELEASE) stable; urgency=low

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

-- Wazuh, Inc <[email protected]> Thu, 07 Dec 2023 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Tue, 05 Dec 2023 00:00:00 +0000

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

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

-- Wazuh, Inc <[email protected]> Tue, 21 Nov 2023 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Tue, 05 Nov 2023 00:00:00 +0000

wazuh-dashboard (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]> Tue, 31 Oct 2023 00:00:00 +0000

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

* More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html
Expand Down
2 changes: 1 addition & 1 deletion stack/dashboard/deb/debian/copyright
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 Tue, 21 Nov 2023 00:00:00 +0000
Wazuh, Inc <[email protected]> on Mon, 27 Nov 2023 00:00:00 +0000

It was downloaded from:

Expand Down
4 changes: 2 additions & 2 deletions stack/dashboard/rpm/wazuh-dashboard.spec
Original file line number Diff line number Diff line change
Expand Up @@ -337,11 +337,11 @@ rm -fr %{buildroot}
%changelog
* Fri Dec 15 2023 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Thu Dec 07 2023 support <[email protected]> - 4.7.1
* Tue Dec 05 2023 support <[email protected]> - 4.7.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html
* Tue Nov 21 2023 support <[email protected]> - 4.7.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html
* Tue Oct 24 2023 support <[email protected]> - 4.6.0
* Tue Oct 31 2023 support <[email protected]> - 4.6.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
* Tue Oct 24 2023 support <[email protected]> - 4.5.4
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html
Expand Down
4 changes: 2 additions & 2 deletions stack/indexer/deb/debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ wazuh-indexer (4.7.1-RELEASE) stable; urgency=low

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

-- Wazuh, Inc <[email protected]> Thu, 07 Dec 2023 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Tue, 05 Dec 2023 00:00:00 +0000

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

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

-- Wazuh, Inc <[email protected]> Tue, 21 Nov 2023 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Tue, 05 Nov 2023 00:00:00 +0000

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

Expand Down
2 changes: 1 addition & 1 deletion stack/indexer/deb/debian/copyright
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 Tue, 21 Nov 2023 00:00:00 +0000
Wazuh, Inc <[email protected]> on Mon, 27 Nov 2023 00:00:00 +0000

It was downloaded from:

Expand Down
4 changes: 2 additions & 2 deletions stack/indexer/rpm/wazuh-indexer.spec
Original file line number Diff line number Diff line change
Expand Up @@ -699,11 +699,11 @@ rm -fr %{buildroot}
%changelog
* Fri Dec 15 2023 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Thu Dec 07 2023 support <[email protected]> - 4.7.1
* Tue Dec 05 2023 support <[email protected]> - 4.7.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html
* Tue Nov 21 2023 support <[email protected]> - 4.7.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html
* Tue Oct 24 2023 support <[email protected]> - 4.6.0
* Tue Oct 31 2023 support <[email protected]> - 4.6.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
* Tue Oct 24 2023 support <[email protected]> - 4.5.4
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html
Expand Down
4 changes: 2 additions & 2 deletions unattended_installer/builder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,15 @@ function buildInstaller() {
echo 'readonly repogpg="https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH"' >> "${output_script_path}"
echo 'readonly repobaseurl="https://packages-dev.wazuh.com/'${devrepo}'"' >> "${output_script_path}"
echo 'readonly reporelease="unstable"' >> "${output_script_path}"
echo 'readonly filebeat_wazuh_module="${repobaseurl}/filebeat/wazuh-filebeat-0.2.tar.gz"' >> "${output_script_path}"
echo 'readonly filebeat_wazuh_module="${repobaseurl}/filebeat/wazuh-filebeat-0.3.tar.gz"' >> "${output_script_path}"
echo 'readonly bucket="packages-dev.wazuh.com"' >> "${output_script_path}"
echo 'readonly repository="'"${devrepo}"'"' >> "${output_script_path}"
sed -i 's|v${wazuh_version}|${wazuh_version}|g' "${resources_installer}/installVariables.sh"
else
echo 'readonly repogpg="https://packages.wazuh.com/key/GPG-KEY-WAZUH"' >> "${output_script_path}"
echo 'readonly repobaseurl="https://packages.wazuh.com/4.x"' >> "${output_script_path}"
echo 'readonly reporelease="stable"' >> "${output_script_path}"
echo 'readonly filebeat_wazuh_module="${repobaseurl}/filebeat/wazuh-filebeat-0.2.tar.gz"' >> "${output_script_path}"
echo 'readonly filebeat_wazuh_module="${repobaseurl}/filebeat/wazuh-filebeat-0.3.tar.gz"' >> "${output_script_path}"
echo 'readonly bucket="packages.wazuh.com"' >> "${output_script_path}"
echo 'readonly repository="4.x"' >> "${output_script_path}"
fi
Expand Down
30 changes: 0 additions & 30 deletions unattended_installer/install_functions/dashboard.sh
Original file line number Diff line number Diff line change
Expand Up @@ -220,33 +220,3 @@ function dashboard_install() {
fi

}

function dashboard_installReportDependencies() {

# Flags that indicates that is an optional installation.
optional_installation=1
report_dependencies=1
common_logger -d "Installing Wazuh dashboard report dependencies."

installCommon_checkChromium

if [ "${sys_type}" == "yum" ]; then
dashboard_dependencies+=( nss xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-utils xorg-x11-fonts-cyrillic xorg-x11-fonts-Type1 xorg-x11-fonts-misc fontconfig freetype )
installCommon_yumInstallList "${dashboard_dependencies[@]}"

# In RHEL cases, remove the CentOS repositories configuration
if [ "${centos_repos_configured}" == 1 ]; then
installCommon_removeCentOSrepositories
fi

elif [ "${sys_type}" == "apt-get" ]; then
dashboard_dependencies+=( libnss3-dev fonts-liberation libfontconfig1 )
installCommon_aptInstallList "${dashboard_dependencies[@]}"
fi

if [ "${pdf_warning}" == 1 ]; then
common_logger -w "Wazuh dashboard dependencies skipped. PDF report generation may not work."
fi
optional_installation=0

}
Loading
Loading