From b1832935bea244e0b3ac4f2e8b6d0ddb0fd5be93 Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Wed, 21 Feb 2018 07:43:54 +0100 Subject: [PATCH] Enable the rpc plugin --- debian/changelog | 1 + debian/collectd.conf | 16 ++++++++++++++++ debian/control | 3 +++ debian/rules | 3 --- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2f04a87..c66f9b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ collectd (5.8.0-1) UNRELEASED; urgency=medium * New upstream release. + * 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. diff --git a/debian/collectd.conf b/debian/collectd.conf index 6bb8516..16a9d36 100644 --- a/debian/collectd.conf +++ b/debian/collectd.conf @@ -121,6 +121,7 @@ LoadPlugin entropy #LoadPlugin gmond #LoadPlugin gps #LoadPlugin hugepages +#LoadPlugin grpc #LoadPlugin hddtemp #LoadPlugin intel_rdt LoadPlugin interface @@ -579,6 +580,21 @@ LoadPlugin users # Port 7634 # +# +# +# EnableSSL true +# SSLCACertificateFile "/path/to/root.pem" +# SSLCertificateFile "/path/to/server.pem" +# SSLCertificateKeyFile "/path/to/server.key" +# +# +# EnableSSL true +# SSLCACertificateFile "/path/to/root.pem" +# SSLCertificateFile "/path/to/client.pem" +# SSLCertificateKeyFile "/path/to/client.key" +# +# + # # ReportPerNodeHP true # ReportRootHP true diff --git a/debian/control b/debian/control index abe2b0b..cbcda59 100644 --- a/debian/control +++ b/debian/control @@ -21,6 +21,7 @@ Build-Depends: debhelper (>= 9.20160709~), dpkg-dev (>= 1.14.10), po-debconf, dh libgeom-dev [kfreebsd-any], libgcrypt20-dev, libglib2.0-dev, + libgrpc++-dev, libgps-dev, libhiredis-dev, libi2c-dev, @@ -62,6 +63,7 @@ Build-Depends: debhelper (>= 9.20160709~), dpkg-dev (>= 1.14.10), po-debconf, dh 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, + protobuf-compiler (>= 3.0.0), python-dev, riemann-c-client Build-Conflicts: libpthread-dev, libhal-dev @@ -135,6 +137,7 @@ Description: statistics collection and monitoring daemon (core system) * count the number of files in directories: filecount * Linux file-system based caching framework statistics: fscache * Monitor gps related data through gpsd: gps + * Send or receive values over the network using the gRPC framework: grpc * query data from Java processes using JMX: GenericJMX (Java based plugin) * receive and interpret Ganglia multicast traffic: gmond * harddisk temperature: hddtemp diff --git a/debian/rules b/debian/rules index 919318c..1e06f00 100755 --- a/debian/rules +++ b/debian/rules @@ -82,9 +82,6 @@ confflags += --disable-routeros # xmms1 is required for the xmms plugin. confflags += --disable-xmms -# protobuf-compiler >= 3.0.0 and libgrpc++ are required for the grpc plugin. -confflags += --disable-grpc - # libsigrok4 incompatible with the plugin. # Cf. https://github.com/collectd/collectd/issues/1574 confflags += --disable-sigrok -- 2.30.2