Skip to content

T75: migrate from pmacct to ipt_NETFLOW #4688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmbaturin merged 1 commit into from
Sep 16, 2025
Merged

T75: migrate from pmacct to ipt_NETFLOW #4688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions data/templates/ipt-netflow/ipt_NETFLOW.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{% if netflow.engine_id is vyos_defined %}
options ipt_NETFLOW engine-id={{ netflow.engine_id }}
{% endif %}
{% if netflow.max_flows is vyos_defined %}
options ipt_NETFLOW maxflows={{ netflow.max_flows }}
{% endif %}
{% if netflow.sampling_rate is vyos_defined %}
options ipt_NETFLOW sampler=random:{{ netflow.sampling_rate }}
{% endif %}
{% if netflow.server is vyos_defined %}
{% set servers_list = [] %}
{% for server in netflow.server %}
{% set d = netflow.server[server] %}
{% set s = (server | bracketize_ipv6) ~ ':' ~ d['port'] %}
{% set s = s ~ ('%' ~ d['source_interface'] if d['source_interface'] is vyos_defined else '') %}
{% set s = s ~ ('@' ~ d['source_address'] if d['source_address'] is vyos_defined else '') %}
{% set _ = servers_list.append(s) %}
{% endfor %}
options ipt_NETFLOW destination={{ servers_list | join(",") }}
{% endif %}
{% if netflow.version is vyos_defined %}
options ipt_NETFLOW protocol={{ netflow.version }}
{% endif %}
{% if netflow.inactive_timeout is vyos_defined %}
options ipt_NETFLOW inactive_timeout={{ netflow.inactive_timeout }}
{% endif %}
{% if netflow.active_timeout is vyos_defined %}
options ipt_NETFLOW active_timeout={{ netflow.active_timeout }}
{% endif %}
17 changes: 0 additions & 17 deletions data/templates/pmacct/override.conf.j2
View file
Open in desktop

This file was deleted.

57 changes: 0 additions & 57 deletions data/templates/pmacct/uacctd.conf.j2
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,9 +321,6 @@ Depends:
# For "vpn openconnect"
ocserv,
# End "vpn openconnect"
# For "system flow-accounting"
pmacct (>= 1.6.0),

@sever-sever sever-sever Sep 15, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do not forget to remove mentions about pmacct (after merging) in the vyos-build

@hedrok hedrok Sep 15, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks you, I missed that!
Here is PR: vyos/vyos-build#1030
I'll make it non-draft when ipt_NETFLOW is merged.

# End "system flow-accounting"
# For "system syslog"
rsyslog,
# End "system syslog"
Expand Down
2 changes: 1 addition & 1 deletion interface-definitions/include/version/flow-accounting-version.xml.i
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<!-- include start from include/version/flow-accounting-version.xml.i -->
<syntaxVersion component='flow-accounting' version='2'></syntaxVersion>
<syntaxVersion component='flow-accounting' version='3'></syntaxVersion>
<!-- include end -->
Loading
Loading