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

Merge 4.8 into 4.9.0 #7628

Closed
wants to merge 31 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
818624f
{WiP} Add Wazuh server API rework
javimed Jul 23, 2024
373bab8
{WiP} Add Wazuh server API rework
javimed Jul 24, 2024
9807113
{WiP} Add Wazuh server API rework
javimed Jul 24, 2024
713649c
Updated changes in docu
mpRegalado Jul 25, 2024
7a25076
{WiP} Add Wazuh server API rework
javimed Jul 25, 2024
372e180
Merge pull request #7574 from wazuh/enhancement/2773-wazuh-server-api…
javimed Jul 25, 2024
9f55d9b
{WiP} Add Wazuh server API rework
javimed Jul 25, 2024
ebededb
Merge pull request #7572 from wazuh/enhancement/17897-update-settings…
javimed Jul 25, 2024
048fbfc
CL:
GabrielEValenzuela Jul 25, 2024
6685abb
Fix outdated Wazuh dashboard URL
javimed Jul 26, 2024
b3429af
Fix outdated Wazuh dashboard URL
javimed Jul 26, 2024
50df094
Merge pull request #7582 from wazuh/bug/7568-wrong-dashboard-url
javimed Jul 26, 2024
ebd546b
{WiP} Add Wazuh server API rework
javimed Jul 26, 2024
87b8c5d
{WiP} Add Wazuh server API rework
javimed Jul 26, 2024
eb68a69
{WiP} Add Wazuh server API rework
javimed Jul 26, 2024
f4371eb
CL:
GabrielEValenzuela Jul 26, 2024
bf38d24
Merge pull request #7576 from wazuh/enhancement/2782-add-server-api-r…
javimed Jul 29, 2024
3192f15
CL:
GabrielEValenzuela Jul 29, 2024
965bb60
Add --api option when changing the API users passwords
Enaraque Jul 29, 2024
d516c58
CL:
sebasfalcone Jul 29, 2024
f0b31d8
Add changes from review
javimed Jul 29, 2024
6d4be9a
Merge pull request #7579 from wazuh/enhancement/24937-improve-compati…
javimed Jul 29, 2024
7383729
Merge pull request #7587 from wazuh/bug/7564-add-api-parameter-to-cha…
javimed Jul 29, 2024
d59db7a
{WiP} Add Wazuh server API rework - RBAC Reference and use cases
javimed Jul 30, 2024
430ba00
{WiP} Add Wazuh server API rework - RBAC Reference and use cases
javimed Jul 30, 2024
dea5050
{WiP} Add Wazuh server API rework - RBAC Reference and use cases
javimed Jul 30, 2024
a9cab69
{WiP} Add Wazuh server API rework - RBAC Reference and use cases
javimed Jul 31, 2024
ac233d6
Merge pull request #7591 from wazuh/enhancement/2792-add-wazuh-server…
javimed Jul 31, 2024
b340a58
Add Wazuh server API rework - RBAC Reference and use cases
javimed Jul 31, 2024
7c66eb0
Merge pull request #7573 from wazuh/enhancement/2174-wazuh-server-api…
javimed Jul 31, 2024
2babd22
Merge branch '4.8' into merge-4.8-into-4.9.0
Rebits Aug 2, 2024
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
9 changes: 8 additions & 1 deletion source/_static/js/redirects.js
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ removedUrls['4.8'] = [
'/migration-guide/migrating-from-ossec/index.html',
'/migration-guide/migrating-from-ossec/ossec-server.html',
'/migration-guide/migrating-from-ossec/ossec-agent.html',
'/user-manual/api/equivalence.html',
'/user-manual/api/rbac/configuration.html',
];

/* Redirections from 4.7 to 4.8 */
Expand Down Expand Up @@ -247,7 +249,12 @@ redirections.push(
{
'target': ['4.7=>4.8', '4.8=>4.7'],
'4.7': '/user-manual/manager/remote-service.html',
'4.8': 'user-manual/manager/wazuh-manager.html#agent-connection-service-configuration',
'4.8': '/user-manual/manager/wazuh-manager.html#agent-connection-service-configuration',
},
{
'target': ['4.7=>4.8'],
'4.7': '/user-manual/api/rbac/configuration.html',
'4.8': '/user-manual/api/rbac/how-it-works.html',
},
);

Expand Down
2 changes: 1 addition & 1 deletion source/cloud-service/your-environment/settings.rst
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Managing your environment settings is crucial to meeting your evolving needs and

Advanced settings might be more challenging to determine in advance. While the interface provides recommendations based on our experience, your specific workload might differ. Hence, we recommend deploying, monitoring, and adjusting the settings as needed to align with your evolving requirements.

To effectively monitor and adapt your environment, you have the option to modify your settings by opening a support ticket. Here's how the process works:
You can update your environment settings directly in the Wazuh Cloud Console under the environment details page. Here's how the process works:

- **Upgrading a setting**: If you need to raise a setting, you will be charged a prorated amount based on the remaining time in your billing cycle. The change will be implemented immediately after the payment is made. Please note that your next billing cycle will reflect the increased cost of the enhancement.

Expand Down
120 changes: 60 additions & 60 deletions source/deployment-options/offline-installation/step-by-step.rst

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/images/manual/api/example-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/images/manual/api/example-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/images/manual/api/execute-api-request.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions source/installation-guide/wazuh-dashboard/step-by-step.rst
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ Select your deployment type and follow the instructions to change the default pa

.. code-block:: console

# /usr/share/wazuh-indexer/plugins/opensearch-security/tools/wazuh-passwords-tool.sh --change-all --admin-user wazuh --admin-password wazuh
# /usr/share/wazuh-indexer/plugins/opensearch-security/tools/wazuh-passwords-tool.sh --api --change-all --admin-user wazuh --admin-password wazuh

.. code-block:: console
:class: output
Expand Down Expand Up @@ -180,7 +180,7 @@ Select your deployment type and follow the instructions to change the default pa
.. code-block:: console

# curl -sO https://packages.wazuh.com/|WAZUH_CURRENT_MINOR|/wazuh-passwords-tool.sh
# bash wazuh-passwords-tool.sh --change-all --admin-user wazuh --admin-password wazuh
# bash wazuh-passwords-tool.sh --api --change-all --admin-user wazuh --admin-password wazuh

.. code-block:: console
:class: output
Expand Down
410 changes: 222 additions & 188 deletions source/user-manual/api/configuration.rst

Large diffs are not rendered by default.

88 changes: 0 additions & 88 deletions source/user-manual/api/equivalence.rst

This file was deleted.

Loading