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.8.1 into master #6807

Merged
merged 171 commits into from
Nov 27, 2023
Merged

Merge 4.8.1 into master #6807

merged 171 commits into from
Nov 27, 2023

Conversation

javimed
Copy link
Member

@javimed javimed commented Nov 27, 2023

Description

This PR carries latest changes from earlier branches into master.

Checks

Docs building

  • Compiles without warnings.

Code formatting and web optimization

  • Uses three spaces indentation.
  • Adds or updates meta descriptions accordingly.
  • Updates the redirects.js script if necessary (check this guide).

Writing style

  • Uses present tense, active voice, and semi-formal registry.
  • Uses short, simple sentences.
  • Uses bold for user interface elements, italics for key terms or emphasis, and code font for Bash commands, file names, REST paths, and code.

vcerenu and others added 30 commits June 21, 2023 17:31
@vcerenu
add distributed option deploy
2764ff8
@AlexRuiz7
Add documentation for the ISM rollover policy
5634fbb
@JuanGarriuz
Modules remove from wazuh app update and app/wazuh change to app/wz-home
f5c822d
@AlexRuiz7
Remove docs_per_shard setting
d7f4373
@AlexRuiz7
Add steps to customize the rollover policy
d176fda 
Also fixes several typos
@javimed
Add changes from review
06f92b6
@AlexRuiz7
Update ISM documentation with the new design
ac33e59 
The policy is configured along the the indexer, instead by the app
@AlexRuiz7
Update ISM documentation with the new design
aa76b5f 
The policy is configured along the the indexer, instead by the app
@AlexRuiz7
Revert changes
7415140
@vcerenu
remove agent installation
023ec06
@JuanGarriuz
Reviewed changes, remove extensions, logo.sidebar and disabled_roles
7b65e80
@JuanGarriuz
Reviewed changes, remove disabled_roles
729f923
@vcerenu
fix stage parameter use
4767c8c
@JuanGarriuz
Fix Amazon Web Services and remove enable-wazuh-docker-listener-dashb…
3104105 
…oard.gif
@AlexRuiz7
Add steps to configure the ISM rollover policy
e3cd696
@AlexRuiz7
Revert changes to .gitignore
de42d45
@AlexRuiz7
Unify indexer's initialization steps
0c2fd6d
@AlexRuiz7
Fix typo
72b550c
@JuanGarriuz
Configuration assessment update
74691a5
@JuanGarriuz
OpenScap and System Auditing remove
500d832
@AlexRuiz7
Update how-to section customize the policy
bc371ab
@lucianogorza
Replace Securitu events modulo with Threat hunting
06d5018
@lucianogorza
Replace Securitu events modulo with Threat hunting
cc41028
@lucianogorza
Replace Vulnerabilities with Vulnerability detection
6016615
@lucianogorza
Replace Docker listener with Docker
d25cb66
@Desvelao
fix: remove unwanted file
d603e98
@Desvelao
fix: restore the removed files
82aac13
@lucianogorza
Replace Threat hunting with Threat Hunting
e9405b2
@lucianogorza
Merge branch 'enhancement/wdp-5965-add-global-menu-remove-extensions-…
e3b41d2 
…disabled-roles-setting' of https://github.com/wazuh/wazuh-documentation into enhancement/wdp-5965-add-global-menu-remove-extensions-disabled-roles-setting
@Desvelao
fix: replace Agents section by Endpoints Summary
df0df9d
javimed and others added 26 commits November 24, 2023 09:08
@javimed
Merge pull request #6789 from wazuh/merge-4.7.0-into-4.7.1
29ce0cb 
Merge 4.7.0 into 4.7.1
@javimed
Add fix to 4.7.0 release notes
78ca843
@asteriscos @javimed
Update CHANGELOG.md
e710346 
Co-authored-by: Javier Medeot <[email protected]>
@javimed
Merge pull request #6771 from wazuh/enhancement/1125-add-creating-cus…
a14abc2 
…tom-dashboards

Add custom dahboards section
@javimed
Merge pull request #6775 from wazuh/change/update-saml-configuration-…
b07c14d 
…home-references-6773

Change home URL to just the base path
@javimed
Add changes from review
b270354
@asteriscos
Add blue rectangles to logos
641130b
@javimed
Merge pull request #6779 from wazuh/change/set-custom-top-logo-config…
87d787d 
…uration-6774

Change custom branding top logo configuration
@davidjiglesias
Merge pull request #6791 from wazuh/fix/update-4.7.0-changelog
c67f3df 
Add fix to 4.7.0 release notes
@javimed
Merge branch '4.6' into merge-4.6-into-4.7.0
0531dec
@javimed
Merge pull request #6796 from wazuh/merge-4.6-into-4.7.0
573b302 
Merge 4.6 into 4.7.0
@javimed
Set release date and API tag
30fa1fb
@javimed
Merge branch '4.7.0' into merge-4.7.0-into-4.7.1
db911eb
@javimed
Merge pull request #6800 from wazuh/merge-4.7.0-into-4.7.1
b6c1f32 
Merge 4.7.0 into 4.7.1
@javimed
Update 4.7.1 docs changelog
8dd3ac0
@javimed
Merge pull request #6801 from wazuh/maintenance/6761-update-4.7.1-doc…
28ac6aa 
…s-changelog

Update 4.7.1 docs changelog
@javimed
Merge pull request #6797 from wazuh/maintenance/6794-set-release
5353681 
Set release date and API tag
@fdalmaup
Modify discard_field description and examples
f70f23a
@javimed
Merge pull request #6770 from wazuh/enhancement/6740-aws-discard-feature
d0d3c3f 
Enhance the discard regex and field feature description and examples
@javimed
Update 4.7.1 release notes
16a4ba4
@javimed
Merge pull request #6802 from wazuh/maintenance/6798-update-4.7.1-rel…
6b0f4ff 
…ease-notes

Update 4.7.1 release notes
@javimed
Fix 4.7.0 Wazuh dashboard changelog reference URL
98c2325
@javimed
Merge branch '4.7' into merge-4.7-into-4.7.1
5091a62
@javimed
Merge branch '4.7.1' into merge-4.7.1-into-4.8.0
35ea649
@javimed
Merge branch '4.8.0' into merge-4.8.0-into-4.8.1
28b64c1
@javimed
Merge branch '4.8.1' into merge-4.8.1-into-master
fae2f12
@javimed javimed self-assigned this Nov 27, 2023
@javimed javimed merged commit 6573a9f into master Nov 27, 2023
@javimed javimed deleted the merge-4.8.1-into-master branch November 27, 2023 20:49
@javimed javimed linked an issue Nov 27, 2023 that may be closed by this pull request
Post release tasks for 4.7.0 #6795
Closed
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@javimed javimed

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Post release tasks for 4.7.0