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.9.0 into 4.10.0 #1358

Merged
merged 22 commits into from
Jul 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
e09d8d1
Bump revision to 40901
Enaraque Jun 20, 2024
736ccfa
Merge pull request #1324 from wazuh/enhancement/bump-revision-40901
davidcr01 Jun 20, 2024
30fffdd
Bumped REVISION to 40814
davidcr01 Jul 2, 2024
3b5707e
Merge pull request #1330 from wazuh/enhancement/1329-support-4.8.1-rc…
davidcr01 Jul 2, 2024
1704952
Support 4.8.1-rc2
teddytpc1 Jul 4, 2024
fa4995c
Merge pull request #1334 from wazuh/enhancement/1332-support-4.8.1-rc2
teddytpc1 Jul 4, 2024
140834b
Opward merge
vcerenu Jul 8, 2024
2e1c0f4
Merge pull request #1335 from wazuh/enhancemment/1333-merge-4.8.1-int…
vcerenu Jul 8, 2024
19f18eb
Fix AL2023 dependencies bugs
Enaraque Jul 9, 2024
d2b5b62
Change 'install curl' task condition
Enaraque Jul 11, 2024
6c8e2b5
Merge pull request #1338 from wazuh/bug/1331-bug-wazuh-installation-p…
teddytpc1 Jul 11, 2024
c0a6e6c
Bump revision to 40902
Enaraque Jul 12, 2024
ea480ae
Merge pull request #1340 from wazuh/enhancement/1339-support-4.9.0-al…
davidcr01 Jul 12, 2024
8e164e8
bump revision 40816
CarlosALgit Jul 15, 2024
80fe427
Merge pull request #1343 from wazuh/enhancement/1342-bump-revision-40816
davidcr01 Jul 15, 2024
234e873
bump revision to 40817
CarlosALgit Jul 17, 2024
6a3f037
Merge pull request #1345 from wazuh/enhancement/1344-bump-revision-40817
davidcr01 Jul 17, 2024
1e72846
Merge branch '4.8.1' into merge-4.8.1-into-4.9.0
davidcr01 Jul 18, 2024
2a496a8
Merge pull request #1349 from wazuh/merge-4.8.1-into-4.9.0
c-bordon Jul 18, 2024
0b771cb
bump revision to 40903
CarlosALgit Jul 19, 2024
5dcc5ad
Merge pull request #1356 from wazuh/enhancement/1354-bump-revision-40903
davidcr01 Jul 19, 2024
56006ed
Merge branch '4.9.0' into merge-4.9.0-into-4.10.0
davidcr01 Jul 19, 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
43 changes: 32 additions & 11 deletions roles/wazuh/ansible-wazuh-manager/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,38 @@
---

- name: "Install dependencies"
package:
name:
- unzip
- openssl
- tar
- curl
state: present
register: package_status
until: "package_status is not failed"
retries: 10
delay: 10
block:
- name: "Install common dependencies"
package:
name:
- unzip
- openssl
- tar
state: present
register: package_status
until: "package_status is not failed"
retries: 10
delay: 10

- name: "Install curl"
package:
name: curl
state: present
when: ansible_distribution != "Amazon" and ansible_distribution_version != "2023"
register: package_status
until: "package_status is not failed"
retries: 10
delay: 10

- name: "Install curl minimal in AL2023"
package:
name: curl-minimal
state: present
when: ansible_distribution == "Amazon" and ansible_distribution_version == "2023"
register: package_status
until: "package_status is not failed"
retries: 10
delay: 10

- include_vars: ../../vars/repo_vars.yml

Expand Down
7 changes: 5 additions & 2 deletions roles/wazuh/wazuh-indexer/tasks/RedHat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,15 @@



- name: Amazon Linux | Install Amazon extras
- name: Amazon Linux | Configure system settings
block:
- name: Install Amazon extras
- name: Install Amazon extras in Amazon Linux 2
yum:
name: amazon-linux-extras
state: present
when:
- ansible_distribution == 'Amazon'
- ansible_distribution_major_version == '2'

- name: Configure vm.max_map_count
lineinfile:
Expand Down
Loading