move node_data pillar to logstash:nodes, set extra hosts for filebeat docker

This commit is contained in:
m0duspwnens
2021-12-14 13:32:42 -05:00
parent 6518691c55
commit c490a3be36
8 changed files with 67 additions and 38 deletions

View File

@@ -1,23 +1,33 @@
{% set node_types = {} %}
{% set manage_alived = salt.saltutil.runner('manage.alived', show_ip=True) %}
{% set manager = grains.master %}
{% set manager_type = manager.split('_')|last %}
{% for minionid, ip in salt.saltutil.runner('mine.get', tgt='*', fun='network.ip_addrs', tgt_type='glob') | dictsort() %}
{% set hostname = minionid.split('_')[0] %}
{% set node_type = minionid.split('_')[1] %}
{% set is_alive = False %}
{% if minionid in manage_alived.keys() %}
{% if ip[0] == manage_alived[minionid] %}
{% set is_alive = True %}
{% endif %}
{% endif %}
{% if node_type not in node_types.keys() %}
{% do node_types.update({node_type: {hostname: ip[0]}}) %}
{% do node_types.update({node_type: {hostname: {'ip':ip[0], 'alive':is_alive }}}) %}
{% else %}
{% if hostname not in node_types[node_type] %}
{% do node_types[node_type].update({hostname: ip[0]}) %}
{% do node_types[node_type].update({hostname: {'ip':ip[0], 'alive':is_alive}}) %}
{% else %}
{% do node_types[node_type][hostname].update(ip[0]) %}
{% do node_types[node_type][hostname].update({'ip':ip[0], 'alive':is_alive}) %}
{% endif %}
{% endif %}
{% endfor %}
node_data:
{% for node_type, values in node_types.items() %}
{% for node_type, host_values in node_types.items() %}
{{node_type}}:
{% for hostname, ip in values.items() %}
{% for hostname, details in host_values.items() %}
{{hostname}}:
ip: {{ip}}
ip: {{details.ip}}
alive: {{ details.alive }}
{% endfor %}
{% endfor %}

View File

@@ -1,23 +0,0 @@
{% set node_types = {} %}
{% for minionid, test_ping in salt.saltutil.runner('mine.get', tgt='*', fun='test.ping', tgt_type='glob') | dictsort() %}
{% set node_type = minionid.split('_')[1] %}
{% set hostname = minionid.split('_')[0] %}
{% if node_type not in node_types.keys() %}
{% do node_types.update({node_type: {hostname: test_ping}}) %}
{% else %}
{% if hostname not in node_types[node_type] %}
{% do node_types[node_type].update({hostname: test_ping}) %}
{% else %}
{% do node_types[node_type][hostname].update(test_ping) %}
{% endif %}
{% endif %}
{% endfor %}
node_data:
{% for node_type, values in node_types.items() %}
{{node_type}}:
{% for hostname, test_ping in values.items() %}
{{hostname}}:
test_ping: {{test_ping}}
{% endfor %}
{% endfor %}