diff options
| author | John Estabrook <jestabro@vyos.io> | 2024-07-18 10:06:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-18 10:06:06 -0500 |
| commit | 0ec9cdd65473b35197c60dd531610a7007712089 (patch) | |
| tree | 84cca546fbdb8fc47e260705797a522bf93df1ff | |
| parent | bb7c376659afde1294973dd2fde43840b10c919d (diff) | |
| parent | fcc1193b4ec5af560e6f39e89baeab342e65666c (diff) | |
| download | vyos-1x-0ec9cdd65473b35197c60dd531610a7007712089.tar.gz vyos-1x-0ec9cdd65473b35197c60dd531610a7007712089.zip | |
Merge pull request #3826 from vyos/mergify/bp/sagitta/pr-3748
T6523: Telegraf use nft scripts only if the firewall configured (backport #3748)
| -rw-r--r-- | data/templates/telegraf/telegraf.j2 | 2 | ||||
| -rwxr-xr-x | src/conf_mode/service_monitoring_telegraf.py | 3 |
2 files changed, 4 insertions, 1 deletions
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" ] diff --git a/src/conf_mode/service_monitoring_telegraf.py b/src/conf_mode/service_monitoring_telegraf.py index 9455b6109..db870aae5 100755 --- a/src/conf_mode/service_monitoring_telegraf.py +++ b/src/conf_mode/service_monitoring_telegraf.py @@ -86,7 +86,8 @@ def get_config(config=None): monitoring['custom_scripts_dir'] = custom_scripts_dir monitoring['hostname'] = get_hostname() monitoring['interfaces_ethernet'] = Section.interfaces('ethernet', vlan=False) - monitoring['nft_chains'] = get_nft_filter_chains() + if conf.exists('firewall'): + monitoring['nft_chains'] = get_nft_filter_chains() # Redefine azure group-metrics 'single-table' and 'table-per-metric' if 'azure_data_explorer' in monitoring: |