4 files changed, 53 insertions, 8 deletions
diff --git a/data/configd-include.json b/data/configd-include.json
index 648655a8b..456211caa 100644
--- a/data/configd-include.json
+++ b/data/configd-include.json
@@ -74,6 +74,7 @@
 "system-logs.py",
 "system-option.py",
 "system-proxy.py",
+"system_sflow.py",
 "system_sysctl.py",
 "system-syslog.py",
 "system-timezone.py",
diff --git a/data/templates/accel-ppp/ipoe.config.j2 b/data/templates/accel-ppp/ipoe.config.j2
index 27621bc9b..ac83c3dbd 100644
--- a/data/templates/accel-ppp/ipoe.config.j2
+++ b/data/templates/accel-ppp/ipoe.config.j2
@@ -44,18 +44,18 @@ vlan-mon={{ iface }},{{ iface_config.vlan | join(',') }}
 {% endif %}
 {% if authentication.mode is vyos_defined('noauth') %}
 noauth=1
-{%     if client_ip_pool.name is vyos_defined %}
-{%         for pool, pool_options in client_ip_pool.name.items() %}
-{%             if pool_options.subnet is vyos_defined and pool_options.gateway_address is vyos_defined %}
-ip-pool={{ pool }}
-gw-ip-address={{ pool_options.gateway_address }}/{{ pool_options.subnet.split('/')[1] }}
-{%             endif %}
-{%         endfor %}
-{%     endif %}
 {% elif authentication.mode is vyos_defined('local') %}
 username=ifname
 password=csid
 {% endif %}
+{% if client_ip_pool.name is vyos_defined %}
+{%     for pool, pool_options in client_ip_pool.name.items() %}
+{%         if pool_options.subnet is vyos_defined and pool_options.gateway_address is vyos_defined %}
+ip-pool={{ pool }}
+gw-ip-address={{ pool_options.gateway_address }}/{{ pool_options.subnet.split('/')[1] }}
+{%         endif %}
+{%     endfor %}
+{% endif %}
 proxy-arp=1
 
 {% if client_ip_pool.name is vyos_defined %}
diff --git a/data/templates/sflow/hsflowd.conf.j2 b/data/templates/sflow/hsflowd.conf.j2
new file mode 100644
index 000000000..7ce6554d7
--- /dev/null
+++ b/data/templates/sflow/hsflowd.conf.j2
@@ -0,0 +1,28 @@
+# Genereated by /usr/libexec/vyos/conf_mode/system_sflow.py
+# Parameters http://sflow.net/host-sflow-linux-config.php
+
+sflow {
+{% if polling is vyos_defined %}
+  polling={{ polling }}
+{% endif %}
+{% if sampling_rate is vyos_defined %}
+  sampling={{ sampling_rate }}
+  sampling.bps_ratio=0
+{% endif %}
+{% if agent_address is vyos_defined %}
+  agentIP={{ agent_address }}
+{% endif %}
+{% if agent_interface is vyos_defined %}
+  agent={{ agent_interface }}
+{% endif %}
+{% if server is vyos_defined %}
+{%     for server, server_config in server.items() %}
+  collector { ip = {{ server }} udpport = {{ server_config.port }} }
+{%     endfor %}
+{% endif %}
+{% if interface is vyos_defined %}
+{%     for iface in interface %}
+  pcap { dev={{ iface }} }
+{%     endfor %}
+{% endif %}
+}
diff --git a/data/templates/sflow/override.conf.j2 b/data/templates/sflow/override.conf.j2
new file mode 100644
index 000000000..f2a982528
--- /dev/null
+++ b/data/templates/sflow/override.conf.j2
@@ -0,0 +1,16 @@
+[Unit]
+After=
+After=vyos-router.service
+ConditionPathExists=
+ConditionPathExists=/run/sflow/hsflowd.conf
+
+[Service]
+EnvironmentFile=
+ExecStart=
+ExecStart=/usr/sbin/hsflowd -m %m -d -f /run/sflow/hsflowd.conf
+WorkingDirectory=
+WorkingDirectory=/run/sflow
+PIDFile=
+PIDFile=/run/sflow/hsflowd.pid
+Restart=always
+RestartSec=10