From 797d76966178ab5ed439b14d2e4b62b1d4b640d9 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Thu, 3 Feb 2022 10:36:18 -0500
Subject: [PATCH] use actual hostname in logstash:nodes pillar

---
 pillar/logstash/nodes.sls | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pillar/logstash/nodes.sls b/pillar/logstash/nodes.sls
index 3658065cb..18c4b39bf 100644
--- a/pillar/logstash/nodes.sls
+++ b/pillar/logstash/nodes.sls
@@ -1,11 +1,13 @@
 {% set node_types = {} %}
+{% set cached_grains = salt.saltutil.runner('cache.grains', tgt='*') %}
 {% for minionid, ip in salt.saltutil.runner(
     'mine.get',
     tgt='G@role:so-manager or G@role:so-managersearch or G@role:so-standalone or G@role:so-node or G@role:so-heavynode or G@role:so-receiver or G@role:so-helix ',
     fun='network.ip_addrs',
-    tgt_type='compound') | dictsort() 
+    tgt_type='compound') | dictsort()
 %}
-{%   set hostname = minionid.split('_')[0] %}
+
+{%   set hostname = cached_grains[minionid]['host'] %}
 {%   set node_type = minionid.split('_')[1] %}
 {%   if node_type not in node_types.keys() %}
 {%     do node_types.update({node_type: {hostname: ip[0]}}) %}