diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-10-11 22:14:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-11 22:14:56 +0200 |
| commit | b74f297d8a7426cbdb0b44240bfa4b7666986337 (patch) | |
| tree | 77901be8b378310203ab555c92cecfecc063c74a | |
| parent | 06d6386e5d9fb9812b23032516bbdc938dcc4a9f (diff) | |
| parent | 6859a2474dab7c2e118020af621e5b6a5a8f7fca (diff) | |
| download | vyos-1x-b74f297d8a7426cbdb0b44240bfa4b7666986337.tar.gz vyos-1x-b74f297d8a7426cbdb0b44240bfa4b7666986337.zip | |
Merge pull request #1584 from sever-sever/T4747
monitoring: T4747: Fix template check influxdb config
| -rw-r--r-- | data/templates/telegraf/telegraf.j2 | 2 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_service_monitoring_telegraf.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/data/templates/telegraf/telegraf.j2 b/data/templates/telegraf/telegraf.j2 index 2d14230ae..36571ce98 100644 --- a/data/templates/telegraf/telegraf.j2 +++ b/data/templates/telegraf/telegraf.j2 @@ -110,7 +110,7 @@ server = "unixgram:///run/telegraf/telegraf_syslog.sock" best_effort = true syslog_standard = "RFC3164" -{% if influxdb_configured is vyos_defined %} +{% if influxdb is vyos_defined %} [[inputs.exec]] commands = [ "{{ custom_scripts_dir }}/show_firewall_input_filter.py", diff --git a/smoketest/scripts/cli/test_service_monitoring_telegraf.py b/smoketest/scripts/cli/test_service_monitoring_telegraf.py index c1c4044e6..ed486c3b9 100755 --- a/smoketest/scripts/cli/test_service_monitoring_telegraf.py +++ b/smoketest/scripts/cli/test_service_monitoring_telegraf.py @@ -60,6 +60,7 @@ class TestMonitoringTelegraf(VyOSUnitTestSHIM.TestCase): self.assertIn(f' token = "$INFLUX_TOKEN"', config) self.assertIn(f'urls = ["{url}:{port}"]', config) self.assertIn(f'bucket = "{bucket}"', config) + self.assertIn(f'[[inputs.exec]]', config) for input in inputs: self.assertIn(input, config) |