diff --git a/ansible-role-elasticsearch/README.md b/ansible-role-elasticsearch/README.md index 9f3ec016..f939dbf1 100644 --- a/ansible-role-elasticsearch/README.md +++ b/ansible-role-elasticsearch/README.md @@ -24,7 +24,7 @@ Defaults variables are listed below, along with its values (see `defaults/main.y elasticsearch_http_port: 9200 elasticsearch_network_host: 127.0.0.1 elasticsearch_jvm_xms: 1g - elk_stack_version: 5.4.0 + elastic_stack_version: 5.4.0 ``` Example Playbook diff --git a/ansible-role-elasticsearch/defaults/main.yml b/ansible-role-elasticsearch/defaults/main.yml index 003dc319..2e73fe5b 100644 --- a/ansible-role-elasticsearch/defaults/main.yml +++ b/ansible-role-elasticsearch/defaults/main.yml @@ -4,4 +4,4 @@ elasticsearch_node_name: node-1 elasticsearch_http_port: 9200 elasticsearch_network_host: 127.0.0.1 elasticsearch_jvm_xms: 1g -elk_stack_version: 5.4.0 +elastic_stack_version: 5.4.0 diff --git a/ansible-role-elasticsearch/tasks/Debian.yml b/ansible-role-elasticsearch/tasks/Debian.yml index e32929fc..0a4cc8bd 100644 --- a/ansible-role-elasticsearch/tasks/Debian.yml +++ b/ansible-role-elasticsearch/tasks/Debian.yml @@ -33,5 +33,5 @@ filename: 'elk_repo' - name: Debian/Ubuntu | Install Elasticsarch - apt: name=elasticsearch={{ elk_stack_version }} state=present update_cache=yes + apt: name=elasticsearch={{ elastic_stack_version }} state=present update_cache=yes tags: install diff --git a/ansible-role-elasticsearch/tasks/RedHat.yml b/ansible-role-elasticsearch/tasks/RedHat.yml index df21a989..ceaf4357 100644 --- a/ansible-role-elasticsearch/tasks/RedHat.yml +++ b/ansible-role-elasticsearch/tasks/RedHat.yml @@ -26,6 +26,6 @@ gpgcheck: yes - name: RedHat/CentOS/Fedora | Install Elasticsarch - package: name=elasticsearch-{{ elk_stack_version }} state=present + package: name=elasticsearch-{{ elastic_stack_version }} state=present when: oracle_java_task_rpm_installed is defined tags: install diff --git a/ansible-role-kibana/README.md b/ansible-role-kibana/README.md index d9f87ab1..c781b04e 100644 --- a/ansible-role-kibana/README.md +++ b/ansible-role-kibana/README.md @@ -22,7 +22,7 @@ Role Variables elasticsearch_network_host: "127.0.0.1" kibana_server_host: "0.0.0.0" kibana_server_port: "5601" - elk_stack_version: 5.4.0 + elastic_stack_version: 5.4.0 ``` Example Playbook diff --git a/ansible-role-kibana/defaults/main.yml b/ansible-role-kibana/defaults/main.yml index 3073ab80..b8bd9381 100644 --- a/ansible-role-kibana/defaults/main.yml +++ b/ansible-role-kibana/defaults/main.yml @@ -3,4 +3,4 @@ elasticsearch_http_port: "9200" elasticsearch_network_host: "127.0.0.1" kibana_server_host: "0.0.0.0" kibana_server_port: "5601" -elk_stack_version: 5.4.0 +elastic_stack_version: 5.4.0 diff --git a/ansible-role-kibana/tasks/Debian.yml b/ansible-role-kibana/tasks/Debian.yml index 2a9d265c..8ff200d1 100644 --- a/ansible-role-kibana/tasks/Debian.yml +++ b/ansible-role-kibana/tasks/Debian.yml @@ -17,5 +17,5 @@ filename: 'elk_repo' - name: Debian/Ubuntu | Install Kibana - apt: name=kibana={{ elk_stack_version }} state=present update_cache=yes + apt: name=kibana={{ elastic_stack_version }} state=present update_cache=yes tags: install diff --git a/ansible-role-kibana/tasks/RedHat.yml b/ansible-role-kibana/tasks/RedHat.yml index 8ceb03e7..52759c15 100644 --- a/ansible-role-kibana/tasks/RedHat.yml +++ b/ansible-role-kibana/tasks/RedHat.yml @@ -13,5 +13,5 @@ gpgcheck: yes - name: RedHat/CentOS/Fedora | Install Kibana - package: name=kibana-{{ elk_stack_version }} state=present + package: name=kibana-{{ elastic_stack_version }} state=present tags: install diff --git a/ansible-role-kibana/tasks/main.yml b/ansible-role-kibana/tasks/main.yml index ba3183db..83d465f7 100644 --- a/ansible-role-kibana/tasks/main.yml +++ b/ansible-role-kibana/tasks/main.yml @@ -20,7 +20,7 @@ tags: configure - name: Checking Wazuh-APP version - shell: "grep -c -E 'version.*{{ elk_stack_version }}' /usr/share/kibana/plugins/wazuh/package.json | xargs echo" + shell: "grep -c -E 'version.*{{ elastic_stack_version }}' /usr/share/kibana/plugins/wazuh/package.json | xargs echo" args: removes: /usr/share/kibana/plugins/wazuh/package.json register: wazuh_app_verify @@ -35,7 +35,7 @@ tags: install - name: Install Wazuh-APP (can take a while) - shell: "/usr/share/kibana/bin/kibana-plugin install https://packages.wazuh.com/wazuhapp/wazuhapp-2.0_{{ elk_stack_version }}.zip" + shell: "/usr/share/kibana/bin/kibana-plugin install https://packages.wazuh.com/wazuhapp/wazuhapp-2.0_{{ elastic_stack_version }}.zip" args: creates: /usr/share/kibana/plugins/wazuh/package.json notify: restart kibana diff --git a/ansible-role-logstash/README.md b/ansible-role-logstash/README.md index a066b2e4..692bf658 100644 --- a/ansible-role-logstash/README.md +++ b/ansible-role-logstash/README.md @@ -19,7 +19,7 @@ Role Variables --- elasticsearch_network_host: "127.0.0.1" elasticsearch_http_port: "9200" - elk_stack_version: 5.4.0 + elastic_stack_version: 5.4.0 ``` Example Playbook diff --git a/ansible-role-logstash/defaults/main.yml b/ansible-role-logstash/defaults/main.yml index c021a488..d8a11ad1 100644 --- a/ansible-role-logstash/defaults/main.yml +++ b/ansible-role-logstash/defaults/main.yml @@ -4,7 +4,7 @@ logstash_input_beats: false elasticsearch_network_host: "127.0.0.1" elasticsearch_http_port: "9200" -elk_stack_version: 5.4.0 +elastic_stack_version: 5.4.0 logstash_ssl: false logstash_ssl_dir: /etc/pki/logstash diff --git a/ansible-role-logstash/tasks/Debian.yml b/ansible-role-logstash/tasks/Debian.yml index c982c465..601d1250 100644 --- a/ansible-role-logstash/tasks/Debian.yml +++ b/ansible-role-logstash/tasks/Debian.yml @@ -36,5 +36,5 @@ filename: 'elk_repo' - name: Debian/Ubuntu | Install Logstash - apt: name=logstash=1:{{ elk_stack_version }}-1 state=present update_cache=yes + apt: name=logstash=1:{{ elastic_stack_version }}-1 state=present update_cache=yes tags: install diff --git a/ansible-role-logstash/tasks/RedHat.yml b/ansible-role-logstash/tasks/RedHat.yml index 31540239..7cc49718 100644 --- a/ansible-role-logstash/tasks/RedHat.yml +++ b/ansible-role-logstash/tasks/RedHat.yml @@ -26,6 +26,6 @@ gpgcheck: yes - name: RedHat/CentOS/Fedora | Install Logstash - package: name=logstash-{{ elk_stack_version }} state=present + package: name=logstash-{{ elastic_stack_version }} state=present when: oracle_java_task_rpm_installed is defined tags: install