Skip to content

Commit

Permalink
Merge pull request #7865 from wazuh/merge-4.9-into-4.9.1
Browse files Browse the repository at this point in the history
Merge 4.9 into 4.9.1
  • Loading branch information
javimed authored Oct 10, 2024
2 parents 7edfcd8 + 7b8000e commit 67c6414
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 22 deletions.
1 change: 1 addition & 0 deletions source/_static/js/redirects.js
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ newUrls['4.9'] = [
'/user-manual/agent/agent-management/remote-upgrading/wpk-files/wpk-list.html',
'/user-manual/wazuh-dashboard/navigating-the-wazuh-dashboard.html',
'/user-manual/wazuh-dashboard/settings.html',
'/cloud-service/your-environment/custom-dns.html',
'/migration-guide/creating/index.html',
'/migration-guide/creating/wazuh-agent.html',
'/migration-guide/creating/wazuh-central-components.html',
Expand Down
36 changes: 36 additions & 0 deletions source/cloud-service/your-environment/custom-dns.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
.. Copyright (C) 2015, Wazuh, Inc.
.. meta::
:description: Check out how to configure a custom domain to access an environment in Wazuh Cloud. Learn more about it in this section of the documentation.

Custom DNS
==========

By default, Wazuh Cloud environments are accessed through a subdomain of ``cloud.wazuh.com``.

You can configure your environment to use your own custom domain. To do this, go to the **Wazuh Cloud Console** under the environment details page. You need to provide the following:

- **Certificate**: SSL/TLS certificate for your domain

- Must use SHA2
- Must use RSA with key size of at least 2048 bits
- TLS Web Server Authentication is required if using EKU
- Must contain domain name in CN or SAN field(s)
- Must be PEM encoded

- **Private Key**: Associated with the provided certificate

- Must not be encrypted or require a passphrase
- Must be PEM encoded

- **Certificate Chain**: Used to sign your certificate

- Must contain all intermediate certificates in the certificate chain
- Must be signed by a trusted certificate authority
- Must be PEM encoded

After providing the above and applying the configuration, create a ``CNAME`` DNS record using the value provided by the **Wazuh Cloud Console**.

.. note::

Your Wazuh Cloud environment is still accessible through the default URL, even if you have configured a custom domain.
1 change: 1 addition & 0 deletions source/cloud-service/your-environment/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ Learn more about your environment in the sections below.
send-syslog-data
agents-without-internet
configure-email
custom-dns
technical-faq
21 changes: 2 additions & 19 deletions source/user-manual/api/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ Here are all the available settings for the ``/var/ossec/api/configuration/api.y
allow_headers: "*"
allow_credentials: no
cache:
enabled: yes
time: 0.750
access:
max_login_attempts: 50
block_time: 300
Expand All @@ -81,8 +77,8 @@ Here are all the available settings for the ``/var/ossec/api/configuration/api.y
integrations:
virustotal:
public_key:
allow: yes
minimum_quota: 240
allow: yes
minimum_quota: 240
.. warning::

Expand Down Expand Up @@ -235,19 +231,6 @@ cors
| allow_credentials | yes, true, no, false | false | Tell browsers whether to expose the response to frontend JavaScript or not. |
+-------------------+----------------------+---------------+-----------------------------------------------------------------------------------------------+

cache
^^^^^

.. deprecated:: 4.8.0

+------------+--------------------------------------+---------------+-----------------------------------------------------------------------------------------------------------------------------+
| Sub-fields | Allowed values | Default value | Description |
+============+======================================+===============+=============================================================================================================================+
| enabled | yes, true, no, false | true | Enable or disable caching for certain Wazuh server API responses (currently, all :api-ref:`rules endpoints <tag/Rules>` ) |
+------------+--------------------------------------+---------------+-----------------------------------------------------------------------------------------------------------------------------+
| time | Any positive integer or real number | 0.75 | Time in seconds that the cache lasts before expiring. |
+------------+--------------------------------------+---------------+-----------------------------------------------------------------------------------------------------------------------------+

.. _api_configuration_access:

access
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,12 @@ VirusTotal's Terms of Service specify the two ways users may use the VirusTotal
Public API
^^^^^^^^^^

This method uses a free API with many of VirusTotal's functionalities. However, it has some significant limitations, such as:
This method uses a free API with many of VirusTotal's functionalities. However, it has some `significant limitations <https://developers.virustotal.com/reference/public-vs-premium-api>`__, such as:

- Request rate limitations, which you can find on `VirusTotal’s website <https://developers.virustotal.com/reference/public-vs-premium-api>`__.
- Low priority access for requests done by this API to the VirusTotal engine.
- The Public API is limited to 500 requests per day and a rate of 4 requests per minute.
- The Public API must not be used in commercial products or services.
- The Public API must not be used in business workflows that do not contribute new files.
- You are not allowed to register multiple accounts to overcome the aforementioned limitations.

Private API
^^^^^^^^^^^
Expand Down

0 comments on commit 67c6414

Please sign in to comment.