Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NodeJS node_options variable and Kibana plugin optimization #385

Merged
merged 13 commits into from
Mar 13, 2020
Merged

NodeJS node_options variable and Kibana plugin optimization #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
163c89d
Adding nodejs recommended node_options and plugin optimization
Zenidd Mar 10, 2020
cfd2de0
node_options scope improvements
Zenidd Mar 11, 2020
a4465eb
node options variable improvements
Zenidd Mar 11, 2020
9dc91b8
Adding lint fixes
Zenidd Mar 11, 2020
efd55e5
Minor linting fix
Zenidd Mar 11, 2020
c0670f0
Lint fixes
Zenidd Mar 12, 2020
040aba1
Adding devel changes
Zenidd Mar 12, 2020
b4bd4b3
multiline wrap with whitespace in a correct column
Zenidd Mar 12, 2020
3d2cce7
multiline wrapping fix
Zenidd Mar 12, 2020
dab2f69
removing single quotes
Zenidd Mar 12, 2020
b9a8dff
fix to pass the indempotence test
Zenidd Mar 13, 2020
84b5510
Removing whitespaces surrounding node_options var
Zenidd Mar 13, 2020
f4b70ab
removing kibana script extra node options
Zenidd Mar 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions roles/elastic-stack/ansible-kibana/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,6 @@ nodejs:
# Build from sources
build_from_sources: false
wazuh_plugin_branch: 3.11-7.6

#Nodejs NODE_OPTIONS
node_options: --max-old-space-size=4096
4 changes: 1 addition & 3 deletions roles/elastic-stack/ansible-kibana/tasks/build_wazuh_plugin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,7 @@
chdir: "/tmp/app/build"

- name: Install Wazuh Plugin (can take a while)
shell: "/usr/share/kibana/bin/kibana-plugin install file:///tmp/app/build/{{ wazuhapp_package_name.stdout }}"
environment:
NODE_OPTIONS: "--max-old-space-size=3072"
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
Expand Down
17 changes: 13 additions & 4 deletions roles/elastic-stack/ansible-kibana/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,10 @@
- build_from_sources is defined
- build_from_sources


- 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"
environment:
NODE_OPTIONS: "--max-old-space-size=3072"
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
Expand All @@ -135,6 +134,16 @@
when:
- 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
wait_for: host={{ elasticsearch_network_host }} port={{ elasticsearch_http_port }}

Expand Down