From 231dcfe4566b5cf63b365d02be9499f8881ad226 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Thu, 2 Nov 2023 12:20:59 -0300 Subject: [PATCH 1/4] Bump revision for 4.7.0 alpha2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 0c9bd04f..4a01f7d0 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-ANSIBLE_VERSION="v4.7.0" -REVISION="40701" +REVISION="40702" From 0a611b9a385be6bccb4c668b20d9e47798129eaf Mon Sep 17 00:00:00 2001 From: c-bordon Date: Wed, 8 Nov 2023 14:23:56 -0300 Subject: [PATCH 2/4] Fixed production ready playbook for dashboard --- playbooks/wazuh-production-ready.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/playbooks/wazuh-production-ready.yml b/playbooks/wazuh-production-ready.yml index 83849e04..a6ea3097 100644 --- a/playbooks/wazuh-production-ready.yml +++ b/playbooks/wazuh-production-ready.yml @@ -162,6 +162,10 @@ become_user: root vars: indexer_network_host: "{{ hostvars.wi1.private_ip }}" + indexer_cluster_nodes: + - "{{ hostvars.wi1.private_ip }}" + - "{{ hostvars.wi2.private_ip }}" + - "{{ hostvars.wi3.private_ip }}" dashboard_node_name: node-6 wazuh_api_credentials: - id: default From c3eba57e840130cf58c1bd16b37691516db50b73 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 13 Nov 2023 09:26:25 -0300 Subject: [PATCH 3/4] Bump revision to RC1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 4a01f7d0..ad92b38d 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-ANSIBLE_VERSION="v4.7.0" -REVISION="40702" +REVISION="40703" From bcce084cdb048d35c402a5bbed01f700c1a66f12 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 14 Nov 2023 04:26:21 -0300 Subject: [PATCH 4/4] resolving conflicts --- VERSION | 5 ----- 1 file changed, 5 deletions(-) diff --git a/VERSION b/VERSION index fe299427..b4586bf4 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,2 @@ -<<<<<<< HEAD -WAZUH-ANSIBLE_VERSION="v4.7.0" -REVISION="40703" -======= WAZUH-ANSIBLE_VERSION="v4.7.1" REVISION="40705" ->>>>>>> 018da92c8c21f9d194729532c6b042bc1be4dee7