Merge "Allow ELK7 roles to run with disabled ANSIBLE_INJECT_FACT_VARS"

Author: Zuul

elk_metrics_7x/installJournalbeat.yml

@@ -63,7 +63,7 @@
       meta: end_play
       when:
         - not (journal_dir.stat.exists | bool) or
-          (ansible_service_mgr != 'systemd')
+          (ansible_facts['service_mgr'] != 'systemd')
 
   roles:
     - role: elastic_journalbeat
@@ -94,7 +94,7 @@
       meta: end_play
       when:
         - not (journal_dir.stat.exists | bool) or
-          (ansible_service_mgr != 'systemd')
+          (ansible_facts['service_mgr'] != 'systemd')
 
   roles:
     - role: elastic_rollup

elk_metrics_7x/installMonitorStack.yml

@@ -27,7 +27,7 @@
             union(groups['memcached_all'] | default([])) |
             union(groups['memcached_all'] | default([]))
           )
-        - ansible_service_mgr == 'systemd'
+        - ansible_facts['service_mgr'] == 'systemd'
   tags:
     - always
 
@@ -154,7 +154,7 @@
   post_tasks:
     - name: Find clouds config
       stat:
-        path: "{{ ansible_env.HOME }}/.config/openstack/clouds.yaml"
+        path: "{{ ansible_facts['env']['HOME'] }}/.config/openstack/clouds.yaml"
       register: clouds_config
 
     - name: Find openstack release
@@ -174,9 +174,9 @@
       block:
         - name: Ensure disto packages are installed
           package:
-            name: "{{ monitorstack_distro_packages[(ansible_distribution | lower)] }}"
+            name: "{{ monitorstack_distro_packages[(ansible_facts['distribution'] | lower)] }}"
             state: "{{ monitorstack_package_state | default('present') }}"
-            update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}"
+            update_cache: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary('yes', omit) }}"
 
         - name: Refresh local facts
           setup:
@@ -218,7 +218,7 @@
 
         - name: Copy the clouds config into monitorstack
           copy:
-            src: "{{ ansible_env.HOME }}/.config/openstack/clouds.yaml"
+            src: "{{ ansible_facts['env']['HOME'] }}/.config/openstack/clouds.yaml"
             dest: "/var/lib/monitorstack/.config/openstack/clouds.yaml"
             remote_src: yes
           when:

elk_metrics_7x/roles/elastic_apm_server/tasks/main.yml

@@ -14,22 +14,26 @@
 # limitations under the License.
 
 - name: Gather variables for each operating system
-  include_vars: "{{ item }}"
-  with_first_found:
-    - "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml"
-    - "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
-    - "{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
-    - "{{ ansible_distribution | lower }}.yml"
-    - "{{ ansible_os_family | lower }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
-    - "{{ ansible_os_family | lower }}.yml"
+  include_vars: "{{ lookup('first_found', params) }}"
+  vars:
+    params:
+      files:
+        - "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_version'] | lower }}.yml"
+        - "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_major_version'] | lower }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}-{{ ansible_facts['distribution_major_version'] | lower }}.yml"
+        - "{{ ansible_facts['distribution'] | lower }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
+      paths:
+        - "{{ role_path }}/vars"
   tags:
     - always
 
 - name: Ensure apm-server is installed
   package:
     name: "{{ apm_server_distro_packages }}"
     state: "{{ elk_package_state | default('present') }}"
-    update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}"
+    update_cache: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary('yes', omit) }}"
   register: _package_task
   until: _package_task is success
   retries: 3

elk_metrics_7x/roles/elastic_auditbeat/tasks/main.yml

@@ -14,14 +14,18 @@
 # limitations under the License.
 
 - name: Gather variables for each operating system
-  include_vars: "{{ item }}"
-  with_first_found:
-    - "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml"
-    - "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
-    - "{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
-    - "{{ ansible_distribution | lower }}.yml"
-    - "{{ ansible_os_family | lower }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
-    - "{{ ansible_os_family | lower }}.yml"
+  include_vars: "{{ lookup('first_found', params) }}"
+  vars:
+    params:
+      files:
+        - "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_version'] | lower }}.yml"
+        - "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_major_version'] | lower }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}-{{ ansible_facts['distribution_major_version'] | lower }}.yml"
+        - "{{ ansible_facts['distribution'] | lower }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
+      paths:
+        - "{{ role_path }}/vars"
   tags:
     - always
 
@@ -31,13 +35,13 @@
       - auditbeat
     containerised: true
   when:
-    - ansible_virtualization_type in ["systemd-nspawn", "lxc", "lxd", "podman", "docker", "systemd_container", "container"]
+    - ansible_facts['virtualization_type'] in ["systemd-nspawn", "lxc", "lxd", "podman", "docker", "systemd_container", "container"]
 
 - name: Ensure beat is installed
   package:
     name: "{{ auditbeat_distro_packages }}"
     state: "{{ elk_package_state | default('present') }}"
-    update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}"
+    update_cache: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary('yes', omit) }}"
   register: _package_task
   until: _package_task is success
   retries: 3

elk_metrics_7x/roles/elastic_auditbeat/templates/auditbeat.yml.j2

@@ -34,7 +34,7 @@ auditbeat.modules:
 # The auditd module collects events from the audit framework in the Linux
 # kernel. You need to specify audit rules for the events that you want to audit.
 - module: auditd
-{% if ansible_kernel is version('4.4', '>=') %}
+{% if ansible_facts['kernel'] is version('4.4', '>=') %}
   socket_type: {{ (apply_security_hardening | default(true) | bool) | ternary('multicast', 'unicast') }}
 {% endif %}
   resolve_ids: true
@@ -678,7 +678,7 @@ name: {{ elastic_hostname }}
   #kerberos.realm: ELASTIC
 
 # ------------------------------ Logstash Output -------------------------------
-{{ elk_macros.output_logstash(inventory_hostname, logstash_data_hosts, ansible_processor_count) }}
+{{ elk_macros.output_logstash(inventory_hostname, logstash_data_hosts, ansible_facts['processor_count']) }}
 
 # -------------------------------- Kafka Output --------------------------------
 #output.kafka:
@@ -1155,7 +1155,7 @@ setup.ilm.policy_file: "{{ ilm_policy_file_location }}/{{ ilm_policy_filename }}
 {{ elk_macros.beat_logging('auditbeat', auditbeat_log_level) }}
 
 # ============================= X-Pack Monitoring ==============================
-{{ elk_macros.xpack_monitoring_elasticsearch('auditbeat', inventory_hostname, elasticsearch_data_hosts, ansible_processor_count, beats_system_username, elastic_cluster_uuid) }}
+{{ elk_macros.xpack_monitoring_elasticsearch('auditbeat', inventory_hostname, elasticsearch_data_hosts, ansible_facts['processor_count'], beats_system_username, elastic_cluster_uuid) }}
 
 # =============================== HTTP Endpoint ================================
 

elk_metrics_7x/roles/elastic_data_hosts/defaults/main.yml

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 # This interface is used to determine cluster recovery speed.
-elastic_data_interface: "{{ ansible_default_ipv4['alias'] }}"
+elastic_data_interface: "{{ ansible_facts['default_ipv4']['alias'] }}"
 
 # A list of interfaces/ports of the elasticsearch data nodes
 # to override the default of ansible_host:elastic_port

elk_metrics_7x/roles/elastic_data_hosts/vars/data-node-variables.yml

@@ -99,11 +99,11 @@ _elasticsearch_discovery_seed_hosts: >-
   }}
 
 elasticsearch_interface_speed: |-
-  {% set default_interface_fact = hostvars[inventory_hostname]['ansible_' + (elastic_data_interface | replace('-', '_'))] %}
+  {% set default_interface_fact = hostvars[inventory_hostname]['ansible_facts'][elastic_data_interface | replace('-', '_')] %}
   {% set speeds = [] %}
   {% if default_interface_fact['type'] == 'bridge' %}
   {%   for interface in default_interface_fact['interfaces'] %}
-  {%     set interface_fact = hostvars[inventory_hostname]['ansible_' + (interface | replace('-', '_'))] %}
+  {%     set interface_fact = hostvars[inventory_hostname]['ansible_facts'][interface | replace('-', '_')] %}
   {%     if 'speed' in interface_fact %}
   {%       set speed = (interface_fact['speed'] | default(1000)) | string %}
   {%       if speed == "-1" %}
@@ -158,9 +158,9 @@ logstash_data_node_details: >-
 master_node: "{{ (inventory_hostname in master_nodes) | ternary(true, false) }}"
 data_node: "{{ (inventory_hostname in data_nodes) | ternary(true, false) }}"
 
-elastic_processors_floor: "{{ ((ansible_processor_count | int) - 1) }}"
+elastic_processors_floor: "{{ ((ansible_facts['processor_count'] | int) - 1) }}"
 elastic_processors_floor_set: "{{ ((elastic_processors_floor | int) > 0) | ternary(elastic_processors_floor, 1) }}"
-elastic_thread_pool_size: "{{ ((ansible_processor_count | int) >= 24) | ternary(23, elastic_processors_floor_set) }}"
+elastic_thread_pool_size: "{{ ((ansible_facts['processor_count'] | int) >= 24) | ternary(23, elastic_processors_floor_set) }}"
 
 # Set a data node facts. The data nodes, in the case of elasticsearch are also
 # ingest nodes.

elk_metrics_7x/roles/elastic_dependencies/defaults/main.yml

@@ -21,7 +21,7 @@
 #elastic_shared_fs_repos:
 #  - fstype: nfs4
 #    src: "<nfs-server-ip>:/esbackup"
-#    opts: clientaddr="{{ ansible_eth1['ipv4']['address'] }}"
+#    opts: clientaddr="{{ ansible_facts['eth1']['ipv4']['address'] }}"
 #    path: "/elastic-backup"
 #    state: mounted
 

elk_metrics_7x/roles/elastic_dependencies/tasks/main.yml

@@ -38,14 +38,18 @@
   include_vars: "vars_{{ service_name }}.yml"
 
 - name: Gather variables for each operating system
-  include_vars: "{{ item }}"
-  with_first_found:
-    - "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml"
-    - "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
-    - "{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
-    - "{{ ansible_distribution | lower }}.yml"
-    - "{{ ansible_os_family | lower }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
-    - "{{ ansible_os_family | lower }}.yml"
+  include_vars: "{{ lookup('first_found', params) }}"
+  vars:
+    params:
+      files:
+        - "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_version'] | lower }}.yml"
+        - "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_major_version'] | lower }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}-{{ ansible_facts['distribution_major_version'] | lower }}.yml"
+        - "{{ ansible_facts['distribution'] | lower }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
+      paths:
+        - "{{ role_path }}/vars"
   tags:
     - always
 
@@ -186,8 +190,8 @@
   package:
     name: "{{ elastic_distro_packages }}"
     state: "{{ elk_package_state | default('present') }}"
-    install_recommends: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}"
-    update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}"
+    install_recommends: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary('yes', omit) }}"
+    update_cache: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary('yes', omit) }}"
   register: _package_task
   until: _package_task is success
   retries: 3
@@ -208,7 +212,7 @@
         name: java
         path: "{{ java_alternatives.stdout.strip() }}"
   when:
-    - (ansible_os_family | lower) == 'debian'
+    - (ansible_facts['os_family'] | lower) == 'debian'
 
 - name: Ensure service directories exists
   file:
@@ -229,7 +233,7 @@
   lineinfile:
     path: /etc/hosts
     regexp: '^{{ item }}'
-    line: '{{ item }} {{ ansible_hostname }} {{ ansible_fqdn }}'
+    line: '{{ item }} {{ ansible_facts["hostname"] }} {{ ansible_facts["fqdn"] }}'
     owner: root
     group: root
     mode: 0644

elk_metrics_7x/roles/elastic_filebeat/tasks/main.yml

@@ -14,22 +14,26 @@
 # limitations under the License.
 
 - name: Gather variables for each operating system
-  include_vars: "{{ item }}"
-  with_first_found:
-    - "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml"
-    - "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
-    - "{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
-    - "{{ ansible_distribution | lower }}.yml"
-    - "{{ ansible_os_family | lower }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
-    - "{{ ansible_os_family | lower }}.yml"
+  include_vars: "{{ lookup('first_found', params) }}"
+  vars:
+    params:
+      files:
+        - "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_version'] | lower }}.yml"
+        - "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_major_version'] | lower }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}-{{ ansible_facts['distribution_major_version'] | lower }}.yml"
+        - "{{ ansible_facts['distribution'] | lower }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
+      paths:
+        - "{{ role_path }}/vars"
   tags:
     - always
 
 - name: Ensure beat is installed
   package:
     name: "{{ filebeat_distro_packages }}"
     state: "{{ elk_package_state | default('present') }}"
-    update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}"
+    update_cache: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary('yes', omit) }}"
   register: _package_task
   until: _package_task is success
   retries: 3
@@ -63,11 +67,11 @@
 
 - name: Set dicovery facts to enable Filebeat modules
   set_fact:
-    elasticsearch_enabled: "{{ ((ansible_facts.services['elasticsearch.service'] | default({}) )['state'] | default('')) == 'running' }}"
-    logstash_enabled: "{{ ((ansible_facts.services['logstash.service'] | default({}) )['state'] | default('')) == 'running' }}"
-    kibana_enabled: "{{ ((ansible_facts.services['kibana.service'] | default({}) )['state'] | default('')) == 'running' }}"
-    haproxy_enabled: "{{ ((ansible_facts.services['haproxy.service'] | default({}) )['state'] | default('')) == 'running' }}"
-    nginx_enabled: "{{ ((ansible_facts.services['nginx.service'] | default({}) )['state'] | default('')) == 'running' }}"
+    elasticsearch_enabled: "{{ ((ansible_facts.services['elasticsearch.service'] | default({}))['state'] | default('')) == 'running' }}"
+    logstash_enabled: "{{ ((ansible_facts.services['logstash.service'] | default({}))['state'] | default('')) == 'running' }}"
+    kibana_enabled: "{{ ((ansible_facts.services['kibana.service'] | default({}))['state'] | default('')) == 'running' }}"
+    haproxy_enabled: "{{ ((ansible_facts.services['haproxy.service'] | default({}))['state'] | default('')) == 'running' }}"
+    nginx_enabled: "{{ ((ansible_facts.services['nginx.service'] | default({}))['state'] | default('')) == 'running' }}"
 
 - name: Drop Filebeat conf file
   template: