From 4851e29e9c1e047dac5d87205dfcabf8099e95ab Mon Sep 17 00:00:00 2001 From: Duncan Martin Walker Date: Fri, 14 Feb 2020 14:28:03 +0000 Subject: [PATCH] Subdivision of elastic-logstash group It is currently assumed that the elasticsearch data nodes and the logstash nodes are co-located within the same container during deployment of the ELK stack. This commit is intended to remove that assumption by requiring specification of separate elastic and logstash groups. This is particularly important where instances of elasticsearch and logstash are separated for resource reasons, a common setup for an elastic cluster. The default setup for the elastic nodes has been simplified, with all non-coordinating nodes being both data and ingest nodes unless otherwise specified. This was previously defined algorithmically, with the elastic node setup tightly coupled to the placement of the logstash instances. Change-Id: Id06eb78b52705aefea9cfe1247f53bac58badd52 --- elk_metrics_7x/README.rst | 14 ++-- elk_metrics_7x/createElasticIndexes.yml | 2 +- elk_metrics_7x/env.d/elk.yml | 4 +- elk_metrics_7x/installAPMserver.yml | 2 +- elk_metrics_7x/installAuditbeat.yml | 2 +- elk_metrics_7x/installElastic.yml | 2 +- elk_metrics_7x/installFilebeat.yml | 2 +- elk_metrics_7x/installHeartbeat.yml | 2 +- elk_metrics_7x/installJournalbeat.yml | 2 +- elk_metrics_7x/installLogstash.yml | 2 +- elk_metrics_7x/installMetricbeat.yml | 2 +- elk_metrics_7x/installPacketbeat.yml | 2 +- .../vars/data-node-variables.yml | 80 +++++-------------- .../roles/elastic_ilm/defaults/main.yml | 2 +- .../roles/elastic_kibana/defaults/main.yml | 2 +- .../roles/elastic_logstash/handlers/main.yml | 4 +- .../templates/metricbeat.yml.j2 | 4 +- .../roles/elasticsearch/tasks/main.yml | 2 +- elk_metrics_7x/setupKibanaDashboard.yml | 4 +- elk_metrics_7x/showElasticCluster.yml | 4 +- elk_metrics_7x/templates/_macros.j2 | 4 +- .../inventory/test-container-inventory.yml | 5 +- .../tests/inventory/test-metal-inventory.yml | 6 +- elk_metrics_7x/tests/testAPI.yml | 6 +- elk_metrics_7x/vars/variables.yml | 2 +- 25 files changed, 67 insertions(+), 96 deletions(-) diff --git a/elk_metrics_7x/README.rst b/elk_metrics_7x/README.rst index d21cd162..1d42df93 100644 --- a/elk_metrics_7x/README.rst +++ b/elk_metrics_7x/README.rst @@ -512,7 +512,7 @@ Optional | Customize Elasticsearch cluster configuration ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Cluster configuration can be augmented using several variables which will force -a node to use a given role. +a node to use a given role. By default all nodes are data and ingest eligible. Available roles are *data*, *ingest*, and *master*. @@ -529,7 +529,7 @@ Example setting override options within inventory. hosts: children: - elastic-logstash: + elastic: hosts: elk1: ansible_host: 10.0.0.1 @@ -552,11 +552,15 @@ Example setting override options within inventory. elk4: ansible_host: 10.0.0.4 ansible_user: root + logstash: + children: + elk3: + elk4: With the following inventory settings **elk1** would be a master node, **elk2** -would be a data, **elk3** would be an ingest node, and **elk4** would auto -select a role. - +would be a data, **elk3** would be an ingest node, and **elk4** would be both a +data and an ingest node. **elk3** and **elk4** would become the nodes hosting +logstash instances. Upgrading the cluster --------------------- diff --git a/elk_metrics_7x/createElasticIndexes.yml b/elk_metrics_7x/createElasticIndexes.yml index 4af8faac..fcf683bf 100644 --- a/elk_metrics_7x/createElasticIndexes.yml +++ b/elk_metrics_7x/createElasticIndexes.yml @@ -12,7 +12,7 @@ # limitations under the License. - name: Create/Setup known indexes in Elasticsearch - hosts: "elastic-logstash[0]" + hosts: "elastic[0]" become: true roles: diff --git a/elk_metrics_7x/env.d/elk.yml b/elk_metrics_7x/env.d/elk.yml index 286534ce..d5e7af71 100644 --- a/elk_metrics_7x/env.d/elk.yml +++ b/elk_metrics_7x/env.d/elk.yml @@ -4,11 +4,13 @@ component_skel: belongs_to: - elk_all - apm_all - elastic-logstash: + elastic: belongs_to: - elk_all - elasticsearch - elasticsearch_all + logstash: + belongs_to: - logstash - logstash_all kibana: diff --git a/elk_metrics_7x/installAPMserver.yml b/elk_metrics_7x/installAPMserver.yml index 53c4b645..66fca2df 100644 --- a/elk_metrics_7x/installAPMserver.yml +++ b/elk_metrics_7x/installAPMserver.yml @@ -32,7 +32,7 @@ - apm-server - name: Setup apm-server rollup - hosts: elastic-logstash[0] + hosts: elastic[0] become: true vars: haproxy_ssl: false diff --git a/elk_metrics_7x/installAuditbeat.yml b/elk_metrics_7x/installAuditbeat.yml index 022bd221..88e08590 100644 --- a/elk_metrics_7x/installAuditbeat.yml +++ b/elk_metrics_7x/installAuditbeat.yml @@ -29,7 +29,7 @@ - beat-install - name: Setup auditbeat rollup - hosts: elastic-logstash[0] + hosts: elastic[0] become: true vars: haproxy_ssl: false diff --git a/elk_metrics_7x/installElastic.yml b/elk_metrics_7x/installElastic.yml index 748834b7..7229d828 100644 --- a/elk_metrics_7x/installElastic.yml +++ b/elk_metrics_7x/installElastic.yml @@ -12,7 +12,7 @@ # limitations under the License. - name: Install Elastic Search - hosts: "elastic-logstash:kibana" + hosts: elastic:kibana become: true vars_files: diff --git a/elk_metrics_7x/installFilebeat.yml b/elk_metrics_7x/installFilebeat.yml index 842dc694..966b091d 100644 --- a/elk_metrics_7x/installFilebeat.yml +++ b/elk_metrics_7x/installFilebeat.yml @@ -29,7 +29,7 @@ - beat-install - name: Setup filebeat rollup - hosts: elastic-logstash[0] + hosts: elastic[0] become: true vars: haproxy_ssl: false diff --git a/elk_metrics_7x/installHeartbeat.yml b/elk_metrics_7x/installHeartbeat.yml index 772b0ba5..69241a66 100644 --- a/elk_metrics_7x/installHeartbeat.yml +++ b/elk_metrics_7x/installHeartbeat.yml @@ -46,7 +46,7 @@ - beat-install - name: Setup heartbeat rollup - hosts: elastic-logstash[0] + hosts: elastic[0] become: true vars: haproxy_ssl: false diff --git a/elk_metrics_7x/installJournalbeat.yml b/elk_metrics_7x/installJournalbeat.yml index d78e1da0..2cae6799 100644 --- a/elk_metrics_7x/installJournalbeat.yml +++ b/elk_metrics_7x/installJournalbeat.yml @@ -72,7 +72,7 @@ - beat-install - name: Setup journalbeat rollup - hosts: elastic-logstash[0] + hosts: elastic[0] become: true vars: haproxy_ssl: false diff --git a/elk_metrics_7x/installLogstash.yml b/elk_metrics_7x/installLogstash.yml index 02a3e6d9..d8f5648a 100644 --- a/elk_metrics_7x/installLogstash.yml +++ b/elk_metrics_7x/installLogstash.yml @@ -12,7 +12,7 @@ # limitations under the License. - name: Install Logstash - hosts: elastic-logstash + hosts: logstash become: true vars_files: - vars/variables.yml diff --git a/elk_metrics_7x/installMetricbeat.yml b/elk_metrics_7x/installMetricbeat.yml index 4e9a3bac..34dcf153 100644 --- a/elk_metrics_7x/installMetricbeat.yml +++ b/elk_metrics_7x/installMetricbeat.yml @@ -30,7 +30,7 @@ - beat-install - name: Setup metricbeat rollup - hosts: elastic-logstash[0] + hosts: elastic[0] become: true vars: haproxy_ssl: false diff --git a/elk_metrics_7x/installPacketbeat.yml b/elk_metrics_7x/installPacketbeat.yml index a8d32e08..1b1286b4 100644 --- a/elk_metrics_7x/installPacketbeat.yml +++ b/elk_metrics_7x/installPacketbeat.yml @@ -29,7 +29,7 @@ - beat-install - name: Setup packetbeat rollup - hosts: elastic-logstash[0] + hosts: elastic[0] become: true vars: haproxy_ssl: false diff --git a/elk_metrics_7x/roles/elastic_data_hosts/vars/data-node-variables.yml b/elk_metrics_7x/roles/elastic_data_hosts/vars/data-node-variables.yml index a6e8b385..b72bcc5b 100644 --- a/elk_metrics_7x/roles/elastic_data_hosts/vars/data-node-variables.yml +++ b/elk_metrics_7x/roles/elastic_data_hosts/vars/data-node-variables.yml @@ -14,12 +14,12 @@ # limitations under the License. # storage node count is equal to the cluster size -storage_node_count: "{{ groups['elastic-logstash'] | length }}" +storage_node_count: "{{ groups['elastic'] | length }}" # the elasticsearch cluster elects one master from all those which are marked as master-eligible # 1 node cluster can only have one master -# 2 node clusters have 1 master-eligable nodes to avoid split-brain -# 3 node clusters have 3 master-eligable nodes +# 2 node clusters have 1 master-eligible nodes to avoid split-brain +# 3 node clusters have 3 master-eligible nodes # >3 node clusters have (nodes // 2) eligable masters rounded up to the next odd number elastic_master_node_count: |- {% set masters = 0 %} @@ -35,83 +35,41 @@ elastic_master_node_count: |- {% endif %} {{ masters }} -# Assign node roles -# the first 'elastic_master_node_count' hosts in groups['elastic-logstash'] become master-eligible nodes -# the first 'elastic_master_node_count' and subsequent alternate hosts in groups['elastic-logstash'] becomes data nodes -## While the data node group is dynamically chosen the override -## `elasticsearch_node_data` can be used to override the node type. -## Dynamic node inclusion will still work for all other nodes in the group. -_data_nodes: "{{ (groups['elastic-logstash'][:elastic_master_node_count | int] | union(groups['elastic-logstash'][elastic_master_node_count | int::2])) }}" +## Assign node roles +# By default, let all elastic cluster nodes be data unless overridden using elasticsearch_node_data: false data_nodes: |- {% set nodes = [] %} - {% for node in groups['elastic-logstash'] %} - {% if (hostvars[node]['elasticsearch_node_data'] is defined) and (hostvars[node]['elasticsearch_node_data'] | bool) %} + {% for node in groups['elastic'] %} + {% if not ((hostvars[node]['elasticsearch_node_data'] is defined) and (not (hostvars[node]['elasticsearch_node_data'] | bool))) %} {% set _ = nodes.append(node) %} {% endif %} {% endfor %} - {% for node in groups['elastic-logstash'] %} - {% if (nodes | length) <= (_data_nodes | length) %} - {% if (node in _data_nodes) %} - {% set _ = nodes.append(node) %} - {% endif %} - {% endif %} - {% endfor %} {{ nodes }} -## While the logstash node group is dynamically chosen the override -## `elasticsearch_node_ingest` can be used to override the node type. -## Dynamic node inclusion will still work for all other nodes in the group. -_logstash_nodes: "{{ data_nodes }}" -logstash_nodes: |- - {% set nodes = [] %} - {% for node in groups['elastic-logstash'] %} - {% if (hostvars[node]['elasticsearch_node_ingest'] is defined) and (hostvars[node]['elasticsearch_node_ingest'] | bool) %} - {% set _ = nodes.append(node) %} - {% endif %} - {% endfor %} - {% for node in groups['elastic-logstash'] %} - {% if (nodes | length) <= (_logstash_nodes | length) %} - {% if (node in _logstash_nodes) %} - {% set _ = nodes.append(node) %} - {% endif %} - {% endif %} - {% endfor %} - {{ nodes }} - -## While the logstash node group is dynamically chosen the override -## `elasticsearch_node_ingest` can be used to override the node type. -## Dynamic node inclusion will still work for all other nodes in the group. -_ingest_nodes: "{{ data_nodes }}" +# By default, let all elastic cluster nodes be ingest unless overridden using elasticsearch_node_ingest: false ingest_nodes: |- {% set nodes = [] %} - {% for node in groups['elastic-logstash'] %} - {% if (hostvars[node]['elasticsearch_node_ingest'] is defined) and (hostvars[node]['elasticsearch_node_ingest'] | bool) %} + {% for node in groups['elastic'] %} + {% if not ((hostvars[node]['elasticsearch_node_ingest'] is defined) and (not (hostvars[node]['elasticsearch_node_ingest'] | bool))) %} {% set _ = nodes.append(node) %} {% endif %} {% endfor %} - {% for node in groups['elastic-logstash'] %} - {% if (nodes | length) <= (_ingest_nodes | length) %} - {% if (node in _ingest_nodes) %} - {% set _ = nodes.append(node) %} - {% endif %} - {% endif %} - {% endfor %} {{ nodes }} ## While the master node group is dynamically chosen the override ## `elasticsearch_node_master` can be used to override the node type. ## Dynamic node inclusion will still work for all other nodes in the group. -_master_nodes: "{{ groups['elastic-logstash'][:elastic_master_node_count | int] }}" +_master_nodes: "{{ groups['elastic'][:elastic_master_node_count | int] }}" master_nodes: |- {% set nodes = [] %} - {% for node in groups['elastic-logstash'] %} + {% for node in groups['elastic'] %} {% if (nodes | length) <= (elastic_master_node_count | int) %} {% if (hostvars[node]['elasticsearch_node_master'] is defined) and (hostvars[node]['elasticsearch_node_master'] | bool) %} {% set _ = nodes.append(node) %} {% endif %} {% endif %} {% endfor %} - {% for node in groups['elastic-logstash'] %} + {% for node in groups['elastic'] %} {% if (nodes | length) <= (elastic_master_node_count | int) %} {% if (node in _master_nodes) %} {% set _ = nodes.append(node) %} @@ -125,7 +83,7 @@ coordination_nodes: |- {% if (groups['kibana'] | length) > 0 %} {% set c_nodes = groups['kibana'] %} {% else %} - {% set c_nodes = groups['elastic-logstash'] %} + {% set c_nodes = groups['elastic'] %} {% endif %} {{ (elasticsearch_coordination_node_socket_addresses @@ -135,7 +93,7 @@ coordination_nodes: |- zen_nodes: >- {{ - (groups['elastic-logstash'] | union(groups['kibana'])) | map('extract', hostvars, 'ansible_host') | list | shuffle(seed=inventory_hostname) + (groups['elastic'] | union(groups['kibana'])) | map('extract', hostvars, 'ansible_host') | list | shuffle(seed=inventory_hostname) }} elasticserch_interface_speed: |- @@ -189,12 +147,11 @@ elasticsearch_data_node_details: >- logstash_data_node_details: >- {{ logstash_data_node_socket_addresses - | default((logstash_nodes | map('extract', hostvars, 'ansible_host') | list) + | default((groups['logstash'] | map('extract', hostvars, 'ansible_host') | list) | map('regex_replace', '(.*)' ,'\1:' ~ logstash_beat_input_port) | list) }} - # based on the assignment of roles to hosts, set per host booleans master_node: "{{ (inventory_hostname in master_nodes) | ternary(true, false) }}" data_node: "{{ (inventory_hostname in data_nodes) | ternary(true, false) }}" @@ -212,7 +169,7 @@ elasticsearch_beat_settings: number_of_replicas: "{{ elasticsearch_number_of_replicas }}" max_docvalue_fields_search: "{{ elastic_max_docvalue_fields_search | default('100') }}" - +# Shuffled elasticsearch endpoints (with localhost if relevant) for use in beat config files elasticsearch_data_hosts: |- {% set data_hosts = elasticsearch_data_node_details | shuffle(seed=inventory_hostname) %} {% if inventory_hostname in data_nodes %} @@ -220,9 +177,10 @@ elasticsearch_data_hosts: |- {% endif %} {{ data_hosts }} +# Shuffled logstash endpoints (with localhost if relevant) for use in beat config files logstash_data_hosts: |- {% set data_hosts = logstash_data_node_details | shuffle(seed=inventory_hostname) %} - {% if inventory_hostname in data_nodes %} + {% if inventory_hostname in groups['logstash'] %} {% set _ = data_hosts.insert(0, '127.0.0.1:' ~ logstash_beat_input_port) %} {% endif %} {{ data_hosts }} diff --git a/elk_metrics_7x/roles/elastic_ilm/defaults/main.yml b/elk_metrics_7x/roles/elastic_ilm/defaults/main.yml index 63924b61..7f587579 100644 --- a/elk_metrics_7x/roles/elastic_ilm/defaults/main.yml +++ b/elk_metrics_7x/roles/elastic_ilm/defaults/main.yml @@ -17,4 +17,4 @@ default_ilm_policy: default_ilm_policy_filename: "default-ilm-policy.json" default_ilm_policy_file_location: "/tmp" -elastic_beat_no_proxy: "{{ hostvars[groups['elastic-logstash'][0]]['ansible_host'] }}" +elastic_beat_no_proxy: "{{ hostvars[groups['elastic'][0]]['ansible_host'] }}" diff --git a/elk_metrics_7x/roles/elastic_kibana/defaults/main.yml b/elk_metrics_7x/roles/elastic_kibana/defaults/main.yml index ad3e0081..1cc8d10b 100644 --- a/elk_metrics_7x/roles/elastic_kibana/defaults/main.yml +++ b/elk_metrics_7x/roles/elastic_kibana/defaults/main.yml @@ -22,7 +22,7 @@ kibana_username: admin kibana_password: admin kibana_nginx_port: 81 kibana_server_name: "{{ ansible_hostname }}" -kibana_index_on_elasticsearch: "http://{{ hostvars[groups['elastic-logstash'][0]]['ansible_host'] }}:{{ elastic_port}}/.kibana" +kibana_index_on_elasticsearch: "http://{{ hostvars[groups['elastic'][0]]['ansible_host'] }}:{{ elastic_port}}/.kibana" kibana_elastic_request_timeout: 1800000 # If unset, the protocol and port default to http and elastic_port diff --git a/elk_metrics_7x/roles/elastic_logstash/handlers/main.yml b/elk_metrics_7x/roles/elastic_logstash/handlers/main.yml index 3a1c3e52..341581a0 100644 --- a/elk_metrics_7x/roles/elastic_logstash/handlers/main.yml +++ b/elk_metrics_7x/roles/elastic_logstash/handlers/main.yml @@ -17,7 +17,7 @@ systemd: name: "logstash" enabled: true - state: "{{ (inventory_hostname in logstash_nodes) | ternary('restarted', 'stopped') }}" + state: "restarted" daemon_reload: true when: - ansible_service_mgr == 'systemd' @@ -26,7 +26,7 @@ - name: Enable and restart logstash (upstart) service: name: "logstash" - state: "{{ (inventory_hostname in logstash_nodes) | ternary('restarted', 'stopped') }}" + state: "restarted" enabled: yes when: - ansible_service_mgr == 'upstart' diff --git a/elk_metrics_7x/roles/elastic_metricbeat/templates/metricbeat.yml.j2 b/elk_metrics_7x/roles/elastic_metricbeat/templates/metricbeat.yml.j2 index 5ac7cf55..0b380775 100644 --- a/elk_metrics_7x/roles/elastic_metricbeat/templates/metricbeat.yml.j2 +++ b/elk_metrics_7x/roles/elastic_metricbeat/templates/metricbeat.yml.j2 @@ -224,7 +224,7 @@ metricbeat.modules: # enabled: true # #---------------------------- Elasticsearch Module --------------------------- -{% if inventory_hostname in (groups['elastic-logstash'] | union(groups['kibana'])) %} +{% if inventory_hostname in (groups['elastic'] | union(groups['kibana'])) %} - module: elasticsearch metricsets: - node @@ -485,7 +485,7 @@ metricbeat.modules: {% endif %} #------------------------------ Logstash Module ------------------------------ -{% if inventory_hostname in groups['elastic-logstash'] | default([]) %} +{% if inventory_hostname in groups['logstash'] | default([]) %} - module: logstash metricsets: ["node", "node_stats"] enabled: true diff --git a/elk_metrics_7x/roles/elasticsearch/tasks/main.yml b/elk_metrics_7x/roles/elasticsearch/tasks/main.yml index 0c08ede8..1aa86114 100644 --- a/elk_metrics_7x/roles/elasticsearch/tasks/main.yml +++ b/elk_metrics_7x/roles/elasticsearch/tasks/main.yml @@ -26,7 +26,7 @@ - always - name: Set elasticsearch variables - include_vars: "vars_{{ ((inventory_hostname in (groups['kibana'] | default([])) and not inventory_hostname in (groups['elastic-logstash']) | default([]))) | ternary('kibana', 'default') }}.yml" + include_vars: "vars_{{ ((inventory_hostname in (groups['kibana'] | default([])) and not inventory_hostname in (groups['elastic']) | default([]))) | ternary('kibana', 'default') }}.yml" tags: - always diff --git a/elk_metrics_7x/setupKibanaDashboard.yml b/elk_metrics_7x/setupKibanaDashboard.yml index a9b86dfc..0848695e 100644 --- a/elk_metrics_7x/setupKibanaDashboard.yml +++ b/elk_metrics_7x/setupKibanaDashboard.yml @@ -12,7 +12,7 @@ # limitations under the License. - name: Install Kibana Dashboards - hosts: "elastic-logstash" + hosts: elastic become: true vars_files: - vars/variables.yml @@ -82,5 +82,5 @@ - 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" environment: - no_proxy: "{{ hostvars[groups['elastic-logstash'][0]]['ansible_host'] }}" + no_proxy: "{{ hostvars[groups[elastic[0]]]['ansible_host'] }}" run_once: yes diff --git a/elk_metrics_7x/showElasticCluster.yml b/elk_metrics_7x/showElasticCluster.yml index 5bf38ca6..b818079f 100644 --- a/elk_metrics_7x/showElasticCluster.yml +++ b/elk_metrics_7x/showElasticCluster.yml @@ -12,7 +12,7 @@ # limitations under the License. - name: Dump cluster node info - hosts: elastic-logstash:kibana + hosts: elastic:logstash:kibana become: true vars_files: @@ -46,7 +46,7 @@ debug: msg: "Zen nodes: {{ zen_nodes }}" - delegate_to: elastic_logstash[0] + delegate_to: elastic[0] run_once: true # show per node cluster setup diff --git a/elk_metrics_7x/templates/_macros.j2 b/elk_metrics_7x/templates/_macros.j2 index dcc1de63..325eb449 100644 --- a/elk_metrics_7x/templates/_macros.j2 +++ b/elk_metrics_7x/templates/_macros.j2 @@ -255,7 +255,7 @@ setup.dashboards.enabled: false # These settings can be adjusted to load your own template or overwrite existing ones. # Set to false to disable template loading. -setup.template.enabled: {{ host == data_nodes[0] }} +setup.template.enabled: {{ host == data_nodes[0] | default(false) }} # Template name. By default the template name is "{{ beat_name }}-%{[beat.version]}" # The template name and pattern has to be set in case the elasticsearch index pattern is modified. @@ -279,7 +279,7 @@ setup.template.fields: "${path.config}/fields.yml" #setup.template.json.name: "" # Overwrite existing template -setup.template.overwrite: {{ host == data_nodes[0] }} +setup.template.overwrite: {{ host == data_nodes[0] | default(false)}} {% set shards = 1 %} diff --git a/elk_metrics_7x/tests/inventory/test-container-inventory.yml b/elk_metrics_7x/tests/inventory/test-container-inventory.yml index a46f16f5..a9b56295 100644 --- a/elk_metrics_7x/tests/inventory/test-container-inventory.yml +++ b/elk_metrics_7x/tests/inventory/test-container-inventory.yml @@ -31,7 +31,7 @@ all_containers: elastic_memory_lock: false children: - elastic-logstash: + elastic: children: kibana: hosts: @@ -46,6 +46,9 @@ all_containers: elastic2: ansible_host: 172.29.236.102 ansible_user: root + logstash: + children: + kibana: apm-server: hosts: diff --git a/elk_metrics_7x/tests/inventory/test-metal-inventory.yml b/elk_metrics_7x/tests/inventory/test-metal-inventory.yml index 97b6f536..b4000afe 100644 --- a/elk_metrics_7x/tests/inventory/test-metal-inventory.yml +++ b/elk_metrics_7x/tests/inventory/test-metal-inventory.yml @@ -11,7 +11,11 @@ hosts: vars: physical_host: localhost - elastic-logstash: + elastic: + hosts: + localhost: {} + + logstash: hosts: localhost: {} diff --git a/elk_metrics_7x/tests/testAPI.yml b/elk_metrics_7x/tests/testAPI.yml index c90d95df..73a52afb 100644 --- a/elk_metrics_7x/tests/testAPI.yml +++ b/elk_metrics_7x/tests/testAPI.yml @@ -31,7 +31,7 @@ - name: Test elasticsearch api - hosts: elastic-logstash + hosts: elastic gather_facts: false become: true @@ -64,7 +64,7 @@ - name: Test kibana api - hosts: elastic-logstash + hosts: elastic gather_facts: false become: true @@ -91,7 +91,7 @@ - name: Test logstash api - hosts: elastic-logstash + hosts: logstash gather_facts: false become: true diff --git a/elk_metrics_7x/vars/variables.yml b/elk_metrics_7x/vars/variables.yml index 217a85e5..2aa86f36 100644 --- a/elk_metrics_7x/vars/variables.yml +++ b/elk_metrics_7x/vars/variables.yml @@ -380,7 +380,7 @@ grafana_datasources: elastic_beats: logstash: make_index: true - hosts: "{{ groups['elastic-logstash'] | default([]) }}" + hosts: "{{ logstash | default([]) }}" apm: make_index: true timeFieldName: '@timestamp'