CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2026-04-27 06:57:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
use logstash merged values for logstash metric collection
This commit is contained in:
Jorge Reyes
2026-01-30 12:54:02 -06:00
committed by GitHub
parent b1575237fc a99c553ada
commit cf1c3ac38d
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
salt/telegraf/config.sls
+2
View File
@@ -7,6 +7,7 @@
{% if sls.split('.')[0] in allowed_states %} {% if sls.split('.')[0] in allowed_states %}
{% from 'vars/globals.map.jinja' import GLOBALS %} {% from 'vars/globals.map.jinja' import GLOBALS %}
{% from 'telegraf/map.jinja' import TELEGRAFMERGED %} {% from 'telegraf/map.jinja' import TELEGRAFMERGED %}
{% from 'logstash/map.jinja' import LOGSTASH_MERGED %}
# add Telegraf to monitor all the things # add Telegraf to monitor all the things
tgraflogdir: tgraflogdir:
@@ -89,6 +90,7 @@ tgrafconf:
- defaults: - defaults:
GLOBALS: {{ GLOBALS }} GLOBALS: {{ GLOBALS }}
TELEGRAFMERGED: {{ TELEGRAFMERGED }} TELEGRAFMERGED: {{ TELEGRAFMERGED }}
LOGSTASH_MERGED: {{ LOGSTASH_MERGED }}
# this file will be read by telegraf to send node details (management interface, monitor interface, etc) # this file will be read by telegraf to send node details (management interface, monitor interface, etc)
# into influx # into influx
salt/telegraf/etc/telegraf.conf
+1 -1
View File
@@ -7,7 +7,7 @@
{%- set UNIQUEID = salt['pillar.get']('sensor:uniqueid', '') %} {%- set UNIQUEID = salt['pillar.get']('sensor:uniqueid', '') %}
{%- set ZEEK_ENABLED = salt['pillar.get']('zeek:enabled', True) %} {%- set ZEEK_ENABLED = salt['pillar.get']('zeek:enabled', True) %}
{%- set MDENGINE = GLOBALS.md_engine %} {%- 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 can be specified here in key="value" format.
[global_tags] [global_tags]
role = "{{ GLOBALS.role.split('-') | last }}" role = "{{ GLOBALS.role.split('-') | last }}"