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.2 into master #6997

Merged
merged 170 commits into from
Jan 26, 2024
Merged

Merge 4.8.2 into master #6997

merged 170 commits into from
Jan 26, 2024

Conversation

javimed
Copy link
Member

@javimed javimed commented Jan 26, 2024 •
edited
Loading

Description

This PR carries latest changes from earlier branches into master branch.

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.

jesuslinares and others added 30 commits May 23, 2023 13:19
@jesuslinares
NPM: Getting started fixed
7be8af7
@jesuslinares
NPM: Add settings section
5b05654
@jesuslinares
NPM: Improve monitoring and settings
5ce3d2c
@jesuslinares
NPM: Improving FAQs
665343a
@jesuslinares
NPM: Improve Billing FAQ
c0f7965
@jesuslinares
NPM: Rename cold storage and adapt to archived data
92a263e
@jesuslinares
NPM: Adapt APIs and CLI
b3cedf0
@jesuslinares
NPM: Adapt Glossary
2977656
@jesuslinares
NPM: Fix typos and links
073aacb
@jesuslinares
Adding Limits
640b530
@jesuslinares
Improve index and getting started
5e0525c
@jesuslinares
Improve your-environment
996d893
@jesuslinares
Improve account-billing
98b9833
@jesuslinares
Improve archived-data
c910a38
@jesuslinares
Improve apis and glossary
92daf54
@jesuslinares
Fix minor typos
3bb12f0
@jesuslinares
Improve EPS definitions and monitoring usage
d147068
@delfilb
Updating new pricing model documentation (#6868)
10f8baf
@jesuslinares
Fix notes and EPS setting description
4ab0a4d
@jesuslinares
Merge branch '4.7' into cloud-new-pricing-model
8705aa5
@jesuslinares @javimed
Update source/cloud-service/account-billing/billing-faq.rst
8749d7f 
Co-authored-by: Javier Medeot <[email protected]>
@jesuslinares @javimed
Update source/cloud-service/account-billing/stop-charges.rst
8f93635 
Co-authored-by: Javier Medeot <[email protected]>
@jesuslinares @javimed
Update source/cloud-service/account-billing/user-settings.rst
1ec3651 
Co-authored-by: Javier Medeot <[email protected]>
@jesuslinares @javimed
Update source/cloud-service/account-billing/user-settings.rst
be0b6ba 
Co-authored-by: Javier Medeot <[email protected]>
@jesuslinares @javimed
Update source/cloud-service/your-environment/technical-faq.rst
928bd33 
Co-authored-by: Javier Medeot <[email protected]>
@jesuslinares @javimed
Update source/cloud-service/your-environment/technical-faq.rst
498b099 
Co-authored-by: Javier Medeot <[email protected]>
@jesuslinares @javimed
Update source/cloud-service/your-environment/technical-faq.rst
56f5746 
Co-authored-by: Javier Medeot <[email protected]>
@jesuslinares @javimed
Update source/cloud-service/apis/index.rst
33e343f 
Co-authored-by: Javier Medeot <[email protected]>
@jesuslinares @javimed
Update source/cloud-service/archived-data/configuration.rst
adf5100 
Co-authored-by: Javier Medeot <[email protected]>
@jesuslinares @javimed
Update source/cloud-service/archived-data/configuration.rst
2a3788c 
Co-authored-by: Javier Medeot <[email protected]>
javimed and others added 27 commits January 19, 2024 10:25
@javimed
Merge pull request #6962 from wazuh/6947-update-mitre-documentation
fa1c166 
Update MITRE documentation
@javimed
Fix Apache web server run command
b4f4d94
@javimed
Merge pull request #6977 from wazuh/fix/6955-running-apache-web-serve…
7047fac 
…r-coomand

Fix Apache web server run command
@javimed
Update 4.8.0 release notes
940b1d2
@javimed
Merge pull request #6980 from wazuh/maintenance/update-4.8.0-release-…
6342044 
…notes

Update 4.8.0 release notes
@javimed
Move OSQuery section to the Malware detection section
833ce94
@javimed
Merge pull request #6982 from wazuh/enhancement/1467-move-osquery-to-…
9b8a7a5 
…malware-detection-section

Move OSQuery section to the Malware detection section
@chantal-kelm
Add configuration to logstash in integration with Opensearch and chan…
536f15b 
…ge note for legacy template
@chantal-kelm
message update
916f7a6
@javimed
Merge pull request #6983 from wazuh/6979_Missing-setting-in-logstash-…
5887b21 
…configuration-in-the-opensearch-integration-guide

Missing setting in logstash configuration in the Opensearch integration guide
@vamera
Updated the NPM dependencies required by our Sphinx theme
96d94a6
@vamera
Updated the requirements to compile this documentation
59b757b
@javimed
Merge pull request #6988 from wazuh/4.7-update-theme-dependencies
dcc0fc1 
[4.7] Updated some dependencies
@javimed
Merge branch '4.7' into merge-4.7-into-4.8.0
38d42c4
@javimed
Merge pull request #6989 from wazuh/merge-4.7-into-4.8.0
b76e73d 
Merge 4.7 into 4.8.0
@javimed
Update 4.8.0 documentation changelog
6e4190d
@javimed
Update CHANGELOG.md
232ad41
@javimed
Merge pull request #6991 from wazuh/maintenance/update-4.8.0-changelog
dbb2d31 
Update 4.8.0 documentation changelog
@javimed
Update 4.8.0 release notes
3af421b
@javimed
Merge pull request #6993 from wazuh/maintenance/715-update-4.8.0-rele…
bb5fe0f 
…ase-notes

Update 4.8.0 release notes
@javimed
Add support for 4.8.1 release notes
6f89878
@javimed
Merge pull request #6994 from wazuh/maintenance/715-add-4.8.1-release…
c463b83 
…-notes-page

Add support for 4.8.1 release notes
@javimed
Merge branch '4.8.0' into merge-4.8.0-into-4.8.1
dfad132
@javimed
Merge pull request #6995 from wazuh/merge-4.8.0-into-4.8.1
f4b1ab2 
Merge 4.8.0 into 4.8.1
@javimed
Merge branch '4.8.1' into merge-4.8.1-into-4.8.2
59cc2e7
@javimed
Merge pull request #6996 from wazuh/merge-4.8.1-into-4.8.2
e391fc0 
Merge 4.8.1 into 4.8.2
@javimed
Merge branch '4.8.2' into merge-4.8.2-into-master
5afd725
@javimed javimed self-assigned this Jan 26, 2024
@javimed javimed merged commit 46a509f into master Jan 26, 2024
3 checks passed
@javimed javimed deleted the merge-4.8.2-into-master branch January 26, 2024 17:19
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.