diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-07-02 15:40:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-02 15:40:11 +0200 |
| commit | 96aa3a695b937bd40ade0d53dee14c264f9baabd (patch) | |
| tree | 8cf07268c0c876b3036e65ab7dcf682963d76f0d | |
| parent | 134889fdced187859c7d4d1630c248e6f434abe5 (diff) | |
| parent | 536613dc03d7b2ca6e9ba87a0b2db05396845530 (diff) | |
| download | vyos-1x-96aa3a695b937bd40ade0d53dee14c264f9baabd.tar.gz vyos-1x-96aa3a695b937bd40ade0d53dee14c264f9baabd.zip | |
Merge pull request #3751 from vyos/mergify/bp/circinus/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: |