Merge pull request #408 from wazuh/wazuh-release-v3.12.2_7.6.2

Wazuh release v3.12.2_7.6.2
2020-04-13 15:24:08 +02:00 · 2020-04-13 15:24:08 +02:00 · f0704e3b4d
commit f0704e3b4d
parent 719e0fb8ce a8d24ff3f8
10 changed files with 30 additions and 52 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,17 @@
 # Change Log
 All notable changes to this project will be documented in this file.

+## [v3.12.2_7.6.2]
+
+### Added
+
+- Update to Wazuh v3.12.2
+
+### Fixed
+- Adjusting Kibana plugin optimization max memory ([@Zenidd](https://github.com/Zenidd)) [PR#404](https://github.com/wazuh/wazuh-ansible/pull/404)
+- Removed python-cryptography library tasks ([@Zenidd](https://github.com/Zenidd)) [PR#401](https://github.com/wazuh/wazuh-ansible/pull/401)
+- Removed duplicated task block ([@manuasir](https://github.com/manuasir)) [PR#400](https://github.com/wazuh/wazuh-ansible/pull/400)
+
 ## [v3.12.0_7.6.1]

 ### Added
--- a/2
+++ b/2
@ -1,2 +1,2 @@
 WAZUH-ANSIBLE_VERSION="v4"
-REVISION="31140"
+REVISION="31220"
--- a/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml
@ -4,7 +4,7 @@ elasticsearch_http_port: 9200
 elasticsearch_network_host: 127.0.0.1
 elasticsearch_reachable_host: 127.0.0.1
 elasticsearch_jvm_xms: null
-elastic_stack_version: 7.6.1
+elastic_stack_version: 7.6.2
 elasticsearch_lower_disk_requirements: false

 elasticrepo:
--- a/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
@ -18,16 +18,6 @@
    - ansible_distribution == "Ubuntu"
    - ansible_distribution_major_version | int == 14

- name: Update and upgrade apt packages
-  become: true
-  apt:
-    upgrade: yes
-    update_cache: yes
-    cache_valid_time: 86400 #One day
-  when:
-    - ansible_distribution == "Ubuntu"
-    - ansible_distribution_major_version | int == 14
-
 - name: Debian/Ubuntu | Add Elasticsearch GPG key.
  apt_key:
    url: "{{ elasticrepo.gpg }}"
--- a/roles/elastic-stack/ansible-kibana/defaults/main.yml
+++ b/roles/elastic-stack/ansible-kibana/defaults/main.yml
@ -5,8 +5,8 @@ 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: 7.6.1
-wazuh_version: 3.12.0
+elastic_stack_version: 7.6.2
+wazuh_version: 3.12.2
 wazuh_app_url: https://packages.wazuh.com/wazuhapp/wazuhapp

 elasticrepo:
@ -50,4 +50,4 @@ build_from_sources: false
 wazuh_plugin_branch: 3.12-7.6

 #Nodejs NODE_OPTIONS
-node_options: --max-old-space-size=4096
+node_options: --max-old-space-size=2048
--- a/roles/elastic-stack/ansible-kibana/tasks/main.yml
+++ b/roles/elastic-stack/ansible-kibana/tasks/main.yml
@ -165,14 +165,12 @@
  file:
    path: /usr/share/kibana/optimize/wazuh/config/
    state: directory
+    recurse: yes

 - name: Configure Wazuh Kibana Plugin
  template:
    src: wazuh.yml.j2
    dest: /usr/share/kibana/optimize/wazuh/config/wazuh.yml
-    owner: kibana
-    group: root
-    mode: 0644

 - name: Reload systemd configuration
  systemd:
--- a/roles/wazuh/ansible-filebeat/defaults/main.yml
+++ b/roles/wazuh/ansible-filebeat/defaults/main.yml
@ -1,5 +1,5 @@
 ---
-filebeat_version: 7.6.1
+filebeat_version: 7.6.2

 filebeat_create_config: true

--- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
+++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
@ -1,5 +1,5 @@
 ---
-wazuh_agent_version: 3.12.0-1
+wazuh_agent_version: 3.12.2-1


 # Custom packages installation
@ -12,7 +12,7 @@ wazuh_custom_packages_installation_agent_rpm_url: ""

 wazuh_agent_sources_installation:
  enabled: false
-  branch: "v3.12.0"
+  branch: "v3.12.2"
  user_language: "y"
  user_no_stop: "y"
  user_install_type: "agent"
@ -63,9 +63,9 @@ wazuh_winagent_config:
  # Adding quotes to auth_path_x86 since win_shell outputs error otherwise
  auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe
  check_md5: True
-  md5: 91efaefae4e1977670eab0c768a22a93
-wazuh_winagent_config_url: https://packages.wazuh.com/3.x/windows/wazuh-agent-3.12.0-1.msi
-wazuh_winagent_package_name: wazuh-agent-3.12.0-1.msi
+  md5: dc64c8bee53df0430e9e03e578ba334d
+wazuh_winagent_config_url: https://packages.wazuh.com/3.x/windows/wazuh-agent-3.12.2-1.msi
+wazuh_winagent_package_name: wazuh-agent-3.12.2-1.msi
 wazuh_agent_config:
  repo:
    apt: 'deb https://packages.wazuh.com/3.x/apt/ stable main'
--- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
+++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
@ -1,21 +1,21 @@
 ---
-wazuh_manager_version: 3.12.0-1
+wazuh_manager_version: 3.12.2-1

 wazuh_manager_fqdn: "wazuh-server"
 wazuh_manager_package_state: present

 # Custom packages installation
 wazuh_custom_packages_installation_manager_enabled: false
-wazuh_custom_packages_installation_manager_deb_url: "https://s3-us-west-1.amazonaws.com/packages-dev.wazuh.com/warehouse/branches/3.12/deb/var/wazuh-manager_3.12.0-0.3319fimreworksqlite_amd64.deb"
-wazuh_custom_packages_installation_manager_rpm_url: "https://s3-us-west-1.amazonaws.com/packages-dev.wazuh.com/warehouse/branches/3.12/rpm/var/wazuh-manager-3.12.0-0.3319fimreworksqlite.x86_64.rpm"
+wazuh_custom_packages_installation_manager_deb_url: "https://s3-us-west-1.amazonaws.com/packages-dev.wazuh.com/"
+wazuh_custom_packages_installation_manager_rpm_url: "https://s3-us-west-1.amazonaws.com/packages-dev.wazuh.com/"
 wazuh_custom_packages_installation_api_enabled: false
-wazuh_custom_packages_installation_api_deb_url: "https://s3-us-west-1.amazonaws.com/packages-dev.wazuh.com/warehouse/branches/3.12/deb/var/wazuh-api_3.12.0-0.3319fimreworksqlite_amd64.deb"
-wazuh_custom_packages_installation_api_rpm_url: "https://s3-us-west-1.amazonaws.com/packages-dev.wazuh.com/warehouse/branches/3.12/rpm/var/wazuh-api-3.12.0-0.3319fimreworksqlite.x86_64.rpm"
+wazuh_custom_packages_installation_api_deb_url: "https://s3-us-west-1.amazonaws.com/packages-dev.wazuh.com/"
+wazuh_custom_packages_installation_api_rpm_url: "https://s3-us-west-1.amazonaws.com/packages-dev.wazuh.com/"

 # Sources installation
 wazuh_manager_sources_installation:
  enabled: false
-  branch: "v3.12.0"
+  branch: "v3.12.2"
  user_language: "en"
  user_no_stop: "y"
  user_install_type: "server"
@ -40,7 +40,7 @@ wazuh_manager_sources_installation:

 wazuh_api_sources_installation:
  enabled: false
-  branch: "v3.12.0"
+  branch: "v3.12.2"
  update: "y"
  remove: "y"
  directory: null
@ -236,7 +236,6 @@ wazuh_manager_config:
    providers:
      - enabled: 'no'
        os:
-          - 'precise'
          - 'trusty'
          - 'xenial'
          - 'bionic'
--- a/roles/wazuh/ansible-wazuh-manager/tasks/RedHat.yml
+++ b/roles/wazuh/ansible-wazuh-manager/tasks/RedHat.yml
@ -62,25 +62,6 @@
    - ( ansible_distribution == 'CentOS' or ansible_distribution == 'RedHat' ) and ansible_distribution_major_version == '6'
    - wazuh_manager_config.cluster.disable != 'yes'

- name: CentOS/RedHat 6 | Install python-cryptography module
-  pip: name=cryptography state=present
-  register: wazuh_manager_cryptography_package_installed
-  until: wazuh_manager_cryptography_package_installed is succeeded
-  environment:
-    PATH: "/opt/rh/python27/root/usr/bin:{{ ansible_env.PATH }}"
-    LD_LIBRARY_PATH: "/opt/rh/python27/root/usr/lib64:/opt/rh/python27/root/usr/lib"
-  when:
-    - ( ansible_distribution == 'CentOS' or ansible_distribution == 'RedHat' ) and ansible_distribution_major_version == '6'
-    - wazuh_manager_config.cluster.disable != 'yes'
-
- name: RedHat/CentOS/Fedora | Install python-cryptography module
-  package: name=python-cryptography state=present
-  register: wazuh_manager_cryptography_package_installed
-  until: wazuh_manager_cryptography_package_installed is succeeded
-  when:
-    - not (( ansible_distribution == 'CentOS' or ansible_distribution == 'RedHat') and ansible_distribution_major_version == '6' )
-    - wazuh_manager_config.cluster.disable != 'yes'
-
 - name: RedHat/CentOS/Fedora | Install OpenJDK 1.8
  yum: name=java-1.8.0-openjdk state=present
  when:
@ -168,4 +149,3 @@
    - ansible_distribution_major_version|int < 6
  tags:
    - init
-