diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-05-01 19:15:31 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2022-05-01 19:15:31 +0200 |
| commit | 7c71e956e8e1779acd82b130ea149ec761520953 (patch) | |
| tree | f0c47238003475b9147c68ee00c2908f872c5a0c | |
| parent | c621175631ab23b7218d1aef7ad0f46a46cb77bc (diff) | |
| download | vyos-1x-7c71e956e8e1779acd82b130ea149ec761520953.tar.gz vyos-1x-7c71e956e8e1779acd82b130ea149ec761520953.zip | |
telegraf: T4353: fix Jinja2 linting errors
| -rw-r--r-- | data/templates/monitoring/override.conf.j2 (renamed from data/templates/monitoring/override.conf.tmpl) | 0 | ||||
| -rw-r--r-- | data/templates/monitoring/syslog_telegraf.j2 (renamed from data/templates/monitoring/syslog_telegraf.tmpl) | 0 | ||||
| -rw-r--r-- | data/templates/monitoring/systemd_vyos_telegraf_service.j2 (renamed from data/templates/monitoring/systemd_vyos_telegraf_service.tmpl) | 0 | ||||
| -rw-r--r-- | data/templates/monitoring/telegraf.j2 (renamed from data/templates/monitoring/telegraf.tmpl) | 0 | ||||
| -rwxr-xr-x | src/conf_mode/service_monitoring_telegraf.py | 8 |
5 files changed, 4 insertions, 4 deletions
diff --git a/data/templates/monitoring/override.conf.tmpl b/data/templates/monitoring/override.conf.j2 index f8f150791..f8f150791 100644 --- a/data/templates/monitoring/override.conf.tmpl +++ b/data/templates/monitoring/override.conf.j2 diff --git a/data/templates/monitoring/syslog_telegraf.tmpl b/data/templates/monitoring/syslog_telegraf.j2 index cdcbd92a4..cdcbd92a4 100644 --- a/data/templates/monitoring/syslog_telegraf.tmpl +++ b/data/templates/monitoring/syslog_telegraf.j2 diff --git a/data/templates/monitoring/systemd_vyos_telegraf_service.tmpl b/data/templates/monitoring/systemd_vyos_telegraf_service.j2 index 234ef5586..234ef5586 100644 --- a/data/templates/monitoring/systemd_vyos_telegraf_service.tmpl +++ b/data/templates/monitoring/systemd_vyos_telegraf_service.j2 diff --git a/data/templates/monitoring/telegraf.tmpl b/data/templates/monitoring/telegraf.j2 index cf33eec4e..cf33eec4e 100644 --- a/data/templates/monitoring/telegraf.tmpl +++ b/data/templates/monitoring/telegraf.j2 diff --git a/src/conf_mode/service_monitoring_telegraf.py b/src/conf_mode/service_monitoring_telegraf.py index 8a972b9fe..94bc02f10 100755 --- a/src/conf_mode/service_monitoring_telegraf.py +++ b/src/conf_mode/service_monitoring_telegraf.py @@ -145,10 +145,10 @@ def generate(monitoring): os.mkdir(custom_scripts_dir) # Render telegraf configuration and systemd override - render(config_telegraf, 'monitoring/telegraf.tmpl', monitoring) - render(systemd_telegraf_service, 'monitoring/systemd_vyos_telegraf_service.tmpl', monitoring) - render(systemd_override, 'monitoring/override.conf.tmpl', monitoring, permission=0o640) - render(syslog_telegraf, 'monitoring/syslog_telegraf.tmpl', monitoring) + render(config_telegraf, 'monitoring/telegraf.j2', monitoring) + render(systemd_telegraf_service, 'monitoring/systemd_vyos_telegraf_service.j2', monitoring) + render(systemd_override, 'monitoring/override.conf.j2', monitoring, permission=0o640) + render(syslog_telegraf, 'monitoring/syslog_telegraf.j2', monitoring) chown(base_dir, 'telegraf', 'telegraf') |