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.

Sign up for GitHub

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

[4.5.1] Add support for Kibana 7.17.10 and 7.17.11 #6311

Merged
merged 4 commits into from
Aug 8, 2023
Merged

[4.5.1] Add support for Kibana 7.17.10 and 7.17.11 #6311

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
024d2e0
Add support for Kibana 7.17.10 and 7.17.11
s-ocando Aug 7, 2023
7168aa7
Update ELK version
s-ocando Aug 8, 2023
55c1f55
Update Wazuh version
s-ocando Aug 8, 2023
518596e
Apply suggestions from code review
s-ocando Aug 8, 2023
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
2 changes: 1 addition & 1 deletion source/_templates/installations/basic/elastic/common/configure_kibana.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

.. code-block:: console

# curl -so /etc/kibana/kibana.yml https://packages.wazuh.com/4.4/tpl/elastic-basic/kibana.yml
# curl -so /etc/kibana/kibana.yml https://packages.wazuh.com/4.5/tpl/elastic-basic/kibana.yml


Edit the ``/etc/kibana/kibana.yml`` file:
Expand Down
2 changes: 1 addition & 1 deletion ...e/_templates/installations/basic/elastic/common/configure_kibana_all_in_one.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

.. code-block:: console

# curl -so /etc/kibana/kibana.yml https://packages.wazuh.com/4.4/tpl/elastic-basic/kibana_all_in_one.yml
# curl -so /etc/kibana/kibana.yml https://packages.wazuh.com/4.5/tpl/elastic-basic/kibana_all_in_one.yml

Edit the ``/etc/kibana/kibana.yml`` file:

Expand Down
2 changes: 1 addition & 1 deletion ...asic/elastic/common/elastic-multi-node/configure_elasticsearch_initial_node.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

.. code-block:: console

# curl -so /etc/elasticsearch/elasticsearch.yml https://packages.wazuh.com/4.4/tpl/elastic-basic/elasticsearch_cluster_initial_node.yml
# curl -so /etc/elasticsearch/elasticsearch.yml https://packages.wazuh.com/4.5/tpl/elastic-basic/elasticsearch_cluster_initial_node.yml

The file ``/etc/elasticsearch/elasticsearch.yml`` has to be edited:

Expand Down
2 changes: 1 addition & 1 deletion .../elastic/common/elastic-multi-node/configure_elasticsearch_subsequent_nodes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

.. code-block:: console

# curl -so /etc/elasticsearch/elasticsearch.yml https://packages.wazuh.com/4.4/tpl/elastic-basic/elasticsearch_cluster_subsequent_nodes.yml
# curl -so /etc/elasticsearch/elasticsearch.yml https://packages.wazuh.com/4.5/tpl/elastic-basic/elasticsearch_cluster_subsequent_nodes.yml

The file ``/etc/elasticsearch/elasticsearch.yml`` has to be edited:

Expand Down
2 changes: 1 addition & 1 deletion ...tallations/basic/elastic/common/elastic-single-node/configure_elasticsearch.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ Once Elasticsearch is installed, it can be configured by downloading the file ``

.. code-block:: console

# curl -so /etc/elasticsearch/elasticsearch.yml https://packages.wazuh.com/4.4/tpl/elastic-basic/elasticsearch.yml
# curl -so /etc/elasticsearch/elasticsearch.yml https://packages.wazuh.com/4.5/tpl/elastic-basic/elasticsearch.yml

.. End of include file
2 changes: 1 addition & 1 deletion source/_templates/installations/basic/elastic/deb/install_elasticsearch.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

.. code-block:: console

# apt-get install elasticsearch=7.17.9
# apt-get install elasticsearch=7.17.11

.. End of include file
2 changes: 1 addition & 1 deletion source/_templates/installations/basic/elastic/deb/install_filebeat.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

.. code-block:: console

# apt-get install filebeat=7.17.9
# apt-get install filebeat=7.17.11

.. End of include file
2 changes: 1 addition & 1 deletion source/_templates/installations/basic/elastic/deb/install_kibana.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

.. code-block:: console

# apt-get install kibana=7.17.9
# apt-get install kibana=7.17.11

.. End of include file
2 changes: 1 addition & 1 deletion source/_templates/installations/basic/elastic/yum/install_elasticsearch.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

.. code-block:: console

# yum install elasticsearch-7.17.9
# yum install elasticsearch-7.17.11

.. End of include file
2 changes: 1 addition & 1 deletion source/_templates/installations/basic/elastic/yum/install_filebeat.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

.. code-block:: console

# yum install filebeat-7.17.9
# yum install filebeat-7.17.11

.. End of include file
2 changes: 1 addition & 1 deletion source/_templates/installations/basic/elastic/yum/install_kibana.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

.. code-block:: console

# yum install kibana-7.17.9
# yum install kibana-7.17.11

.. End of include file
2 changes: 1 addition & 1 deletion source/_templates/installations/filebeat/opensearch/load_filebeat_template.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

.. code-block:: console

# curl -so /etc/filebeat/wazuh-template.json https://raw.githubusercontent.com/wazuh/wazuh/4.4/extensions/elasticsearch/7.x/wazuh-template.json
# curl -so /etc/filebeat/wazuh-template.json https://raw.githubusercontent.com/wazuh/wazuh/4.5/extensions/elasticsearch/7.x/wazuh-template.json
# chmod go+r /etc/filebeat/wazuh-template.json

.. End of include file
4 changes: 2 additions & 2 deletions source/_templates/installations/indexer/common/generate_certificates.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

.. code-block:: console

# curl -sO https://packages.wazuh.com/4.4/wazuh-certs-tool.sh
# curl -sO https://packages.wazuh.com/4.4/config.yml
# curl -sO https://packages.wazuh.com/4.5/wazuh-certs-tool.sh
# curl -sO https://packages.wazuh.com/4.5/config.yml

#. Edit ``./config.yml`` and replace the node names and IP values with the corresponding names and IP addresses. You need to do this for all Wazuh server, Wazuh indexer, and Wazuh dashboard nodes. Add as many node fields as needed.

Expand Down
2 changes: 1 addition & 1 deletion source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ def customReplacements(app, docname, source):
# --- Open Distro for Elasticsearch
"|OPEN_DISTRO_LATEST|" : "1.13.2",
# --- Elasticsearch
"|ELASTICSEARCH_ELK_LATEST|" : "7.17.9", # Basic license
"|ELASTICSEARCH_ELK_LATEST|" : "7.17.11", # Basic license
"|ELASTICSEARCH_LATEST|" : "7.10.2",
# --- Other Elastic
"|ELASTIC_6_LATEST|" : "6.8.8",
Expand Down
19 changes: 10 additions & 9 deletions source/deployment-options/elastic-stack/all-in-one-deployment/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,21 +57,21 @@ Elasticsearch installation and configuration

.. code-block:: console

# yum install elasticsearch-7.17.9
# yum install elasticsearch-7.17.11
s-ocando marked this conversation as resolved.
Show resolved Hide resolved


.. group-tab:: APT

.. code-block:: console

# apt-get install elasticsearch=7.17.9
# apt-get install elasticsearch=7.17.11
s-ocando marked this conversation as resolved.
Show resolved Hide resolved


#. Download the configuration file ``/etc/elasticsearch/elasticsearch.yml`` as follows:

.. code-block:: console

# curl -so /etc/elasticsearch/elasticsearch.yml https://packages.wazuh.com/4.4/tpl/elastic-basic/elasticsearch_all_in_one.yml
# curl -so /etc/elasticsearch/elasticsearch.yml https://packages.wazuh.com/|WAZUH_CURRENT_MINOR|/tpl/elastic-basic/elasticsearch_all_in_one.yml


Certificates creation and deployment
Expand Down Expand Up @@ -132,20 +132,21 @@ This command should have an output like this:
{
"name" : "elasticsearch",
"cluster_name" : "elasticsearch",
"cluster_uuid" : "CFw_rkxnR7avI7pBv9MvtQ",
"cluster_uuid" : "VohZYVe1RKaT-lx7Lf6Jeg",
"version" : {
"number" : "7.17.9",
"number" : "7.17.11",
"build_flavor" : "default",
"build_type" : "rpm",
"build_hash" : "ef48222227ee6b9e70e502f0f0daa52435ee634d",
"build_date" : "2023-01-31T05:34:43.305517834Z",
"build_hash" : "eeedb98c60326ea3d46caef960fb4c77958fb885",
"build_date" : "2023-06-23T05:33:12.261262042Z",
"build_snapshot" : false,
"lucene_version" : "8.11.1",
"minimum_wire_compatibility_version" : "6.8.0",
"minimum_index_compatibility_version" : "6.0.0-beta1"
},
"tagline" : "You Know, for Search"
}
}


.. _basic_all_in_one_wazuh:

Expand Down Expand Up @@ -296,7 +297,7 @@ This command should have an output like this:
TLS version: TLSv1.3
dial up... OK
talk to server... OK
version: 7.17.9
version: 7.17.11

Kibana installation and configuration
-------------------------------------
Expand Down
10 changes: 9 additions & 1 deletion source/deployment-options/elastic-stack/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ The following Elastic Stack versions are compatible with the Wazuh manager |WAZU
+-------------------------+
| 7.16.0–7.16.3 |
+-------------------------+
| 7.17.0–7.17.9 |
| 7.17.0–7.17.11 |
+-------------------------+

.. _packages_list_elk:
Expand Down Expand Up @@ -118,6 +118,10 @@ The following table contains the Wazuh Kibana plugin files for each version of E

.. |WAZUH_KIBANA_7.17.9| replace:: `wazuh_kibana-|WAZUH_CURRENT|_7.17.9.zip <https://packages.wazuh.com/|WAZUH_CURRENT_MAJOR|/ui/kibana/wazuh_kibana-|WAZUH_CURRENT|_7.17.9-1.zip>`__ (`sha512 <https://packages.wazuh.com/|WAZUH_CURRENT_MAJOR|/checksums/wazuh/|WAZUH_CURRENT|/wazuh_kibana-|WAZUH_CURRENT|_7.17.9-1.zip.sha512>`__)

.. |WAZUH_KIBANA_7.17.10| replace:: `wazuh_kibana-|WAZUH_CURRENT|_7.17.10.zip <https://packages.wazuh.com/|WAZUH_CURRENT_MAJOR|/ui/kibana/wazuh_kibana-|WAZUH_CURRENT|_7.17.10-1.zip>`__ (`sha512 <https://packages.wazuh.com/|WAZUH_CURRENT_MAJOR|/checksums/wazuh/|WAZUH_CURRENT|/wazuh_kibana-|WAZUH_CURRENT|_7.17.10-1.zip.sha512>`__)

.. |WAZUH_KIBANA_7.17.11| replace:: `wazuh_kibana-|WAZUH_CURRENT|_7.17.11.zip <https://packages.wazuh.com/|WAZUH_CURRENT_MAJOR|/ui/kibana/wazuh_kibana-|WAZUH_CURRENT|_7.17.11-1.zip>`__ (`sha512 <https://packages.wazuh.com/|WAZUH_CURRENT_MAJOR|/checksums/wazuh/|WAZUH_CURRENT|/wazuh_kibana-|WAZUH_CURRENT|_7.17.11-1.zip.sha512>`__)

+------------------+--------------------------+
| Kibana Version | Package |
+==================+==========================+
Expand Down Expand Up @@ -151,6 +155,10 @@ The following table contains the Wazuh Kibana plugin files for each version of E
+------------------+--------------------------+
| 7.17.9 | |WAZUH_KIBANA_7.17.9| |
+------------------+--------------------------+
| 7.17.10 | |WAZUH_KIBANA_7.17.10| |
+------------------+--------------------------+
| 7.17.11 | |WAZUH_KIBANA_7.17.11| |
+------------------+--------------------------+

For a full list of the available Wazuh Kibana plugin packages, check the `Wazuh Kibana plugin compatibility matrix <https://github.com/wazuh/wazuh-kibana-app/wiki/Compatibility>`__.

Expand Down
2 changes: 1 addition & 1 deletion source/upgrade-guide/compatibility-matrix/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ The following Elastic Stack and Open Distro for Elasticsearch versions are compa
+--------------------------+---------------------------+
| 7.16.0–7.16.3 | |
+--------------------------+---------------------------+
| 7.17.0–7.17.9 | |
| 7.17.0–7.17.11 | |
+--------------------------+---------------------------+

You can find more information on the `Wazuh Kibana plugin repository <https://github.com/wazuh/wazuh-kibana-app/wiki/Compatibility>`_.
Expand Down