Updating with the Kibana optimization fixes

This commit is contained in:
Zenidd 2020-03-13 14:04:55 +01:00
commit 824395a258
6 changed files with 25 additions and 10 deletions

View File

@ -43,8 +43,15 @@ nodejs:
repo_dict: repo_dict:
debian: "deb" debian: "deb"
redhat: "rpm" redhat: "rpm"
<<<<<<< HEAD
repo_url_ext: "nodesource.com/setup_8.x" repo_url_ext: "nodesource.com/setup_8.x"
=======
repo_url_ext: "nodesource.com/setup_10.x"
>>>>>>> feature-node_options-variable
# Build from sources # Build from sources
build_from_sources: false build_from_sources: false
wazuh_plugin_branch: 3.11-7.6 wazuh_plugin_branch: 3.11-7.6
#Nodejs NODE_OPTIONS
node_options: --max-old-space-size=4096

View File

@ -63,9 +63,7 @@
chdir: "/tmp/app/build" chdir: "/tmp/app/build"
- name: Install Wazuh Plugin (can take a while) - name: Install Wazuh Plugin (can take a while)
shell: "/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 }}
environment:
NODE_OPTIONS: "--max-old-space-size=3072"
args: args:
executable: /bin/bash executable: /bin/bash
creates: /usr/share/kibana/plugins/wazuh/package.json creates: /usr/share/kibana/plugins/wazuh/package.json

View File

@ -117,11 +117,10 @@
- build_from_sources is defined - build_from_sources is defined
- build_from_sources - build_from_sources
- name: Install Wazuh Plugin (can take a while) - name: Install Wazuh Plugin (can take a while)
shell: "/usr/share/kibana/bin/kibana-plugin install {{ wazuh_app_url }}-{{ wazuh_version }}_{{ elastic_stack_version }}.zip" shell: >-
environment: NODE_OPTIONS="{{ node_options }}" /usr/share/kibana/bin/kibana-plugin install
NODE_OPTIONS: "--max-old-space-size=3072" {{ wazuh_app_url }}-{{ wazuh_version }}_{{ elastic_stack_version }}.zip
args: args:
executable: /bin/bash executable: /bin/bash
creates: /usr/share/kibana/plugins/wazuh/package.json creates: /usr/share/kibana/plugins/wazuh/package.json
@ -135,6 +134,16 @@
when: when:
- not build_from_sources - not build_from_sources
- name: Kibana optimization (can take a while)
shell: NODE_OPTIONS="{{ node_options }}" /usr/share/kibana/bin/kibana --optimize
args:
executable: /bin/bash
become: yes
become_user: kibana
changed_when: false
tags:
- skip_ansible_lint
- name: Wait for Elasticsearch port - name: Wait for Elasticsearch port
wait_for: host={{ elasticsearch_network_host }} port={{ elasticsearch_http_port }} wait_for: host={{ elasticsearch_network_host }} port={{ elasticsearch_http_port }}

View File

@ -60,8 +60,9 @@ wazuh_winagent_config:
auth_path: C:\Program Files\ossec-agent\agent-auth.exe auth_path: C:\Program Files\ossec-agent\agent-auth.exe
# Adding quotes to auth_path_x86 since win_shell outputs error otherwise # Adding quotes to auth_path_x86 since win_shell outputs error otherwise
auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe
check_md5: True
md5: 87ce22038688efb44d95f9daff472056 md5: 87ce22038688efb44d95f9daff472056
wazuh_winagent_config_url: https://packages.wazuh.com/3.x/windows/wazuh-agent-3.11.3-1.msi wazuh_winagent_config_url: https://packages.wazuh.com/3.x/windows/wazuh-agent-3.11.4-1.msi
wazuh_winagent_package_name: wazuh-agent-3.11.4-1.msi wazuh_winagent_package_name: wazuh-agent-3.11.4-1.msi
wazuh_agent_config: wazuh_agent_config:
repo: repo:

View File

@ -38,6 +38,8 @@
register: wazuh_agent_status register: wazuh_agent_status
failed_when: failed_when:
- wazuh_agent_status.stat.checksum != wazuh_winagent_config.md5 - wazuh_agent_status.stat.checksum != wazuh_winagent_config.md5
when:
- wazuh_winagent_config.check_md5
- name: Windows | Install Agent if not already installed - name: Windows | Install Agent if not already installed
win_package: win_package:

View File

@ -11,8 +11,6 @@
stat: stat:
path: /usr/bin/node path: /usr/bin/node
register: node_service_status register: node_service_status
when:
- wazuh_manager_config.cluster.node_type == "master"
- name: Install NodeJS repository - name: Install NodeJS repository
block: block: