Skip to content

Commit f877943

Browse files
authored
Merge pull request #9162 from wazuh/merge-4.14.3-into-main
Merge 4.14.3 into main
2 parents 44ed33e + 12d61a6 commit f877943

File tree

74 files changed

+1335
-893
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+1335
-893
lines changed

CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,26 @@ All notable changes to this project will be documented in this file.
3131
- Removed documentation to deprecated `fluent-forward` tool. ([#8778](https://github.com/wazuh/wazuh-documentation/pull/8778))
3232
- Removed support for legacy operating systems, including Red Hat 5, CentOS 5, Oracle Linux 5, SUSE Linux Enterprise Server 11, AIX, HP-UX, Solaris, Windows XP, Windows Vista, and Windows Server 2003. ([#8894](https://github.com/wazuh/wazuh-documentation/pull/8894))
3333

34+
## [v4.14.3]
35+
36+
### Added
37+
38+
- Added the macOS 26 (Tahoe) SCA policy reference to the *Available SCA policies* section. ([#9158](https://github.com/wazuh/wazuh-documentation/pull/9158))
39+
40+
## [v4.14.2]
41+
42+
### Changed
43+
44+
- Updated the Wazuh module for Filebeat version references to ``0.5``. ([#9149](https://github.com/wazuh/wazuh-documentation/pull/9149))
45+
3446
## [v4.14.1]
3547

3648
### Added
3749

3850
- **Post-release**: Added clarification to the ``field`` option in the *Rules syntax* section. ([#9103](https://github.com/wazuh/wazuh-documentation/pull/9103))
3951
- **Post-release**: Added Syscollector parameter references. ([#9108](https://github.com/wazuh/wazuh-documentation/pull/9108)) ([#9109](https://github.com/wazuh/wazuh-documentation/pull/9109))
4052
- **Post-release**: Added ``apache`` to the allowed ``log_format`` values in the localfile configuration documentation. ([#9114](https://github.com/wazuh/wazuh-documentation/pull/9114))
53+
- **Post-release**: Added step to set file ownership and permissions when modifying default decoders. ([#9141](https://github.com/wazuh/wazuh-documentation/pull/9141))
4154

4255
### Changed
4356

@@ -46,6 +59,15 @@ All notable changes to this project will be documented in this file.
4659
- **Post-release**: Updated the *Agents* manifests in the *Deployment on Kubernetes* section. ([#9111](https://github.com/wazuh/wazuh-documentation/pull/9111))
4760
- **Post-release**: Updated the *Monitoring Microsoft Graph services with Wazuh* section. ([#9107](https://github.com/wazuh/wazuh-documentation/pull/9107))
4861
- **Post-release**: Updated the *log_format* reference sub-section. ([#9117](https://github.com/wazuh/wazuh-documentation/pull/9117))
62+
- **Post-release**: Updated deployment on Docker documentation. ([#9138](https://github.com/wazuh/wazuh-documentation/pull/9138))
63+
- **Post-release**: Updated the auditd restart command. ([#9140](https://github.com/wazuh/wazuh-documentation/pull/9140))
64+
- **Post-release**: Updated the *Resources* table in the *RBAC reference* guide. ([#9118](https://github.com/wazuh/wazuh-documentation/pull/9118))
65+
- **Post-release**: Updated the command in the Wazuh sever API *Getting started* guide. ([#9143](https://github.com/wazuh/wazuh-documentation/pull/9143))
66+
- **Post-release**: Updated the *Adding new Wazuh server nodes* section. ([#9144](https://github.com/wazuh/wazuh-documentation/pull/9144)) ([#9145](https://github.com/wazuh/wazuh-documentation/pull/9145))
67+
- **Post-release**: Updated the *Wazuh Cloud service* documentation. ([#9136](https://github.com/wazuh/wazuh-documentation/pull/9136))
68+
- **Post-release**: Updated the version references for the Wazuh certificates generation tool. ([#9152](https://github.com/wazuh/wazuh-documentation/pull/9152))
69+
- **Post-release**: Updated steps on the *Upgrading Wazuh Docker* section. ([#9155](https://github.com/wazuh/wazuh-documentation/pull/9155))
70+
- **Post-release**: Updated the Deployment on Kubernetes documentation. ([#9154](https://github.com/wazuh/wazuh-documentation/pull/9154))
4971

5072
### Removed
5173

source/_static/js/redirects.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,11 @@ removedUrls['5.0'] = [
107107
/* Pages added in 4.14 */
108108

109109
newUrls['4.14'] = [
110+
'/release-notes/release-4-14-3.html',
111+
'/release-notes/release-4-14-2.html',
110112
'/release-notes/release-4-14-1.html',
111113
'/release-notes/release-4-14-0.html',
114+
'/cloud-service/your-environment/limitations.html',
112115
]
113116

114117
/* Pages no longer available in x.y (this is not required if there is a redirection for this url) */

source/_variables/replacements.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,9 @@
150150
"|WAZUH_CURRENT_HPUX|" : release,
151151
"|WAZUH_REVISION_HPUX|" : "1",
152152
#
153+
# === Wazuh module for Filebeat
154+
"|WAZUH_FILEBEAT|": "0.5",
155+
#
153156
# === OpenSearch
154157
"|OPENSEARCH_DASHBOARDS_VERSION|": "2.16.0",
155158
#
@@ -176,6 +179,10 @@
176179
"|SPLUNK_LATEST_MINOR|" : "8.2",
177180
"|WAZUH_SPLUNK_REV_CURRENT_LATEST|" : "1", # 8.2
178181
"|WAZUH_SPLUNK_REV_CURRENT_8.1|" : "1",
182+
#
183+
# === Tools
184+
"|WAZUH_CERTS_GENERATOR|": "0.0.3",
185+
"|CERT_TOOL_VERSION|": version,
179186
}
180187

181188
if is_latest_release:

source/_variables/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
api_tag = 'master'
2626

2727
apiURL = 'https://raw.githubusercontent.com/wazuh/wazuh/'+api_tag+'/api/api/spec/spec.yaml'
28-
apiURL_server = '../../_static/server-api-spec/spec-'+api_tag+'.yaml'
28+
apiURL_server = '../../_static/server-api-spec/spec-'+api_tag+'.yaml'
2929

3030
apiURL_indexer = '../../_static/indexer-api-spec/spec.yml'

source/cloud-service/account-billing/billing-faq.rst

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,13 @@
33
.. meta::
44
:description: Get answers to the most frequently asked questions about billing in this FAQ. Explore the potential of Wazuh Cloud and the Wazuh Cloud Console.
55

6-
.. _cloud_account_billing_faq:
7-
86
Billing FAQ
97
===========
108

11-
- `When is my credit card charged?`_
12-
13-
- `Is my credit card information safe?`_
14-
15-
- `Where can I see the next payment for an environment?`_
16-
17-
- `What happens to my payments if I want to upgrade or downgrade a setting?`_
18-
19-
- `How do I view previous receipts and billing history?`_
20-
21-
- `How can I configure who receives receipts and billing notifications?`_
22-
23-
- `What are the available payment methods on Wazuh Cloud?`_
24-
25-
- `Can I get a refund?`_
26-
27-
- `What is included in my Wazuh Cloud environment?`_
28-
29-
- `How can I request more information?`_
9+
.. contents::
10+
:local:
11+
:depth: 1
12+
:backlinks: none
3013

3114
When is my credit card charged?
3215
-------------------------------
@@ -58,13 +41,11 @@ How can I configure who receives receipts and billing notifications?
5841

5942
Go to :doc:`Update billing and operational contacts </cloud-service/account-billing/update-billing>` section to learn how to configure who receives receipts and billing notifications.
6043

61-
6244
What are the available payment methods on Wazuh Cloud?
6345
--------------------------------------------------------------
6446

6547
Credit or debit card payments are supported. To learn more about Wazuh supported cards, see the certified payment processor list of card brands in the `Stripe documentation <https://stripe.com/docs/payments/cards/supported-card-brands>`_.
6648

67-
6849
Can I get a refund?
6950
-------------------
7051

source/cloud-service/account-billing/billing-history.rst

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,20 @@
33
.. meta::
44
:description: Learn how to check out the billing history and the current billing cycle information of your Wazuh Cloud environments in this section.
55

6-
.. _cloud_billing_history:
7-
86
See your billing cycle and history
97
==================================
108

119
Information about your current billing cycle, outstanding payments, and billing receipts is available from the Wazuh Cloud Console. The billing cycle is the period between the last billing date and the current billing date, while your billing history shows an overview of all invoices issued for your account.
1210

1311
To see your current billing cycle information:
1412

15-
1. Log in to the `Wazuh Cloud Console <https://console.cloud.wazuh.com/>`_.
16-
2. Go to the **Account** section and select **Summary** under **Billing**.
17-
18-
You can see the details about the upcoming billing for your active environments under the current billing cycle.
13+
#. Log in to the `Wazuh Cloud Console <https://console.cloud.wazuh.com/>`_.
14+
#. Go to the **Account** section and select **Summary** under **Billing**.
15+
16+
You can see the details about the upcoming billing for your active environments under the current billing cycle.
1917

2018
To see your billing history:
2119

22-
1. Log in to the `Wazuh Cloud Console <https://console.cloud.wazuh.com/>`_.
23-
2. Go to the **Account** section, select **Billing** and select **Invoices**.
24-
3. Click the invoice to download a PDF with your billing history details.
20+
#. Log in to the `Wazuh Cloud Console <https://console.cloud.wazuh.com/>`_.
21+
#. Go to the **Account** section, select **Billing** and select **Invoices**.
22+
#. Click the invoice to download a PDF with your billing history details.

source/cloud-service/account-billing/index.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
.. meta::
44
:description: Learn more about managing your cloud environments and the actions that can be performed in your account using the Wazuh Cloud Console in this section.
55

6-
.. _cloud_account_billing:
7-
86
Account and billing
97
===================
108

source/cloud-service/account-billing/manage-billing-details.rst

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@
33
.. meta::
44
:description: Learn how to add your billing details to your Wazuh Cloud account in this section of the documentation.
55

6-
.. _cloud_account_billing_details:
7-
86
Manage your billing details
97
===========================
108

11-
If you want to continue using your environment beyond the trial period, you need to add credit card details to your Wazuh Cloud account. Your credit card information is sent securely to our billing provider and stored with them.
9+
To continue using your environment beyond the trial period, you need to add credit card details to your Wazuh Cloud account. Your credit card information is sent securely to our billing provider and stored with them.
1210

13-
.. note::
11+
.. note::
1412

15-
A trial environment is converted to a paid environment when the trial expires. If you do not add your credit card information before the expiration date, your environment is deleted, and all data is permanently erased. Make sure to add your credit card before the end of the trial period.
13+
A trial environment is converted to a paid environment when the trial expires. If you do not add your credit card information before the expiration date, your environment is deleted, and all data is permanently erased. Make sure to add your credit card before the end of the trial period.
1614

1715
Add your billing details
1816
------------------------
@@ -21,31 +19,28 @@ To add the billing details:
2119

2220
#. Log in to the `Wazuh Cloud Console <https://console.cloud.wazuh.com/>`_.
2321
#. Go to the **Account** section and select **Billing**.
24-
#. In the Payment method section, select **Add billing information**.
22+
#. Select **Add billing information** in the **Payment method** section.
2523
#. Fill in the form with your billing details.
2624
#. Click **Save** to confirm the payment method.
2725

28-
You can stop upcoming charges by :ref:`canceling your environments <cloud_stop_charges>`.
26+
You can stop upcoming charges by :doc:`canceling your environments <stop-charges>`.
27+
28+
.. note::
2929

30-
.. note::
31-
32-
Please take into account that the cancellation cannot be undone once you do it and that all your data will be completely deleted.
30+
Cancellation cannot be undone, all data will be permanently deleted.
3331

3432
Remove your billing details
3533
---------------------------
3634

37-
Billing details can only be removed when there are no active paid environments. This means either:
35+
You can only remove billing details when there are no active paid environments. This means either:
3836

39-
- There are no environments.
40-
- The only active environment is in a trial period.
41-
- All the environments have been canceled.
37+
- There are no environments.
38+
- The only active environment is in a trial period.
39+
- All the environments have been canceled.
4240

4341
In order to remove your billing information:
4442

45-
1. Log in to the `Wazuh Cloud Console <https://console.cloud.wazuh.com/>`_.
46-
47-
2. Go to the **Account** section, select **Billing**, and select **Payment method**.
48-
49-
3. In Payment method, select **Delete**. This button will be disabled if there is an active paid environment.
50-
51-
4. Confirm **Delete** in the pop up.
43+
#. Log in to the `Wazuh Cloud Console <https://console.cloud.wazuh.com/>`_.
44+
#. Go to the **Account** section, select **Billing**, and select **Payment method**.
45+
#. Select **Delete** in the **Payment method**. This button will be disabled if there is an active paid environment.
46+
#. Confirm **Delete** in the pop up.

source/cloud-service/account-billing/stop-charges.rst

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,16 @@
33
.. meta::
44
:description: You can always cancel a Wazuh Cloud environment you no longer need. Learn more about how to stop charges for an environment here.
55

6-
.. _cloud_stop_charges:
7-
86
Stop charges for an environment
97
===============================
108

119
You can always cancel an environment you no longer need. When performing this action, the environment is removed at the end of the billing cycle, with no new or additional charges incurred.
1210

1311
To stop being charged for an environment:
1412

15-
1. Log in to the `Wazuh Cloud Console <https://console.cloud.wazuh.com/>`_.
16-
2. Go to the **Environments** page and select the environment you want to cancel.
17-
3. Click **Cancel environment** and confirm the cancellation.
13+
#. Log in to the `Wazuh Cloud Console <https://console.cloud.wazuh.com/>`_.
14+
#. Go to the **Environments** page and select the environment you want to cancel.
15+
#. Click **Cancel environment** and confirm the cancellation.
1816

1917
.. warning::
2018

source/cloud-service/account-billing/update-billing.rst

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,19 @@
33
.. meta::
44
:description: Check how to update billing and operational contacts through the Wazuh Cloud Console. Learn more about it in this section of the documentation.
55

6-
.. _cloud_account_billing_update_billing:
7-
86
Update billing and operational contacts
97
=======================================
108

11-
You can specify billing and operational contacts in addition to the primary email address of your account.
12-
13-
.. note::
14-
15-
Billing and operational contacts are only for notification purposes, they cannot be used to log in to the Wazuh Cloud Console. To access the Wazuh Cloud Console, you must use the primary email address for your account.
9+
You can specify billing and operational contacts in addition to the primary email address of your account.
1610

17-
To update billing and operational contacts:
11+
.. note::
1812

19-
1. Log in to the `Wazuh Cloud Console <https://console.cloud.wazuh.com/>`_.
13+
Billing and operational contacts are only for notification purposes, they cannot be used to log in to the Wazuh Cloud Console. To access the Wazuh Cloud Console, you must use the primary email address for your account.
2014

21-
2. Go to the **Account** section and select **Contacts**.
15+
To update billing and operational contacts:
2216

23-
3. Add or remove contacts from the desired category.
17+
#. Log in to the `Wazuh Cloud Console <https://console.cloud.wazuh.com/>`__.
18+
#. Go to the **Account** section and select **Contacts**.
19+
#. Add or remove contacts from the desired category.
2420

2521
Multiple email addresses can be specified for each category. They become effective immediately and no further confirmation from the email addresses is required.

0 commit comments

Comments
 (0)