2011-08-04 15:09:39 +02:00
|
|
|
#
|
|
|
|
# spec file for package collectd
|
|
|
|
#
|
2019-04-27 12:18:32 +02:00
|
|
|
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
2013-08-23 07:31:49 +02:00
|
|
|
# Copyright (c) 2005-2013 Pascal Bleser <pascal.bleser@opensuse.org>
|
2011-08-04 15:09:39 +02:00
|
|
|
#
|
|
|
|
# All modifications and additions to the file contributed by third parties
|
|
|
|
# remain the property of their copyright owners, unless otherwise agreed
|
|
|
|
# upon. The license for this file, and modifications and additions to the
|
|
|
|
# file, is the same license as for the pristine package itself (unless the
|
|
|
|
# license for the pristine package is not an Open Source License, in which
|
|
|
|
# case the license is the MIT License). An "Open Source License" is a
|
|
|
|
# license that conforms to the Open Source Definition (Version 1.9)
|
|
|
|
# published by the Open Source Initiative.
|
|
|
|
|
2019-04-27 12:18:32 +02:00
|
|
|
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
2011-08-04 15:09:39 +02:00
|
|
|
#
|
2011-08-04 15:09:29 +02:00
|
|
|
|
2012-02-19 18:06:09 +01:00
|
|
|
|
2017-10-29 17:50:16 +01:00
|
|
|
%define plugins apache apcups aggregation ascent battery bind \\\
|
|
|
|
ceph cgroups chrony curl curl_json curl_xml conntrack contextswitch cpu cpufreq cpusleep csv \\\
|
|
|
|
df disk dns drbd \\\
|
|
|
|
email entropy ethstat exec fhcount filecount fscache hddtemp hugepages \\\
|
|
|
|
interface ipc iptables ipvs irq \\\
|
|
|
|
load logfile log_logstash \\\
|
|
|
|
madwifi match_empty_counter match_hashed match_regex match_timediff match_value \\\
|
|
|
|
mbmon md memcached memory multimeter \\\
|
|
|
|
netlink network nfs nginx notify_nagios ntpd numa olsrd openvpn \\\
|
|
|
|
perl ping protocols powerdns processes \\\
|
|
|
|
rrdcached rrdtool %{expand:%{sensors_plugin}} serial statsd swap syslog \\\
|
|
|
|
table tail tail_csv target_notification target_replace target_scale target_set target_v5upgrade \\\
|
|
|
|
tcpconns teamspeak2 ted thermal threshold \\\
|
|
|
|
unixsock uptime users uuid vmem vserver \\\
|
|
|
|
wireless write_graphite write_http write_log write_sensu write_tsdb write_prometheus \\\
|
|
|
|
zfs_arc zookeeper
|
|
|
|
|
2019-11-26 12:48:59 +01:00
|
|
|
%if !0%{?is_opensuse}
|
|
|
|
%if 0%{?sle_version} <= 150100
|
|
|
|
%define lvm2app 1
|
|
|
|
%else
|
|
|
|
%define lvm2app 0
|
|
|
|
%endif
|
|
|
|
%else
|
|
|
|
%if !0%{?suse_version} > 1500
|
|
|
|
%define lvm2app 1
|
|
|
|
%else
|
|
|
|
%define lvm2app 0
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
|
2015-12-31 19:21:24 +01:00
|
|
|
%ifnarch s390 s390x
|
|
|
|
%define sensors 1
|
|
|
|
%define sensors_plugin sensors
|
|
|
|
%else
|
|
|
|
%define sensors 0
|
|
|
|
%define sensors_plugin %{nil}
|
|
|
|
%endif
|
2011-02-03 02:08:49 +01:00
|
|
|
Name: collectd
|
2019-11-26 12:48:59 +01:00
|
|
|
Version: 5.10.0
|
2011-09-16 16:32:49 +02:00
|
|
|
Release: 0
|
2011-02-03 02:08:49 +01:00
|
|
|
Summary: Statistics Collection Daemon for filling RRD Files
|
2019-04-27 12:18:32 +02:00
|
|
|
License: GPL-2.0-only AND MIT
|
2012-01-12 13:52:31 +01:00
|
|
|
Group: System/Monitoring
|
2019-04-27 12:18:32 +02:00
|
|
|
URL: http://collectd.org/
|
2011-02-03 02:08:49 +01:00
|
|
|
Source: http://collectd.org/files/collectd-%{version}.tar.bz2
|
|
|
|
Source1: collectd.suse.init
|
|
|
|
Source2: collectd.apache2.conf
|
|
|
|
Source3: collectd-js.apache2.conf
|
2011-09-16 16:35:58 +02:00
|
|
|
Source99: collectd-rpmlintrc
|
2019-04-27 12:18:32 +02:00
|
|
|
Patch1: collectd-fix-config.patch
|
|
|
|
Patch2: collectd-version.patch
|
|
|
|
Patch3: collectd-perl-vendor.patch
|
2011-02-03 02:08:32 +01:00
|
|
|
# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=467072
|
2019-04-27 12:18:32 +02:00
|
|
|
Patch4: collectd-fix_broken_perl-5.10.patch
|
|
|
|
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
|
|
|
|
# PATCH-FIX-OPENSUSE avoid-pg-config.patch avoid pg_config if possible
|
|
|
|
Patch11: avoid-pg-config.patch
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
# for /etc/apache2/... ownership (rpmlint):
|
|
|
|
BuildRequires: apache2
|
|
|
|
BuildRequires: autoconf
|
|
|
|
BuildRequires: automake
|
2012-01-12 13:52:31 +01:00
|
|
|
BuildRequires: bind-devel
|
2012-04-03 18:53:33 +02:00
|
|
|
BuildRequires: bison
|
|
|
|
BuildRequires: flex
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
BuildRequires: gcc
|
2017-08-02 14:18:42 +02:00
|
|
|
BuildRequires: gdbm-devel
|
2012-01-12 13:52:31 +01:00
|
|
|
BuildRequires: gettext-devel
|
|
|
|
BuildRequires: intltool
|
2017-08-02 14:18:42 +02:00
|
|
|
BuildRequires: java-devel
|
|
|
|
BuildRequires: libesmtp-devel
|
|
|
|
BuildRequires: libgcrypt-devel
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
BuildRequires: libnetlink-devel
|
2017-08-02 14:18:42 +02:00
|
|
|
BuildRequires: libpcap-devel
|
2012-01-12 13:52:31 +01:00
|
|
|
BuildRequires: libpng-devel
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
BuildRequires: libtool
|
2017-08-02 14:18:42 +02:00
|
|
|
BuildRequires: libyajl-devel
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
BuildRequires: linux-kernel-headers
|
|
|
|
BuildRequires: make
|
2017-08-02 14:18:42 +02:00
|
|
|
BuildRequires: mysql-devel >= 4.1.0
|
|
|
|
BuildRequires: net-snmp-devel
|
|
|
|
BuildRequires: openldap2-devel
|
2012-01-12 13:52:31 +01:00
|
|
|
BuildRequires: perl
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
BuildRequires: pkgconfig
|
2017-08-02 14:18:42 +02:00
|
|
|
BuildRequires: postgresql-devel
|
|
|
|
BuildRequires: protobuf-c
|
2012-01-12 13:52:31 +01:00
|
|
|
BuildRequires: rrdtool
|
2017-08-02 14:18:42 +02:00
|
|
|
BuildRequires: systemd-rpm-macros
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
BuildRequires: xfsprogs-devel
|
2017-08-02 14:18:42 +02:00
|
|
|
BuildRequires: pkgconfig(OpenIPMI)
|
|
|
|
BuildRequires: pkgconfig(OpenIPMIpthread)
|
2019-11-26 12:48:59 +01:00
|
|
|
%if 0%{?sle_version} < 150000 || 0%{?is_opensuse}
|
2017-08-02 14:18:42 +02:00
|
|
|
BuildRequires: pkgconfig(Qgpsmm)
|
2019-11-26 12:48:59 +01:00
|
|
|
BuildRequires: pkgconfig(libgps)
|
|
|
|
BuildRequires: pkgconfig(libsigrok)
|
|
|
|
%endif
|
2017-08-02 14:18:42 +02:00
|
|
|
BuildRequires: pkgconfig(dbi)
|
|
|
|
BuildRequires: pkgconfig(devmapper)
|
|
|
|
BuildRequires: pkgconfig(freetype2)
|
|
|
|
BuildRequires: pkgconfig(gail)
|
|
|
|
BuildRequires: pkgconfig(gdk-2.0)
|
|
|
|
BuildRequires: pkgconfig(gtk+-2.0)
|
|
|
|
BuildRequires: pkgconfig(libart-2.0)
|
|
|
|
BuildRequires: pkgconfig(libatasmart)
|
|
|
|
BuildRequires: pkgconfig(libcurl)
|
|
|
|
BuildRequires: pkgconfig(libevent)
|
|
|
|
BuildRequires: pkgconfig(libiptc)
|
|
|
|
BuildRequires: pkgconfig(libmemcached)
|
|
|
|
BuildRequires: pkgconfig(libmicrohttpd)
|
|
|
|
BuildRequires: pkgconfig(libmnl)
|
|
|
|
BuildRequires: pkgconfig(libnotify)
|
|
|
|
BuildRequires: pkgconfig(liboping)
|
2019-04-27 12:18:32 +02:00
|
|
|
BuildRequires: pkgconfig(libpq)
|
2017-08-02 14:18:42 +02:00
|
|
|
BuildRequires: pkgconfig(librrd)
|
|
|
|
BuildRequires: pkgconfig(libudev)
|
|
|
|
BuildRequires: pkgconfig(libupsclient)
|
|
|
|
BuildRequires: pkgconfig(libvirt)
|
|
|
|
BuildRequires: pkgconfig(libxml-2.0)
|
|
|
|
BuildRequires: pkgconfig(lua)
|
2019-11-26 12:48:59 +01:00
|
|
|
%if %{?lvm2app}
|
2017-08-02 14:18:42 +02:00
|
|
|
BuildRequires: pkgconfig(lvm2app)
|
2019-11-26 12:48:59 +01:00
|
|
|
%endif
|
2017-08-02 14:18:42 +02:00
|
|
|
BuildRequires: pkgconfig(python3)
|
|
|
|
BuildRequires: pkgconfig(xtables)
|
|
|
|
BuildRequires: pkgconfig(zlib)
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
Requires: rrdtool
|
2017-08-02 14:18:42 +02:00
|
|
|
Requires(post): %fillup_prereq
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
# play nice with collectd-beta:
|
|
|
|
Obsoletes: collectd-beta < %{version}
|
|
|
|
Provides: collectd-beta = %{version}-%{release}
|
2017-08-02 14:18:42 +02:00
|
|
|
%{?systemd_requires}
|
|
|
|
%if 0%{?suse_version} >= 1330
|
|
|
|
BuildRequires: pkgconfig(libnutclient)
|
2012-07-31 12:14:32 +02:00
|
|
|
%endif
|
2017-08-02 14:18:42 +02:00
|
|
|
%if %{sensors}
|
|
|
|
BuildRequires: sensors
|
|
|
|
Requires: sensors
|
2012-07-31 12:14:32 +02:00
|
|
|
%endif
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%description
|
2017-06-21 12:00:54 +02:00
|
|
|
collectd is a daemon (written in C) that reads various system
|
|
|
|
statistics and updates RRD files. Statistics are very fine grained
|
|
|
|
with an update interval of 10 seconds.
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%package web
|
2011-02-03 02:08:49 +01:00
|
|
|
Summary: Web Frontend for watching the %{name} Statistics
|
|
|
|
Group: System/Monitoring
|
2012-04-03 18:53:33 +02:00
|
|
|
Requires: apache2
|
|
|
|
Requires: perl
|
|
|
|
Requires: rrdtool
|
2011-02-03 02:08:49 +01:00
|
|
|
Requires: perl(CGI)
|
2012-04-03 18:53:33 +02:00
|
|
|
Requires: perl(Data::Dumper)
|
2011-02-03 02:08:49 +01:00
|
|
|
Requires: perl(HTML::Entities)
|
2018-06-09 19:01:18 +02:00
|
|
|
Requires: perl(RRDs)
|
2011-02-03 02:08:49 +01:00
|
|
|
Requires: perl(URI::Escape)
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%description web
|
|
|
|
Web frontend CGI for watching %{name} statistics from a browser.
|
|
|
|
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
Please look at %{_sysconfdir}/apache2/conf.d/%{name}.conf on how to enable.
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%package web-js
|
2011-02-03 02:08:49 +01:00
|
|
|
Summary: Web/JavaScript Frontend for watching %{name} Statistics
|
|
|
|
Group: System/Monitoring
|
2012-04-03 18:53:33 +02:00
|
|
|
Requires: apache2
|
|
|
|
Requires: perl
|
|
|
|
Requires: rrdtool
|
2011-02-03 02:08:49 +01:00
|
|
|
Requires: perl(CGI)
|
2012-04-03 18:53:33 +02:00
|
|
|
Requires: perl(Config::General)
|
|
|
|
Requires: perl(Data::Dumper)
|
2011-02-03 02:08:49 +01:00
|
|
|
Requires: perl(HTML::Entities)
|
|
|
|
Requires: perl(JSON)
|
2012-04-03 18:53:33 +02:00
|
|
|
Requires: perl(RRDs)
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%description web-js
|
|
|
|
Web/JavaScript frontend CGI for watching %{name} statistics from
|
|
|
|
a browser.
|
|
|
|
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
Please look at %{_sysconfdir}/apache2/conf.d/%{name}-js.conf on how to
|
2011-02-03 02:08:32 +01:00
|
|
|
enable.
|
|
|
|
|
|
|
|
%package plugin-notify-desktop
|
2011-02-03 02:08:49 +01:00
|
|
|
Summary: Desktop Notification Plugin for %{name}
|
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%description plugin-notify-desktop
|
2017-08-02 14:18:42 +02:00
|
|
|
Desktop Notification Support for %{name} allow you to receive
|
2017-06-21 12:00:54 +02:00
|
|
|
message delivery on your desktop.
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%package plugin-ipmi
|
2011-02-03 02:08:49 +01:00
|
|
|
Summary: OpenIPMI Monitoring Plugin for %{name}
|
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%description plugin-ipmi
|
|
|
|
Optional %{name} plugin to monitor sensors using the OpenIPMI
|
2017-06-21 12:00:54 +02:00
|
|
|
library for IPMI enabled systems.
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%package plugin-snmp
|
2011-02-03 02:08:49 +01:00
|
|
|
Summary: SNMP Monitoring Plugin for %{name}
|
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
2012-04-03 18:53:33 +02:00
|
|
|
Requires: perl(Config::General)
|
2011-02-03 02:08:49 +01:00
|
|
|
Requires: perl(SNMP)
|
|
|
|
Requires: perl(Socket6)
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%description plugin-snmp
|
|
|
|
Optional %{name} plugin to monitor devices using SNMP.
|
|
|
|
|
|
|
|
%package plugin-mysql
|
2011-02-03 02:08:49 +01:00
|
|
|
Summary: MySQL Monitoring Plugin for %{name}
|
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%description plugin-mysql
|
|
|
|
Optional %{name} plugin to monitor MySQL server instances.
|
|
|
|
|
2017-08-02 14:18:42 +02:00
|
|
|
%package plugin-openldap
|
|
|
|
Summary: OpenLDAP plugin for %{name}
|
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
|
|
|
%description plugin-openldap
|
|
|
|
This plugin for collectd reads monitoring information
|
|
|
|
from OpenLDAP's cn=Monitor subtree.
|
|
|
|
|
|
|
|
%if 0%{?suse_version} >= 1330
|
|
|
|
%package plugin-nut
|
|
|
|
Summary: Network UPS Tools plugin for collectd
|
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
|
|
|
%description plugin-nut
|
|
|
|
This plugin for collectd provides Network UPS Tools support.
|
|
|
|
%endif
|
|
|
|
|
2019-11-26 12:48:59 +01:00
|
|
|
%if %{?lvm2app}
|
2017-08-02 14:18:42 +02:00
|
|
|
%package plugin-lvm
|
|
|
|
Summary: LVM plugin for collectd
|
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
|
|
|
%description plugin-lvm
|
|
|
|
This plugin collects information from lvm.
|
2019-11-26 12:48:59 +01:00
|
|
|
%endif
|
2017-08-02 14:18:42 +02:00
|
|
|
|
Accepting request 709801 from home:mnhauke:monitoring
- 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
2019-06-14 11:02:25 +02:00
|
|
|
%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.
|
|
|
|
|
2011-02-03 02:08:32 +01:00
|
|
|
%package plugin-postgresql
|
2011-02-03 02:08:49 +01:00
|
|
|
Summary: PostgreSQL Monitoring Plugin for %{name}
|
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%description plugin-postgresql
|
|
|
|
Optional %{name} plugin to monitor PostgreSQL server instances.
|
|
|
|
|
2017-08-02 14:18:42 +02:00
|
|
|
%package plugin-python3
|
|
|
|
Summary: Python3 API for %{name}
|
2011-02-03 02:08:49 +01:00
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
2011-02-03 02:08:32 +01:00
|
|
|
|
2017-08-02 14:18:42 +02:00
|
|
|
%description plugin-python3
|
|
|
|
Optional %{name} Python3 API in order to write %{name} plugins in
|
|
|
|
Python3.
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%package plugin-java
|
2011-02-03 02:08:49 +01:00
|
|
|
Summary: Java API for %{name}
|
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%description plugin-java
|
|
|
|
Optional %{name} Java API in order to write %{name} plugins in
|
|
|
|
Java.
|
|
|
|
|
|
|
|
%package plugin-virt
|
2011-02-03 02:08:49 +01:00
|
|
|
Summary: Virtual Machine Statistics Plugin for %{name}
|
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%description plugin-virt
|
|
|
|
Optional %{name} plugin to gather statistics from virtual
|
|
|
|
machines using libvirt.
|
|
|
|
|
|
|
|
%package plugin-dbi
|
2011-02-03 02:08:49 +01:00
|
|
|
Summary: DBI Storage Plugin for %{name}
|
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%description plugin-dbi
|
|
|
|
Optional %{name} plugin to store sampling results into
|
|
|
|
various databases as supported by libdbi.
|
|
|
|
|
|
|
|
%package plugin-memcachec
|
2011-02-03 02:08:49 +01:00
|
|
|
Summary: Memcache Daemon Monitoring Plugin for %{name}
|
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%description plugin-memcachec
|
|
|
|
Optional %{name} plugin to sample memcached statistics.
|
2015-10-26 16:49:18 +01:00
|
|
|
|
2011-08-04 15:09:29 +02:00
|
|
|
%package plugin-pinba
|
|
|
|
Summary: Pinba Collector Plugin for %{name}
|
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
|
|
|
%description plugin-pinba
|
|
|
|
Optional %{name} plugin to receive and dispatch timing values from Pinba, a
|
|
|
|
profiling extension for PHP.
|
|
|
|
|
2019-11-26 12:48:59 +01:00
|
|
|
%if 0%{?sle_version} < 150000 || 0%{?is_opensuse}
|
2017-10-29 17:50:16 +01:00
|
|
|
%package plugin-sigrok
|
|
|
|
Summary: Sigrok Monitoring Plugin for %{name}
|
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
|
|
|
%description plugin-sigrok
|
|
|
|
Optional %{name} plugin to collect measurements from
|
|
|
|
various devices supported by libsigrok.
|
2019-11-26 12:48:59 +01:00
|
|
|
%endif
|
2017-10-29 17:50:16 +01:00
|
|
|
|
2016-08-16 15:11:34 +02:00
|
|
|
%package plugin-smart
|
|
|
|
Summary: SMART Monitoring Plugin for %{name}
|
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
|
|
|
%description plugin-smart
|
|
|
|
Optional %{name} plugin to monitor Self-Monitoring, Analysis and Reporting
|
2017-06-21 12:00:54 +02:00
|
|
|
Technology (SMART) information from disk drives.
|
2016-08-16 15:11:34 +02:00
|
|
|
|
2017-05-18 00:05:22 +02:00
|
|
|
%package plugin-lua
|
|
|
|
Summary: Lua API for %{name}
|
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
Requires: lua
|
|
|
|
|
|
|
|
%description plugin-lua
|
2017-06-21 12:00:54 +02:00
|
|
|
Optional %{name} Lua API in order to write %{name} plugins in Lua.
|
2017-05-18 00:05:22 +02:00
|
|
|
|
2019-11-26 12:48:59 +01:00
|
|
|
%if 0%{?sle_version} < 150000 || 0%{?is_opensuse}
|
2017-05-18 00:05:22 +02:00
|
|
|
%package plugin-gps
|
2019-04-27 12:18:32 +02:00
|
|
|
Summary: GPSD monitoring plugin for %{name}
|
2017-05-18 00:05:22 +02:00
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
|
|
|
%description plugin-gps
|
|
|
|
Optional %{name} plugin to monitor gpsd.
|
2019-11-26 12:48:59 +01:00
|
|
|
%endif
|
2017-05-18 00:05:22 +02:00
|
|
|
|
2019-04-27 12:18:32 +02:00
|
|
|
%package plugin-mcelog
|
|
|
|
Summary: Machine Check Exceptions plugin for %{name}
|
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
|
|
|
%description plugin-mcelog
|
|
|
|
Optional %{name} plugin to monitor machine check exceptions.
|
|
|
|
|
|
|
|
%package plugin-ovs
|
|
|
|
Summary: Open vSwitch (OVS) plugin for %{name}
|
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
|
|
|
%description plugin-ovs
|
|
|
|
Optional %{name} plugin to monitor an OVS database.
|
|
|
|
|
|
|
|
%package plugin-synproxy
|
|
|
|
Summary: Synproxy stats plugin for %{name}
|
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
|
|
|
%description plugin-synproxy
|
|
|
|
Optional %{name} plugin to monitor Synproxy stats.
|
|
|
|
|
Accepting request 709801 from home:mnhauke:monitoring
- 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
2019-06-14 11:02:25 +02:00
|
|
|
%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.
|
|
|
|
|
2019-11-26 12:48:59 +01:00
|
|
|
%package plugin-uptime
|
|
|
|
Summary: Uptime plugin for %{name}
|
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
|
|
|
%description plugin-uptime
|
|
|
|
Optional %{name} plugin to collect system uptime statistics.
|
|
|
|
|
|
|
|
%package plugin-connectivity
|
|
|
|
Summary: Connectivity plugin for %{name}
|
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
|
|
|
%description plugin-connectivity
|
|
|
|
Optional %{name} plugin to collect Event-based interface status.
|
|
|
|
|
|
|
|
|
|
|
|
%package plugin-procevent
|
|
|
|
Summary: Procevent plugin for %{name}
|
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
|
|
|
%description plugin-procevent
|
|
|
|
Optional %{name} plugin to listen for process starts and exits via netlink.
|
|
|
|
|
|
|
|
|
|
|
|
%package plugin-sysevent
|
|
|
|
Summary: Sysevent plugin for %{name}
|
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
|
|
|
%description plugin-sysevent
|
|
|
|
Optional %{name} plugin to listen to rsyslog events and submit matched values.
|
|
|
|
.
|
|
|
|
|
2011-02-03 02:08:32 +01:00
|
|
|
%package plugins-all
|
2011-02-03 02:08:49 +01:00
|
|
|
Summary: All Monitoring Plugins for %{name}
|
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
2019-11-26 12:48:59 +01:00
|
|
|
Requires: %{name}-plugin-connectivity = %{version}-%{release}
|
2017-08-02 14:18:42 +02:00
|
|
|
Requires: %{name}-plugin-dbi = %{version}-%{release}
|
2019-11-26 12:48:59 +01:00
|
|
|
%if 0%{?sle_version} < 150000 || 0%{?is_opensuse}
|
2017-05-18 00:05:22 +02:00
|
|
|
Requires: %{name}-plugin-gps = %{version}-%{release}
|
2019-11-26 12:48:59 +01:00
|
|
|
%endif
|
2017-08-02 14:18:42 +02:00
|
|
|
Requires: %{name}-plugin-ipmi = %{version}-%{release}
|
|
|
|
Requires: %{name}-plugin-java = %{version}-%{release}
|
2017-05-18 00:05:22 +02:00
|
|
|
Requires: %{name}-plugin-lua = %{version}-%{release}
|
2019-11-26 12:48:59 +01:00
|
|
|
%if %{?lvm2app}
|
2017-08-02 14:18:42 +02:00
|
|
|
Requires: %{name}-plugin-lvm = %{version}-%{release}
|
2019-11-26 12:48:59 +01:00
|
|
|
%endif
|
2019-04-27 12:18:32 +02:00
|
|
|
Requires: %{name}-plugin-mcelog = %{version}-%{release}
|
2017-08-02 14:18:42 +02:00
|
|
|
Requires: %{name}-plugin-memcachec = %{version}-%{release}
|
|
|
|
Requires: %{name}-plugin-mysql = %{version}-%{release}
|
|
|
|
Requires: %{name}-plugin-notify-desktop = %{version}-%{release}
|
|
|
|
Requires: %{name}-plugin-openldap = %{version}-%{release}
|
2019-04-27 12:18:32 +02:00
|
|
|
Requires: %{name}-plugin-ovs = %{version}-%{release}
|
Accepting request 709801 from home:mnhauke:monitoring
- 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
2019-06-14 11:02:25 +02:00
|
|
|
Requires: %{name}-plugin-pcie = %{version}-%{release}
|
2017-08-02 14:18:42 +02:00
|
|
|
Requires: %{name}-plugin-pinba = %{version}-%{release}
|
|
|
|
Requires: %{name}-plugin-postgresql = %{version}-%{release}
|
2019-11-26 12:48:59 +01:00
|
|
|
Requires: %{name}-plugin-procevent = %{version}-%{release}
|
2017-08-02 14:18:42 +02:00
|
|
|
Requires: %{name}-plugin-python3 = %{version}-%{release}
|
2019-11-26 12:48:59 +01:00
|
|
|
%if 0%{?sle_version} < 150000 || 0%{?is_opensuse}
|
2017-10-29 17:50:16 +01:00
|
|
|
Requires: %{name}-plugin-sigrok = %{version}-%{release}
|
2019-11-26 12:48:59 +01:00
|
|
|
%endif
|
2016-08-16 15:11:34 +02:00
|
|
|
Requires: %{name}-plugin-smart = %{version}-%{release}
|
2017-08-02 14:18:42 +02:00
|
|
|
Requires: %{name}-plugin-snmp = %{version}-%{release}
|
2019-04-27 12:18:32 +02:00
|
|
|
Requires: %{name}-plugin-synproxy = %{version}-%{release}
|
2019-11-26 12:48:59 +01:00
|
|
|
Requires: %{name}-plugin-sysevent = %{version}-%{release}
|
|
|
|
Requires: %{name}-plugin-uptime = %{version}-%{release}
|
2017-08-02 14:18:42 +02:00
|
|
|
Requires: %{name}-plugin-virt = %{version}-%{release}
|
Accepting request 709801 from home:mnhauke:monitoring
- 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
2019-06-14 11:02:25 +02:00
|
|
|
Requires: %{name}-plugin-write_stackdriver = %{version}-%{release}
|
|
|
|
Requires: %{name}-plugin-write_syslog = %{version}-%{release}
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
Requires: %{name}-web = %{version}-%{release}
|
|
|
|
Requires: %{name}-web-js = %{version}-%{release}
|
2017-08-02 14:18:42 +02:00
|
|
|
%if 0%{?suse_version} >= 1330
|
|
|
|
Requires: %{name}-plugin-nut = %{version}-%{release}
|
2011-08-04 15:09:29 +02:00
|
|
|
%endif
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%description plugins-all
|
|
|
|
Metapackage that installs %{name} and all the available
|
2017-08-02 14:18:42 +02:00
|
|
|
monitoring plugin subpackages.
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%package spamassassin
|
2011-02-03 02:08:49 +01:00
|
|
|
Summary: Spamassassin Monitoring for %{name}
|
|
|
|
Group: System/Monitoring
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
Requires: perl-spamassassin
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%description spamassassin
|
|
|
|
Plugin for filling %{name} with statistics from the
|
|
|
|
SpamAsssassin anti-spam engine.
|
|
|
|
|
2013-08-23 07:31:49 +02:00
|
|
|
%package -n libcollectdclient1
|
2011-02-03 02:08:49 +01:00
|
|
|
Summary: Library for %{name} clients
|
|
|
|
Group: System/Monitoring
|
|
|
|
Provides: libcollectdclient = %{version}-%{release}
|
2011-02-03 02:08:32 +01:00
|
|
|
|
2013-08-23 07:31:49 +02:00
|
|
|
%description -n libcollectdclient1
|
2011-02-03 02:08:32 +01:00
|
|
|
Library which abstracts communication with the %{name}
|
|
|
|
unixsock plugin for clients.
|
|
|
|
|
|
|
|
%package -n libcollectdclient-devel
|
2011-02-03 02:08:49 +01:00
|
|
|
Summary: Development Environment for %{name} clients
|
|
|
|
Group: Development/Libraries/C and C++
|
2013-08-23 07:31:49 +02:00
|
|
|
Requires: libcollectdclient1 = %{version}-%{release}
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%description -n libcollectdclient-devel
|
|
|
|
Library which abstracts communication with the %{name}
|
|
|
|
unixsock plugin for clients.
|
|
|
|
This package contains the required development environment
|
|
|
|
to write %{name} unixsock clients.
|
|
|
|
|
|
|
|
%prep
|
2013-08-23 07:31:49 +02:00
|
|
|
%setup -q -n "collectd-%{version}"
|
2019-04-27 12:18:32 +02:00
|
|
|
%patch1
|
|
|
|
%patch2 -p1
|
|
|
|
%patch3 -p1
|
|
|
|
%patch4 -p1
|
|
|
|
%patch5 -p1
|
|
|
|
%patch6
|
|
|
|
%patch7 -p1
|
2017-10-29 17:50:16 +01:00
|
|
|
%if 0%{?suse_version} > 1320
|
2019-04-27 12:18:32 +02:00
|
|
|
%patch8 -p1
|
2017-10-29 17:50:16 +01:00
|
|
|
%endif
|
2019-04-27 12:18:32 +02:00
|
|
|
%patch11 -p1
|
2011-02-03 02:08:32 +01:00
|
|
|
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
sed -i 's|@@VERSION@@|%{version}|g' configure.ac
|
2011-02-03 02:08:32 +01:00
|
|
|
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
perl -p -i -e 's|(-L\$withval/lib)\b|${1}64|g' configure.ac configure
|
2011-08-04 15:09:29 +02:00
|
|
|
|
2011-02-03 02:08:32 +01:00
|
|
|
# unneeded files:
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
rm -fr \
|
2011-08-04 15:09:29 +02:00
|
|
|
contrib/solaris-smf \
|
|
|
|
contrib/redhat \
|
|
|
|
contrib/sles*
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%build
|
|
|
|
autoreconf -fiv
|
|
|
|
|
2011-08-04 15:09:29 +02:00
|
|
|
export CFLAGS="%{optflags} -fno-strict-aliasing"
|
2011-02-03 02:08:32 +01:00
|
|
|
export CXXFLAGS="$CFLAGS"
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
export KERNEL_DIR=%{_prefix}/src/linux
|
2011-02-03 02:08:32 +01:00
|
|
|
%configure \
|
2017-08-02 14:18:42 +02:00
|
|
|
--disable-werror \
|
|
|
|
--disable-silent-rules \
|
2011-08-04 15:09:29 +02:00
|
|
|
--disable-static \
|
|
|
|
--with-java="$JAVA_HOME/" \
|
2017-08-02 14:18:42 +02:00
|
|
|
--without-included-ltdl \
|
|
|
|
--disable-turbostat
|
2011-02-03 02:08:32 +01:00
|
|
|
|
2017-08-02 14:18:42 +02:00
|
|
|
make %{?_smp_mflags}
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%install
|
2017-08-02 14:18:42 +02:00
|
|
|
%make_install
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
# delete .la files
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
rm -f "%{buildroot}%{_libdir}"/*.{a,la}
|
|
|
|
rm -f "%{buildroot}%{_libdir}/collectd"/*.a
|
2011-02-03 02:08:32 +01:00
|
|
|
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
sed -i '/^dependency_libs=/ s|-L'"${RPM_BUILD_DIR}/%{name}-%{version}"'/src||g' "%{buildroot}%{_libdir}/collectd/python.la"
|
2011-02-03 02:08:32 +01:00
|
|
|
|
2011-08-04 15:09:29 +02:00
|
|
|
# delete if it exists (not packaged any more on openSUSE):
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
rm -rf "%{buildroot}%{_localstatedir}/adm/perl-modules/%{name}"
|
2011-08-04 15:09:29 +02:00
|
|
|
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
mkdir -p _rpmdoc_/java
|
|
|
|
mv contrib/GenericJMX.conf _rpmdoc_/java/
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
# fix permissions:
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
chmod 0755 "%{buildroot}%{_libdir}/collectd"/*.so
|
|
|
|
chmod 0644 "%{buildroot}%{_libdir}/collectd"/*.la
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
# create /var/lib/collectd to add it to the %files section:
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
install -d -m 0755 "%{buildroot}%{_localstatedir}/lib/collectd"
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
# Apache2 configuration for the CGI frontend:
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
install -D -m 0644 "%{SOURCE2}" "%{buildroot}%{_sysconfdir}/apache2/conf.d/%{name}.conf"
|
|
|
|
install -D -m 0755 contrib/collection.cgi "%{buildroot}/srv/www/collectd/collection.cgi"
|
|
|
|
install -D -m 0644 contrib/collection.conf "%{buildroot}%{_sysconfdir}/collectd/collection.conf"
|
|
|
|
sed -i 's|@@LIBDIR@@|%{_libdir}|g' "%{buildroot}%{_sysconfdir}/collectd/collection.conf"
|
2011-02-03 02:08:32 +01:00
|
|
|
# remove it from contrib, to avoid having it end up in the main package as well:
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
rm contrib/collection.cgi contrib/collection.conf
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%perl_process_packlist
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
rm -rf "%{buildroot}%{_localstatedir}/adm/perl-modules"/*
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
# web-js CGI frontend (_must_ be installed _after_ perl_process_packlist)
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
install -d "%{buildroot}/srv/www/collectd-js"
|
|
|
|
mkdir -p _rpmdoc_/web-js
|
|
|
|
mv contrib/collection3/README _rpmdoc_/web-js/README
|
|
|
|
find contrib/collection3/ -name .htaccess -exec rm {} \;
|
|
|
|
cp -a \
|
2011-08-04 15:09:29 +02:00
|
|
|
contrib/collection3/bin/* \
|
|
|
|
contrib/collection3/share/* \
|
|
|
|
"%{buildroot}/srv/www/collectd-js/"
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
mkdir -p "%{buildroot}%{_libexecdir}/collectd-js"
|
|
|
|
mv contrib/collection3/lib/* "%{buildroot}%{_libexecdir}/collectd-js/"
|
2011-02-03 02:08:32 +01:00
|
|
|
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
install -D -m 0644 contrib/collection3%{_sysconfdir}/collection.conf \
|
2011-08-04 15:09:29 +02:00
|
|
|
"%{buildroot}%{_sysconfdir}/collectd/collection-js.conf"
|
2019-04-27 12:18:32 +02:00
|
|
|
rm -fr contrib/collection3%{_sysconfdir}
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
install -D -m 0644 "%{SOURCE3}" "%{buildroot}%{_sysconfdir}/apache2/conf.d/%{name}-js.conf"
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
# spamassassin (_must_ be installed _after_ perl_process_packlist)
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
install -D -m0644 contrib/SpamAssassin/example.cf \
|
2011-08-04 15:09:29 +02:00
|
|
|
"%{buildroot}%{_datadir}/spamassassin/99_%{name}.cf"
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
install -D -m0644 contrib/SpamAssassin/Collectd.pm \
|
2011-08-04 15:09:29 +02:00
|
|
|
"%{buildroot}%{perl_vendorlib}/Mail/SpamAssassin/Plugin/Collectd.pm"
|
2011-02-03 02:08:32 +01:00
|
|
|
pod2man \
|
2011-08-04 15:09:29 +02:00
|
|
|
contrib/SpamAssassin/Collectd.pm \
|
|
|
|
> "%{buildroot}%{perl_man3dir}/Mail::SpamAssassin::Plugin::Collectd.%{perl_man3ext}"
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
rm -rf contrib/SpamAssassin
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
# cussh script from contrib:
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
install -m0755 contrib/cussh.pl "%{buildroot}%{_bindir}/cussh"
|
|
|
|
install -d "%{buildroot}%{_mandir}/man1"
|
2011-02-03 02:08:32 +01:00
|
|
|
pod2man \
|
2011-08-04 15:09:29 +02:00
|
|
|
-c "Collectd UNIX Socket Shell" \
|
|
|
|
-n "CUSSH" \
|
|
|
|
-s 1 \
|
|
|
|
contrib/cussh.pl > "%{buildroot}%{_mandir}/man1/cussh.1"
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
rm contrib/cussh.pl
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
# snmp:
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
mkdir -p _rpmdoc_/snmp
|
|
|
|
sed -n '/^snmp-data\.conf/,$ p' contrib/README > _rpmdoc_/snmp/README
|
|
|
|
sed -i '/^snmp-data\.conf/,$ d' contrib/README
|
|
|
|
mv contrib/snmp-data.conf _rpmdoc_/snmp/
|
|
|
|
sed -i 's|\(\./\)snmp-probe-host\.px|collectd-snmp-probe-host|g' contrib/snmp-probe-host.px
|
2011-02-03 02:08:32 +01:00
|
|
|
pod2man \
|
2011-08-04 15:09:29 +02:00
|
|
|
-c "Collectd SNMP Host Probe" \
|
|
|
|
-n "COLLECTD-SNMP-PROBE-HOST" \
|
|
|
|
-s 1 \
|
|
|
|
contrib/snmp-probe-host.px \
|
|
|
|
> "%{buildroot}%{_mandir}/man1/collectd-snmp-probe-host.1"
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
install -D -m0755 contrib/snmp-probe-host.px "%{buildroot}%{_bindir}/collectd-snmp-probe-host"
|
|
|
|
rm contrib/snmp-probe-host.px
|
|
|
|
install -d "%{buildroot}%{_mandir}/man1"
|
2011-02-03 02:08:32 +01:00
|
|
|
|
2017-06-21 12:00:54 +02:00
|
|
|
find contrib/ -name '*.orig' -delete
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
# plugin list:
|
|
|
|
echo -n > plugins.lst
|
|
|
|
for plugin in %{plugins}; do
|
2011-08-04 15:09:29 +02:00
|
|
|
for ext in so la; do
|
|
|
|
echo "%{_libdir}/collectd/${plugin}.${ext}" >> plugins.lst
|
|
|
|
done
|
2011-02-03 02:08:32 +01:00
|
|
|
done
|
|
|
|
|
2017-06-21 12:00:54 +02:00
|
|
|
cat <<EOF >README.plugins-all
|
2011-02-03 02:08:32 +01:00
|
|
|
This package is empty but depends on all collectd plugin subpackages.
|
|
|
|
EOF
|
|
|
|
|
2019-04-27 12:18:32 +02:00
|
|
|
install -d -m 0755 "%{buildroot}%{_sbindir}"
|
2016-07-07 10:56:19 +02:00
|
|
|
install -D -m0644 contrib/systemd.collectd.service %{buildroot}%{_unitdir}/collectd.service
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
|
2012-10-18 13:21:46 +02:00
|
|
|
|
2011-02-03 02:08:32 +01:00
|
|
|
%preun
|
2012-10-18 13:21:46 +02:00
|
|
|
%service_del_preun %{name}.service
|
|
|
|
|
2011-02-03 02:08:32 +01:00
|
|
|
%postun
|
2012-10-18 13:21:46 +02:00
|
|
|
%service_del_postun %{name}.service
|
|
|
|
|
|
|
|
%pre
|
|
|
|
%service_add_pre %{name}.service
|
|
|
|
|
2011-02-03 02:08:32 +01:00
|
|
|
%post
|
|
|
|
%{fillup_only collectd}
|
2012-10-18 13:21:46 +02:00
|
|
|
%service_add_post %{name}.service
|
|
|
|
|
2013-08-23 07:31:49 +02:00
|
|
|
%post -n libcollectdclient1 -p /sbin/ldconfig
|
|
|
|
%postun -n libcollectdclient1 -p /sbin/ldconfig
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%files -f plugins.lst
|
2019-04-27 12:18:32 +02:00
|
|
|
%license COPYING
|
|
|
|
%doc AUTHORS ChangeLog README
|
2011-02-03 02:08:32 +01:00
|
|
|
%doc contrib
|
|
|
|
%config(noreplace) %{_sysconfdir}/collectd.conf
|
|
|
|
%dir %{_sysconfdir}/collectd
|
2013-08-23 07:31:49 +02:00
|
|
|
%{_bindir}/collectd-tg
|
2011-02-03 02:08:32 +01:00
|
|
|
%{_bindir}/collectd-nagios
|
2012-02-19 18:06:09 +01:00
|
|
|
%{_bindir}/collectdctl
|
2011-02-03 02:08:32 +01:00
|
|
|
%{_bindir}/cussh
|
|
|
|
%{_sbindir}/collectd
|
|
|
|
%{_sbindir}/collectdmon
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
%{_sbindir}/rccollectd
|
2011-02-03 02:08:32 +01:00
|
|
|
%dir %{_libdir}/collectd
|
|
|
|
%{_libdir}/collectd/notify_email.so
|
|
|
|
%{_libdir}/collectd/notify_email.la
|
|
|
|
%dir %{_datadir}/collectd
|
|
|
|
%{_datadir}/collectd/types.db
|
|
|
|
%{perl_vendorlib}/Collectd.pm
|
|
|
|
%dir %{perl_vendorlib}/Collectd
|
|
|
|
%{perl_vendorlib}/Collectd/*
|
|
|
|
%{perl_vendorarch}/auto/Collectd
|
2019-04-27 12:18:32 +02:00
|
|
|
%{_mandir}/man1/collectd.1%{?ext_man}
|
|
|
|
%{_mandir}/man1/collectdctl.1%{?ext_man}
|
|
|
|
%{_mandir}/man1/collectdmon.1%{?ext_man}
|
|
|
|
%{_mandir}/man1/collectd-tg.1%{?ext_man}
|
|
|
|
%{_mandir}/man1/collectd-nagios.1%{?ext_man}
|
|
|
|
%{_mandir}/man1/cussh.1%{?ext_man}
|
|
|
|
%{_mandir}/man5/collectd.conf.5%{?ext_man}
|
|
|
|
%{_mandir}/man5/collectd-email.5%{?ext_man}
|
|
|
|
%{_mandir}/man5/collectd-exec.5%{?ext_man}
|
|
|
|
%{_mandir}/man5/collectd-perl.5%{?ext_man}
|
|
|
|
%{_mandir}/man5/collectd-threshold.5%{?ext_man}
|
|
|
|
%{_mandir}/man5/collectd-unixsock.5%{?ext_man}
|
|
|
|
%{_mandir}/man5/types.db.5%{?ext_man}
|
2011-08-04 15:09:29 +02:00
|
|
|
%doc %{perl_man3dir}/Collectd::Unixsock.%{perl_man3ext}%{ext_man}
|
2011-02-03 02:08:32 +01:00
|
|
|
%dir %{_localstatedir}/lib/collectd
|
2012-10-18 13:21:46 +02:00
|
|
|
%{_unitdir}/collectd.service
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%files web
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
%config(noreplace) %{_sysconfdir}/apache2/conf.d/%{name}.conf
|
2011-02-03 02:08:32 +01:00
|
|
|
%dir %{_sysconfdir}/collectd
|
|
|
|
%config(noreplace) %{_sysconfdir}/collectd/collection.conf
|
|
|
|
/srv/www/collectd
|
|
|
|
|
|
|
|
%files web-js
|
|
|
|
%doc _rpmdoc_/web-js/README
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
%config(noreplace) %{_sysconfdir}/apache2/conf.d/%{name}-js.conf
|
2011-02-03 02:08:32 +01:00
|
|
|
%dir %{_sysconfdir}/collectd
|
|
|
|
%config(noreplace) %{_sysconfdir}/collectd/collection-js.conf
|
|
|
|
/srv/www/collectd-js
|
Accepting request 288613 from home:bruno_friedmann:branches:server:monitoring
- packaging :
deleted source collectd.service, use now upstream version in contrib
spec_cleaner .spec
- upstream update bugfix release 2015-02-26, Version 5.4.2
* Build system: Numerous fixes. Thanks to Bjørn Nordbø, Jim Radford,
KOMEDA Shinji, Lauri Tirkkonen, Manuel Luis Sanmartin Rozada, Marc
Fournier, Rainer Müller, Yoga Ramalingam and Yves Mettier. #326,
#373, #653, #828
* collectd: A use-after-free has been fixed in the "parse_value()"
function. Thanks to Matthias Urlichs.
* collectd: Fix carriage return sign in types_list Thanks to Marc
Fournier and @NsLib.
* collectd: Fix programming error in src/configfile.c. Thanks to
Wilfried Goesgens.
* collectd: An off-by-one error has been fixed in the
"strstripnewline()" function. Patch by Florian Forster.
* collectd: Use the complain mechanism to report filter chain write
failures. Thanks to Sebastian Harl.
* collectd: Spelling and grammar of error messages have been fixed.
Thanks to Katelyn Perry and Tim Laszlo.
* collectdctl: Fixed buffering issues which caused trouble on AIX and
Solaris. Thanks to Yoga Ramalingam.
* Documentation: Details and example about multi-instance filterchain
targets have been added. Thanks to Marc Fournier.
* Documentation: The "CollectStatistics" option of the rrdcached has
been documented. Thanks to Micha Krause. #907
* Documentation: The write_redis has been documented. Thanks to Marc
Fournier.
* Documentation: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options of the amqp have been documented.
OBS-URL: https://build.opensuse.org/request/show/288613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=125
2015-03-25 17:14:40 +01:00
|
|
|
%{_libexecdir}/collectd-js
|
2011-08-04 15:09:39 +02:00
|
|
|
|
2011-02-03 02:08:32 +01:00
|
|
|
%files plugin-notify-desktop
|
|
|
|
%{_libdir}/collectd/notify_desktop.so
|
|
|
|
%{_libdir}/collectd/notify_desktop.la
|
|
|
|
|
|
|
|
%files plugin-ipmi
|
|
|
|
%{_libdir}/collectd/ipmi.so
|
|
|
|
%{_libdir}/collectd/ipmi.la
|
|
|
|
|
|
|
|
%files plugin-snmp
|
|
|
|
%doc _rpmdoc_/snmp/*
|
|
|
|
%{_bindir}/collectd-snmp-probe-host
|
2019-04-27 12:18:32 +02:00
|
|
|
%{_mandir}/man1/collectd-snmp-probe-host.1%{?ext_man}
|
|
|
|
%{_libdir}/collectd/snmp*.so
|
|
|
|
%{_libdir}/collectd/snmp*.la
|
|
|
|
%{_mandir}/man5/collectd-snmp.5%{?ext_man}
|
2017-08-02 14:18:42 +02:00
|
|
|
|
2019-11-26 12:48:59 +01:00
|
|
|
%if %{?lvm2app}
|
2017-08-02 14:18:42 +02:00
|
|
|
%files plugin-lvm
|
|
|
|
%{_libdir}/collectd/lvm.so
|
|
|
|
%{_libdir}/collectd/lvm.la
|
2019-11-26 12:48:59 +01:00
|
|
|
%endif
|
2011-02-03 02:08:32 +01:00
|
|
|
|
2011-08-04 15:09:29 +02:00
|
|
|
%files plugin-pinba
|
|
|
|
%{_libdir}/collectd/pinba.so
|
|
|
|
%{_libdir}/collectd/pinba.la
|
2011-02-03 02:08:49 +01:00
|
|
|
|
2011-02-03 02:08:32 +01:00
|
|
|
%files plugin-mysql
|
|
|
|
%{_libdir}/collectd/mysql.so
|
|
|
|
%{_libdir}/collectd/mysql.la
|
|
|
|
|
Accepting request 709801 from home:mnhauke:monitoring
- 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
2019-06-14 11:02:25 +02:00
|
|
|
%files plugin-pcie
|
|
|
|
%{_libdir}/collectd/pcie_errors.so
|
|
|
|
%{_libdir}/collectd/pcie_errors.la
|
|
|
|
|
2011-02-03 02:08:32 +01:00
|
|
|
%files plugin-postgresql
|
|
|
|
%{_libdir}/collectd/postgresql.so
|
|
|
|
%{_libdir}/collectd/postgresql.la
|
|
|
|
%config %{_datadir}/collectd/postgresql_default.conf
|
|
|
|
|
2017-08-02 14:18:42 +02:00
|
|
|
%files plugin-python3
|
2011-02-03 02:08:32 +01:00
|
|
|
%{_libdir}/collectd/python.so
|
|
|
|
%{_libdir}/collectd/python.la
|
2019-04-27 12:18:32 +02:00
|
|
|
%{_mandir}/man5/collectd-python.5%{?ext_man}
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%files plugin-java
|
|
|
|
%doc _rpmdoc_/java/GenericJMX.conf
|
|
|
|
%{_libdir}/collectd/java.so
|
|
|
|
%{_libdir}/collectd/java.la
|
|
|
|
%{_datadir}/collectd/java
|
2019-04-27 12:18:32 +02:00
|
|
|
%{_mandir}/man5/collectd-java.5%{?ext_man}
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%files plugin-virt
|
2016-01-18 09:23:37 +01:00
|
|
|
%{_libdir}/collectd/virt.so
|
|
|
|
%{_libdir}/collectd/virt.la
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%files plugin-dbi
|
|
|
|
%{_libdir}/collectd/dbi.so
|
|
|
|
%{_libdir}/collectd/dbi.la
|
|
|
|
|
|
|
|
%files plugin-memcachec
|
|
|
|
%{_libdir}/collectd/memcachec.so
|
|
|
|
%{_libdir}/collectd/memcachec.la
|
2015-10-26 16:49:18 +01:00
|
|
|
|
2019-11-26 12:48:59 +01:00
|
|
|
%if 0%{?sle_version} < 150000 || 0%{?is_opensuse}
|
|
|
|
|
2017-10-29 17:50:16 +01:00
|
|
|
%files plugin-sigrok
|
|
|
|
%{_libdir}/collectd/sigrok.so
|
|
|
|
%{_libdir}/collectd/sigrok.la
|
|
|
|
|
2019-11-26 12:48:59 +01:00
|
|
|
%files plugin-gps
|
|
|
|
%{_libdir}/collectd/gps.so
|
|
|
|
%{_libdir}/collectd/gps.la
|
|
|
|
|
|
|
|
%endif
|
|
|
|
|
2016-08-16 15:11:34 +02:00
|
|
|
%files plugin-smart
|
|
|
|
%{_libdir}/collectd/smart.so
|
|
|
|
%{_libdir}/collectd/smart.la
|
|
|
|
|
2017-05-18 00:05:22 +02:00
|
|
|
%files plugin-lua
|
|
|
|
%{_libdir}/collectd/lua.so
|
|
|
|
%{_libdir}/collectd/lua.la
|
2019-04-27 12:18:32 +02:00
|
|
|
%{_mandir}/man5/collectd-lua.5%{?ext_man}
|
2017-05-18 00:05:22 +02:00
|
|
|
|
2017-08-02 14:18:42 +02:00
|
|
|
%files plugin-openldap
|
|
|
|
%{_libdir}/collectd/openldap.so
|
|
|
|
%{_libdir}/collectd/openldap.la
|
|
|
|
|
2019-04-27 12:18:32 +02:00
|
|
|
%files plugin-mcelog
|
|
|
|
%{_libdir}/collectd/mcelog.so
|
|
|
|
%{_libdir}/collectd/mcelog.la
|
|
|
|
|
|
|
|
%files plugin-ovs
|
|
|
|
%{_libdir}/collectd/ovs_*.so
|
|
|
|
%{_libdir}/collectd/ovs_*.la
|
|
|
|
|
|
|
|
%files plugin-synproxy
|
|
|
|
%{_libdir}/collectd/synproxy.so
|
|
|
|
%{_libdir}/collectd/synproxy.la
|
|
|
|
|
Accepting request 709801 from home:mnhauke:monitoring
- 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
2019-06-14 11:02:25 +02:00
|
|
|
%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
|
|
|
|
|
2019-11-26 12:48:59 +01:00
|
|
|
%files plugin-uptime
|
|
|
|
%{_libdir}/collectd/check_uptime.la
|
|
|
|
%{_libdir}/collectd/check_uptime.so
|
|
|
|
|
|
|
|
%files plugin-connectivity
|
|
|
|
%{_libdir}/collectd/connectivity.la
|
|
|
|
%{_libdir}/collectd/connectivity.so
|
|
|
|
|
|
|
|
%files plugin-procevent
|
|
|
|
%{_libdir}/collectd/procevent.la
|
|
|
|
%{_libdir}/collectd/procevent.so
|
|
|
|
|
|
|
|
%files plugin-sysevent
|
|
|
|
%{_libdir}/collectd/sysevent.la
|
|
|
|
%{_libdir}/collectd/sysevent.so
|
|
|
|
|
2017-08-02 14:18:42 +02:00
|
|
|
%if 0%{?suse_version} >= 1330
|
|
|
|
%files plugin-nut
|
|
|
|
%{_libdir}/collectd/nut.so
|
|
|
|
%{_libdir}/collectd/nut.la
|
|
|
|
%endif
|
|
|
|
|
2011-02-03 02:08:32 +01:00
|
|
|
%files spamassassin
|
|
|
|
%dir %{_datadir}/spamassassin
|
|
|
|
%config(noreplace) %{_datadir}/spamassassin/99_%{name}.cf
|
|
|
|
%dir %{perl_vendorlib}/Mail
|
|
|
|
%dir %{perl_vendorlib}/Mail/SpamAssassin
|
|
|
|
%dir %{perl_vendorlib}/Mail/SpamAssassin/Plugin
|
|
|
|
%{perl_vendorlib}/Mail/SpamAssassin/Plugin/Collectd.pm
|
2011-08-04 15:09:29 +02:00
|
|
|
%doc %{perl_man3dir}/Mail::SpamAssassin::Plugin::Collectd.%{perl_man3ext}%{ext_man}
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%files plugins-all
|
|
|
|
%doc README.plugins-all
|
|
|
|
|
2013-08-23 07:31:49 +02:00
|
|
|
%files -n libcollectdclient1
|
|
|
|
%{_libdir}/libcollectdclient.so.1
|
|
|
|
%{_libdir}/libcollectdclient.so.1.*.*
|
2011-02-03 02:08:32 +01:00
|
|
|
|
|
|
|
%files -n libcollectdclient-devel
|
|
|
|
%{_includedir}/collectd
|
|
|
|
%{_libdir}/libcollectdclient.so
|
|
|
|
%{_libdir}/pkgconfig/libcollectdclient.pc
|
|
|
|
|
2011-02-03 02:08:49 +01:00
|
|
|
%changelog
|