Mention new plugins and their build-deps, disable non-buildable plugins.

diff --git a/debian/changelog b/debian/changelog
index 63f679efc9196944e2f108e5d290020c60b2d993..21841e6a644fc3a0e3ed9ce2f130bfe7bb2a9434 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,19 @@
 collectd (5.7.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+    New plugins:
+    - DPDK interface statistics: dpdkstat
+    - Report the number of used and free hugepages: hugepages (Linux-specific)
+    - Intel Resource Director Technology statistics: intel_rdt (disabled in
+      Debian because of missing dependencies)
+    - Publish values in a Prometheus-compatible format: write_prometheus
+  * debian/rules:
+    - Disable hugepages plugin on non-Linux.
+    - Disable the intel_rdt plugin.
+  * debian/control:
+    - Build-depend on libdpdk-dev: Needed by the new dpdkstat plugin.
+    - Build-depend on libmicrohttpd-dev: Needed by the new write_prometheus
+      plugin.
 
  -- Marc Fournier <marc@bl.uem.li>  Tue, 13 Dec 2016 21:27:06 +0100
 

diff --git a/debian/control b/debian/control
index 206e36b6adc39076eb19400e8d06b2ba73e2ab70..13e017a02290cc77fd226bf3ba6b3e23b64cb624 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends: debhelper (>= 9.20120909~), dpkg-dev (>= 1.14.10), po-debconf, dh
  libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev,
  libdevstat-dev [kfreebsd-any],
  libdbi0-dev,
+ libdpdk-dev,
  libesmtp-dev,
  libganglia1-dev (>= 3) [linux-any],
  libgeom-dev [kfreebsd-any],
@@ -27,6 +28,7 @@ Build-Depends: debhelper (>= 9.20120909~), dpkg-dev (>= 1.14.10), po-debconf, dh
  liblua5.3-dev,
  liblvm2-dev [linux-any],
  libmemcached-dev,
+ libmicrohttpd-dev,
  libmodbus-dev,
  libmosquitto-dev,
  libmnl-dev [linux-any],

diff --git a/debian/rules b/debian/rules
index 15026c773cfe832ad6e34bfb052dde525798e063..3510060ba10b04e4adb9906bfff8d8ec4d8f55d9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -88,6 +88,9 @@ 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
+
 # These plugins are Linux-specific.
 ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
        confflags += \
@@ -97,6 +100,7 @@ ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
                --disable-drbd \
                --disable-ethstat \
                --disable-fhcount \
+               --disable-hugepages \
                --disable-ipc \
                --disable-iptables \
                --disable-ipvs \