diff options
Diffstat (limited to 'data/templates/monitoring')
| -rw-r--r-- | data/templates/monitoring/syslog_telegraf.tmpl | 15 | ||||
| -rw-r--r-- | data/templates/monitoring/telegraf.tmpl | 11 |
2 files changed, 10 insertions, 16 deletions
diff --git a/data/templates/monitoring/syslog_telegraf.tmpl b/data/templates/monitoring/syslog_telegraf.tmpl index 122bdf9cc..cdcbd92a4 100644 --- a/data/templates/monitoring/syslog_telegraf.tmpl +++ b/data/templates/monitoring/syslog_telegraf.tmpl @@ -1,12 +1,5 @@ -# Generated by /usr/libexec/vyos/conf_mode/service_monitoring.py +# Generated by /usr/libexec/vyos/conf_mode/service_monitoring_telegraf.py -$ModLoad imjournal -$ImjournalDefaultSeverity 4 -$WorkDirectory /var/spool/rsyslog - -$ActionQueueType LinkedList # use asynchronous processing -$ActionQueueFileName srvrfwd # set file name, also enables disk mode -$ActionResumeRetryCount -1 # infinite retries on insert failure -$ActionQueueSaveOnShutdown on # save in-memory data if rsyslog shuts down - -*.* @127.0.0.1:6514;RSYSLOG_SyslogProtocol23Format +$ModLoad omuxsock +$OMUxSockSocket /run/telegraf/telegraf_syslog.sock +*.notice :omuxsock: diff --git a/data/templates/monitoring/telegraf.tmpl b/data/templates/monitoring/telegraf.tmpl index 631e59d74..62fa4df7a 100644 --- a/data/templates/monitoring/telegraf.tmpl +++ b/data/templates/monitoring/telegraf.tmpl @@ -1,4 +1,4 @@ -# Generated by /usr/libexec/vyos/conf_mode/service_monitoring.py +# Generated by /usr/libexec/vyos/conf_mode/service_monitoring_telegraf.py [agent] interval = "10s" @@ -15,10 +15,10 @@ hostname = "" omit_hostname = false [[outputs.influxdb_v2]] - urls = ["{{ url }}"] + urls = ["{{ url }}:{{ port }}"] insecure_skip_verify = true token = "{{ authentication.token }}" - organization = "{{ authentication.login }}" + organization = "{{ authentication.organization }}" bucket = "{{ bucket }}" [[inputs.cpu]] percpu = true @@ -51,8 +51,9 @@ [[inputs.internal]] [[inputs.nstat]] [[inputs.syslog]] - server = "udp://localhost:6514" -# server = "unix:///var/run/telegraf-syslog.sock" + server = "unixgram:///run/telegraf/telegraf_syslog.sock" + best_effort = true + syslog_standard = "RFC3164" [[inputs.exec]] commands = [ "{{ custom_scripts_dir }}/show_interfaces_input_filter.py", |