Fix pillar

This commit is contained in:
Mike Reeves
2022-12-16 08:38:31 -05:00
parent 8a0991afd0
commit 5badfb9cf5

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 TGMERGED = salt['pillar.get']('telegraf:config', TGDEFAULTS, merge=true) %} {%- set TGMERGED = salt['pillar.get']('telegraf', TGDEFAULTS.telegraf, merge=true) %}
# 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 }}"
@@ -15,7 +15,7 @@
# Configuration for telegraf agent # Configuration for telegraf agent
[agent] [agent]
## Default data collection interval for all inputs ## Default data collection interval for all inputs
interval = "{{ TGMERGED.interval }}" interval = "{{ TGMERGED.config.interval }}"
## Rounds collection interval to 'interval' ## Rounds collection interval to 'interval'
## ie, if interval="10s" then always collect on :00, :10, :20, etc. ## ie, if interval="10s" then always collect on :00, :10, :20, etc.
round_interval = true round_interval = true
@@ -23,27 +23,27 @@
## Telegraf will send metrics to outputs in batches of at most ## Telegraf will send metrics to outputs in batches of at most
## metric_batch_size metrics. ## metric_batch_size metrics.
## This controls the size of writes that Telegraf sends to output plugins. ## This controls the size of writes that Telegraf sends to output plugins.
metric_batch_size = {{ TGMERGED.metric_batch_size }} metric_batch_size = {{ TGMERGED.config.metric_batch_size }}
## For failed writes, telegraf will cache metric_buffer_limit metrics for each ## For failed writes, telegraf will cache metric_buffer_limit metrics for each
## output, and will flush this buffer on a successful write. Oldest metrics ## output, and will flush this buffer on a successful write. Oldest metrics
## are dropped first when this buffer fills. ## are dropped first when this buffer fills.
## This buffer only fills when writes fail to output plugin(s). ## This buffer only fills when writes fail to output plugin(s).
metric_buffer_limit = {{ TGMERGED.metric_buffer_limit }} metric_buffer_limit = {{ TGMERGED.config.metric_buffer_limit }}
## Collection jitter is used to jitter the collection by a random amount. ## Collection jitter is used to jitter the collection by a random amount.
## Each plugin will sleep for a random time within jitter before collecting. ## Each plugin will sleep for a random time within jitter before collecting.
## This can be used to avoid many plugins querying things like sysfs at the ## This can be used to avoid many plugins querying things like sysfs at the
## same time, which can have a measurable effect on the system. ## same time, which can have a measurable effect on the system.
collection_jitter = "{{ TGMERGED.collection_jitter }}" collection_jitter = "{{ TGMERGED.config.collection_jitter }}"
## Default flushing interval for all outputs. Maximum flush_interval will be ## Default flushing interval for all outputs. Maximum flush_interval will be
## flush_interval + flush_jitter ## flush_interval + flush_jitter
flush_interval = "{{ TGMERGED.flush_interval }}" flush_interval = "{{ TGMERGED.config.flush_interval }}"
## Jitter the flush interval by a random amount. This is primarily to avoid ## Jitter the flush interval by a random amount. This is primarily to avoid
## large write spikes for users running a large number of telegraf instances. ## large write spikes for users running a large number of telegraf instances.
## ie, a jitter of 5s and interval 10s means flushes will happen every 10-15s ## ie, a jitter of 5s and interval 10s means flushes will happen every 10-15s
flush_jitter = "{{ TGMERGED.flush_jitter }}" flush_jitter = "{{ TGMERGED.config.flush_jitter }}"
## By default or when set to "0s", precision will be set to the same ## By default or when set to "0s", precision will be set to the same
## timestamp order as the collection interval, with the maximum being 1s. ## timestamp order as the collection interval, with the maximum being 1s.
@@ -56,7 +56,7 @@
## Logging configuration: ## Logging configuration:
## Run telegraf with debug log messages. ## Run telegraf with debug log messages.
debug = {{ TGMERGED.debug }} debug = {{ TGMERGED.config.debug }}
## Run telegraf in quiet mode (error log messages only). ## Run telegraf in quiet mode (error log messages only).
quiet = false quiet = false
## Specify the log file name. The empty string means to log to stderr. ## Specify the log file name. The empty string means to log to stderr.