diff options
| author | Christian Poessinger <christian.poessinger@rohde-schwarz.com> | 2021-12-06 17:40:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-06 17:40:14 +0100 |
| commit | 3e027ddb1f4dfc8f713ebff4553bc97fc9a4ae62 (patch) | |
| tree | e81caa7ee923ba9e674b50a0cc28102458ca27df | |
| parent | 025f0609cea8591e93b8cb4a7d0256e43e23323b (diff) | |
| parent | bb77dd269bfb9522f5b56ac027598ac20e101f13 (diff) | |
| download | vyos-1x-3e027ddb1f4dfc8f713ebff4553bc97fc9a4ae62.tar.gz vyos-1x-3e027ddb1f4dfc8f713ebff4553bc97fc9a4ae62.zip | |
Merge pull request #1099 from sever-sever/T4046
sflow: T4046: Add source-address for sflow
| -rw-r--r-- | data/templates/netflow/uacctd.conf.tmpl | 3 | ||||
| -rw-r--r-- | interface-definitions/flow-accounting-conf.xml.in | 1 | ||||
| -rwxr-xr-x | src/conf_mode/flow_accounting_conf.py | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/data/templates/netflow/uacctd.conf.tmpl b/data/templates/netflow/uacctd.conf.tmpl index 1c183bb20..11fc76769 100644 --- a/data/templates/netflow/uacctd.conf.tmpl +++ b/data/templates/netflow/uacctd.conf.tmpl @@ -68,5 +68,8 @@ sfprobe_agentip[sf_{{ server['address'] }}]: {{ templatecfg['sflow']['agent-addr {% if templatecfg['sflow']['sampling-rate'] != none %} sampling_rate[sf_{{ server['address'] }}]: {{ templatecfg['sflow']['sampling-rate'] }} {% endif %} +{% if templatecfg['sflow']['source-address'] != none %} +sfprobe_source_ip[sf_{{ server['address'] }}]: {{ templatecfg['sflow']['source-address'] }} +{% endif %} {% endfor %} {% endif %} diff --git a/interface-definitions/flow-accounting-conf.xml.in b/interface-definitions/flow-accounting-conf.xml.in index 113c1d849..b98794792 100644 --- a/interface-definitions/flow-accounting-conf.xml.in +++ b/interface-definitions/flow-accounting-conf.xml.in @@ -420,6 +420,7 @@ </leafNode> </children> </tagNode> + #include <include/source-address-ipv4-ipv6.xml.i> </children> </node> </children> diff --git a/src/conf_mode/flow_accounting_conf.py b/src/conf_mode/flow_accounting_conf.py index 0a4559ade..daad00067 100755 --- a/src/conf_mode/flow_accounting_conf.py +++ b/src/conf_mode/flow_accounting_conf.py @@ -169,7 +169,8 @@ def get_config(): 'configured': vc.exists('system flow-accounting sflow'), 'agent-address': vc.return_value('system flow-accounting sflow agent-address'), 'sampling-rate': vc.return_value('system flow-accounting sflow sampling-rate'), - 'servers': None + 'servers': None, + 'source-address': vc.return_value('system flow-accounting sflow source-address') }, 'netflow': { 'configured': vc.exists('system flow-accounting netflow'), |