Merge pull request #15447 from Security-Onion-Solutions/reyesj2-patch-13

use logstash merged values for logstash metric collection

salt/telegraf/config.sls

@@ -7,6 +7,7 @@
 {% if sls.split('.')[0] in allowed_states %}
 {%   from 'vars/globals.map.jinja' import GLOBALS %}
 {%   from 'telegraf/map.jinja' import TELEGRAFMERGED %}
+{%   from 'logstash/map.jinja' import LOGSTASH_MERGED %}
 
 # add Telegraf to monitor all the things
 tgraflogdir:
@@ -89,6 +90,7 @@ tgrafconf:
     - defaults:
         GLOBALS: {{ GLOBALS }}
         TELEGRAFMERGED: {{ TELEGRAFMERGED }}
+        LOGSTASH_MERGED: {{ LOGSTASH_MERGED }}
 
 # this file will be read by telegraf to send node details (management interface, monitor interface, etc)
 # into influx

salt/telegraf/etc/telegraf.conf

@@ -7,7 +7,7 @@
 {%- set UNIQUEID = salt['pillar.get']('sensor:uniqueid', '') %}
 {%- set ZEEK_ENABLED = salt['pillar.get']('zeek:enabled', True) %}
 {%- set MDENGINE = GLOBALS.md_engine %}
-{%- set LOGSTASH_ENABLED = salt['pillar.get']('logstash:enabled', False) %}
+{%- set LOGSTASH_ENABLED = LOGSTASH_MERGED.enabled %}
 # Global tags can be specified here in key="value" format.
 [global_tags]
   role = "{{ GLOBALS.role.split('-') | last }}"