Merge pull request #624 from wazuh/Add-changes-to-4.2

Add changes to 4.2
wazuh · Aug 26, 2021 · 691be0e · 691be0e
2 parents 8582b09 + 0c665f5
commit 691be0e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 24 deletions.
diff --git a/playbooks/wazuh-agent.yml b/playbooks/wazuh-agent.yml
@@ -1,5 +1,7 @@
 ---
 - hosts: <your wazuh agents hosts>
+  become: yes
+  become_user: root
   roles:
     - ../roles/wazuh/ansible-wazuh-agent
   vars:

diff --git a/roles/opendistro/opendistro-kibana/defaults/main.yml b/roles/opendistro/opendistro-kibana/defaults/main.yml
@@ -41,7 +41,7 @@ kibana_telemetry_optin: "false"
 kibana_telemetry_enabled: "false"
 
 opendistro_admin_password: changeme
-opendistro_kibana_user: changeme
+opendistro_kibana_user: kibanaserver
 opendistro_kibana_password: changeme
 local_certs_path: "{{ playbook_dir }}/opendistro/certificates"
 

diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
@@ -252,39 +252,24 @@ wazuh_manager_syscheck:
 ## Command
 wazuh_manager_commands:
   - name: 'disable-account'
-    executable: 'disable-account.sh'
-    expect: 'user'
+    executable: 'disable-account'
     timeout_allowed: 'yes'
-  - name: 'restart-ossec'
-    executable: 'restart-ossec.sh'
-    expect: ''
+  - name: 'restart-wazuh'
+    executable: 'restart-wazuh'
   - name: 'firewall-drop'
     executable: 'firewall-drop'
-    expect: 'srcip'
     timeout_allowed: 'yes'
   - name: 'host-deny'
-    executable: 'host-deny.sh'
-    expect: 'srcip'
+    executable: 'host-deny'
     timeout_allowed: 'yes'
   - name: 'route-null'
-    executable: 'route-null.sh'
-    expect: 'srcip'
+    executable: 'route-null'
     timeout_allowed: 'yes'
   - name: 'win_route-null'
-    executable: 'route-null.cmd'
-    expect: 'srcip'
-    timeout_allowed: 'yes'
-  - name: 'win_route-null-2012'
-    executable: 'route-null-2012.cmd'
-    expect: 'srcip'
+    executable: 'route-null.exe'
     timeout_allowed: 'yes'
   - name: 'netsh'
-    executable: 'netsh.cmd'
-    expect: 'srcip'
-    timeout_allowed: 'yes'
-  - name: 'netsh-win-2016'
-    executable: 'netsh-win-2016.cmd'
-    expect: 'srcip'
+    executable: 'netsh.exe'
     timeout_allowed: 'yes'
 
 ## Localfile

diff --git a/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2 b/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2
@@ -369,7 +369,6 @@
   <command>
     <name>{{ command.name }}</name>
     <executable>{{ command.executable }}</executable>
-    <expect>{{ command.expect }}</expect>
     {% if command.timeout_allowed is defined %}
         <timeout_allowed>{{ command.timeout_allowed }}</timeout_allowed>
     {% endif %}