Skip to content

Commit

Permalink
Merge pull request #6267 from wazuh/merge-4.7.0-into-master
Browse files Browse the repository at this point in the history
Merge branch 4.7.0 into master
  • Loading branch information
javimed authored Jul 21, 2023
2 parents 6cee8a1 + 0f7b808 commit 35cb943
Show file tree
Hide file tree
Showing 251 changed files with 1,202 additions and 358 deletions.
414 changes: 404 additions & 10 deletions source/_static/js/redirects.js

Large diffs are not rendered by default.

5 changes: 1 addition & 4 deletions source/_themes/wazuh_doc_theme_v3/src/js-source/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ if ( typeof(versions) === 'undefined' ) {
});
$('.navbar-nav .dropdown-toggle').on('mouseleave', function(e) {
let toElement = e.toElement || e.relatedTarget;
console.log(toElement);
if ($(this).closest('.dropdown').hasClass('show')
&& toElement !== $(this).siblings()[0]) {
e.stopPropagation();
Expand All @@ -47,8 +46,6 @@ if ( typeof(versions) === 'undefined' ) {
});
$('.navbar-nav .dropdown-menu').on('mouseleave', function(e) {
let toElement = e.toElement || e.relatedTarget;

console.log("submenu",toElement);
if ($(this).closest('.dropdown').hasClass('show')
&& toElement !== $(this).siblings()[0]) {
$(this).siblings().trigger('click');
Expand All @@ -72,7 +69,7 @@ const newTabNodes = [
let oursHost = ['documentation.wazuh.com'];

$('a.reference.external').each(function() {
let link = new URL($(this).attr('href'));
let link = new URL(this.href);
if ( !oursHost.includes(link.host) ) {
$(this).attr('target', '_blank').attr('rel', 'noreferrer noopener');
}
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.. meta::
:description: AWS Application Load Balancer is a service that distributes incoming application traffic across multiple targets. Learn how to configure and monitor it with Wazuh.

.. _amazon_alb:
:orphan:

Amazon ALB
==========
Expand All @@ -13,23 +13,23 @@ Amazon ALB
Amazon configuration
--------------------

#. Select an existing S3 Bucket or :doc:`create a new one </amazon/services/prerequisites/S3-bucket>`.
#. Select an existing S3 Bucket or :doc:`create a new one </cloud-security/amazon/services/prerequisites/S3-bucket>`.

#. Go to Services > Compute > EC2:

.. thumbnail:: ../../../../images/aws/aws-create-vpc-1.png
.. thumbnail:: /images/cloud-security/aws/aws-create-vpc-1.png
:align: center
:width: 70%

#. Go to Load Balancing > Load Balancers on the left menu. Create a new load balancer or select one or more load balancers and select *Edit attributes* on the *Actions* menu:

.. thumbnail:: ../../../../images/aws/aws-create-elb-1.png
.. thumbnail:: /images/cloud-security/aws/aws-create-elb-1.png
:align: center
:width: 70%

#. In this tab we will define our S3 and the path where the logs will be stored:

.. thumbnail:: ../../../../images/aws/aws-create-elb-2.png
.. thumbnail:: /images/cloud-security/aws/aws-create-elb-2.png
:align: center
:width: 70%

Expand Down Expand Up @@ -77,4 +77,3 @@ Wazuh configuration

.. include:: /_templates/common/restart_agent.rst


Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.. meta::
:description: AWS Classic Load Balancer is a service that distributes incoming application traffic across multiple targets. Learn how to configure and monitor it with Wazuh.

.. _amazon_clb:
:orphan:

Amazon CLB
==========
Expand All @@ -13,23 +13,23 @@ Amazon CLB
Amazon configuration
--------------------

#. Select an existing S3 Bucket or :doc:`create a new one </amazon/services/prerequisites/S3-bucket>`.
#. Select an existing S3 Bucket or :doc:`create a new one </cloud-security/amazon/services/prerequisites/S3-bucket>`.

#. Go to Services > Compute > EC2:

.. thumbnail:: ../../../../images/aws/aws-create-vpc-1.png
.. thumbnail:: /images/cloud-security/aws/aws-create-vpc-1.png
:align: center
:width: 70%

#. Go to Load Balancing > Load Balancers on the left menu. Create a new load balancer or select one or more load balancers and select *Edit attributes* on the *Actions* menu:

.. thumbnail:: ../../../../images/aws/aws-create-elb-1.png
.. thumbnail:: /images/cloud-security/aws/aws-create-elb-1.png
:align: center
:width: 70%

#. In this tab we will define our S3 and the path where the logs will be stored:

.. thumbnail:: ../../../../images/aws/aws-create-elb-2.png
.. thumbnail:: /images/cloud-security/aws/aws-create-elb-2.png
:align: center
:width: 70%

Expand Down Expand Up @@ -76,4 +76,3 @@ Wazuh configuration
* If you're configuring a Wazuh agent:

.. include:: /_templates/common/restart_agent.rst

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.. meta::
:description: AWS Elastic Load Balancers are services that distribute incoming traffic across multiple targets. Learn how to configure and monitor them with Wazuh.

.. _elastic_load_balancing:
:orphan:

======================
Elastic Load Balancers
Expand All @@ -16,4 +16,4 @@ AWS Elastic Load Balancers are services that distribute incoming traffic across

Amazon Application Load Balancer (ALB)<alb>
Amazon Classic Load Balancer (CLB)<clb>
Amazon Network Load Balancer (NLB)<nlb>
Amazon Network Load Balancer (NLB)<nlb>
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.. meta::
:description: Amazon NLB automatically distributes the incoming traffic across multiple targets. Learn how to use Amazon NLB with Wazuh in this section.

.. _amazon_nlb:
:orphan:

Amazon NLB
==========
Expand All @@ -13,23 +13,23 @@ Amazon NLB
Amazon configuration
--------------------

#. Select an existing S3 Bucket or :doc:`create a new one </amazon/services/prerequisites/S3-bucket>`.
#. Select an existing S3 Bucket or :doc:`create a new one </cloud-security/amazon/services/prerequisites/S3-bucket>`.

#. Go to Services > Compute > EC2:

.. thumbnail:: ../../../../images/aws/aws-create-vpc-1.png
.. thumbnail:: /images/cloud-security/aws/aws-create-vpc-1.png
:align: center
:width: 70%

#. Go to Load Balancing > Load Balancers on the left menu. Create a new load balancer or select one or more load balancers and select *Edit attributes* on the *Actions* menu:

.. thumbnail:: ../../../../images/aws/aws-create-elb-1.png
.. thumbnail:: /images/cloud-security/aws/aws-create-elb-1.png
:align: center
:width: 70%

#. In this tab we will define our S3 and the path where the logs will be stored:

.. thumbnail:: ../../../../images/aws/aws-create-elb-2.png
.. thumbnail:: /images/cloud-security/aws/aws-create-elb-2.png
:align: center
:width: 70%

Expand Down Expand Up @@ -76,4 +76,3 @@ Wazuh configuration
* If you're configuring a Wazuh agent:

.. include:: /_templates/common/restart_agent.rst

5 changes: 2 additions & 3 deletions source/azure/activity-services/prerequisites/dependencies.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
.. Copyright (C) 2015, Wazuh, Inc.
.. _azure_monitoring_dependencies:

:orphan:

Installing dependencies
=======================
Expand Down Expand Up @@ -66,4 +65,4 @@ To install the Azure Storage Blobs client library for Python, execute the follow

.. code-block:: console
# pip3 install azure-storage-blob==2.1.0 azure-storage-common==2.1.0 azure-common==1.1.25 cryptography==3.3.2 cffi==1.14.4 pycparser==2.20 six==1.14.0 python-dateutil==2.8.1 requests==2.25.1 certifi==2022.12.07 chardet==3.0.4 idna==2.9 urllib3==1.26.5 SQLAlchemy==1.3.11 pytz==2020.1
# pip3 install azure-storage-blob==2.1.0 azure-storage-common==2.1.0 azure-common==1.1.25 cryptography==3.3.2 cffi==1.14.4 pycparser==2.20 six==1.14.0 python-dateutil==2.8.1 requests==2.25.1 certifi==2022.12.07 chardet==3.0.4 idna==2.9 urllib3==1.26.5 SQLAlchemy==1.3.11 pytz==2020.1
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Monitoring AWS based services

The Wazuh module for AWS (``aws-s3``) provides capabilities to monitor AWS based services. Each of the sections below contains detailed instructions to configure and set up all of the supported services, and also the required Wazuh configuration to collect the logs.

This module requires dependencies in order to work, and also the right credentials in order to access the services. Take a look at the :doc:`Amazon prerequisites </amazon/services/prerequisites/index>` section before proceeding.
This module requires dependencies in order to work, and also the right credentials in order to access the services. Take a look at the :doc:`Amazon prerequisites </cloud-security/amazon/services/prerequisites/index>` section before proceeding.


.. topic:: Contents
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ In this section we will see how to create these data containers:

1. Go to Services > Storage > S3:

.. thumbnail:: ../../../images/aws/aws-create-firehose-1.png
.. thumbnail:: /images/cloud-security/aws/aws-create-firehose-1.png
:align: center
:width: 70%

2. Click on *Create bucket*:

.. thumbnail:: ../../../images/aws/aws-create-firehose-2.png
.. thumbnail:: /images/cloud-security/aws/aws-create-firehose-2.png
:align: center
:width: 70%

3. Create a new bucket, give it a name, then click on the *Create* button:

.. thumbnail:: ../../../images/aws/aws-create-firehose-3.png
.. thumbnail:: /images/cloud-security/aws/aws-create-firehose-3.png
:align: center
:width: 45%

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ Wazuh requires a user with permissions to pull log data from the different servi

Navigate to Services > IAM > Users

.. thumbnail:: ../../../images/aws/aws-user.png
.. thumbnail:: /images/cloud-security/aws/aws-user.png
:align: center
:width: 70%

Click on "Next: Permissions" to continue.

2. Confirm user creation and get credentials:

.. thumbnail:: ../../../images/aws/aws-summary-user.png
.. thumbnail:: /images/cloud-security/aws/aws-summary-user.png
:align: center
:width: 70%

Expand Down Expand Up @@ -98,55 +98,55 @@ IAM Roles can also be used to interact with the different AWS services. This sec

1. Go to Services > Security, Identity & Compliance > IAM.

.. thumbnail:: ../../../images/aws/aws-create-role-1.png
.. thumbnail:: /images/cloud-security/aws/aws-create-role-1.png
:align: center
:width: 70%

2. Select Roles in the right menu and click on the **Create role** button:

.. thumbnail:: ../../../images/aws/aws-create-role-2.png
.. thumbnail:: /images/cloud-security/aws/aws-create-role-2.png
:align: center
:width: 70%

3. Select S3 service and click on the **Next: Permissions** button:

.. thumbnail:: ../../../images/aws/aws-create-role-4.png
.. thumbnail:: /images/cloud-security/aws/aws-create-role-4.png
:align: center
:width: 70%

4. Select the previously created policy:

.. thumbnail:: ../../../images/aws/aws-create-role-5.png
.. thumbnail:: /images/cloud-security/aws/aws-create-role-5.png
:align: center
:width: 70%

5. Click on the **Create role** button:

.. thumbnail:: ../../../images/aws/aws-create-role-6.png
.. thumbnail:: /images/cloud-security/aws/aws-create-role-6.png
:align: center
:width: 70%

6. Access to role summary and click on its policy name:

.. thumbnail:: ../../../images/aws/aws-create-role-7.png
.. thumbnail:: /images/cloud-security/aws/aws-create-role-7.png
:align: center
:width: 70%

7. Add permissions so the new role can do *sts:AssumeRole* action:

.. thumbnail:: ../../../images/aws/aws-create-role-8.png
.. thumbnail:: /images/cloud-security/aws/aws-create-role-8.png
:align: center
:width: 70%

8. Come back to the role summary, go to the *Trust relationships* tab and click on the **Edit trust relationship** button:

.. thumbnail:: ../../../images/aws/aws-create-role-9.png
.. thumbnail:: /images/cloud-security/aws/aws-create-role-9.png
:align: center
:width: 70%

9. Add your user to the *Principal* tag and click on the **Update Trust Policy** button:

.. thumbnail:: ../../../images/aws/aws-create-role-10.png
.. thumbnail:: /images/cloud-security/aws/aws-create-role-10.png
:align: center
:width: 70%

Expand Down
Loading

0 comments on commit 35cb943

Please sign in to comment.