diff --git a/salt/common/init.sls b/salt/common/init.sls index 52daf7fc5..7ddae863a 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -124,6 +124,20 @@ tgrafetcdir: - name: /opt/so/conf/telegraf/etc - makedirs: True +tgrafetsdir: + file.directory: + - name: /opt/so/conf/telegraf/scripts + - makedirs: True + +tgrafsyncscripts: + file.recurse: + - name: /opt/so/conf/telegraf/scripts + - user: 939 + - group: 939 + - mode: 755 + - template: jinja + - source: salt://common/telegraf/scripts + tgrafconf: file.managed: - name: /opt/so/conf/telegraf/etc/telegraf.conf @@ -154,6 +168,10 @@ so-telegraf: - /etc/pki/ca.crt:/etc/telegraf/ca.crt:ro - /etc/pki/influxdb.crt:/etc/telegraf/telegraf.crt:ro - /etc/pki/influxdb.key:/etc/telegraf/telegraf.key:ro + - /opt/so/conf/telegraf/scripts:/scripts:ro + - watch: + - /opt/so/conf/telegraf/etc/telegraf.conf + - /opt/so/conf/telegraf/scripts # If its a master or eval lets install the back end for now {% if grains['role'] == 'so-master' or grains['role'] == 'so-eval' %} diff --git a/salt/common/telegraf/etc/telegraf.conf b/salt/common/telegraf/etc/telegraf.conf index 861b5bd21..9d3f57807 100644 --- a/salt/common/telegraf/etc/telegraf.conf +++ b/salt/common/telegraf/etc/telegraf.conf @@ -604,13 +604,11 @@ # # Read metrics from one or more commands that can output to stdout -# [[inputs.exec]] + [[inputs.exec]] # ## Commands array -# commands = [ -# "/tmp/test.sh", -# "/usr/bin/mycollector --foo=bar", -# "/tmp/collect_*.sh" -# ] + commands = [ + "/scripts/stenoloss.sh" + ] # # ## Timeout for each command to complete. # timeout = "5s" @@ -622,7 +620,7 @@ # ## 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 -# data_format = "influx" + data_format = "influx" # # Read metrics from fail2ban. diff --git a/salt/common/telegraf/scripts/stenoloss.sh b/salt/common/telegraf/scripts/stenoloss.sh new file mode 100644 index 000000000..b324c9246 --- /dev/null +++ b/salt/common/telegraf/scripts/stenoloss.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +# Get the data +DROP=$(tac /opt/so/log/stenographer/stenographer.log | grep -m1 drop | awk '{print $14}' | awk -F "=" '{print $2}') + +echo "stenodrop drop=$DROP"