diff --git a/global/overlay/etc/puppet/modules/eid/manifests/telegraf.pp b/global/overlay/etc/puppet/modules/eid/manifests/telegraf.pp
index f007f75a..af82a2df 100644
--- a/global/overlay/etc/puppet/modules/eid/manifests/telegraf.pp
+++ b/global/overlay/etc/puppet/modules/eid/manifests/telegraf.pp
@@ -20,7 +20,7 @@ class eid::telegraf(String $version = "stable", Array $volumes = []) {
       }
    }
 
-   $_volumes = flatten(["/dev/log:/dev/log","/var/log:/var/log","/etc/telegraf:/etc/telegraf",$volumes])
+   $_volumes = flatten(["/dev/log:/dev/log","/var/log:/var/log","/etc/telegraf:/etc/telegraf","/proc:/proc:ro",$volumes])
 
    sunet::docker_run {"telegraf":
       image     => "docker.sunet.se/eduid/telegraf",
diff --git a/global/overlay/etc/telegraf/telegraf.conf.d/40-system.conf b/global/overlay/etc/telegraf/telegraf.conf.d/40-system.conf
new file mode 100644
index 00000000..205bee33
--- /dev/null
+++ b/global/overlay/etc/telegraf/telegraf.conf.d/40-system.conf
@@ -0,0 +1,2 @@
+[[inputs.system]]
+