From cd64a52eb2a6aaab967abebd63b2b09270e4d6e4 Mon Sep 17 00:00:00 2001 From: Luis Gil Guijarro Date: Fri, 14 Dec 2018 18:40:40 +0100 Subject: [PATCH 1/8] Updating to Elastic Stack to 6.5.3 and Wazuh 3.7.1 --- roles/elastic-stack/ansible-elasticsearch/defaults/main.yml | 2 +- roles/elastic-stack/ansible-kibana/defaults/main.yml | 4 ++-- roles/elastic-stack/ansible-logstash/defaults/main.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml b/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml index d549d233..57784d16 100644 --- a/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml +++ b/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml @@ -4,7 +4,7 @@ elasticsearch_node_name: node-1 elasticsearch_http_port: 9200 elasticsearch_network_host: 127.0.0.1 elasticsearch_jvm_xms: null -elastic_stack_version: 6.4.0 +elastic_stack_version: 6.5.3 elasticsearch_shards: 5 elasticsearch_replicas: 1 elasticsearch_install_java: yes diff --git a/roles/elastic-stack/ansible-kibana/defaults/main.yml b/roles/elastic-stack/ansible-kibana/defaults/main.yml index 92fa24b9..5bfbdf6d 100644 --- a/roles/elastic-stack/ansible-kibana/defaults/main.yml +++ b/roles/elastic-stack/ansible-kibana/defaults/main.yml @@ -3,5 +3,5 @@ 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: 6.4.0 -wazuh_version: 3.6.0 +elastic_stack_version: 6.5.3 +wazuh_version: 3.7.1 diff --git a/roles/elastic-stack/ansible-logstash/defaults/main.yml b/roles/elastic-stack/ansible-logstash/defaults/main.yml index 3c6d25b6..ace99900 100644 --- a/roles/elastic-stack/ansible-logstash/defaults/main.yml +++ b/roles/elastic-stack/ansible-logstash/defaults/main.yml @@ -9,7 +9,7 @@ elasticsearch_network_host: ["Localhost"] elasticsearch_http_port: "9200" elasticsearch_shards: 5 elasticsearch_replicas: 1 -elastic_stack_version: 6.4.0 +elastic_stack_version: 6.5.3 logstash_ssl: false logstash_ssl_dir: /etc/pki/logstash From e38cc87a497946dab404a20282dba9a63a7d4f10 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 20 Dec 2018 13:46:37 +0100 Subject: [PATCH 2/8] Update CHANGELOG.md --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0503516..a55a13ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,9 @@ # Change Log All notable changes to this project will be documented in this file. -## v3.7.0-37xx +## [v3.7.2] + +## [v3.7.1] ### Added @@ -16,6 +18,7 @@ All notable changes to this project will be documented in this file. - Solve the conflict betwwen tha agent configuration and the shared master configuration. Also include monitoring for `/var/log/auth.log` ([#90](https://github.com/wazuh/wazuh-ansible/pull/90)) - Moved custom_ruleset files ([#98](https://github.com/wazuh/wazuh-ansible/pull/98)) +- Add authlog fix to localfile ([#99](https://github.com/wazuh/wazuh-ansible/pull/99)) ### Removed From 927ebf8dfbb5d0646ff0eadea018161fb4d5c18f Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 20 Dec 2018 13:47:09 +0100 Subject: [PATCH 3/8] Bump version 3709 --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index fa848c88..cfc16103 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-ANSIBLE_VERSION="v3.7.0" -REVISION="3708" +WAZUH-ANSIBLE_VERSION="v3.7.1" +REVISION="3709" From d2a79e4ea824143f974de1f5224600fa0b370212 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 20 Dec 2018 13:47:51 +0100 Subject: [PATCH 4/8] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a55a13ee..69c65b11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ All notable changes to this project will be documented in this file. ### Changed - Changed windows agent version ([#89](https://github.com/wazuh/wazuh-ansible/pull/89)) + - Updating to Elastic Stack to 6.5.3 and Wazuh 3.7.1 ([#108](https://github.com/wazuh/wazuh-ansible/pull/108)) ### Fixed From 10a0b83be3e99ddbc1f0afb0cbd1474771da674b Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 20 Dec 2018 13:48:13 +0100 Subject: [PATCH 5/8] Bump version 3710 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index cfc16103..155aec47 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-ANSIBLE_VERSION="v3.7.1" -REVISION="3709" +REVISION="3710" From e6ba94d4b9c4e64d7f5401890943234b076dafc0 Mon Sep 17 00:00:00 2001 From: Carlos Dominguez <43823505+cadoming@users.noreply.github.com> Date: Thu, 20 Dec 2018 17:58:55 +0100 Subject: [PATCH 6/8] exception reload systemd task (#114) --- roles/elastic-stack/ansible-elasticsearch/tasks/main.yml | 5 ++++- roles/elastic-stack/ansible-kibana/tasks/main.yml | 5 ++++- roles/elastic-stack/ansible-logstash/tasks/main.yml | 5 ++++- roles/wazuh/ansible-filebeat/tasks/main.yml | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml b/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml index b5afdf5f..fb566741 100644 --- a/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml +++ b/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml @@ -71,7 +71,10 @@ - name: Reload systemd systemd: daemon_reload=yes ignore_errors: yes - when: not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA") + when: + - not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA") + - not (ansible_distribution == "Ubuntu" and ansible_distribution_version is version('15.04', '<')) + - not (ansible_distribution == "Debian" and ansible_distribution_version is version('8', '<')) - name: Ensure Elasticsearch started and enabled service: diff --git a/roles/elastic-stack/ansible-kibana/tasks/main.yml b/roles/elastic-stack/ansible-kibana/tasks/main.yml index 4d81579f..db85a112 100644 --- a/roles/elastic-stack/ansible-kibana/tasks/main.yml +++ b/roles/elastic-stack/ansible-kibana/tasks/main.yml @@ -12,7 +12,10 @@ - name: Reload systemd systemd: daemon_reload=yes ignore_errors: yes - when: not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA") + when: + - not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA") + - not (ansible_distribution == "Ubuntu" and ansible_distribution_version is version('15.04', '<')) + - not (ansible_distribution == "Debian" and ansible_distribution_version is version('8', '<')) - name: Kibana configuration template: diff --git a/roles/elastic-stack/ansible-logstash/tasks/main.yml b/roles/elastic-stack/ansible-logstash/tasks/main.yml index d88082c8..a53ab166 100644 --- a/roles/elastic-stack/ansible-logstash/tasks/main.yml +++ b/roles/elastic-stack/ansible-logstash/tasks/main.yml @@ -11,7 +11,10 @@ - name: Reload systemd systemd: daemon_reload=yes ignore_errors: yes - when: not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA") + when: + - not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA") + - not (ansible_distribution == "Ubuntu" and ansible_distribution_version is version('15.04', '<')) + - not (ansible_distribution == "Debian" and ansible_distribution_version is version('8', '<')) - name: Amazon Linux create service shell: /usr/share/logstash/bin/system-install /etc/logstash/startup.options diff --git a/roles/wazuh/ansible-filebeat/tasks/main.yml b/roles/wazuh/ansible-filebeat/tasks/main.yml index 29ba695c..5138e2d8 100644 --- a/roles/wazuh/ansible-filebeat/tasks/main.yml +++ b/roles/wazuh/ansible-filebeat/tasks/main.yml @@ -16,7 +16,10 @@ - name: Reload systemd systemd: daemon_reload=yes ignore_errors: yes - when: not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA") + when: + - not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA") + - not (ansible_distribution == "Ubuntu" and ansible_distribution_version is version('15.04', '<')) + - not (ansible_distribution == "Debian" and ansible_distribution_version is version('8', '<')) - name: Ensure Filebeat is started and enabled at boot. service: From 5c3f7b3ee28b1e95102af5e88c3da36f79c8dd38 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 20 Dec 2018 18:17:38 +0100 Subject: [PATCH 7/8] Update CHANGELOG.md --- CHANGELOG.md | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69c65b11..30592dc4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,27 +3,30 @@ All notable changes to this project will be documented in this file. ## [v3.7.2] + + ## [v3.7.1] ### Added - - include template local_internal_options.conf ([#87](https://github.com/wazuh/wazuh-ansible/pull/87)) - - Add multiple Elasticsearch IPs for Logstash reports.([#92](https://github.com/wazuh/wazuh-ansible/pull/92)) + - include template local_internal_options.conf. ([#87](https://github.com/wazuh/wazuh-ansible/pull/87)) + - Add multiple Elasticsearch IPs for Logstash reports. ([#92](https://github.com/wazuh/wazuh-ansible/pull/92)) ### Changed - - Changed windows agent version ([#89](https://github.com/wazuh/wazuh-ansible/pull/89)) - - Updating to Elastic Stack to 6.5.3 and Wazuh 3.7.1 ([#108](https://github.com/wazuh/wazuh-ansible/pull/108)) + - Changed windows agent version. ([#89](https://github.com/wazuh/wazuh-ansible/pull/89)) + - Updating to Elastic Stack to 6.5.3 and Wazuh 3.7.1. ([#108](https://github.com/wazuh/wazuh-ansible/pull/108)) ### Fixed -- Solve the conflict betwwen tha agent configuration and the shared master configuration. Also include monitoring for `/var/log/auth.log` ([#90](https://github.com/wazuh/wazuh-ansible/pull/90)) -- Moved custom_ruleset files ([#98](https://github.com/wazuh/wazuh-ansible/pull/98)) -- Add authlog fix to localfile ([#99](https://github.com/wazuh/wazuh-ansible/pull/99)) +- Solve the conflict betwwen tha agent configuration and the shared master configuration. Also include monitoring for `/var/log/auth.log`. ([#90](https://github.com/wazuh/wazuh-ansible/pull/90)) +- Moved custom_ruleset files. ([#98](https://github.com/wazuh/wazuh-ansible/pull/98)) +- Add authlog fix to localfile. ([#99](https://github.com/wazuh/wazuh-ansible/pull/99)) +- Exceptions reload systemd. ([#114](https://github.com/wazuh/wazuh-ansible/pull/114)) ### Removed -- clean old code for windows agent ([#86](https://github.com/wazuh/wazuh-ansible/pull/86)) +- clean old code for windows agent. ([#86](https://github.com/wazuh/wazuh-ansible/pull/86)) ## v3.7.0-3701 From d68801c26640805c3c35a68a4d3b6f6d470360fe Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 20 Dec 2018 18:19:29 +0100 Subject: [PATCH 8/8] Bump version 3711 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 155aec47..0af53d67 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-ANSIBLE_VERSION="v3.7.1" -REVISION="3710" +REVISION="3711"