From fcc1193b4ec5af560e6f39e89baeab342e65666c Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Tue, 2 Jul 2024 08:44:53 +0000 Subject: T6523: Telegraf use nft scripts only if the firewall configured If a firewall is not configured there is no reason to get and execute telegraf firewall custom scripts as there are no nft chain in the firewall nftables configuration (cherry picked from commit ebff0c481907ac0c2c0be9981c3c3d87caf3003b) --- data/templates/telegraf/telegraf.j2 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'data') diff --git a/data/templates/telegraf/telegraf.j2 b/data/templates/telegraf/telegraf.j2 index f382dbf2e..535e3a347 100644 --- a/data/templates/telegraf/telegraf.j2 +++ b/data/templates/telegraf/telegraf.j2 @@ -130,7 +130,9 @@ metric_name_label = "{{ loki.metric_name_label }}" {% if influxdb is vyos_defined %} [[inputs.exec]] commands = [ +{% if nft_chains is vyos_defined %} "{{ custom_scripts_dir }}/show_firewall_input_filter.py", +{% endif %} "{{ custom_scripts_dir }}/show_interfaces_input_filter.py", "{{ custom_scripts_dir }}/vyos_services_input_filter.py" ] -- cgit v1.2.3