diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-07-15 16:16:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-15 16:16:22 +0200 |
| commit | 8cff40290be42b8dbd2e1f5ba7660d95ec740bc4 (patch) | |
| tree | 81f69367887283ef635a860f4ae50e351ef6dcdc /data | |
| parent | 81e0f4a8dece85da7169ba05448e870206aaf57b (diff) | |
| parent | 2b46250616f6c5a330f9a20dbd196cc8b00b1de6 (diff) | |
| download | vyos-1x-8cff40290be42b8dbd2e1f5ba7660d95ec740bc4.tar.gz vyos-1x-8cff40290be42b8dbd2e1f5ba7660d95ec740bc4.zip | |
Merge pull request #1414 from sever-sever/T4532
netflow: T4532: replace dot and colons to dash
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/pmacct/uacctd.conf.j2 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/templates/pmacct/uacctd.conf.j2 b/data/templates/pmacct/uacctd.conf.j2 index a5016691f..8fbc09e83 100644 --- a/data/templates/pmacct/uacctd.conf.j2 +++ b/data/templates/pmacct/uacctd.conf.j2 @@ -21,13 +21,13 @@ imt_mem_pools_number: 169 {% set plugin = [] %} {% if netflow.server is vyos_defined %} {% for server in netflow.server %} -{% set nf_server_key = 'nf_' ~ server | replace(':', '.') %} +{% set nf_server_key = 'nf_' ~ server | dot_colon_to_dash %} {% set _ = plugin.append('nfprobe['~ nf_server_key ~ ']') %} {% endfor %} {% endif %} {% if sflow.server is vyos_defined %} {% for server in sflow.server %} -{% set sf_server_key = 'sf_' ~ server | replace(':', '.') %} +{% set sf_server_key = 'sf_' ~ server | dot_colon_to_dash %} {% set _ = plugin.append('sfprobe[' ~ sf_server_key ~ ']') %} {% endfor %} {% endif %} @@ -40,7 +40,7 @@ plugins: {{ plugin | join(',') }} # NetFlow servers {% for server, server_config in netflow.server.items() %} {# # prevent pmacct syntax error when using IPv6 flow collectors #} -{% set nf_server_key = 'nf_' ~ server | replace(':', '.') %} +{% set nf_server_key = 'nf_' ~ server | dot_colon_to_dash %} nfprobe_receiver[{{ nf_server_key }}]: {{ server | bracketize_ipv6 }}:{{ server_config.port }} nfprobe_version[{{ nf_server_key }}]: {{ netflow.version }} {% if netflow.engine_id is vyos_defined %} @@ -66,7 +66,7 @@ nfprobe_timeouts[{{ nf_server_key }}]: expint={{ netflow.timeout.expiry_interval # sFlow servers {% for server, server_config in sflow.server.items() %} {# # prevent pmacct syntax error when using IPv6 flow collectors #} -{% set sf_server_key = 'sf_' ~ server | replace(':', '.') %} +{% set sf_server_key = 'sf_' ~ server | dot_colon_to_dash %} sfprobe_receiver[{{ sf_server_key }}]: {{ server | bracketize_ipv6 }}:{{ server_config.port }} sfprobe_agentip[{{ sf_server_key }}]: {{ sflow.agent_address }} {% if sflow.sampling_rate is vyos_defined %} |