summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-02-05 19:58:20 +0100
committerGitHub <noreply@github.com>2022-02-05 19:58:20 +0100
commit48d4be3dd3eba6bae445536d28ad7188f6b08c92 (patch)
tree42c797a3531cda3f66853e1509e35eda8df0a37b /data
parent9077c834b3dea1e984e3153a245e4ac715f0bcb2 (diff)
parentd331da9949060870f0543ac841e533d73e02c079 (diff)
downloadvyos-1x-48d4be3dd3eba6bae445536d28ad7188f6b08c92.tar.gz
vyos-1x-48d4be3dd3eba6bae445536d28ad7188f6b08c92.zip
Merge pull request #1200 from sever-sever/T3872
monitoring: T3872: Fix template input plugin for running services
Diffstat (limited to 'data')
-rw-r--r--data/templates/monitoring/override.conf.tmpl2
-rw-r--r--data/templates/monitoring/telegraf.tmpl2
2 files changed, 2 insertions, 2 deletions
diff --git a/data/templates/monitoring/override.conf.tmpl b/data/templates/monitoring/override.conf.tmpl
index 63f6d7391..f8f150791 100644
--- a/data/templates/monitoring/override.conf.tmpl
+++ b/data/templates/monitoring/override.conf.tmpl
@@ -3,5 +3,5 @@ After=vyos-router.service
ConditionPathExists=/run/telegraf/vyos-telegraf.conf
[Service]
Environment=INFLUX_TOKEN={{ authentication.token }}
-CapabilityBoundingSet=CAP_NET_RAW CAP_NET_ADMIN
+CapabilityBoundingSet=CAP_NET_RAW CAP_NET_ADMIN CAP_SYS_ADMIN
AmbientCapabilities=CAP_NET_RAW CAP_NET_ADMIN
diff --git a/data/templates/monitoring/telegraf.tmpl b/data/templates/monitoring/telegraf.tmpl
index f05396d91..465b58c80 100644
--- a/data/templates/monitoring/telegraf.tmpl
+++ b/data/templates/monitoring/telegraf.tmpl
@@ -53,7 +53,7 @@
[[inputs.exec]]
commands = [
"{{ custom_scripts_dir }}/show_interfaces_input_filter.py",
- "cat /tmp/vyos_services_input_filter"
+ "{{ custom_scripts_dir }}/vyos_services_input_filter.py"
]
timeout = "10s"
data_format = "influx"