Merge pull request #2162 from maryamtahhan/feat_intel_rdt

collectd.service: add intel_rdt plugin capability requirement

diff --git a/contrib/systemd.collectd.service b/contrib/systemd.collectd.service
index d0f1bdea9c049a757a2ce2ae06a8f96146994815..8a1fc2706b60f35c9f98d516faa406febf756c9b 100644 (file)
--- a/contrib/systemd.collectd.service
+++ b/contrib/systemd.collectd.service
@@ -18,6 +18,7 @@ ProtectHome=true
 #   ceph            CAP_DAC_OVERRIDE
 #   dns             CAP_NET_RAW
 #   exec            CAP_SETUID CAP_SETGID
+#   intel_rdt       CAP_SYS_RAWIO
 #   iptables        CAP_NET_ADMIN
 #   ping            CAP_NET_RAW
 #   turbostat       CAP_SYS_RAWIO

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 51fe68d23831ddf01357226f96b3f2851a7471dc..6931066e99a935a9274a557748a87fe83eacfbd8 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -2958,6 +2958,10 @@ allows to monitor instructions per clock (IPC).
 Monitor events are hardware dependant. Monitoring capabilities are detected on
 plugin initialization and only supported events are monitored.
 
+B<Note:> I<intel_rdt> plugin is using model-specific registers (MSRs), which
+require an additional capability to be enabled if collectd is run as a service.
+Please refer to I<contrib/systemd.collectd.service> file for more details.
+
 B<Synopsis:>
 
   <Plugin "intel_rdt">