Enable the intel_rdt plugin

diff --git a/debian/changelog b/debian/changelog
index b6613e33eb9e2938cc60d0bdcbcf9b0fd14f2179..3387713a6c347647402f2e8b8c385d32fbcd3281 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 collectd (5.8.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Enable the intel_rdt plugin, libpqos is now available.
 
  -- Marc Fournier <marc@bl.uem.li>  Wed, 21 Feb 2018 07:02:01 +0100
 

diff --git a/debian/collectd.conf b/debian/collectd.conf
index cf6e8cfed5ef56340e46b324183e1c2837f47c70..2e1bf5fd3982e284bb7bb7c01cb1bdc656186ab5 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -122,6 +122,7 @@ LoadPlugin entropy
 #LoadPlugin gps
 #LoadPlugin hugepages
 #LoadPlugin hddtemp
+#LoadPlugin intel_rdt
 LoadPlugin interface
 #LoadPlugin ipc
 #LoadPlugin ipmi
@@ -585,6 +586,10 @@ LoadPlugin users
 #    ValuesPercentage false
 #</Plugin>
 
+#<Plugin "intel_rdt">
+#  Cores "0-2"
+#</Plugin>
+
 #<Plugin interface>
 #      Interface "eth0"
 #      IgnoreSelected false

diff --git a/debian/control b/debian/control
index bc7c66803ba5ef93b657458e132e2cd01478be1f..75580390defb68600aca314b162239a622eaa286 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Marc Fournier <marc@bl.uem.li>
 Build-Depends: debhelper (>= 9.20160709~), dpkg-dev (>= 1.14.10), po-debconf, dh-strip-nondeterminism, dh-autoreconf,
  bison, flex, autotools-dev, libltdl-dev, pkg-config,
  default-libmysqlclient-dev,
+ intel-cmt-cat,
  iptables-dev (>= 1.4.3.2-2) [linux-any],
  javahelper,
  kfreebsd-kernel-headers [kfreebsd-any],
@@ -137,6 +138,7 @@ Description: statistics collection and monitoring daemon (core system)
    * receive and interpret Ganglia multicast traffic: gmond
    * harddisk temperature: hddtemp
    * Report the number of used and free hugepages: hugepages
+   * Intel Resource Director Technology statistics: intel_rdt
    * network traffic: interface
    * IPC statistics: ipc
    * IPMI sensors information: ipmi

diff --git a/debian/rules b/debian/rules
index cac99e0d8b81fd6da2ce193d887201590ac250d3..837d0369c7d92f7d4867bb4f47500e318ed23171 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -85,9 +85,6 @@ confflags += --disable-xmms
 # protobuf-compiler >= 3.0.0 and libgrpc++ are required for the grpc plugin.
 confflags += --disable-grpc
 
-# libqpos is required for the intel_rdt plugin.
-confflags += --disable-intel_rdt
-
 # libsigrok4 incompatible with the plugin.
 # Cf. https://github.com/collectd/collectd/issues/1574
 confflags += --disable-sigrok