From 9dc91b88775e901c91f34b3ea591431b78e4c683 Mon Sep 17 00:00:00 2001
From: Zenidd <jpsaezgutierrez@gmail.com>
Date: Wed, 11 Mar 2020 17:55:28 +0100
Subject: [PATCH] Adding lint fixes

---
 .../ansible-kibana/defaults/main.yml            |  2 +-
 .../ansible-kibana/tasks/build_wazuh_plugin.yml |  2 +-
 .../elastic-stack/ansible-kibana/tasks/main.yml | 17 ++++++++++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/roles/elastic-stack/ansible-kibana/defaults/main.yml b/roles/elastic-stack/ansible-kibana/defaults/main.yml
index f62e114a..79078f7b 100644
--- a/roles/elastic-stack/ansible-kibana/defaults/main.yml
+++ b/roles/elastic-stack/ansible-kibana/defaults/main.yml
@@ -50,5 +50,5 @@ build_from_sources: false
 wazuh_plugin_branch: 3.11-7.6
 
 #Nodejs NODE_OPTIONS
-kibana_script_node_options: "--max-old-space-size=4096"
+kibana_script_node_options: ""
 node_options: --max-old-space-size=4096
diff --git a/roles/elastic-stack/ansible-kibana/tasks/build_wazuh_plugin.yml b/roles/elastic-stack/ansible-kibana/tasks/build_wazuh_plugin.yml
index 5fb74823..e2b0bb50 100644
--- a/roles/elastic-stack/ansible-kibana/tasks/build_wazuh_plugin.yml
+++ b/roles/elastic-stack/ansible-kibana/tasks/build_wazuh_plugin.yml
@@ -63,7 +63,7 @@
       chdir: "/tmp/app/build"
 
   - name: Install Wazuh Plugin (can take a while)
-    shell: 'NODE_OPTIONS="{{node_options}}" /usr/share/kibana/bin/kibana-plugin install file:///tmp/app/build/{{ wazuhapp_package_name.stdout }}'
+    shell: 'NODE_OPTIONS=" {{node_options}} " /usr/share/kibana/bin/kibana-plugin install file:///tmp/app/build/{{ wazuhapp_package_name.stdout }}'
     args:
       executable: /bin/bash
       creates: /usr/share/kibana/plugins/wazuh/package.json
diff --git a/roles/elastic-stack/ansible-kibana/tasks/main.yml b/roles/elastic-stack/ansible-kibana/tasks/main.yml
index 8fad346a..e6c7f52d 100644
--- a/roles/elastic-stack/ansible-kibana/tasks/main.yml
+++ b/roles/elastic-stack/ansible-kibana/tasks/main.yml
@@ -65,9 +65,14 @@
 - name: Kibana script additional configuration for node
   replace:
     path: /usr/share/kibana/bin/kibana
-    regexp: 'NODE_OPTIONS=\"--no-warnings --max-http-header-size=65536 \$\{NODE_OPTIONS\}\" NODE_ENV=production exec \"\$\{NODE}\" \"\$\{DIR\}/src/cli\" \$\{@\}'
-    replace: 'NODE_OPTIONS="--no-warnings {{kibana_script_node_options}} --max-http-header-size=65536 ${NODE_OPTIONS}" NODE_ENV=production exec "${NODE}" "${DIR}/src/cli" ${@}'
-  when: kibana_script_node_options != ""
+    regexp: >-
+      'NODE_OPTIONS=\"--no-warnings --max-http-header-size=65536 \$\{NODE_OPTIONS\}\"
+      NODE_ENV=production exec \"\$\{NODE}\" \"\$\{DIR\}/src/cli\" \$\{@\}'
+    replace: >-
+      'NODE_OPTIONS="--no-warnings {{kibana_script_node_options}} --max-http-header-size=65536 ${NODE_OPTIONS}"
+      NODE_ENV=production exec "${NODE}" "${DIR}/src/cli" ${@}'
+  when: kibana_script_node_options | length > 0
+
 
 - name: Ensuring certificates folder owner
   file:
@@ -126,7 +131,9 @@
 
 
 - name: Install Wazuh Plugin (can take a while)
-  shell: 'NODE_OPTIONS="{{node_options}}" /usr/share/kibana/bin/kibana-plugin install {{ wazuh_app_url }}-{{ wazuh_version }}_{{ elastic_stack_version }}.zip'
+  shell: >-
+    'NODE_OPTIONS=" {{node_options}} " /usr/share/kibana/bin/kibana-plugin install {{ wazuh_app_url }}
+    -{{ wazuh_version }}_{{ elastic_stack_version }}.zip'
   args:
     executable: /bin/bash
     creates: /usr/share/kibana/plugins/wazuh/package.json
@@ -141,7 +148,7 @@
     - not build_from_sources
 
 - name: Kibana optimization (can take a while)
-  shell: 'NODE_OPTIONS="{{node_options}}" /usr/share/kibana/bin/kibana --optimize --allow-root'
+  shell: 'NODE_OPTIONS=" {{node_options}} " /usr/share/kibana/bin/kibana --optimize'
   args:
     executable: /bin/bash
   become: yes