Fix Kibana dashboard uploading for mirrors and proxies
To upload the Kibana dashboard behind http proxies we need to * Point to a local mirror for nodejs if one is defined * Install nodejs directly with apt rather than the magic script * Be explicit about no_proxy when uploading the dashboard This change also uploads the dashboard only once rather than on each elastic-logstash node. Change-Id: I4695d6fe6f85d9120f83abc9a92c54ac3ad68c95
This commit is contained in:
parent
48d7b08773
commit
bc374b8688
@ -20,7 +20,7 @@
|
|||||||
environment: "{{ deployment_environment_variables | default({}) }}"
|
environment: "{{ deployment_environment_variables | default({}) }}"
|
||||||
|
|
||||||
vars:
|
vars:
|
||||||
disto_packages:
|
distro_packages:
|
||||||
zypper:
|
zypper:
|
||||||
- nodejs6
|
- nodejs6
|
||||||
apt:
|
apt:
|
||||||
@ -31,11 +31,36 @@
|
|||||||
shell: "curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -"
|
shell: "curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -"
|
||||||
when:
|
when:
|
||||||
- ansible_pkg_mgr == 'apt'
|
- ansible_pkg_mgr == 'apt'
|
||||||
|
- ossec_nodejs_repo is not defined
|
||||||
|
|
||||||
|
- name: Manual nodejs installation
|
||||||
|
block:
|
||||||
|
- name: Add nodejs apt key
|
||||||
|
apt_key:
|
||||||
|
url: "{{ ossec_nodejs_repo.key_url }}"
|
||||||
|
state: "present"
|
||||||
|
register: _apt_task
|
||||||
|
until: _apt_task is success
|
||||||
|
retries: 3
|
||||||
|
delay: 2
|
||||||
|
|
||||||
|
- name: add nodejs repo to apt sources list
|
||||||
|
apt_repository:
|
||||||
|
repo: "{{ ossec_nodejs_repo.repo }}"
|
||||||
|
state: "{{ ossec_nodejs_repo.state }}"
|
||||||
|
filename: "{{ ossec_nodejs_repo.filename | default(omit) }}"
|
||||||
|
register: _apt_task
|
||||||
|
until: _apt_task is success
|
||||||
|
retries: 3
|
||||||
|
delay: 2
|
||||||
|
when:
|
||||||
|
- ansible_pkg_mgr == 'apt'
|
||||||
|
- ossec_nodejs_repo is defined
|
||||||
|
|
||||||
- name: Install nodejs
|
- name: Install nodejs
|
||||||
package:
|
package:
|
||||||
name: "{{ disto_packages[ansible_pkg_mgr] }}"
|
name: "{{ distro_packages[ansible_pkg_mgr] }}"
|
||||||
state: "present"
|
state: "{{ elk_package_state | default('present') }}"
|
||||||
update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}"
|
update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}"
|
||||||
register: _pkg_task
|
register: _pkg_task
|
||||||
until: _pkg_task is success
|
until: _pkg_task is success
|
||||||
@ -48,11 +73,14 @@
|
|||||||
path: /opt/elasticdump
|
path: /opt/elasticdump
|
||||||
state: "present"
|
state: "present"
|
||||||
|
|
||||||
- block:
|
- name: Copy openstack dashboard json template to /tmp dir
|
||||||
- name: Copy openstack dashboard json template to /tmp dir
|
template:
|
||||||
template:
|
src: templates/openstack-log-dashboard.json
|
||||||
src: templates/openstack-log-dashboard.json
|
dest: /tmp/openstack-log-dashboard.json
|
||||||
dest: /tmp/openstack-log-dashboard.json
|
run_once: yes
|
||||||
|
|
||||||
- name: Upload Custom Openstack Log Dashboard
|
- name: Upload Custom Openstack Log Dashboard
|
||||||
shell: "/opt/elasticdump/node_modules/elasticdump/bin/elasticdump --input=/tmp/openstack-log-dashboard.json --output={{ kibana_index_on_elasticsearch }} --type=data"
|
shell: "/opt/elasticdump/node_modules/elasticdump/bin/elasticdump --input=/tmp/openstack-log-dashboard.json --output={{ kibana_index_on_elasticsearch }} --type=data"
|
||||||
|
environment:
|
||||||
|
no_proxy: "{{ hostvars[groups['elastic-logstash'][0]]['ansible_host'] }}"
|
||||||
|
run_once: yes
|
||||||
|
Loading…
Reference in New Issue
Block a user