Merge pull request #787 from wazuh/3.13.4-fixes

3.13.4 deployment fixes
wazuh · Jun 6, 2022 · 779ebe2 · 779ebe2
2 parents de4070e + 96acb20
commit 779ebe2
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 19 deletions.
diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py
@@ -60,4 +60,4 @@ def test_filebeat_is_installed(host):
     """Test the elasticsearch package is installed."""
     filebeat = host.package("filebeat")
     assert filebeat.is_installed
-    assert filebeat.version.startswith('7.9.1')
+    assert filebeat.version.startswith('7.9.2')
diff --git 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.9.1
+elastic_stack_version: 7.9.2
 elasticsearch_lower_disk_requirements: false
 elasticsearch_path_repo: []
 

diff --git a/roles/elastic-stack/ansible-elasticsearch/templates/jvm.options.j2 b/roles/elastic-stack/ansible-elasticsearch/templates/jvm.options.j2
@@ -46,11 +46,6 @@
 ##
 ################################################################
 
-## GC configuration
--XX:+UseConcMarkSweepGC
--XX:CMSInitiatingOccupancyFraction=75
--XX:+UseCMSInitiatingOccupancyOnly
-
 ## optimizations
 
 # pre-touch memory pages used by the JVM during initialization

diff --git a/roles/elastic-stack/ansible-kibana/defaults/main.yml b/roles/elastic-stack/ansible-kibana/defaults/main.yml
@@ -6,7 +6,7 @@ elasticsearch_network_host: "127.0.0.1"
 kibana_server_host: "0.0.0.0"
 kibana_server_port: "5601"
 kibana_conf_path: /etc/kibana
-elastic_stack_version: 7.9.1
+elastic_stack_version: 7.9.2
 wazuh_version: 3.13.4
 wazuh_app_url: https://packages.wazuh.com/wazuhapp/wazuhapp
 
@@ -19,7 +19,7 @@ elasticrepo:
 # API credentials
 wazuh_api_credentials:
   - id: "default"
-    url: "http://localhost"
+    url: "https://localhost"
     port: 55000
     user: "foo"
     password: "bar"

diff --git a/roles/elastic-stack/ansible-kibana/tasks/main.yml b/roles/elastic-stack/ansible-kibana/tasks/main.yml
@@ -104,6 +104,15 @@
     - build_from_sources is defined
     - build_from_sources
 
+- name: Ensuring folder permissions (/usr/share/kibana)
+  file:
+    path: "/usr/share/kibana/"
+    owner: kibana
+    group: kibana
+    mode: 0770
+    state: directory
+    recurse: yes
+
 - name: Install Wazuh Plugin (can take a while)
   shell: >-
     NODE_OPTIONS="{{ node_options }}" /usr/share/kibana/bin/kibana-plugin install

diff --git a/roles/opendistro/opendistro-elasticsearch/defaults/main.yml b/roles/opendistro/opendistro-elasticsearch/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 # Cluster Settings
-es_version: "7.8.0"
+es_version: "7.9.2"
 es_major_version: "7.x"
 
 opendistro_version: 1.9.0

diff --git a/roles/opendistro/opendistro-elasticsearch/templates/jvm.options.j2 b/roles/opendistro/opendistro-elasticsearch/templates/jvm.options.j2
@@ -46,11 +46,6 @@
 ##
 ################################################################
 
-## GC configuration
--XX:+UseConcMarkSweepGC
--XX:CMSInitiatingOccupancyFraction=75
--XX:+UseCMSInitiatingOccupancyOnly
-
 ## optimizations
 
 # pre-touch memory pages used by the JVM during initialization

diff --git a/roles/opendistro/opendistro-kibana/defaults/main.yml b/roles/opendistro/opendistro-kibana/defaults/main.yml
@@ -14,7 +14,7 @@ kibana_server_host: "0.0.0.0"
 kibana_server_port: "5601"
 kibana_server_name: "kibana"
 kibana_max_payload_bytes: 1048576
-elastic_stack_version: 7.8.0
+elastic_stack_version: 7.9.2
 wazuh_version: 3.13.4
 wazuh_app_url: https://packages.wazuh.com/wazuhapp/wazuhapp
 
@@ -34,7 +34,7 @@ package_repos:
 # API credentials
 wazuh_api_credentials:
   - id: "default"
-    url: "http://localhost"
+    url: "https://localhost"
     port: 55000
     user: "foo"
     password: "bar"

diff --git a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-filebeat_version: 7.8.0
+filebeat_version: 7.9.2
 
 wazuh_template_branch: v3.13.4
 

diff --git a/roles/wazuh/ansible-filebeat/defaults/main.yml b/roles/wazuh/ansible-filebeat/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-filebeat_version: 7.9.1
+filebeat_version: 7.9.2
 
 wazuh_template_branch: v3.13.4