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.7.1 into master #779

Merged
merged 14 commits into from
Sep 22, 2023
Merged

Merge 4.7.1 into master #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
dc462f7
Updated wazuh_extensions_version variable
davidcr01 Sep 11, 2023
d7493db
Updated wazuh_extensions_version variable to v4.6.0
davidcr01 Sep 12, 2023
236d9c7
Merge pull request #770 from wazuh/bug/769-wazuh_extensions_version-fix
teddytpc1 Sep 12, 2023
a732b12
Add Amazon Linux 2023 VDT support
Leoquicenoz Sep 7, 2023
fb46e7c
Update manifests/params_manager.pp
Leoquicenoz Sep 13, 2023
5b2aec7
Bump version to 4.7.1
davidcr01 Sep 20, 2023
455743a
Merge pull request #772 from wazuh/bump-version-4.7.1
teddytpc1 Sep 20, 2023
db968a8
Merge pull request #762 from wazuh/17617-vdt-alas2023-support
teddytpc1 Sep 21, 2023
9edbe7e
Merge remote-tracking branch 'origin/4.6.0' into merge-4.6.0-into-4.7.0
davidcr01 Sep 22, 2023
0e53082
Merge pull request #777 from wazuh/merge-4.6.0-into-4.7.0
teddytpc1 Sep 22, 2023
0bb40cd
Merge remote-tracking branch 'origin/4.7.0' into merge-4.7.0-into-4.7.1
davidcr01 Sep 22, 2023
5fa22fa
Merge pull request #778 from wazuh/merge-4.7.0-into-4.7.1
teddytpc1 Sep 22, 2023
e2bc7a7
Merge remote-tracking branch 'origin/4.7.1' into merge-4.7.1-into-master
davidcr01 Sep 22, 2023
a2dcba2
Updated wazuh_extensions_version variable
davidcr01 Sep 22, 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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ All notable changes to this project will be documented in this file.

- Support to 4.8.0 Wazuh release.

## Wazuh Puppet v4.7.1

### Added

- Support to 4.7.1 Wazuh release.

## Wazuh Puppet v4.7.0

### Added
Expand Down
2 changes: 1 addition & 1 deletion manifests/filebeat_oss.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
$filebeat_oss_elastic_password = 'admin',
$filebeat_oss_version = '7.10.2',
$wazuh_app_version = '4.8.0_7.10.2',
$wazuh_extensions_version = '4.8',
$wazuh_extensions_version = 'v4.8.0',
$wazuh_filebeat_module = 'wazuh-filebeat-0.2.tar.gz',

$filebeat_fileuser = 'root',
Expand Down
3 changes: 2 additions & 1 deletion manifests/params_manager.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,8 @@
$vulnerability_detector_provider_alas = 'yes'
$vulnerability_detector_provider_alas_enabled = 'no'
$vulnerability_detector_provider_alas_os = ['amazon-linux',
'amazon-linux-2'
'amazon-linux-2',
'amazon-linux-2023'
]
$vulnerability_detector_provider_alas_update_interval = '1h'

Expand Down