diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 16443a2872..188ad32b82 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -137,6 +137,8 @@ congress_api_port: "1789"
 
 cloudkitty_api_port: "8889"
 
+collectd_udp_port: "25826"
+
 designate_api_port: "9001"
 designate_bind_port: "53"
 designate_mdns_port: "5354"
diff --git a/ansible/roles/collectd/templates/collectd.conf.j2 b/ansible/roles/collectd/templates/collectd.conf.j2
index 6fdc5a333b..fad5e438fb 100644
--- a/ansible/roles/collectd/templates/collectd.conf.j2
+++ b/ansible/roles/collectd/templates/collectd.conf.j2
@@ -4,3 +4,8 @@ LoadPlugin cpu
 LoadPlugin interface
 LoadPlugin load
 LoadPlugin memory
+LoadPlugin network
+
+<Plugin "network">
+    Server "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}" "{{ collectd_udp_port }}"
+</Plugin>
diff --git a/ansible/roles/telegraf/templates/telegraf.conf.j2 b/ansible/roles/telegraf/templates/telegraf.conf.j2
index 687cdcc078..667c79271b 100644
--- a/ansible/roles/telegraf/templates/telegraf.conf.j2
+++ b/ansible/roles/telegraf/templates/telegraf.conf.j2
@@ -21,6 +21,13 @@
   percpu = true
   totalcpu = true
   fielddrop = ["time_*"]
+{% if enable_collectd | bool and inventory_hostname in groups['collectd'] %}
+[[inputs.socket_listener]]
+  service_address = "udp://{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ collectd_udp_port }}"
+  name_prefix = "collectd_"
+  data_format = "collectd"
+  collectd_typesdb = ["/usr/share/collectd/types.db"]
+{% endif %}
 [[inputs.disk]]
   ignore_fs = ["tmpfs", "devtmpfs"]
 [[inputs.diskio]]