From c4f225cb1b8f8a8c6b5c8b43ca18c112bb846ffd Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Thu, 29 May 2025 09:22:27 -0300 Subject: [PATCH 1/3] Remove 4.12.2 references from 4.13.0 branch --- CHANGELOG.md | 26 +++---------------- .../config/wazuh_indexer_ssl_certs/certs.yml | 24 +++++++++++++++++ 2 files changed, 28 insertions(+), 22 deletions(-) create mode 100644 multi-node/config/wazuh_indexer_ssl_certs/certs.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 154e2c80..94919027 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ All notable changes to this project will be documented in this file. ### Added - Added repository_bumper script. ([#1781](https://github.com/wazuh/wazuh-docker/pull/1781)) +- Fix Warning message when migrating Docker compose v2 ([#1828](https://github.com/wazuh/wazuh-docker/pull/1828)) +- Add technical documentation ([#1822](https://github.com/wazuh/wazuh-docker/pull/1822)) +- Add wazuh agent test and push ([#1817](https://github.com/wazuh/wazuh-docker/pull/1817)) +- Add Wazuh agent image build and deploy ([#1816](https://github.com/wazuh/wazuh-docker/pull/1816)) ### Changed @@ -20,28 +24,6 @@ All notable changes to this project will be documented in this file. - Remove default docker reference version from workflow ([#1761](https://github.com/wazuh/wazuh-docker/pull/1761)) - Remove 'stable' branch ocurrencies ([#1757](https://github.com/wazuh/wazuh-docker/pull/1757)) -## [4.12.2] - -### Added - -- Fix Warning message when migrating Docker compose v2 ([#1828](https://github.com/wazuh/wazuh-docker/pull/1828)) -- Add technical documentation ([#1822](https://github.com/wazuh/wazuh-docker/pull/1822)) -- Add wazuh agent test and push ([#1817](https://github.com/wazuh/wazuh-docker/pull/1817)) -- Add Wazuh agent image build and deploy ([#1816](https://github.com/wazuh/wazuh-docker/pull/1816)) - -### Changed - -- None - -### Fixed - -- None - -### Deleted - -- None - - ## [4.12.1] ### Added diff --git a/multi-node/config/wazuh_indexer_ssl_certs/certs.yml b/multi-node/config/wazuh_indexer_ssl_certs/certs.yml new file mode 100644 index 00000000..f88f5f7f --- /dev/null +++ b/multi-node/config/wazuh_indexer_ssl_certs/certs.yml @@ -0,0 +1,24 @@ +nodes: + # Wazuh indexer server nodes + indexer: + - name: wazuh1.indexer + ip: wazuh1.indexer + - name: wazuh2.indexer + ip: wazuh2.indexer + - name: wazuh3.indexer + ip: wazuh3.indexer + + # Wazuh server nodes + # Use node_type only with more than one Wazuh manager + server: + - name: wazuh.master + ip: wazuh.master + node_type: master + - name: wazuh.worker + ip: wazuh.worker + node_type: worker + + # Wazuh dashboard node + dashboard: + - name: wazuh.dashboard + ip: wazuh.dashboard \ No newline at end of file From d13127b5dec5af954689cfbf74570eaf013a44af Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Thu, 29 May 2025 09:23:59 -0300 Subject: [PATCH 2/3] Remove 4.12.2 references from 4.13.0 branch --- multi-node/config/wazuh_indexer_ssl_certs/certs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multi-node/config/wazuh_indexer_ssl_certs/certs.yml b/multi-node/config/wazuh_indexer_ssl_certs/certs.yml index f88f5f7f..5c3f4f1d 100644 --- a/multi-node/config/wazuh_indexer_ssl_certs/certs.yml +++ b/multi-node/config/wazuh_indexer_ssl_certs/certs.yml @@ -21,4 +21,4 @@ nodes: # Wazuh dashboard node dashboard: - name: wazuh.dashboard - ip: wazuh.dashboard \ No newline at end of file + ip: wazuh.dashboard From 08bc37198f8754767f968ab51aa693987bed28d3 Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Thu, 29 May 2025 09:25:52 -0300 Subject: [PATCH 3/3] Remove 4.12.2 references from 4.13.0 branch --- .../config/wazuh_indexer_ssl_certs/certs.yml | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 multi-node/config/wazuh_indexer_ssl_certs/certs.yml diff --git a/multi-node/config/wazuh_indexer_ssl_certs/certs.yml b/multi-node/config/wazuh_indexer_ssl_certs/certs.yml deleted file mode 100644 index 5c3f4f1d..00000000 --- a/multi-node/config/wazuh_indexer_ssl_certs/certs.yml +++ /dev/null @@ -1,24 +0,0 @@ -nodes: - # Wazuh indexer server nodes - indexer: - - name: wazuh1.indexer - ip: wazuh1.indexer - - name: wazuh2.indexer - ip: wazuh2.indexer - - name: wazuh3.indexer - ip: wazuh3.indexer - - # Wazuh server nodes - # Use node_type only with more than one Wazuh manager - server: - - name: wazuh.master - ip: wazuh.master - node_type: master - - name: wazuh.worker - ip: wazuh.worker - node_type: worker - - # Wazuh dashboard node - dashboard: - - name: wazuh.dashboard - ip: wazuh.dashboard