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

Accepting request 419179 from home:benoit_monin:branches:server:monitoring

Browse Source 
- update to upstream version 5.5.2
- update patch collectd-fix_broken_perl-5.10.patch
- drop patch collectd-df-remove-duplicates.patch: fixed upstream
- add libatasmart-devel and libudev-devel as BuildRequires to enable the SMART plugin

OBS-URL: https://build.opensuse.org/request/show/419179
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=137
This commit is contained in:
Lars Vogdt 2016-08-14 12:49:05 +00:00 committed by Git OBS Bridge
parent 7a12e3203e
commit 51a752b6cc
6 changed files with 147 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
collectd-5.5.0.tar.bz2
View File

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

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

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

31
collectd-df-remove-duplicates.patch
View File

@ -1,31 +0,0 @@
--- src/df.c.orig 2012-01-26 01:18:25.360102426 +0100
+++ src/df.c 2012-01-26 01:19:42.699099673 +0100
@@ -183,6 +183,7 @@
{
unsigned long long blocksize;
char disk_name[256];
+ cu_mount_t *mnt_dup_ptr;
uint64_t blk_free;
uint64_t blk_reserved;
uint64_t blk_used;
@@ -197,6 +198,20 @@
if (ignorelist_match (il_fstype, mnt_ptr->type))
continue;
+ /* ignore duplicates */
+ for (mnt_dup_ptr = mnt_ptr; mnt_dup_ptr != NULL; mnt_dup_ptr = mnt_dup_ptr->next)
+ {
+ if (by_device) {
+ if (strcmp (mnt_ptr->spec_device, mnt_dup_ptr->spec_device) == 0)
+ continue;
+ }
+ else
+ {
+ if (strcmp (mnt_ptr->dir, mnt_dup_ptr->dir) == 0)
+ continue;
+ }
+ }
+
if (STATANYFS (mnt_ptr->dir, &statbuf) < 0)
{
char errbuf[1024];

8
collectd-fix_broken_perl-5.10.patch
View File

@ -1,8 +1,8 @@
--- src/perl.c.orig 2008-04-02 21:06:14.000000000 +0200
+++ src/perl.c 2008-04-02 21:15:50.000000000 +0200
@@ -1440,7 +1440,13 @@
--- src/perl.c.orig
+++ src/perl.c
@@ -2411,7 +2411,13 @@ static int perl_config_loadplugin (pTHX_
log_debug ("perl_config: loading perl plugin \"%s\"", value);
log_debug ("perl_config: Loading Perl plugin \"%s\"", value);
load_module (PERL_LOADMOD_NOIMPORT,
- newSVpv (module_name, strlen (module_name)), Nullsv);
+ newSVpv (module_name, strlen (module_name)),

136
collectd.changes
View File

@ -1,3 +1,139 @@
-------------------------------------------------------------------
Sat Aug 13 14:06:04 UTC 2016 - benoit.monin@gmx.fr
- update to upstream version 5.5.2:
* collectd: A division by zero has been fixed in the
"plugin_dispatch_multivalue()" function. Thanks to Corey Kosak.
* collectd: The address of the Free Software Foundation has been
fixed in GPL license headers. Thanks to Ruben Kerkhof.
* Build system: Detection and handling of librrd 1.6 and later
has been fixed. Thanks to Ruben Kerkof.
* Apache plugin: A warning about a possible misconfiguration has
been added. Thanks to Marc Fournier.
* cURL, cURL-JSON and cURL-XML plugins: A memory leak when
allocating more memory fails has been fixed. Thanks to Brandon
Arp.
* DF plugin: A build issue on DragonFlyBSD has been fixed. Thanks
to Ruben Kerkhof. #1575
* Ethstat plugin: Code to strip leading whitespace from device
names. This works around an issue in the VMXNet3 driver. Thanks
to Thomas Guthmann. #1059
* Exec plugin: A problem in the error handling of an fdopen()
failure has been fixed. Thanks to @ciomaire.
* Modbus plugin: The debug output has been disabled by default.
It is now only enabled when building with "--enable-debug".
Thanks to Eric Sandeen and Marc Fournier.
* Network plugin: A check for the initialization of secure memory
has been added. Previously, failure to initialize this memory
was ignored. Thanks to @yujokang. #1665
* Network plugin: A heap overflow has been fixed in the server
code. This issue can be triggered remotely and is potentially
exploitable. Thanks to Emilien Gaspar. CVE-2016-6254
* Perl plugin: Init callbacks have been changed to run
essentially single-threaded to avoid race conditions by init
functions which create additional threads. Thanks to Pavel
Rochnyack. #1706
* Processes plugin: A compilation error on systems without
"regex.h" has been fixed. Thanks to Corey Kosak.
* Processes plugin: A memory leak on Solaris has been fixed.
Thanks to Jim Quinn.
* Processes plugin: A warning about too long process names has
been added. Thanks to Marc Fournier. #1284
* Redis plugin: A memory leak in an error handling code path has
been fixed. Thanks to Andrés J. Díaz.
* Redis plugin: The data source type of the expired_keys metric
has been corrected to "DERIVE". Thanks to Marc Falzon and Marc
Fournier. #1483.
* SMART plugin: A build dependency on libudev has been added.
Thanks to Pavel Rochnyack. #1724
* StatsD plugin: A deadlock on plugin shutdown has been fixed.
Thanks to Pavel Rochnyack #1703
* Write HTTP plugin: Freeing of memory holding HTTP headers
during shutdown has been fixed. Thanks to Tolga Ceylan.
* Write Sensu plugin: A segfault when the Tag was unset has been
fixed. Thanks to Marc Fournier.
* ZFS ARC plugin: The cache_operation-stolen metric has been
removed for FreeBSD 10.2 and later. Thanks to Ruben Kerkhof.
#1580
- additional changes from version 5.5.1:
* Build system: Compilation errors have been avoided by correctly
defining package name and version used by autoconf. Thanks to
Nathan Berkley. #1063
* Build system: Dependency ordering was fixed to ensure parallel
builds work reliably. Thanks to Gustavo Zacarias. #1125
* Build system: Error messages have been improved and building
the unit tests has been fixed on Solaris. Thanks to Florian
Forster and Dagobert Michelsen. #1077
* Build system: The move of the "utils_ignorelist" functions has
been reverted. This fixes build issues of numerous plugins.
Thanks to Benjamin Drung;. #1323
* Build system: The fhcount plugin has been restricted to Linux.
Thanks to Ruben Kerkhof. #1195
* Build system: Detection of header files for the turbostat
plugin has been fixed. Thanks to Marc Fournier. #1075
* collectd: The "LC_NUMERIC" locale is now forced, to prevent
issues with some plugins on environments using a comma as
decimal separator. Thanks to Florian Forster. #1237
* Documentation: Some precisions related to the virt plugin have
been added. Thanks to Wojtek Bocer and Ruben Kerkhof.
* Documentation: The CollectdInternalStats documentation has been
improved. Thanks to Yves Mettier and Florian Forster.
* Battery plugin: A missing Type has been added. Thanks to Marc
Fournier. #1338
* Bind plugin: An off-by-one error has been fixed: an index was
checked against a wrong variable, which may lead to an
out-of-bounds read. Thanks to Michal Humpula. #1123
* Ceph plugin: JSON parsing has been refactored to support ceph
10.0.0 and fixes several buffer overflows. Thanks to Florian
Forster. #1350
* CPU plugin: A Mac OS X specific bug has been fixed: the plugin
expected an incorrect number of CPU states, resulting in
failing read callbacks. This regression was introduced in
5.5.0. Thanks to Robert Viduya.
* Disk plugin: Support for Mac OS X 10.10 has been added. Thanks
to Robert Viduya. #1065
* IPC plugin: Support for building with musl-libc has been added.
Thanks to Natanael Copa. #1147
* Log Logstash plugin: A segfault when using libyajl, version 1
was fixed. Thanks to Vincent Bernat. #1190
* Log Logstash plugin: The timestamp is now ISO 8601 compliant.
Thanks to Marc Fournier. #1132
* memcached plugin: The Type of the listen-disabled metric was
fixed. Thanks to Florian Forster. #1356
* MySQL plugin: The Type used by Innodb_buffer_pool_pages_flushed
was fixed. Thanks to Marek Becka. #1085
* OpenLDAP plugin: A crash when using LDAPI (LDAP-over-IPC) got
fixed. Thanks to Marek Becka. #1080
* OpenLDAP plugin: Support for Mac OS X has been added. Thanks to
Ruben Kerkhof. #1489
* SMART plugin: A memory leak has been fixed. Thanks to Florian
Schüller and Pierre-Yves Ritschard. #1076
* Swap plugin: A regression that would lead to swap usage being
reported in kilobytes (instead of bytes) has been fixed. Thanks
to Marek Becka. #1071
* Varnish plugin: Support for FreeBSD has been added. Thanks to
Ruben Kerkhof. #1182
* Varnish plugin: Support for versions 3 and 4 has been made more
tolerant to minor changes in Varnish point releases. Thanks to
Marc Fournier. #1302
* virt plugin: A copy-and-paste mistake in an error message has
been fixed. Thanks to Ruben Kerkhof. #1101
* Write Kafka plugin: Support for Solaris has been added. Thanks
to Shahul Hameed. #1171
* Write Redis plugin: Dead code has been removed. Thanks to Brian
Kelly. #1143
* 27 patches have been applied to numerous plugins and core
components, fixing various programming errors which were
reported by scan-build, libasan, FBInfer, coverity-scan and
clang: Thanks to Ruben Kerkhof, Florian Forster and Marek
Becka.
* Collectd::Unixsock: A Perl error got corrected. Thanks to
Ciaran Mac An Iomaire. #1295
- update patch collectd-fix_broken_perl-5.10.patch
- drop patch collectd-df-remove-duplicates.patch: fixed upstream
- add libatasmart-devel and libudev-devel as BuildRequires to enable
the SMART plugin
-------------------------------------------------------------------
Thu Jul 7 07:43:59 UTC 2016 - joop.boonen@opensuse.org

8
collectd.spec
View File

@ -24,7 +24,7 @@
%define snmp 1
%define with_esmtp 1
%define ipvs_plugin ipvs
%define plugins apache apcups battery %{expand:%{bind_plugin}} cgroups curl %{expand:%{curl_json_plugin}} %{expand:%{curl_xml_plugin}} conntrack contextswitch cpu cpufreq csv df disk %{expand:%{dns_plugin}} email entropy exec filecount fscache hddtemp interface %{expand:%{ipvs_plugin}} irq load logfile match_empty_counter match_hashed match_regex match_timediff match_value mbmon %{expand:%{memcached_plugin}} memory multimeter netlink network nfs nginx ntpd olsrd openvpn perl ping protocols powerdns processes rrdtool %{expand:%{sensors_plugin}} serial statsd swap syslog table tail target_notification target_replace target_scale target_set target_v5upgrade tcpconns teamspeak2 ted thermal threshold unixsock uptime users uuid vmem vserver wireless write_http %{expand:%{ascent_plugin}} %{expand:%{iptables_plugin}} %{expand:%{madwifi_plugin}} %{expand:%{rrdcached_plugin}} aggregation ethstat md numa tail_csv write_graphite write_riemann ceph drbd fhcount ipc log_logstash %{expand:%{turbostat_plugin}} write_log write_log write_sensu write_tsdb zfs_arc zookeeper
%define plugins apache apcups battery %{expand:%{bind_plugin}} cgroups curl %{expand:%{curl_json_plugin}} %{expand:%{curl_xml_plugin}} conntrack contextswitch cpu cpufreq csv df disk %{expand:%{dns_plugin}} email entropy exec filecount fscache hddtemp interface %{expand:%{ipvs_plugin}} irq load logfile match_empty_counter match_hashed match_regex match_timediff match_value mbmon %{expand:%{memcached_plugin}} memory multimeter netlink network nfs nginx ntpd olsrd openvpn perl ping protocols powerdns processes rrdtool %{expand:%{sensors_plugin}} serial smart statsd swap syslog table tail target_notification target_replace target_scale target_set target_v5upgrade tcpconns teamspeak2 ted thermal threshold unixsock uptime users uuid vmem vserver wireless write_http %{expand:%{ascent_plugin}} %{expand:%{iptables_plugin}} %{expand:%{madwifi_plugin}} %{expand:%{rrdcached_plugin}} aggregation ethstat md numa tail_csv write_graphite write_riemann ceph drbd fhcount ipc log_logstash %{expand:%{turbostat_plugin}} write_log write_log write_sensu write_tsdb zfs_arc zookeeper
%ifnarch s390 s390x
%define sensors 1
%define sensors_plugin sensors
@ -129,7 +129,7 @@ BuildRequires: systemd
PreReq: %insserv_prereq
%endif
Name: collectd
Version: 5.5.0
Version: 5.5.2
Release: 0
Summary: Statistics Collection Daemon for filling RRD Files
License: GPL-2.0
@ -153,7 +153,6 @@ Patch19: collectd-fix_spamassassin_doc.patch
Patch20: collectd-split_README.patch
Patch21: collectd-fix_collectd_config_path_in_snmp_probe.patch
Patch23: collectd-javac_target.patch
Patch25: collectd-df-remove-duplicates.patch
# for /etc/apache2/... ownership (rpmlint):
BuildRequires: apache2
BuildRequires: autoconf
@ -169,6 +168,7 @@ BuildRequires: intltool
# for ipvs and madwifi:
BuildRequires: kernel-source
BuildRequires: libart_lgpl-devel
BuildRequires: libatasmart-devel
BuildRequires: libevent-devel
BuildRequires: libmnl-devel
BuildRequires: libnetlink-devel
@ -177,6 +177,7 @@ BuildRequires: libpcap
BuildRequires: libpng-devel
BuildRequires: libstatgrab-devel
BuildRequires: libtool
BuildRequires: libudev-devel
BuildRequires: libxml2-devel
BuildRequires: linux-kernel-headers
BuildRequires: make
@ -553,7 +554,6 @@ to write %{name} unixsock clients.
%if 0%{?suse_version} <= 1140 && !0%{?sles_version}
%patch24 -p1
%endif
%patch25
sed -i 's|@@VERSION@@|%{version}|g' configure.ac