diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-12-21 09:54:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-21 09:54:21 +0100 |
| commit | f8db20706527ab04f3585ab28bc2bed030c7def7 (patch) | |
| tree | 291e48b4d1a0297802d924fb92f79eacedbd8f49 /data | |
| parent | 089b5f10aaa3f7976eb3f9165e805babdbf2a564 (diff) | |
| parent | 2f1373fbcb0de83f272f8cb2934f05871850a18c (diff) | |
| download | vyos-1x-f8db20706527ab04f3585ab28bc2bed030c7def7.tar.gz vyos-1x-f8db20706527ab04f3585ab28bc2bed030c7def7.zip | |
Merge pull request #653 from jpbede/fix/flow-accounting-template
flow-accounting: T3141: remove legacy jinja2 template
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/netflow/uacctd.conf.tmpl | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/data/templates/netflow/uacctd.conf.tmpl b/data/templates/netflow/uacctd.conf.tmpl index 3d4df72f7..1c183bb20 100644 --- a/data/templates/netflow/uacctd.conf.tmpl +++ b/data/templates/netflow/uacctd.conf.tmpl @@ -19,28 +19,25 @@ syslog: {{ templatecfg['syslog-facility'] }} imt_path: /tmp/uacctd.pipe imt_mem_pools_number: 169 {% endif %} -plugins: -{%- if templatecfg['netflow']['servers'] != none -%} - {%- for server in templatecfg['netflow']['servers'] -%} - {%- if loop.last -%}nfprobe[nf_{{ server['address'] }}]{%- else -%}nfprobe[nf_{{ server['address'] }}],{%- endif -%} - {%- endfor -%} - {%- set plugins_presented = true -%} -{%- endif -%} -{%- if templatecfg['sflow']['servers'] != none -%} - {%- if plugins_presented -%} - {%- for server in templatecfg['sflow']['servers'] -%} - ,sfprobe[sf_{{ server['address'] }}] - {%- endfor -%} - {%- else -%} - {%- for server in templatecfg['sflow']['servers'] -%} - {%- if loop.last -%}sfprobe[sf_{{ server['address'] }}]{%- else -%}sfprobe[sf_{{ server['address'] }}],{%- endif -%} - {%- endfor -%} - {%- endif -%} - {%- set plugins_presented = true -%} -{%- endif -%} -{%- if templatecfg['disable-imt'] == none %} - {%- if plugins_presented %},memory{%- else -%}memory{%- endif -%} -{%- endif -%} +plugins: {% if templatecfg['netflow']['servers'] != none %} +{% for server in templatecfg['netflow']['servers'] %} +{% if loop.last %}nfprobe[nf_{{ server['address'] }}]{% else %}nfprobe[nf_{{ server['address'] }}],{% endif %} +{% endfor %} +{% set plugins_presented = true %} +{% endif %} +{% if templatecfg['sflow']['servers'] != none %} +{% if plugins_presented %} +{% for server in templatecfg['sflow']['servers'] %},sfprobe[sf_{{ server['address'] }}]{% endfor %} +{% else %} +{% for server in templatecfg['sflow']['servers'] %} +{% if loop.last %}sfprobe[sf_{{ server['address'] }}]{% else %}sfprobe[sf_{{ server['address'] }}],{% endif %} +{% endfor %} +{% endif %} +{% set plugins_presented = true %} +{% endif %} +{% if templatecfg['disable-imt'] == none %} +{% if plugins_presented %},memory{% else %}memory{% endif %} +{% endif %} {% if templatecfg['netflow']['servers'] != none %} {% for server in templatecfg['netflow']['servers'] %} |