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

use ansible_facts to reference facts #891

Closed
wants to merge 26 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
2251a85
Bump master to 4.5
teddytpc1 May 20, 2022
b45b342
Merge pull request #777 from wazuh/bump-4.5
May 23, 2022
91e5449
Conflicts resolution
teddytpc1 Jun 1, 2022
ba7e1aa
Merge pull request #790 from wazuh/merge-433-master
Jun 1, 2022
7ae757e
Fix to be able to set complex passwords with symbols too
TuningYourCode Jun 9, 2022
4080da4
Merge pull request #794 from TuningYourCode/master
teddytpc1 Jun 13, 2022
a9b8c48
disable filebeat metrics
fcaffieri Jul 4, 2022
022bff9
Merge pull request #811 from wazuh/1667-disable-filebeat-metrics-toma…
alberpilot Jul 4, 2022
6365d88
update cookiecutter version
vcerenu Jul 5, 2022
db71354
update cookiecutter version
vcerenu Jul 5, 2022
c244ac4
update cookiecutter version
vcerenu Jul 5, 2022
cc9885c
Merge pull request #814 from wazuh/change_version_dependency
alberpilot Jul 5, 2022
3c96df7
Add fix to avoid GLIBC crash
fcaffieri Jul 6, 2022
f768c01
Add fix to avoid GLIBC crash, fix identation
fcaffieri Jul 6, 2022
9319ff4
Merge pull request #818 from wazuh/1665-Fix-filebeat-crash-due-to-gli…
Jul 7, 2022
a1b7fa0
Merge 4.3.6 into master (conflicts)
teddytpc1 Jul 22, 2022
794222d
Conflicts 4.3.6
teddytpc1 Jul 25, 2022
68718a0
Merge pull request #822 from wazuh/merge-436-master
Jul 25, 2022
6607cea
Merge branch 'master' into merge-43-master
teddytpc1 Oct 12, 2022
7733af0
Merge pull request #850 from wazuh/merge-43-master
teddytpc1 Oct 17, 2022
6952a17
Conflicts resolved
teddytpc1 Feb 1, 2023
4cddcac
Merge pull request #886 from wazuh/merge-44-master
teddytpc1 Feb 1, 2023
1317a9a
Old workflow files deleted
teddytpc1 Feb 1, 2023
2d0aa67
Bump master to 4.6
teddytpc1 Feb 1, 2023
970263a
Merge pull request #888 from wazuh/bump-master-46
teddytpc1 Feb 1, 2023
afeb107
use ansible_facts to reference facts
GregWhiteyBialas Feb 10, 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
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
# Change Log
All notable changes to this project will be documented in this file.

## [v4.6.0]

### Added

- Update to [Wazuh v4.6.0](https://github.com/wazuh/wazuh/blob/v4.6.0/CHANGELOG.md#v460)

## [v4.5.0]

### Added

- Update to [Wazuh v4.5.0](https://github.com/wazuh/wazuh/blob/v4.5.0/CHANGELOG.md#v450)

## [v4.4.0]

### Added
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb

| Wazuh version | Elastic | ODFE |
|---------------|---------|--------|
| v4.6.0 | | |
| v4.5.0 | | |
| v4.4.0 | | |
| v4.3.10 | | |
| v4.4.0 | | |
| v4.3.9 | | |
| v4.3.8 | | |
| v4.3.7 | | |
Expand Down
4 changes: 2 additions & 2 deletions VERSION
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
WAZUH-ANSIBLE_VERSION="v4.4.0"
REVISION="40400"
WAZUH-ANSIBLE_VERSION="v4.6.0"
REVISION="40600"
53 changes: 0 additions & 53 deletions roles/elastic-stack/ansible-kibana/defaults/main.yml

This file was deleted.

57 changes: 0 additions & 57 deletions roles/opendistro/opendistro-elasticsearch/tasks/Debian.yml

This file was deleted.

60 changes: 0 additions & 60 deletions roles/opendistro/opendistro-kibana/defaults/main.yml

This file was deleted.

124 changes: 0 additions & 124 deletions roles/opendistro/opendistro-kibana/tasks/main.yml

This file was deleted.

13 changes: 0 additions & 13 deletions roles/opendistro/opendistro-kibana/tasks/security_actions.yml

This file was deleted.

2 changes: 1 addition & 1 deletion roles/wazuh/ansible-filebeat-oss/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
filebeat_version: 7.10.2

wazuh_template_branch: 4.4
wazuh_template_branch: 4.6

filebeat_node_name: node-1

Expand Down
12 changes: 6 additions & 6 deletions roles/wazuh/ansible-filebeat-oss/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
- include_tasks: RedHat.yml
when: ansible_os_family == 'RedHat'
when: ansible_facts.os_family == 'RedHat'

- include_tasks: Debian.yml
when: ansible_os_family == 'Debian'
when: ansible_facts.os_family == 'Debian'

- name: Install Filebeat | Redhat
yum:
Expand All @@ -13,7 +13,7 @@
tags:
- install
- init
when: ansible_os_family == 'RedHat'
when: ansible_facts.os_family == 'RedHat'

- name: Install Filebeat | Debian
apt:
Expand All @@ -23,7 +23,7 @@
tags:
- install
- init
when: ansible_os_family == 'Debian'
when: ansible_facts.os_family == 'Debian'

- name: Checking if Filebeat Module folder file exists
stat:
Expand Down Expand Up @@ -72,7 +72,7 @@
enabled: true

- include_tasks: "RMRedHat.yml"
when: ansible_os_family == "RedHat"
when: ansible_facts.os_family == "RedHat"

- include_tasks: "RMDebian.yml"
when: ansible_os_family == "Debian"
when: ansible_facts.os_family == "Debian"
Loading