Merge pull request #1108 from wazuh/merge-4.8.0-into-master

Merge 4.8.0 into master
wazuh · Oct 31, 2023 · 75547da · 75547da
2 parents 52caa80 + 42a8311
commit 75547da
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 86 deletions.
diff --git a/README.md b/README.md
@@ -93,7 +93,7 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb
 
 ### Playbook
 
-The hereunder example playbook uses the `wazuh-ansible` role to provision a production-ready Wazuh environment. The architecture includes 2 Wazuh nodes, 3 Wazuh indexer nodes and a mixed Wazuh dashboard node (Wazuh indexer data node + Wazuh dashboard).
+The hereunder example playbook uses the `wazuh-ansible` role to provision a production-ready Wazuh environment. The architecture includes 2 Wazuh nodes, 3 Wazuh indexer nodes, and a Wazuh dashboard node.
 
 ```yaml
 ---
@@ -252,61 +252,21 @@ The hereunder example playbook uses the `wazuh-ansible` role to provision a prod
                 - "{{ hostvars.wi2.private_ip }}"
                 - "{{ hostvars.wi3.private_ip }}"
 
-# Indexer + dashboard node
+# Wazuh dashboard node
     - hosts: dashboard
       roles:
-        - role: "../roles/wazuh/wazuh-indexer"
         - role: "../roles/wazuh/wazuh-dashboard"
       become: yes
       become_user: root
       vars:
-        indexer_network_host: "{{ hostvars.dashboard.private_ip }}"
-        indexer_node_name: node-6
-        indexer_node_master: false
-        indexer_node_ingest: false
-        indexer_node_data: false
-        indexer_cluster_nodes:
-            - "{{ hostvars.wi1.private_ip }}"
-            - "{{ hostvars.wi2.private_ip }}"
-            - "{{ hostvars.wi3.private_ip }}"
-        indexer_discovery_nodes:
-            - "{{ hostvars.wi1.private_ip }}"
-            - "{{ hostvars.wi2.private_ip }}"
-            - "{{ hostvars.wi3.private_ip }}"
+        indexer_network_host: "{{ hostvars.wi1.private_ip }}"
         dashboard_node_name: node-6
         wazuh_api_credentials:
           - id: default
             url: https://{{ hostvars.manager.private_ip }}
             port: 55000
             username: custom-user
             password: SecretPassword1!
-        instances:
-          node1:
-            name: node-1
-            ip: "{{ hostvars.wi1.private_ip }}"   # When unzipping, the node will search for its node name folder to get the cert.
-            role: indexer
-          node2:
-            name: node-2
-            ip: "{{ hostvars.wi2.private_ip }}"
-            role: indexer
-          node3:
-            name: node-3
-            ip: "{{ hostvars.wi3.private_ip }}"
-            role: indexer
-          node4:
-            name: node-4
-            ip: "{{ hostvars.manager.private_ip }}"
-            role: wazuh
-            node_type: master
-          node5:
-            name: node-5
-            ip: "{{ hostvars.worker.private_ip }}"
-            role: wazuh
-            node_type: worker
-          node6:
-            name: node-6
-            ip: "{{ hostvars.dashboard.private_ip }}"
-            role: dashboard
         ansible_shell_allow_world_readable_temp: true
 ```
 

diff --git a/playbooks/wazuh-production-ready.yml b/playbooks/wazuh-production-ready.yml
@@ -154,59 +154,19 @@
                 - "{{ hostvars.wi2.private_ip }}"
                 - "{{ hostvars.wi3.private_ip }}"
 
-# Indexer + dashboard node
+# Wazuh dashboard node
     - hosts: dashboard
       roles:
-        - role: "../roles/wazuh/wazuh-indexer"
         - role: "../roles/wazuh/wazuh-dashboard"
       become: yes
       become_user: root
       vars:
-        indexer_network_host: "{{ hostvars.dashboard.private_ip }}"
-        indexer_node_name: node-6
-        indexer_node_master: false
-        indexer_node_ingest: false
-        indexer_node_data: false
-        indexer_cluster_nodes:
-            - "{{ hostvars.wi1.private_ip }}"
-            - "{{ hostvars.wi2.private_ip }}"
-            - "{{ hostvars.wi3.private_ip }}"
-        indexer_discovery_nodes:
-            - "{{ hostvars.wi1.private_ip }}"
-            - "{{ hostvars.wi2.private_ip }}"
-            - "{{ hostvars.wi3.private_ip }}"
+        indexer_network_host: "{{ hostvars.wi1.private_ip }}"
         dashboard_node_name: node-6
         wazuh_api_credentials:
           - id: default
             url: https://{{ hostvars.manager.private_ip }}
             port: 55000
             username: custom-user
             password: SecretPassword1!
-        instances:
-          node1:
-            name: node-1
-            ip: "{{ hostvars.wi1.private_ip }}"   # When unzipping, the node will search for its node name folder to get the cert.
-            role: indexer
-          node2:
-            name: node-2
-            ip: "{{ hostvars.wi2.private_ip }}"
-            role: indexer
-          node3:
-            name: node-3
-            ip: "{{ hostvars.wi3.private_ip }}"
-            role: indexer
-          node4:
-            name: node-4
-            ip: "{{ hostvars.manager.private_ip }}"
-            role: wazuh
-            node_type: master
-          node5:
-            name: node-5
-            ip: "{{ hostvars.worker.private_ip }}"
-            role: wazuh
-            node_type: worker
-          node6:
-            name: node-6
-            ip: "{{ hostvars.dashboard.private_ip }}"
-            role: dashboard
         ansible_shell_allow_world_readable_temp: true
diff --git a/roles/wazuh/wazuh-dashboard/templates/wazuh.yml.j2 b/roles/wazuh/wazuh-dashboard/templates/wazuh.yml.j2
@@ -16,7 +16,7 @@
 # https://documentation.wazuh.com/current/installation-guide/index.html
 #
 # Also, you can check our repository:
-# https://github.com/wazuh/wazuh-dashboard
+# https://github.com/wazuh/wazuh-dashboard-plugins
 #
 # ------------------------------- Index patterns -------------------------------
 #