From f7cfdf113b6300d38fed1c0e6fc996d25295902e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Ruiz=20Ruiz?= Date: Wed, 1 Nov 2017 19:21:10 -0400 Subject: [PATCH] some fixes --- ansible-role-elasticsearch/defaults/main.yml | 2 +- ansible-role-kibana/defaults/main.yml | 2 +- ansible-role-kibana/tasks/main.yml | 2 +- ansible-role-logstash/defaults/main.yml | 2 +- ansible-wazuh-agent/defaults/main.yml | 4 ++-- ansible-wazuh-agent/tasks/Windows.yml | 10 +++++----- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ansible-role-elasticsearch/defaults/main.yml b/ansible-role-elasticsearch/defaults/main.yml index c8063a38..66ef5659 100644 --- a/ansible-role-elasticsearch/defaults/main.yml +++ b/ansible-role-elasticsearch/defaults/main.yml @@ -4,6 +4,6 @@ elasticsearch_node_name: node-1 elasticsearch_http_port: 9200 elasticsearch_network_host: 127.0.0.1 elasticsearch_jvm_xms: null -elastic_stack_version: 5.5.2 +elastic_stack_version: 5.6.3 elasticsearch_shards: 5 elasticsearch_replicas: 1 diff --git a/ansible-role-kibana/defaults/main.yml b/ansible-role-kibana/defaults/main.yml index b68a998a..f92813ab 100644 --- a/ansible-role-kibana/defaults/main.yml +++ b/ansible-role-kibana/defaults/main.yml @@ -3,4 +3,4 @@ elasticsearch_http_port: "9200" elasticsearch_network_host: "127.0.0.1" kibana_server_host: "0.0.0.0" kibana_server_port: "5601" -elastic_stack_version: 5.5.2 +elastic_stack_version: 5.6.3 diff --git a/ansible-role-kibana/tasks/main.yml b/ansible-role-kibana/tasks/main.yml index d68ebda2..3f651c48 100644 --- a/ansible-role-kibana/tasks/main.yml +++ b/ansible-role-kibana/tasks/main.yml @@ -35,7 +35,7 @@ tags: install - name: Install Wazuh-APP (can take a while) - shell: "/usr/share/kibana/bin/kibana-plugin install https://packages.wazuh.com/wazuhapp/wazuhapp-2.1.0_{{ elastic_stack_version }}.zip" + shell: "/usr/share/kibana/bin/kibana-plugin install https://packages.wazuh.com/wazuhapp/wazuhapp-2.1.1_{{ elastic_stack_version }}.zip" args: creates: /usr/share/kibana/plugins/wazuh/package.json notify: restart kibana diff --git a/ansible-role-logstash/defaults/main.yml b/ansible-role-logstash/defaults/main.yml index a4563477..baddcf5f 100644 --- a/ansible-role-logstash/defaults/main.yml +++ b/ansible-role-logstash/defaults/main.yml @@ -6,7 +6,7 @@ elasticsearch_network_host: "127.0.0.1" elasticsearch_http_port: "9200" elasticsearch_shards: 5 elasticsearch_replicas: 1 -elastic_stack_version: 5.5.2 +elastic_stack_version: 5.6.3 logstash_ssl: false logstash_ssl_dir: /etc/pki/logstash diff --git a/ansible-wazuh-agent/defaults/main.yml b/ansible-wazuh-agent/defaults/main.yml index def57641..bb07ac02 100644 --- a/ansible-wazuh-agent/defaults/main.yml +++ b/ansible-wazuh-agent/defaults/main.yml @@ -13,10 +13,10 @@ wazuh_notify_time: null wazuh_time_reconnect: null wazuh_winagent_config: install_dir: 'C:\wazuh-agent\' - version: '2.1.0' + version: '2.1.1' revision: '1' repo: https://packages.wazuh.com/windows/ - md5: 715fbd55f670c2cecc607f2cbd0b2310 + md5: fd9a3ce30cd6f9f553a1bc71e74a6c9f wazuh_agent_config: log_format: 'plain' syscheck: diff --git a/ansible-wazuh-agent/tasks/Windows.yml b/ansible-wazuh-agent/tasks/Windows.yml index 0de57d7b..183e8878 100644 --- a/ansible-wazuh-agent/tasks/Windows.yml +++ b/ansible-wazuh-agent/tasks/Windows.yml @@ -15,14 +15,14 @@ - name: Windows | Downloading windows Wazuh agent installer win_get_url: - dest: C:\wazuh-agent-installer.exe - url: "{{ wazuh_winagent_config.repo }}wazuh-winagent-v{{ wazuh_winagent_config.version }}-{{ wazuh_winagent_config.revision }}.exe" + dest: C:\wazuh-agent-installer.msi + url: "{{ wazuh_winagent_config.repo }}wazuh-agent-{{ wazuh_winagent_config.version }}-{{ wazuh_winagent_config.revision }}.msi" when: - correct_version is not defined - name: Windows | Verify the downloaded Wazuh agent installer win_stat: - path: C:\wazuh-agent-installer.exe + path: C:\wazuh-agent-installer.msi get_checksum: yes checksum_algorithm: md5 register: installer_md5 @@ -32,7 +32,7 @@ - installer_md5.stat.checksum != wazuh_winagent_config.md5 - name: Windows | Install Wazuh agent - win_shell: C:\wazuh-agent-installer.exe /S /D={{ wazuh_winagent_config.install_dir }} + win_shell: C:\wazuh-agent-installer.exe /q APPLICATIONFOLDER={{ wazuh_winagent_config.install_dir }} when: - correct_version is not defined @@ -75,5 +75,5 @@ - name: Windows | Delete downloaded Wazuh agent installer file win_file: - path: C:\wazuh-agent-installer.exe + path: C:\wazuh-agent-installer.msi state: absent