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.1 into stable branch #856

Merged
merged 748 commits into from
Sep 9, 2021
Merged

Merge 4.2.1 into stable branch #856

merged 748 commits into from
Sep 9, 2021

Conversation

DFolchA
Copy link
Contributor

@DFolchA DFolchA commented Sep 9, 2021

Related issue

Description

This PR merges the last released version tag, v4.2.1, into the stable branch.

rauldpm and others added 30 commits May 4, 2021 20:06
@rauldpm
Added configuration for the kibana ui
354f7fc
@rauldpm
Added rm of securityadmin_demo.sh
16f3e6f
@rauldpm
Fixed location of rm demo script
df6bd23
@rauldpm
Added vagrant-reload plugin and orders for the last phase of provisio…
7c99e1b 
…ning
@rauldpm
Remove of vagrant user is now done in provision.sh
bff6500
@davidfmiranda
Merge branch '4.2-rc' into 3685_update_elasticsearch_version
60a6cb6
@davidfmiranda
Change Kibana default user
d1330dd
@DFolchA
Add stop using ossec/wazuh-control
147eaeb
@Dwordcito
- Remove disabled shared option during compilation. (#750)
c6d6dda
@s-ocando
Updated server default route
7366472
@DFolchA
Add fix to DEB packages
1eca2cb
@alberpilot
Merge pull request #751 from wazuh/force-stop-using-wazuh-control
feceb2c 
Make sure services are stopped during upgrade
@rauldpm
Fixed output folder exclusion
dd6ee2e
@rauldpm
Added opendistro user wazuh
82e6ceb
@rauldpm
Disabled custom ossec configuration
3c9af02
@rauldpm
Add custom opendistro user config
a76ceba
@rauldpm
Fixed sed command
337712a
@davidfmiranda
Merge branch '4.1' into 3128-Certificate_tool
2ecfbe0
@davidfmiranda
Changed Wazuh cert tool position
37e5a69
@s-ocando
Merge pull request #3669 from wazuh/reenable-multitenancy
bdaea82 
Reenable multitenancy
@davidfmiranda
Improved reading process
5c79a57
@davidfmiranda
Fixed issue when creating standalone certs
16cbe1a
@davidfmiranda
Removed debug message
5095f72
@alberpilot
macOS update folder removal fix
1092c45
@rauldpm
Added debug parameter
01fd0f6
@rauldpm
Changed /vagrant sync folder to /tmp
e2f620e
@rauldpm
Added debug parameter
5236722
@rauldpm
Modularized provision.sh functions
23f12d2
@rauldpm
Modularized structure, added debug mode
4eccf0f
@rauldpm
Modify current admin user instead of creating another admin user
5e978bd
davidfmiranda and others added 23 commits August 17, 2021 09:40
@davidfmiranda
Parametrize baseurl
b6b1094
@davidfmiranda
Use variables for templates and Wazuh Kibana plugin
b12fd16
@DFolchA
Delete symbolic link if present
e239968
@DFolchA
Remove posttrans and ignore cp warnings
44fbd70
@DFolchA
remove -r flag
f0a4d40
Merge pull request #830 from wazuh/828-symbolic-link
85347af 
Fix broken symlink in RPM upgrade
Merge pull request #829 from wazuh/827-aix-error
1d834be 
Fix AIX package issues
@s-ocando
Merge branch '4.1' into 4.2-rc
f3a95aa
@s-ocando
Updated Wazuh version
2363230
@s-ocando
Fixed Wazuh Kibana plugin version - unattended
f03dce3
Bumped version to 4.2.1
2198eb8
@DFolchA
Remove 4.2.0 SPECS
d5d5318
Merge pull request #833 from wazuh/4.2.1-bump
ee35a04 
Add specs files to build Wazuh 4.2.1
@rauldpm
Ready to import to wazuh-packages
17d614b
@rauldpm
Merge branch '4.2' of wazuh-documentation/resources into add-unattend…
5c36805 
…ed-script_4.2
@rauldpm
Adapted unattended urls to wazuh-packages repository
0f04ddb
Merge pull request #838 from wazuh/add-unattended-script_4.2
7150d4b 
Added unattended script 4.2
@rauldpm
Bump unattended to 4.2.1
5613751
Merge pull request #844 from wazuh/bump_unattended_4.2.1_4.2
a62ffa2 
Bump unattended 4.2.0 to 4.2.1
@davidjiglesias
Update specs with new wodle files
212ab19
Merge pull request #845 from wazuh/4.2.1-wodles-fix
3005e10 
Update specs with new wodle files
Removed duplicated entries
c92f04c
@DFolchA
Merge tag 'v4.2.1' of https://github.com/wazuh/wazuh-packages into me…
7c3f7a9 
…rge-4.21-stable

Release v4.2.1 of Wazuh packages
@DFolchA DFolchA requested review from alberpilot and okynos September 9, 2021 08:48
@DFolchA DFolchA self-assigned this Sep 9, 2021
alberpilot
alberpilot approved these changes Sep 9, 2021
View reviewed changes
Copy link
Contributor

@alberpilot alberpilot 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 8f4c082 into stable Sep 9, 2021
@alberpilot alberpilot deleted the merge-4.21-stable branch September 9, 2021 11:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alberpilot alberpilot alberpilot approved these changes

@okynos okynos Awaiting requested review from okynos

Assignees

@DFolchA DFolchA

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@DFolchA @alberpilot @rauldpm @davidfmiranda @Dwordcito @s-ocando @jcruzlp @tinachoB @okynos @davidjiglesias