Skip to content

Commit

Permalink
Minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@nico-stefani
nico-stefani committed May 20, 2024
1 parent a425594 commit 10338ec
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 49 deletions.
80 changes: 32 additions & 48 deletions source/user-manual/manager/configuring-cluster/advanced-settings.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,27 +118,6 @@ There are two main ways to install HAProxy, using packages or Docker images.
#!/usr/bin/env bash
tcplog_enabled=$(echo "${TCPLOG:-true}" | tr '[:upper:]' '[:lower:]')
httplog_enabled=$(echo "${HTTPLOG:-true}" | tr '[:upper:]' '[:lower:]')
echo TCPLOG: $tcplog_enabled HTTPLOG: $httplog_enabled
if [ "$tcplog_enabled" = "true" ]; then
sed -i 's/# option tcplog/ option tcplog/' /etc/haproxy/haproxy.cfg
else
sed -i 's/ option tcplog/# option tcplog/' /etc/haproxy/haproxy.cfg
fi
if [ "$httplog_enabled" = "true" ]; then
sed -i 's/# option httplog/ option httplog/' /etc/haproxy/haproxy.cfg
else
sed -i 's/ option httplog/# option httplog/' /etc/haproxy/haproxy.cfg
fi
if [ "$tcplog_enabled" = "true" ] || [ "$httplog_enabled" = "true" ]; then
sed -i 's/# log / log /' /etc/haproxy/haproxy.cfg
else
sed -i 's/ log /# log /' /etc/haproxy/haproxy.cfg
fi
# Set env-file
env > /.env-file
# Start HAProxy service
service haproxy start
Expand Down Expand Up @@ -381,7 +360,8 @@ There are two main ways to install HAProxy, using packages or Docker images.
# docker run haproxy-deploy
TCPLOG: true HTTPLOG: true
* Starting haproxy haproxy [NOTICE] (33) : haproxy version is 2.8.9-1842fd0
* Starting haproxy haproxy
[NOTICE] (33) : haproxy version is 2.8.9-1842fd0
[NOTICE] (33) : path to executable is /usr/sbin/haproxy
[ALERT] (33) : config : parsing [/etc/haproxy/haproxy.cfg:3] : 'pidfile' already specified. Continuing.
Expand All @@ -399,6 +379,7 @@ Configuration
<summary><b>haproxy.cfg</b></summary>

.. code-block:: cfg
:emphasize-lines: 36-47
global
chroot /var/lib/haproxy
Expand Down Expand Up @@ -435,6 +416,19 @@ Configuration
server worker1 <IP_OR_DNS_OF_WAZUH_WORKER_NODE>:1515 check
server workern <IP_OR_DNS_OF_WAZUH_WORKER_NODE>:1515 check
# Do not include the following if you will enable HAProxy Helper
frontend wazuh_reporting_front
mode tcp
bind :1514 name wazuh_reporting_front_bind
default_backend wazuh_reporting
backend wazuh_reporting
mode tcp
balance leastconn
server master <IP_OR_DNS_OF_WAZUH_MASTER_NODE>:1514 check
server worker1 <IP_OR_DNS_OF_WAZUH_WORKER_NODE>:1514 check
server worker2 <IP_OR_DNS_OF_WAZUH_WORKER_NODE>:1514 check
.. raw:: html

</details>
Expand Down Expand Up @@ -472,7 +466,8 @@ Configuration
.. code-block:: console
# service haproxy start
* Starting haproxy haproxy [NOTICE] (13231) : haproxy version is 2.8.9-1ppa1~jammy
* Starting haproxy haproxy
[NOTICE] (13231) : haproxy version is 2.8.9-1ppa1~jammy
[NOTICE] (13231) : path to executable is /usr/sbin/haproxy
[ALERT] (13231) : config : parsing [/etc/haproxy/haproxy.cfg:3] : 'pidfile' already specified. Continuing.
Expand Down Expand Up @@ -540,6 +535,10 @@ Dataplane API configuration
reload_cmd: service haproxy reload
restart_cmd: service haproxy restart
.. note::

Is needed to replace ``<DATAPLANE_USER>`` and ``<DATAPLANE_PASSWORD>`` with the chosen user and password.

To enable it will depend on the :ref:`installation method <haproxy_installation>`.

.. tabs::
Expand All @@ -549,7 +548,7 @@ Dataplane API configuration

.. code-block:: console
# curl -sL https://github.com/haproxytech/dataplaneapi/releases/download/v2.8.X/dataplaneapi_2.8.X_linux_x86_64.tar.gz | tar xz | cp dataplaneapi /usr/local/bin/
# curl -sL https://github.com/haproxytech/dataplaneapi/releases/download/v2.8.X/dataplaneapi_2.8.X_linux_x86_64.tar.gz | tar xz && cp dataplaneapi /usr/local/bin/
2. Put the configuration in ``/etc/haproxy/dataplaneapi.yml`` and start the process

Expand Down Expand Up @@ -598,31 +597,10 @@ Dataplane API configuration
3. Modify the ``entrypoint.sh`` to start the dataplaneapi process

.. code-block:: bash
:emphasize-lines: 27
:emphasize-lines: 6
#!/usr/bin/env bash
tcplog_enabled=$(echo "${TCPLOG:-true}" | tr '[:upper:]' '[:lower:]')
httplog_enabled=$(echo "${HTTPLOG:-true}" | tr '[:upper:]' '[:lower:]')
echo TCPLOG: $tcplog_enabled HTTPLOG: $httplog_enabled
if [ "$tcplog_enabled" = "true" ]; then
sed -i 's/# option tcplog/ option tcplog/' /etc/haproxy/haproxy.cfg
else
sed -i 's/ option tcplog/# option tcplog/' /etc/haproxy/haproxy.cfg
fi
if [ "$httplog_enabled" = "true" ]; then
sed -i 's/# option httplog/ option httplog/' /etc/haproxy/haproxy.cfg
else
sed -i 's/ option httplog/# option httplog/' /etc/haproxy/haproxy.cfg
fi
if [ "$tcplog_enabled" = "true" ] || [ "$httplog_enabled" = "true" ]; then
sed -i 's/# log / log /' /etc/haproxy/haproxy.cfg
else
sed -i 's/ log /# log /' /etc/haproxy/haproxy.cfg
fi
# Set env-file
env > /.env-file
# Start HAProxy service
service haproxy start
# Start HAProxy Data Plane API
Expand All @@ -640,7 +618,8 @@ Dataplane API configuration
# docker run -p 5555:5555 haproxy-deploy
TCPLOG: true HTTPLOG: true
* Starting haproxy haproxy [NOTICE] (33) : haproxy version is 2.8.9-1842fd0
* Starting haproxy haproxy
[NOTICE] (33) : haproxy version is 2.8.9-1842fd0
[NOTICE] (33) : path to executable is /usr/sbin/haproxy
[ALERT] (33) : config : parsing [/etc/haproxy/haproxy.cfg:3] : 'pidfile' already specified. Continuing.
Expand All @@ -654,6 +633,11 @@ Dataplane API configuration
On the Wazuh's side, we will include the ``<haproxy_helper>...</haproxy_helper>`` labels in the :ref:`configuration <haproxy_helper>` file (``/var/ossec/etc/ossec.conf``) within the ``<cluster>...</cluster>`` section.

.. note::

This configuration is only necessary on the master node.


We are going to configure a basic HAProxy helper within an already configured cluster master node:

- :ref:`haproxy_disabled <haproxy_disabled>`: Indicates whether the helper will be enabled or not in the master node.
Expand Down Expand Up @@ -681,7 +665,7 @@ We are going to configure a basic HAProxy helper within an already configured cl
<haproxy_address><HAPROXY_ADDRESS></haproxy_address>
<haproxy_user><DATAPLANE_USER></haproxy_user>
<haproxy_password><DATAPLANE_PASSWORD></haproxy_password>
</haproxy_helper>
</haproxy_helper>
</cluster>
Restart the master node:
Expand Down
2 changes: 1 addition & 1 deletion source/user-manual/reference/ossec-conf/cluster.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ haproxy_backend
Specifies the name of the backend that will be created in HAProxy.

+--------------------+-------------------------------------+
| **Default value** | wazuh_cluster |
| **Default value** | wazuh_reporting |
+--------------------+-------------------------------------+
| **Allowed values** | Any valid name. |
+--------------------+-------------------------------------+
Expand Down

0 comments on commit 10338ec

Please sign in to comment.