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.0 into 4.8.1 #1147

Merged
merged 20 commits into from
Nov 27, 2023
Merged

Merge 4.8.0 into 4.8.1 #1147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
bb07e95
Updated Filebeat module version to 0.3
c-bordon Nov 14, 2023
8696ea6
Merge pull request #1126 from wazuh/change/1125-update-filebeat-modul…
c-bordon Nov 14, 2023
fc8c920
Updated Filebeat module URL
davidcr01 Nov 15, 2023
aeacd07
Filebeat module URL adapted to repository
davidcr01 Nov 15, 2023
2a6279c
Updated Filebeat module version
davidcr01 Nov 16, 2023
c5fd54f
Merge pull request #1131 from wazuh/change/1130-change-filebeat-modul…
teddytpc1 Nov 20, 2023
f49521a
Reporting dependencies removed
teddytpc1 Nov 21, 2023
c71a905
Merge pull request #1133 from wazuh/idr-492-report-dependencies
teddytpc1 Nov 22, 2023
6161578
Bump revision to 40704
davidcr01 Nov 23, 2023
7bbed79
Merge pull request #1137 from wazuh/enhancement/bump-revision-40704
davidcr01 Nov 23, 2023
4f25935
Merge branch '4.7.1' into merge-4.7.0-into-4.7.1
teddytpc1 Nov 23, 2023
dbc36e2
Merge pull request #1138 from wazuh/merge-4.7.0-into-4.7.1
teddytpc1 Nov 23, 2023
3a15816
Merge pull request #1139 from wazuh/merge-4.7.1-into-4.8.0
teddytpc1 Nov 23, 2023
588aced
Staging variables added
teddytpc1 Nov 23, 2023
0f549ec
Merge pull request #1140 from wazuh/idr-501-staging
teddytpc1 Nov 23, 2023
ec1787c
bump revision number
vcerenu Nov 27, 2023
7997563
Merge pull request #1145 from wazuh/bump_revision_number
teddytpc1 Nov 27, 2023
6f7cf17
Merge branch '4.7.1' into merge-4.7.1-into-4.8.0
davidcr01 Nov 27, 2023
78c903a
Merge pull request #1146 from wazuh/merge-4.7.1-into-4.8.0
teddytpc1 Nov 27, 2023
2ac672c
Merge branch '4.8.0' into merge-4.8.0-into-4.8.1
davidcr01 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
3 changes: 1 addition & 2 deletions roles/wazuh/ansible-filebeat-oss/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ filebeat_node_name: node-1
filebeat_output_indexer_hosts:
- "localhost:9200"

filebeat_module_package_url: https://packages.wazuh.com/4.x/filebeat
filebeat_module_package_name: wazuh-filebeat-0.2.tar.gz
filebeat_module_package_name: wazuh-filebeat-0.3.tar.gz
filebeat_module_package_path: /tmp/
filebeat_module_destination: /usr/share/filebeat/module
filebeat_module_folder: /usr/share/filebeat/module/wazuh
Expand Down
8 changes: 8 additions & 0 deletions roles/wazuh/ansible-filebeat-oss/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
---
- include_vars: ../../vars/repo_vars.yml

- include_vars: ../../vars/repo.yml
when: packages_repository == 'production'

- include_vars: ../../vars/repo_pre-release.yml
when: packages_repository == 'pre-release'

- include_tasks: RedHat.yml
when: ansible_os_family == 'RedHat'

Expand Down
1 change: 1 addition & 0 deletions roles/wazuh/vars/repo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ wazuh_repo:
wazuh_winagent_config_url: "https://packages.wazuh.com/4.x/windows/wazuh-agent-{{ wazuh_agent_version }}-1.msi"
wazuh_winagent_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.msi"
wazuh_winagent_sha512_url: "https://packages.wazuh.com/4.x/checksums/wazuh/{{ wazuh_agent_version }}/wazuh-agent-{{ wazuh_agent_version }}-1.msi.sha512"
filebeat_module_package_url: https://packages.wazuh.com/4.x/filebeat

wazuh_macos_intel_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.intel64.pkg"
wazuh_macos_arm_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.arm64.pkg"
Expand Down
1 change: 1 addition & 0 deletions roles/wazuh/vars/repo_pre-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ wazuh_repo:
wazuh_winagent_config_url: "https://packages-dev.wazuh.com/pre-release/windows/wazuh-agent-{{ wazuh_agent_version }}-1.msi"
wazuh_winagent_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.msi"
wazuh_winagent_sha512_url: "https://packages-dev.wazuh.com/pre-release/checksums/wazuh/{{ wazuh_agent_version }}/wazuh-agent-{{ wazuh_agent_version }}-1.msi.sha512"
filebeat_module_package_url: https://packages-dev.wazuh.com/pre-release/filebeat

wazuh_macos_intel_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.intel64.pkg"
wazuh_macos_arm_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.arm64.pkg"
Expand Down
3 changes: 3 additions & 0 deletions roles/wazuh/vars/repo_staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ wazuh_repo:
key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145'
wazuh_winagent_config_url: "https://packages-dev.wazuh.com/staging/windows/wazuh-agent-{{ wazuh_agent_version }}-1.msi"
wazuh_winagent_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.msi"
wazuh_winagent_sha512_url: "https://packages-dev.wazuh.com/staging/checksums/wazuh/{{ wazuh_agent_version }}/wazuh-agent-{{ wazuh_agent_version }}-1.msi.sha512"
check_sha512: False
filebeat_module_package_url: https://packages-dev.wazuh.com/staging/filebeat

wazuh_macos_intel_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.intel64.pkg"
wazuh_macos_arm_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.arm64.pkg"
Expand Down
7 changes: 0 additions & 7 deletions roles/wazuh/wazuh-dashboard/tasks/Debian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@
state: present
update_cache: yes

- name: Install Wazuh dashboard dependencies
apt:
name: [
'libnss3-dev', 'fonts-liberation', 'libfontconfig1'
]
state: present

- name: Install Wazuh dashboard
apt:
name: "wazuh-dashboard={{ dashboard_version }}-*"
Expand Down
8 changes: 0 additions & 8 deletions roles/wazuh/wazuh-dashboard/tasks/RedHat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,6 @@
gpgkey: "{{ wazuh_repo.gpg }}"
gpgcheck: true

- name: Install Wazuh dashboard dependencies
yum:
name: [
'libnss3.so', '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'
]
state: present
ignore_errors: yes

- name: Install Wazuh dashboard
package:
name: "wazuh-dashboard-{{ dashboard_version }}"
Expand Down
Loading