CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 09:12:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

[fix] Set timeout for scripts (15s, 3x default 5s)

Browse Source
This commit is contained in:
William Wernert
2021-01-22 12:15:29 -05:00
parent 537f7529f8
commit f1781b1fde
1 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
salt/telegraf/etc/telegraf.conf
View File

@@ -670,47 +670,52 @@
{% if grains['role'] in ['so-manager', 'so-managersearch'] %} {% if grains['role'] in ['so-manager', 'so-managersearch'] %}
[[inputs.exec]] [[inputs.exec]]
commands = [ commands = [
"/scripts/redis.sh", "/scripts/redis.sh",
"/scripts/influxdbsize.sh" "/scripts/influxdbsize.sh"
] ]
data_format = "influx" data_format = "influx"
## Timeout for each command to complete.
timeout = "15s"
{% elif grains['role'] in ['so-sensor', 'so-heavynode'] %} {% elif grains['role'] in ['so-sensor', 'so-heavynode'] %}
[[inputs.exec]] [[inputs.exec]]
commands = [ commands = [
"/scripts/stenoloss.sh", "/scripts/stenoloss.sh",
"/scripts/suriloss.sh", "/scripts/suriloss.sh",
"/scripts/checkfiles.sh", "/scripts/checkfiles.sh",
"/scripts/zeekloss.sh", "/scripts/zeekloss.sh",
"/scripts/zeekcaptureloss.sh", "/scripts/zeekcaptureloss.sh",
"/scripts/oldpcap.sh" "/scripts/oldpcap.sh"
] ]
data_format = "influx" data_format = "influx"
timeout = "15s"
{% elif grains['role'] == 'so-standalone' %} {% elif grains['role'] == 'so-standalone' %}
[[inputs.exec]] [[inputs.exec]]
commands = [ commands = [
"/scripts/redis.sh", "/scripts/redis.sh",
"/scripts/influxdbsize.sh", "/scripts/influxdbsize.sh",
"/scripts/stenoloss.sh", "/scripts/stenoloss.sh",
"/scripts/suriloss.sh", "/scripts/suriloss.sh",
"/scripts/checkfiles.sh", "/scripts/checkfiles.sh",
"/scripts/zeekloss.sh", "/scripts/zeekloss.sh",
"/scripts/zeekcaptureloss.sh", "/scripts/zeekcaptureloss.sh",
"/scripts/oldpcap.sh" "/scripts/oldpcap.sh"
] ]
data_format = "influx" data_format = "influx"
timeout = "15s"
{% elif grains['role'] == 'so-eval' %} {% elif grains['role'] == 'so-eval' %}
[[inputs.exec]] [[inputs.exec]]
commands = [ commands = [
"/scripts/redis.sh", "/scripts/redis.sh",
"/scripts/stenoloss.sh", "/scripts/stenoloss.sh",
"/scripts/suriloss.sh", "/scripts/suriloss.sh",
"/scripts/checkfiles.sh", "/scripts/checkfiles.sh",
"/scripts/zeekloss.sh", "/scripts/zeekloss.sh",
"/scripts/zeekcaptureloss.sh", "/scripts/zeekcaptureloss.sh",
"/scripts/oldpcap.sh", "/scripts/oldpcap.sh",
"/scripts/influxdbsize.sh" "/scripts/influxdbsize.sh"
] ]
data_format = "influx" data_format = "influx"
timeout = "15s"
{% elif grains['role'] == 'so-helix' %} {% elif grains['role'] == 'so-helix' %}
[[inputs.exec]] [[inputs.exec]]
commands = [ commands = [
@@ -723,19 +728,16 @@
"/scripts/helixeps.sh" "/scripts/helixeps.sh"
] ]
data_format = "influx" data_format = "influx"
timeout = "15s"
{% endif %} {% endif %}
# ## measurement name suffix (for separating different commands)
# ## Timeout for each command to complete. # name_suffix = "_mycollector"
# timeout = "5s"
# ## Data format to consume.
# ## measurement name suffix (for separating different commands) ## Each data format has its own unique set of configuration options, read
# name_suffix = "_mycollector" ## more about them here:
# ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
# ## Data format to consume.
# ## Each data format has its own unique set of configuration options, read
# ## more about them here:
# ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md