rpm/collectd
SHA256
1
0
Fork 0
forked from pool/collectd
Code Pull Requests Activity

Accepting request 709801 from home:mnhauke:monitoring

Browse Source 
- Update to 5.9.0:
+- Drop patches (fixed by upstream):
+  * 0001-gps-plugin-fix-build-with-newer-gpsd.patch
+  * Removed-checks-for-upper-limit-of-SENSORS_API_VERSION.patch
+- Add new subpackages:
+  * plugin-pcie
+  * plugin-write_stackdriver
+  * plugin-write_syslog
+
+-------------------------------------------------------------------
 Sun Apr 14 12:37:27 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
 
 - Update to 5.8.1:
Index: collectd.spec
===================================================================
--- collectd.spec (revision 154)
+++ collectd.spec (revision 9)
@@ -42,7 +42,7 @@
 %define sensors_plugin %{nil}
 %endif
 Name:           collectd
-Version:        5.8.1
+Version:        5.9.0
 Release:        0
 Summary:        Statistics Collection Daemon for filling RRD Files
 License:        GPL-2.0-only AND MIT
@@ -62,8 +62,6 @@
 Patch6:         collectd-fix_spamassassin_doc.patch
 Patch7:         collectd-fix_collectd_config_path_in_snmp_probe.patch
 Patch8:         9e36cd85a2bb_sigrok_Update_to_support_libsigrok_0_4.patch
-Patch9:         0001-gps-plugin-fix-build-with-newer-gpsd.patch
-Patch10:        Removed-checks-for-upper-limit-of-SENSORS_API_VERSION.patch
 # PATCH-FIX-OPENSUSE avoid-pg-config.patch avoid pg_config if possible
 Patch11:        avoid-pg-config.patch
 # for /etc/apache2/... ownership (rpmlint):
@@ -110,7 +108,6 @@
 BuildRequires:  pkgconfig(libatasmart)
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(libevent)
-#BuildRequires:  pkgconfig(libgpsd)
 BuildRequires:  pkgconfig(libgps)
 BuildRequires:  pkgconfig(libiptc)
 BuildRequires:  pkgconfig(libmemcached)
@@ -251,6 +248,14 @@
 %description plugin-lvm
 This plugin collects information from lvm.
 
+%package plugin-pcie
+Summary:        PCIe Monitoring Plugin for %{name}
+Group:          System/Monitoring
+Requires:       %{name} = %{version}-%{release}
+
+%description plugin-pcie
+Optional %{name} plugin to monitor PCIe errors.
+
 %package plugin-postgresql
 Summary:        PostgreSQL Monitoring Plugin for %{name}
 Group:          System/Monitoring
@@ -371,6 +376,22 @@
 %description plugin-synproxy
 Optional %{name} plugin to monitor Synproxy stats.
 
+%package plugin-write_stackdriver
+Summary:        Write Stackdriver plugin for %{name}
+Group:          System/Monitoring
+Requires:       %{name} = %{version}-%{release}
+
+%description plugin-write_stackdriver
+Optional %{name} plugin to to write to Google Stackdriver.
+
+%package plugin-write_syslog
+Summary:        Write Syslog plugin for %{name}
+Group:          System/Monitoring
+Requires:       %{name} = %{version}-%{release}
+
+%description plugin-write_syslog
+Optional %{name} plugin to write values lists as syslog messages.
+
 %package plugins-all
 Summary:        All Monitoring Plugins for %{name}
 Group:          System/Monitoring
@@ -387,6 +408,7 @@
 Requires:       %{name}-plugin-notify-desktop = %{version}-%{release}
 Requires:       %{name}-plugin-openldap = %{version}-%{release}
 Requires:       %{name}-plugin-ovs = %{version}-%{release}
+Requires:       %{name}-plugin-pcie = %{version}-%{release}
 Requires:       %{name}-plugin-pinba = %{version}-%{release}
 Requires:       %{name}-plugin-postgresql = %{version}-%{release}
 Requires:       %{name}-plugin-python3 = %{version}-%{release}
@@ -395,6 +417,8 @@
 Requires:       %{name}-plugin-snmp = %{version}-%{release}
 Requires:       %{name}-plugin-synproxy = %{version}-%{release}
 Requires:       %{name}-plugin-virt = %{version}-%{release}
+Requires:       %{name}-plugin-write_stackdriver = %{version}-%{release}
+Requires:       %{name}-plugin-write_syslog = %{version}-%{release}
 Requires:       %{name}-web = %{version}-%{release}
 Requires:       %{name}-web-js = %{version}-%{release}
 %if 0%{?suse_version} >= 1330
@@ -447,8 +471,6 @@
 %if 0%{?suse_version} > 1320
 %patch8 -p1
 %endif
-%patch9 -p1
-%patch10 -p1
 %patch11 -p1
 
 sed -i 's|@@VERSION@@|%{version}|g' configure.ac
@@ -678,6 +700,10 @@
 %{_libdir}/collectd/mysql.so
 %{_libdir}/collectd/mysql.la
 
+%files plugin-pcie
+%{_libdir}/collectd/pcie_errors.so
+%{_libdir}/collectd/pcie_errors.la
+
 %files plugin-postgresql
 %{_libdir}/collectd/postgresql.so
 %{_libdir}/collectd/postgresql.la
@@ -740,6 +766,14 @@
 %{_libdir}/collectd/synproxy.so
 %{_libdir}/collectd/synproxy.la
 
+%files plugin-write_stackdriver
+%{_libdir}/collectd/write_stackdriver.so
+%{_libdir}/collectd/write_stackdriver.la
+
+%files plugin-write_syslog
+%{_libdir}/collectd/write_syslog.so
+%{_libdir}/collectd/write_syslog.la
+
 %if 0%{?suse_version} >= 1330
 %files plugin-nut
 %{_libdir}/collectd/nut.so
Index: collectd-5.9.0.tar.bz2
===================================================================
Binary file collectd-5.9.0.tar.bz2 (revision 9) added
Index: 0001-gps-plugin-fix-build-with-newer-gpsd.patch
===================================================================
--- 0001-gps-plugin-fix-build-with-newer-gpsd.patch (revision 154)
+++ 0001-gps-plugin-fix-build-with-newer-gpsd.patch (deleted)
@@ -1,41 +0,0 @@
-From d5ec9075510601537cc76be4417ab337364506d0 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Tue, 9 Oct 2018 19:57:21 +0300
-Subject: [PATCH] gps plugin: fix build with newer gpsd
-
-gpsd version 3.18 changed the prototype of gps_read(). Make the
-gps_read() call depend on GPSD_API_MAJOR_VERSION to fix that.
-
-This fixes build failures like:
-
-gps.c: In function 'cgps_thread':
-gps.c:144:11: error: too few arguments to function 'gps_read'
-       if (gps_read(&gpsd_conn) == -1) {
-		   ^~~~~~~~
-
-(cherry picked from commit 991a6d3fd38c2435d94de3853fda36b3330cf6ab)
----
- src/gps.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/gps.c b/src/gps.c
-index 1d32d049..b22c3a2e 100644
---- a/src/gps.c
-+++ b/src/gps.c
-@@ -141,7 +141,12 @@ static void *cgps_thread(void *pData) {
-         continue;
-       }
- 
--      if (gps_read(&gpsd_conn) == -1) {
-+#if GPSD_API_MAJOR_VERSION > 6
-+      if (gps_read(&gpsd_conn, NULL, 0) == -1)
-+#else
-+      if (gps_read(&gpsd_conn) == -1)
-+#endif
-+      {
-         WARNING("gps plugin: incorrect data! (err_count: %d)", err_count);
-         err_count++;
- 
--- 
-2.16.4
-
Index: Removed-checks-for-upper-limit-of-SENSORS_API_VERSION.patch
===================================================================
--- Removed-checks-for-upper-limit-of-SENSORS_API_VERSION.patch (revision 154)
+++ Removed-checks-for-upper-limit-of-SENSORS_API_VERSION.patch (deleted)
@@ -1,83 +0,0 @@
-From d5a3c020d33cc33ee8049f54c7b4dffcd123bf83 Mon Sep 17 00:00:00 2001
-From: Pavel Rochnyack <pavel2000@ngs.ru>
-Date: Mon, 3 Dec 2018 18:34:14 +0700
-Subject: [PATCH] sensors: Removed checks for upper limit of
- SENSORS_API_VERSION
-
-That makes no more sense after lm-sensors got new maintainers.
-
-Closes: #3006
----
- src/sensors.c | 17 ++++++-----------
- 1 file changed, 6 insertions(+), 11 deletions(-)
-
-diff --git a/src/sensors.c b/src/sensors.c
-index f4ecda5e49..33982e061a 100644
---- a/src/sensors.c
-+++ b/src/sensors.c
-@@ -149,7 +149,7 @@ typedef struct featurelist {
- static char *conffile = SENSORS_CONF_PATH;
- /* #endif SENSORS_API_VERSION < 0x400 */
- 
--#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
-+#elif (SENSORS_API_VERSION >= 0x400)
- typedef struct featurelist {
-   const sensors_chip_name *chip;
-   const sensors_feature *feature;
-@@ -159,11 +159,6 @@ typedef struct featurelist {
- 
- static char *conffile = NULL;
- static _Bool use_labels = 0;
--/* #endif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
--
--#else /* if SENSORS_API_VERSION >= 0x500 */
--#error "This version of libsensors is not supported yet. Please report this " \
--	"as bug."
- #endif
- 
- static featurelist_t *first_feature = NULL;
-@@ -223,7 +218,7 @@ static int sensors_config(const char *key, const char *value) {
-     if (IS_TRUE(value))
-       ignorelist_set_invert(sensor_list, 0);
-   }
--#if (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
-+#if (SENSORS_API_VERSION >= 0x400)
-   else if (strcasecmp(key, "UseLabels") == 0) {
-     use_labels = IS_TRUE(value) ? 1 : 0;
-   }
-@@ -353,7 +348,7 @@ static int sensors_load_conf(void) {
-   }   /* while sensors_get_detected_chips */
- /* #endif SENSORS_API_VERSION < 0x400 */
- 
--#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
-+#elif (SENSORS_API_VERSION >= 0x400)
-   chip_num = 0;
-   while ((chip = sensors_get_detected_chips(NULL, &chip_num)) != NULL) {
-     const sensors_feature *feature;
-@@ -410,7 +405,7 @@ static int sensors_load_conf(void) {
-       } /* while (subfeature) */
-     }   /* while (feature) */
-   }     /* while (chip) */
--#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
-+#endif /* (SENSORS_API_VERSION >= 0x400) */
- 
-   if (first_feature == NULL) {
-     sensors_cleanup();
-@@ -485,7 +480,7 @@ static int sensors_read(void) {
-   } /* for fl = first_feature .. NULL */
- /* #endif SENSORS_API_VERSION < 0x400 */
- 
--#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
-+#elif (SENSORS_API_VERSION >= 0x400)
-   for (featurelist_t *fl = first_feature; fl != NULL; fl = fl->next) {
-     double value;
-     int status;
-@@ -528,7 +523,7 @@ static int sensors_read(void) {
- 
-     sensors_submit(plugin_instance, type, type_instance, value);
-   } /* for fl = first_feature .. NULL */
--#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
-+#endif /* (SENSORS_API_VERSION >= 0x400) */
- 
-   return 0;
- } /* int sensors_read */
Index: collectd-5.8.1.tar.bz2
===================================================================
Binary file collectd-5.8.1.tar.bz2 (revision 154) deleted

OBS-URL: https://build.opensuse.org/request/show/709801
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=155
This commit is contained in:
Dirk Stoecker 2019-06-14 09:02:25 +00:00 committed by Git OBS Bridge
parent 8c70fab9da
commit 5788d17fe3
6 changed files with 172 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
0001-gps-plugin-fix-build-with-newer-gpsd.patch
View File

@ -1,41 +0,0 @@
From d5ec9075510601537cc76be4417ab337364506d0 Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Tue, 9 Oct 2018 19:57:21 +0300
Subject: [PATCH] gps plugin: fix build with newer gpsd
gpsd version 3.18 changed the prototype of gps_read(). Make the
gps_read() call depend on GPSD_API_MAJOR_VERSION to fix that.
This fixes build failures like:
gps.c: In function 'cgps_thread':
gps.c:144:11: error: too few arguments to function 'gps_read'
if (gps_read(&gpsd_conn) == -1) {
^~~~~~~~
(cherry picked from commit 991a6d3fd38c2435d94de3853fda36b3330cf6ab)
---
src/gps.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/gps.c b/src/gps.c
index 1d32d049..b22c3a2e 100644
--- a/src/gps.c
+++ b/src/gps.c
@@ -141,7 +141,12 @@ static void *cgps_thread(void *pData) {
continue;
}
- if (gps_read(&gpsd_conn) == -1) {
+#if GPSD_API_MAJOR_VERSION > 6
+ if (gps_read(&gpsd_conn, NULL, 0) == -1)
+#else
+ if (gps_read(&gpsd_conn) == -1)
+#endif
+ {
WARNING("gps plugin: incorrect data! (err_count: %d)", err_count);
err_count++;
--
2.16.4

83
Removed-checks-for-upper-limit-of-SENSORS_API_VERSION.patch
View File

@ -1,83 +0,0 @@
From d5a3c020d33cc33ee8049f54c7b4dffcd123bf83 Mon Sep 17 00:00:00 2001
From: Pavel Rochnyack <pavel2000@ngs.ru>
Date: Mon, 3 Dec 2018 18:34:14 +0700
Subject: [PATCH] sensors: Removed checks for upper limit of
SENSORS_API_VERSION
That makes no more sense after lm-sensors got new maintainers.
Closes: #3006
---
src/sensors.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/sensors.c b/src/sensors.c
index f4ecda5e49..33982e061a 100644
--- a/src/sensors.c
+++ b/src/sensors.c
@@ -149,7 +149,7 @@ typedef struct featurelist {
static char *conffile = SENSORS_CONF_PATH;
/* #endif SENSORS_API_VERSION < 0x400 */
-#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
+#elif (SENSORS_API_VERSION >= 0x400)
typedef struct featurelist {
const sensors_chip_name *chip;
const sensors_feature *feature;
@@ -159,11 +159,6 @@ typedef struct featurelist {
static char *conffile = NULL;
static _Bool use_labels = 0;
-/* #endif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
-
-#else /* if SENSORS_API_VERSION >= 0x500 */
-#error "This version of libsensors is not supported yet. Please report this " \
- "as bug."
#endif
static featurelist_t *first_feature = NULL;
@@ -223,7 +218,7 @@ static int sensors_config(const char *key, const char *value) {
if (IS_TRUE(value))
ignorelist_set_invert(sensor_list, 0);
}
-#if (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
+#if (SENSORS_API_VERSION >= 0x400)
else if (strcasecmp(key, "UseLabels") == 0) {
use_labels = IS_TRUE(value) ? 1 : 0;
}
@@ -353,7 +348,7 @@ static int sensors_load_conf(void) {
} /* while sensors_get_detected_chips */
/* #endif SENSORS_API_VERSION < 0x400 */
-#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
+#elif (SENSORS_API_VERSION >= 0x400)
chip_num = 0;
while ((chip = sensors_get_detected_chips(NULL, &chip_num)) != NULL) {
const sensors_feature *feature;
@@ -410,7 +405,7 @@ static int sensors_load_conf(void) {
} /* while (subfeature) */
} /* while (feature) */
} /* while (chip) */
-#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
+#endif /* (SENSORS_API_VERSION >= 0x400) */
if (first_feature == NULL) {
sensors_cleanup();
@@ -485,7 +480,7 @@ static int sensors_read(void) {
} /* for fl = first_feature .. NULL */
/* #endif SENSORS_API_VERSION < 0x400 */
-#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
+#elif (SENSORS_API_VERSION >= 0x400)
for (featurelist_t *fl = first_feature; fl != NULL; fl = fl->next) {
double value;
int status;
@@ -528,7 +523,7 @@ static int sensors_read(void) {
sensors_submit(plugin_instance, type, type_instance, value);
} /* for fl = first_feature .. NULL */
-#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
+#endif /* (SENSORS_API_VERSION >= 0x400) */
return 0;
} /* int sensors_read */

3
collectd-5.8.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e796fda27ce06377f491ad91aa286962a68c2b54076aa77a29673d53204453da
size 1789228

3
collectd-5.9.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7b220f8898a061f6e7f29a8c16697d1a198277f813da69474a67911097c0626b
size 1899573

129
collectd.changes
View File

@ -1,3 +1,132 @@
-------------------------------------------------------------------
Thu Jun 13 19:54:45 UTC 2019 - Martin Hauke <mardnh@gmx.de>
- Update to 5.9.0:
* collectd: A new "UNKNOWN" state as the initial state of metrics has
been added.
* collectd: config parser: Improved error reporting on global options.
* collectd: daemon: make plugin_dispatch_multivalue() obey write queue
limits.
* collectd: Macros "STRERROR" and "STRERRNO" have been added.
* collectd: Plugin name field has been added to plugin context to
improve error reporting.
* collectd-tg: Use "CLOCK_REALTIME" for collectd-tg times.
* AMPQ1 plugin: A new plugin to write to amqp1 protocol.
* Chrony plugin: Ignoring late responses has been added.
* CPUFreq plugin: Read number of p-state transitions and time spent in
each p-state.
* cURL, cURL-XML plugins: Option "Interval" has been added.
* Exec plugin: Dynamic allocation of grname buffer has been added.
* GPU NVML plugin: New plugin to collect NVIDIA GPU stats.
* gRPC plugin: The "VerifyPeer" option for servers has been added.
* Intel RDT plugin: Support for groups of PIDs has been added.
* IPMI plugin: Config options "SELSensor" and "SELIgnoreSelected" have
been added.
* Modbus plugin: Support for 64 bit vals has been added, support for
CDAB endian 32-bit modbus polls has been added.
* Modbus plugin: The "Scale" and "Shift" metrics have been added.
* Netlink plugin: Handle new counter from Linux kernel version 4.6+.
* Network plugin: Option "BindAddress" has been added.
* Ping plugin: An "AddressFamily" configuration option has been added.
* OVS Stats plugin: Extended metrics "ovs-dpdk" have been added.
* OVS Stats plugin: Support of bond interface and a "InterfaceStats"
config option have been added.
* PCIe Errors plugin: New plugin to read "PCIe" errors.
* Processes plugin: Support for Linux Delay Accounting has been added.
* Redis plugin: Keyspace "hitratio" metric has been added, metric
"operations_per_second" has been removed, an option for connecting via
UNIX socket has been added.
* RouterOS plugin: Support for temperature and voltage data has been
added, use MAC-address when Radio-name is missing.
* RRDCacheD plugin: Time resolution has been improved to microseconds.
* Sensors plugin: Checks for upper limit of "SENSORS_API_VERSION" have
been removed, support for libsensors older than 3.0.0 has been
dropped.
* SNMP plugin: New options "PluginInstance", "TypeInstance",
"TypeInstanceOID", "PluginInstanceOID", "FilterOID", "FilterValues"
and "FilterIgnoreSelected" have been added.
* SNMP Agent plugin: Multiple key indexes to snmp table and other new
features have been added, refactoring, coverity scan issues have been
fixed.
* Swap plugin: Support for Linux 2.4 has been dropped.
* Turbostat plugin: Configuration option "RestoreAffinityPolicy" has
been added.
* Turbostat plugin: New metrics "P-states", "Turboboost", "Platform
TDP", "Uncore bus ratio" have been added.
* Turbostat plugin: Support of reporting GPU power on SKL has been
added.
* virt plugin: Allow read "Hostname" from libvirt metadata.
* virt plugin: Block info statistics for disk devices have been added.
* Wireless plugin: A "bitrate" metric has been added.
* Write Graphite, Write Kafka plugins: Support for Graphite 1.1+ tag has
been added.
* Write Prometheus plugin: Option "Host" has been added.
* Write Stackdriver plugin: New plugin to write to Google Stackdriver
Monitoring.
* Write Syslog plugin: "write_syslog" plugin writes values lists as
syslog messages.
* collectd: collectdmon cannot exit command line options parse loop has
been fixed.
* collectd: Include "kstat.h" if available to provide "kstat_ctl_t",
include "kstat.h" when available.
* collectd: Parsing option for avoiding making BaseDir has been fixed.
* collectd: Remove empty "cmd_listval_t" data structure and related
no-op code.
* collectd: src/daemon/plugin.c: Refactor plugin_load_file(),
src/utils_format_json.c: Remove chatty debug messages.
* collectd: Stop poisoning function in debug mode.
* collectd: The number of allocations when parsing types.db has been
reduced.
* AMQP1 plugin: Potential memory leaks found via scan-build have been
fixed, a typo in error log message has been fixed, cleanups.
* Barometer plugin: Support to "libi2c-4.0" has been added.
* DBI, Oracle, PostgreSQL plugins: Fixes and improvements.
* Disk plugin: In linux, reset the disk when it disappears from
"/proc/diskstats".
* DPDK Events, DPDK Stats plugins: Buffer size for parsing lcores has
been increased, a deprecation warning has been fixed, runtime config
file path has been fixed.
* GPS plugin: Build with gpsd version 3.18 has been fixed.
* LUA plugin: A memory leak has been fixed.
* MySQL plugin: Properly cleanup dropped MySQL connections.
* Netlink plugin: Truncation warnings have been fixed.
* NFS plugin: Message "Unexpected number of fields for NFSv4 server
statistics: 62" has been fixed.
* NFS plugin: Number of fields for "NFSv4" has been fixed.
* Notify Email plugin: All notification parameters have been included
into email.
* NTPd plugin: Don't treat normal peers as refclocks, skip "0.0.0.0"
hosts in ntpd plugin.
* OVS Stats plugin: A macro to populate counters list has been added,
value of "OpenFlow" has been corrected.
* OVS Stats, OVS Events plugins: utils_ovs: Avoid potential access of
freed memory, fixes.
* Processes plugin: Compilation has been fixed when ps_delay() is not
used.
* Python plugin: A compilation warning with Python 3.7 has been fixed.
* Redis plugin: Bugfixes, extended error reporting, persistent
connections and parallel polling, ability to select db for queries has
been fixed.
* RRDTool plugin: Error reporting has been extended.
* Sensors plugin: Support for humidity sensors has been added.
* Sensu, OVS Stat, Turbostat, virt, OAuth, Write Prometheus, Intel RDT
plugins: Compiler warnings have been fixed.
* virt plugin: Compiler warnings, a segfault in libvirt, typo in error
messages have been fixed.
* virt plugin: Optional "virDomainGetCPUStats()" has been removed from
main flow, cleanup.
* virt plugin: Tracking of VM state changes has been fixed.
* Write MongoDB plugin: Plugin dependencies have been fixed.
* Write Redis plugin: Bug ""max_set_duration" deletes unexpected data"
has been fixed.
- Drop patches (fixed by upstream):
* 0001-gps-plugin-fix-build-with-newer-gpsd.patch
* Removed-checks-for-upper-limit-of-SENSORS_API_VERSION.patch
- Add new subpackages:
* plugin-pcie
* plugin-write_stackdriver
* plugin-write_syslog
-------------------------------------------------------------------
Sun Apr 14 12:37:27 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>

46
collectd.spec
View File

@ -42,7 +42,7 @@
%define sensors_plugin %{nil}
%endif
Name: collectd
Version: 5.8.1
Version: 5.9.0
Release: 0
Summary: Statistics Collection Daemon for filling RRD Files
License: GPL-2.0-only AND MIT
@ -62,8 +62,6 @@ Patch5: collectd-fix_collection_cgi.patch
Patch6: collectd-fix_spamassassin_doc.patch
Patch7: collectd-fix_collectd_config_path_in_snmp_probe.patch
Patch8: 9e36cd85a2bb_sigrok_Update_to_support_libsigrok_0_4.patch
Patch9: 0001-gps-plugin-fix-build-with-newer-gpsd.patch
Patch10: Removed-checks-for-upper-limit-of-SENSORS_API_VERSION.patch
# PATCH-FIX-OPENSUSE avoid-pg-config.patch avoid pg_config if possible
Patch11: avoid-pg-config.patch
# for /etc/apache2/... ownership (rpmlint):
@ -110,7 +108,6 @@ BuildRequires: pkgconfig(libart-2.0)
BuildRequires: pkgconfig(libatasmart)
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(libevent)
#BuildRequires: pkgconfig(libgpsd)
BuildRequires: pkgconfig(libgps)
BuildRequires: pkgconfig(libiptc)
BuildRequires: pkgconfig(libmemcached)
@ -251,6 +248,14 @@ Requires: %{name} = %{version}-%{release}
%description plugin-lvm
This plugin collects information from lvm.
%package plugin-pcie
Summary: PCIe Monitoring Plugin for %{name}
Group: System/Monitoring
Requires: %{name} = %{version}-%{release}
%description plugin-pcie
Optional %{name} plugin to monitor PCIe errors.
%package plugin-postgresql
Summary: PostgreSQL Monitoring Plugin for %{name}
Group: System/Monitoring
@ -371,6 +376,22 @@ Requires: %{name} = %{version}-%{release}
%description plugin-synproxy
Optional %{name} plugin to monitor Synproxy stats.
%package plugin-write_stackdriver
Summary: Write Stackdriver plugin for %{name}
Group: System/Monitoring
Requires: %{name} = %{version}-%{release}
%description plugin-write_stackdriver
Optional %{name} plugin to to write to Google Stackdriver.
%package plugin-write_syslog
Summary: Write Syslog plugin for %{name}
Group: System/Monitoring
Requires: %{name} = %{version}-%{release}
%description plugin-write_syslog
Optional %{name} plugin to write values lists as syslog messages.
%package plugins-all
Summary: All Monitoring Plugins for %{name}
Group: System/Monitoring
@ -387,6 +408,7 @@ Requires: %{name}-plugin-mysql = %{version}-%{release}
Requires: %{name}-plugin-notify-desktop = %{version}-%{release}
Requires: %{name}-plugin-openldap = %{version}-%{release}
Requires: %{name}-plugin-ovs = %{version}-%{release}
Requires: %{name}-plugin-pcie = %{version}-%{release}
Requires: %{name}-plugin-pinba = %{version}-%{release}
Requires: %{name}-plugin-postgresql = %{version}-%{release}
Requires: %{name}-plugin-python3 = %{version}-%{release}
@ -395,6 +417,8 @@ Requires: %{name}-plugin-smart = %{version}-%{release}
Requires: %{name}-plugin-snmp = %{version}-%{release}
Requires: %{name}-plugin-synproxy = %{version}-%{release}
Requires: %{name}-plugin-virt = %{version}-%{release}
Requires: %{name}-plugin-write_stackdriver = %{version}-%{release}
Requires: %{name}-plugin-write_syslog = %{version}-%{release}
Requires: %{name}-web = %{version}-%{release}
Requires: %{name}-web-js = %{version}-%{release}
%if 0%{?suse_version} >= 1330
@ -447,8 +471,6 @@ to write %{name} unixsock clients.
%if 0%{?suse_version} > 1320
%patch8 -p1
%endif
%patch9 -p1
%patch10 -p1
%patch11 -p1
sed -i 's|@@VERSION@@|%{version}|g' configure.ac
@ -678,6 +700,10 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
%{_libdir}/collectd/mysql.so
%{_libdir}/collectd/mysql.la
%files plugin-pcie
%{_libdir}/collectd/pcie_errors.so
%{_libdir}/collectd/pcie_errors.la
%files plugin-postgresql
%{_libdir}/collectd/postgresql.so
%{_libdir}/collectd/postgresql.la
@ -740,6 +766,14 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
%{_libdir}/collectd/synproxy.so
%{_libdir}/collectd/synproxy.la
%files plugin-write_stackdriver
%{_libdir}/collectd/write_stackdriver.so
%{_libdir}/collectd/write_stackdriver.la
%files plugin-write_syslog
%{_libdir}/collectd/write_syslog.so
%{_libdir}/collectd/write_syslog.la
%if 0%{?suse_version} >= 1330
%files plugin-nut
%{_libdir}/collectd/nut.so