summaryrefslogtreecommitdiff
path: root/data/templates/pmacct
diff options
context:
space:
mode:
authorWered <kylem@serverforge.org>2023-06-03 00:34:57 +0000
committerWered <kylem@serverforge.org>2023-06-03 00:34:57 +0000
commit6e46958c3fdd6ed7d0052c6f49933f5e7b7481ea (patch)
treedcdbf9b0195dccd27f6d5b2667f1988ac63b3574 /data/templates/pmacct
parentb8a3dc506b7bd83a0a0fcb7981571eeeb8eedf64 (diff)
downloadvyos-1x-6e46958c3fdd6ed7d0052c6f49933f5e7b7481ea.tar.gz
vyos-1x-6e46958c3fdd6ed7d0052c6f49933f5e7b7481ea.zip
T5257: Fix netflow VRF and bracketize v6 source addresses for netflow/sflow
Diffstat (limited to 'data/templates/pmacct')
-rw-r--r--data/templates/pmacct/uacctd.conf.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/data/templates/pmacct/uacctd.conf.j2 b/data/templates/pmacct/uacctd.conf.j2
index 8fbc09e83..1370f8121 100644
--- a/data/templates/pmacct/uacctd.conf.j2
+++ b/data/templates/pmacct/uacctd.conf.j2
@@ -53,7 +53,7 @@ nfprobe_maxflows[{{ nf_server_key }}]: {{ netflow.max_flows }}
sampling_rate[{{ nf_server_key }}]: {{ netflow.sampling_rate }}
{% endif %}
{% if netflow.source_address is vyos_defined %}
-nfprobe_source_ip[{{ nf_server_key }}]: {{ netflow.source_address }}
+nfprobe_source_ip[{{ nf_server_key }}]: {{ netflow.source_address | bracketize_ipv6 }}
{% endif %}
{% if netflow.timeout is vyos_defined %}
nfprobe_timeouts[{{ nf_server_key }}]: expint={{ netflow.timeout.expiry_interval }}:general={{ netflow.timeout.flow_generic }}:icmp={{ netflow.timeout.icmp }}:maxlife={{ netflow.timeout.max_active_life }}:tcp.fin={{ netflow.timeout.tcp_fin }}:tcp={{ netflow.timeout.tcp_generic }}:tcp.rst={{ netflow.timeout.tcp_rst }}:udp={{ netflow.timeout.udp }}
@@ -73,7 +73,7 @@ sfprobe_agentip[{{ sf_server_key }}]: {{ sflow.agent_address }}
sampling_rate[{{ sf_server_key }}]: {{ sflow.sampling_rate }}
{% endif %}
{% if sflow.source_address is vyos_defined %}
-sfprobe_source_ip[{{ sf_server_key }}]: {{ sflow.source_address }}
+sfprobe_source_ip[{{ sf_server_key }}]: {{ sflow.source_address | bracketize_ipv6 }}
{% endif %}
{% endfor %}