Document new plugins and add respective build-dependencies.

Disable plugins as needed.

diff --git a/debian/changelog b/debian/changelog
index 46616309b836ec1c50e18bf53db68b9d44b1981a..527841339939e86e8b434c1a13dfb54d39479d24 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,29 @@ collectd (5.6.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
     - The disk plugin now supports FreeBSD; enable it in debian/rules.
+    New plugins:
+    - Chrony daemon statistics: chrony
+    - CPU sleep: Time spent in suspend: cpusleep (Linux-specific)
+    - Monitor gps related data through gpsd: gps
+    - Send or receive values over the network using the gRPC framework: grpc
+      (disabled in Debian because of missing dependencies)
+    - Lua interpreter embedded into collectd: lua
+    - Publishes and subscribes to MQTT topics: mqtt
+    - Submit notifications as passive check results to a local nagios
+      instance: notify_nagios
+    - XEN Hypervisor CPU stats: xencpu
+    - Solaris zone metrics: zone (disabled in Debian; Solaris specific)
+  * debian/rules:
+    - Disable cpusleep plugin on non-Linux.
+    - Disable xencpu plugin except on amd64, arm64, armhf, and i386.
+    - Disable the zone plugin.
+  * debian/control:
+    - Build-depend on libgps-dev: Needed by the new gps plugin.
+    - Build-depend on liblua5.3-dev: Needed by the new lua plugin.
+    - Build-depend on libmosquitto-dev: Needed by the new mqtt plugin.
+    - Build-depend on libxen-dev [amd64 arm64 armhf i386]: Needed by the new
+      xencpu plugin.
+    - Build-depend on riemann-c-client: Now needed by the riemann plugin.
 
  -- Sebastian Harl <tokkee@debian.org>  Sat, 24 Sep 2016 11:59:37 +0200
 

diff --git a/debian/control b/debian/control
index e12a9cecee225c63a50ab4c1f39fb0a69c30b07a..aea49b8a1c8d20ec70f46afe45e825fbd56ddcd0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,13 +16,16 @@ Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf, dh-sys
  libganglia1-dev (>= 3) [linux-any],
  libgcrypt20-dev,
  libglib2.0-dev,
+ libgps-dev,
  libhiredis-dev,
  libi2c-dev,
  libkvm-dev [kfreebsd-any],
  libldap2-dev,
+ liblua5.3-dev,
  liblvm2-dev [linux-any],
  libmemcached-dev,
  libmodbus-dev,
+ libmosquitto-dev,
  libmnl-dev [linux-any],
  libmysqlclient-dev,
  libnotify-dev,
@@ -47,12 +50,14 @@ Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf, dh-sys
  libupsclient-dev | libupsclient1-dev,
  libvarnishapi-dev,
  libvirt-dev (>= 0.4.0-6) [linux-any],
+ libxen-dev [amd64 arm64 armhf i386],
  libxml2-dev,
  libyajl-dev,
  linux-libc-dev (>= 2.6.25-4) [linux-any] | linux-libc-dev (<< 2.6.25-1) [linux-any],
  default-jdk [!hppa !sparc !kfreebsd-i386 !kfreebsd-amd64],
  protobuf-c-compiler,
- python-dev
+ python-dev,
+ riemann-c-client
 Build-Conflicts: libpthread-dev, libhal-dev
 Standards-Version: 3.9.8
 Homepage: http://collectd.org/

diff --git a/debian/rules b/debian/rules
index 16153dde499979c48762df61728229aecaa86a1e..078243f2ad1bc7abfd5cae5e381859310a3a1f4b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -85,13 +85,14 @@ confflags += --disable-write_mongodb
 # xmms1 is required for the xmms plugin.
 confflags += --disable-xmms
 
-# protobuf-compiler >= 3.0.0 is required for the grpc plugin.
+# protobuf-compiler >= 3.0.0 and libgrpc++ are required for the grpc plugin.
 confflags += --disable-grpc
 
 # These plugins are Linux-specific.
 ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
        confflags += \
                --disable-cgroups \
+               --disable-cpusleep \
                --disable-ethstat \
                --disable-iptables \
                --disable-ipvs \
@@ -114,6 +115,10 @@ ifeq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
                --disable-pf
 endif
 
+# This plugin is Solaris-specific.
+confflags += \
+               --disable-zone
+
 # These plugins have not been ported to FreeBSD yet.
 ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
        # Work-around an incomplete check for kvm functionality
@@ -151,6 +156,12 @@ ifeq (,$(filter amd64 i386, $(DEB_BUILD_ARCH)))
                --disable-turbostat
 endif
 
+# This plugin is x86 and arm specific.
+ifeq (,$(filter amd64 arm64 armhf i386, $(DEB_BUILD_ARCH)))
+       confflags += \
+               --disable-xencpu
+endif
+
 # libatasmart isn't available on these platforms.
 ifneq (,$(filter hurd-i386 kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
        confflags += --disable-smart