Revert "Disable the lvm plugin"

This reverts commit 5d743f8e686e86eaf108673c422a2224e5b52979.

Conflicts:
	debian/control

diff --git a/debian/changelog b/debian/changelog
index be745886c8d9009cac275cedc5d6da0166ed54c1..82e25a067804fd3753d20b52be61a03561f6ce85 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,6 @@ collectd (5.8.0-1) UNRELEASED; urgency=medium
   * Enable the grpc plugin, libgrpc++ is now available.
   * Enable the intel_rdt plugin, libpqos is now available.
   * Re-enable the varnish plugin, support for varnish 5.2 now implemented.
-  * Disable the lvm plugin, liblvm2app being deprecated. (Closes: #881641)
   * debian/patches:
     - Added i2c_detection.patch; needed to build against libi2c-4.0. Thanks to
       Christian Ehrhardt fo reporting this problem and Andreas Hasenack for

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 17be92dd9a660d2d41c8ddaf4cf14b29fd70d249..16a9d368bf68939b07fbde40bc79b4b8c47ebd36 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -133,6 +133,7 @@ LoadPlugin irq
 #LoadPlugin java
 LoadPlugin load
 #LoadPlugin lua
+#LoadPlugin lvm
 #LoadPlugin madwifi
 #LoadPlugin mbmon
 #LoadPlugin md

diff --git a/debian/control b/debian/control
index 9aeb9d6bc31d813daa85bdd9f67101dc92209ac8..fa16171bb31decf16fc29463143966a7291bb752 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -28,6 +28,7 @@ Build-Depends: debhelper (>= 9.20160709~), dpkg-dev (>= 1.14.10), po-debconf, dh
  libkvm-dev [kfreebsd-any],
  libldap2-dev,
  liblua5.3-dev,
+ liblvm2-dev [linux-any],
  libmemcached-dev,
  libmicrohttpd-dev,
  libmodbus-dev,
@@ -156,6 +157,7 @@ Description: statistics collection and monitoring daemon (core system)
    * logging to files, STDOUT and STDERR: logfile
    * logging in logstash's JSON event format: log_logstash
    * embedded Lua interpreter: lua
+   * Logical Volume Manager usage: lvm
    * Machine Check Exceptions notifications: mcelog
    * Atheros wireless LAN chipset statistics: madwifi
    * motherboard monitor: mbmon

diff --git a/debian/rules b/debian/rules
index 23c1bbda652e95dd3e22dc5e380b00ec79f2ae1b..9562595d1284f32522b0c44340d1b7d69b82a991 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -89,10 +89,6 @@ confflags += --disable-xmms
 # Cf. https://github.com/collectd/collectd/issues/1574
 confflags += --disable-sigrok
 
-# liblvm2app is deprecated.
-# https://github.com/collectd/collectd/issues/2647
-confflags += --disable-lvm
-
 # These plugins are Linux-specific.
 ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
        confflags += \
@@ -106,6 +102,7 @@ ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
                --disable-ipc \
                --disable-iptables \
                --disable-ipvs \
+               --disable-lvm \
                --disable-madwifi \
                --disable-md \
                --disable-netlink \