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

Jump to bottom

Merge 4.2 into master #635

Merged
merged 31 commits into from
Oct 4, 2021
Merged

Merge 4.2 into master #635

merged 31 commits into from
Oct 4, 2021

Conversation

myu1d157h0u54nd
Copy link
Contributor

This PR closed #630

VictorMorenoJimenez and others added 28 commits April 19, 2021 09:42
@VictorMorenoJimenez
#570. Rename Windows agent from OssecSvc to WazuhSvc
85682c5
@alberpilot
Merge pull request #571 from wazuh/570-windows-agent-rename
3f03744 
Rename Windows agent from OssecSvc to WazuhSvc
@VictorMorenoJimenez
#497. Change firewall-drop.sh according to new active-response change…
ab3d36f 
…s. Now script is a C binary instead
@alberpilot
Merge pull request #575 from wazuh/574-firewall-drop
66fc02f 
Change firewall-drop.sh according to new active-response
@VictorMorenoJimenez
#514. Remove conditional from task, config file is not being removed
1b447e1
@VictorMorenoJimenez
#514. Remove conditional from task certs were not copied to kibana fo…
a8b4136 
…lder
@alberpilot
Merge pull request #580 from wazuh/514-kibana-config
a3737f6 
Fix error in Kibana config
@VictorMorenoJimenez
Change win_template to template, due to permission WinRMError
3232b68
@alberpilot
Merge pull request #582 from wazuh/514-kibana-config
88db3f4 
Fix WinRMError in win_template module
@VictorMorenoJimenez
Use localhost for elasticsearch and filebeat on single node setup
656c963
@alberpilot
Merge pull request #587 from wazuh/4.2-d-malko
ff4e8fd 
Use localhost for elasticsearch and filebeat on single node setup
@DFolchA
Change OD version
6e38123
@DFolchA
Fix compatibility matrix
33a4797
@alberpilot
Merge pull request #598 from wazuh/change-OD-version-4.2
0bf4198 
Update OD version from 1.12.0 to 1.13.2 4.2
@DFolchA
Fix compatibility matrix
1195f1e
@alberpilot
Merge pull request #599 from wazuh/change-OD-version-4.2
1f2af13 
Fix compatibility matrix
@okynos
Fixed multi tenant and performance analyzer
4ffb2e0
@alberpilot
Merge pull request #606 from wazuh/fix-tenant
78698c2 
Fixed multi tenant and performance analyzer
Improved removal of performance-analyzer plugin
8582b09
@DFolchA
Update manager conf
5f238f4
@DFolchA
Use root to install agent and fix problem with kibana user
0c665f5
@alberpilot
Merge pull request #624 from wazuh/Add-changes-to-4.2
691be0e 
Add changes to 4.2
@myu1d157h0u54nd
4.2.1 tag update
29e8415
@alberpilot
Merge pull request #627 from wazuh/4.2.1
ef91fbe 
4.2.1 tag update
@myu1d157h0u54nd
4.2.2 tag update
f55390c
@myu1d157h0u54nd
4.2.2 tag update ansible version
b0df88c
@alberpilot
Merge pull request #631 from wazuh/629-prerelease-4.2.2
17a0d96 
Ansible Release 4.2.2
@myu1d157h0u54nd
merge de 4.2 a master
4b774df
@myu1d157h0u54nd myu1d157h0u54nd self-assigned this Oct 1, 2021
@myu1d157h0u54nd myu1d157h0u54nd mentioned this pull request Oct 1, 2021
Closed
teddytpc1
teddytpc1 requested changes Oct 1, 2021
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
teddytpc1
teddytpc1 approved these changes Oct 1, 2021
View reviewed changes
Copy link
Member

@teddytpc1 teddytpc1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

rauldpm
rauldpm requested changes Oct 1, 2021
View reviewed changes
VERSION Outdated Show resolved Hide resolved
rauldpm
rauldpm approved these changes Oct 1, 2021
View reviewed changes
Copy link
Member

@rauldpm rauldpm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@myu1d157h0u54nd myu1d157h0u54nd mentioned this pull request Oct 2, 2021
Closed
3 tasks
okynos
okynos approved these changes Oct 4, 2021
View reviewed changes
Copy link
Contributor

@okynos okynos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@alberpilot alberpilot merged commit 8761d62 into master Oct 4, 2021
@okynos okynos deleted the 630-merge_4.2_to_master branch October 4, 2021 13:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@okynos okynos okynos approved these changes

@rauldpm rauldpm rauldpm approved these changes

@teddytpc1 teddytpc1 teddytpc1 approved these changes

@alberpilot alberpilot Awaiting requested review from alberpilot

@vcerenu vcerenu Awaiting requested review from vcerenu

Assignees

@myu1d157h0u54nd myu1d157h0u54nd

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Release 4.2.2 Ansible
7 participants
@myu1d157h0u54nd @okynos @rauldpm @teddytpc1 @alberpilot @VictorMorenoJimenez @DFolchA