forked from pool/collectd
Accepting request 354476 from server:monitoring
1 OBS-URL: https://build.opensuse.org/request/show/354476 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/collectd?expand=0&rev=21
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
f70dac0f50
7
_service
7
_service
@ -1,7 +0,0 @@
|
|||||||
<services>
|
|
||||||
<service name="verify_file" mode="localonly">
|
|
||||||
<param name="file">collectd-5.4.2.tar.bz2</param>
|
|
||||||
<param name="verifier">sha256</param>
|
|
||||||
<param name="checksum">9789e900c138b5dbe907d3d744143f12b1e30022276cb1d8c65bbabaf0c4e393</param>
|
|
||||||
</service>
|
|
||||||
</services>
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:9789e900c138b5dbe907d3d744143f12b1e30022276cb1d8c65bbabaf0c4e393
|
|
||||||
size 1633610
|
|
||||||
3
collectd-5.5.0.tar.bz2
Normal file
3
collectd-5.5.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:847684cf5c10de1dc34145078af3fcf6e0d168ba98c14f1343b1062a4b569e88
|
||||||
|
size 1824495
|
||||||
@ -1,19 +0,0 @@
|
|||||||
--- Makefile.in.orig 2013-06-04 02:28:14.547813510 +0200
|
|
||||||
+++ Makefile.in 2013-06-04 02:28:22.270816101 +0200
|
|
||||||
@@ -346,7 +346,7 @@
|
|
||||||
top_build_prefix = @top_build_prefix@
|
|
||||||
top_builddir = @top_builddir@
|
|
||||||
top_srcdir = @top_srcdir@
|
|
||||||
-ACLOCAL_AMFLAGS = -I libltdl/m4
|
|
||||||
+ACLOCAL_AMFLAGS = -I libltdl
|
|
||||||
SUBDIRS = libltdl src bindings .
|
|
||||||
INCLUDES = $(LTDLINCL)
|
|
||||||
EXTRA_DIST = contrib version-gen.sh
|
|
||||||
--- Makefile.am.orig 2013-06-04 02:28:28.047818050 +0200
|
|
||||||
+++ Makefile.am 2013-06-04 02:28:32.101819418 +0200
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-ACLOCAL_AMFLAGS = -I libltdl/m4
|
|
||||||
+ACLOCAL_AMFLAGS = -I libltdl
|
|
||||||
|
|
||||||
SUBDIRS = libltdl src bindings .
|
|
||||||
|
|
||||||
@ -1,22 +1,26 @@
|
|||||||
--- bindings/java/Makefile.in.orig 2010-07-12 20:27:41.000000000 +0200
|
diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
|
||||||
+++ bindings/java/Makefile.in 2010-07-12 20:28:09.000000000 +0200
|
index 8d2e49d..549d81a 100644
|
||||||
@@ -490,8 +490,8 @@
|
--- a/bindings/java/Makefile.am
|
||||||
|
+++ b/bindings/java/Makefile.am
|
||||||
|
@@ -25,8 +25,8 @@ EXTRA_DIST = org/collectd/api/CollectdConfigInterface.java \
|
||||||
java-build-stamp: org/collectd/api/*.java org/collectd/java/*.java
|
|
||||||
- $(JAVAC) -d "." "$(srcdir)/org/collectd/api"/*.java
|
|
||||||
- $(JAVAC) -d "." "$(srcdir)/org/collectd/java"/*.java
|
|
||||||
+ $(JAVAC) $(JAVAC_TARGET) -d "." "$(srcdir)/org/collectd/api"/*.java
|
|
||||||
+ $(JAVAC) $(JAVAC_TARGET) -d "." "$(srcdir)/org/collectd/java"/*.java
|
|
||||||
mkdir -p .libs
|
|
||||||
$(JAR) cf .libs/collectd-api.jar "org/collectd/api"/*.class
|
|
||||||
$(JAR) cf .libs/generic-jmx.jar "org/collectd/java"/*.class
|
|
||||||
--- bindings/java/Makefile.am.orig 2010-07-12 20:26:48.000000000 +0200
|
|
||||||
+++ bindings/java/Makefile.am 2010-07-12 20:27:35.000000000 +0200
|
|
||||||
@@ -25,8 +25,8 @@
|
|
||||||
org/collectd/java/JMXMemory.java
|
org/collectd/java/JMXMemory.java
|
||||||
|
|
||||||
java-build-stamp: org/collectd/api/*.java org/collectd/java/*.java
|
java-build-stamp: $(srcdir)/org/collectd/api/*.java $(srcdir)/org/collectd/java/*.java
|
||||||
|
- $(JAVAC) -d "." "$(srcdir)/org/collectd/api"/*.java
|
||||||
|
- $(JAVAC) -d "." "$(srcdir)/org/collectd/java"/*.java
|
||||||
|
+ $(JAVAC) $(JAVAC_TARGET) -d "." "$(srcdir)/org/collectd/api"/*.java
|
||||||
|
+ $(JAVAC) $(JAVAC_TARGET) -d "." "$(srcdir)/org/collectd/java"/*.java
|
||||||
|
mkdir -p .libs
|
||||||
|
$(JAR) cf .libs/collectd-api.jar "org/collectd/api"/*.class
|
||||||
|
$(JAR) cf .libs/generic-jmx.jar "org/collectd/java"/*.class
|
||||||
|
diff --git a/bindings/java/Makefile.in b/bindings/java/Makefile.in
|
||||||
|
index 1c57558..c8ab086 100644
|
||||||
|
--- a/bindings/java/Makefile.in
|
||||||
|
+++ b/bindings/java/Makefile.in
|
||||||
|
@@ -597,8 +597,8 @@ uninstall-am: uninstall-local
|
||||||
|
|
||||||
|
|
||||||
|
java-build-stamp: $(srcdir)/org/collectd/api/*.java $(srcdir)/org/collectd/java/*.java
|
||||||
- $(JAVAC) -d "." "$(srcdir)/org/collectd/api"/*.java
|
- $(JAVAC) -d "." "$(srcdir)/org/collectd/api"/*.java
|
||||||
- $(JAVAC) -d "." "$(srcdir)/org/collectd/java"/*.java
|
- $(JAVAC) -d "." "$(srcdir)/org/collectd/java"/*.java
|
||||||
+ $(JAVAC) $(JAVAC_TARGET) -d "." "$(srcdir)/org/collectd/api"/*.java
|
+ $(JAVAC) $(JAVAC_TARGET) -d "." "$(srcdir)/org/collectd/api"/*.java
|
||||||
|
|||||||
@ -1,11 +0,0 @@
|
|||||||
--- src/collectd.h.orig 2009-12-20 16:36:31.000000000 +0100
|
|
||||||
+++ src/collectd.h 2009-12-21 20:01:00.000000000 +0100
|
|
||||||
@@ -254,7 +254,7 @@
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef PLUGINDIR
|
|
||||||
-#define PLUGINDIR PREFIX "/lib/" PACKAGE_NAME
|
|
||||||
+#define PLUGINDIR PREFIX "/lib64/" PACKAGE_NAME
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef PKGDATADIR
|
|
||||||
@ -1,9 +1,11 @@
|
|||||||
--- a/configure.ac 2014-01-26 09:09:23.000000000 +0100
|
diff --git a/configure.ac b/configure.ac
|
||||||
+++ b/configure.ac 2014-03-11 07:41:44.326748635 +0100
|
index 87d1502..15efa43 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
@@ -1,5 +1,5 @@
|
@@ -1,5 +1,5 @@
|
||||||
dnl Process this file with autoconf to produce a configure script.
|
dnl Process this file with autoconf to produce a configure script.
|
||||||
-AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)])
|
-AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)])
|
||||||
+AC_INIT([collectd],[@@VERSION@@])
|
+AC_INIT([collectd],[@@VERSION@@])
|
||||||
AC_CONFIG_SRCDIR(src/collectd.c)
|
AC_CONFIG_SRCDIR(src/)
|
||||||
AC_CONFIG_HEADERS(src/config.h)
|
AC_CONFIG_HEADERS(src/config.h)
|
||||||
AC_CONFIG_AUX_DIR([libltdl/config])
|
AC_CONFIG_AUX_DIR([libltdl/config])
|
||||||
|
|||||||
308
collectd.changes
308
collectd.changes
@ -1,3 +1,311 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jan 15 20:48:24 UTC 2016 - mardnh@gmx.de
|
||||||
|
|
||||||
|
- packaging:
|
||||||
|
* removed patches:
|
||||||
|
- collectd-new_libstatgrab.patch (fixed upstream)
|
||||||
|
- collectd-lib64.patch (fixed upstream)
|
||||||
|
- collectd-fix_libltdl_autoreconf.patch (fixed upstream)
|
||||||
|
* updated patches:
|
||||||
|
- collectd-javac_target.patch
|
||||||
|
- collectd-version.patch
|
||||||
|
|
||||||
|
- upstream update release 2015-05-27, Version 5.5.0
|
||||||
|
* Build system: Ability to make out-of-tree builds has been fixed.
|
||||||
|
Thanks to Vincent Bernat. #792
|
||||||
|
* Build system, Disk and Users plugins: Detection and use of libstatgrab
|
||||||
|
≧ 0.90 has been added. Thanks to Vincent Bernat. #445, #795, #806,
|
||||||
|
#807, #908
|
||||||
|
* Build system, Memory, CPU, TCPConns and Processes plugins: Numerous
|
||||||
|
fixes related to OpenBSD support have been added. Thanks to Landry
|
||||||
|
Breuil. #777, #778, #779, #808
|
||||||
|
* Build system: Plugins now only export "module_register()". Thanks to
|
||||||
|
Florian Forster.
|
||||||
|
* Build system: Various cleanups and improvements have been done. Thanks
|
||||||
|
to Marc Fournier.
|
||||||
|
* collectd: Numerous internal changes and improvements to the daemon and
|
||||||
|
the plugin API have been make. Thanks to Florian Forster, Pierre-Yves
|
||||||
|
Ritschard and Alex Petrov. #512, #727
|
||||||
|
* collectd: Numerous spelling mistakes have been corrected in comments
|
||||||
|
and documentation and several error messages have been improved.
|
||||||
|
Thanks to Ruben Kerkhof, Abhinav Upadhyay, Olivier Bazoud, Pierre-Yves
|
||||||
|
Ritschard, Tim Smith, Moshe Zada, Katelyn Perry and Marc Fournier.
|
||||||
|
* collectd: Rules/Targets can now be appended to existing Filter Chains.
|
||||||
|
Thanks to Marc Falzon. #444
|
||||||
|
* collectd: Failing Filter Chains destinations will now log the list of
|
||||||
|
available write targets. Thanks to Wilfried Goesgens. #650, #1043
|
||||||
|
* collectd: Support for process signaling and management by upstart and
|
||||||
|
systemd has been implemented for the Linux platform. Thanks to
|
||||||
|
Pierre-Yves Ritschard and Marc Fournier. #798, #811, #814
|
||||||
|
* collectd: The "CollectInternalStats" option has been added. Thanks to
|
||||||
|
Yves Mettier. #691
|
||||||
|
* collectd: The daemon source code and dependencies have moved to the
|
||||||
|
"src/daemon/" directory. Thanks to Florian Forster.
|
||||||
|
* collectd: The new "MaxReadInterval" option allows to cap the
|
||||||
|
exponential retry interval of plugins read errors. Thanks to Alexey
|
||||||
|
Remizov and Florian Forster. #713
|
||||||
|
* collectd: The "-P" command-line option now has precedence over the
|
||||||
|
"PIDFile" option. Thanks to Thomas D. #553
|
||||||
|
* collection.cgi: Various data-source related adjustments have been
|
||||||
|
made. Thanks to Fabiano Pires and Sebastian Harl.
|
||||||
|
* libcollectdclient: Now propagates errors when signing / encrypting
|
||||||
|
network packets. Thanks to Florian Forster.
|
||||||
|
* Configuration: Support for unquoted IPv6 addresses has been added.
|
||||||
|
Thanks to Sebastian Harl. #489
|
||||||
|
* Documentation: Various improvements have been done. Thanks to Florian
|
||||||
|
Forster and Marc Fournier.
|
||||||
|
* Examples: the sample C plugin has been updated to the current plugin
|
||||||
|
API. Thanks to Sebastian Harl.
|
||||||
|
* Licensing: The following components have been relicensed to the MIT
|
||||||
|
license: the Apple Sensors, Ascent, DBI, E-Mail, Entropy, GenericJMX,
|
||||||
|
gmond, LogFile, nginx, Notify Desktop, NTPd, NUT, olsrd, Perl, Ping,
|
||||||
|
PostgreSQL, Protocols, RouterOS, RRDCacheD, SNMP, StatsD, SysLog,
|
||||||
|
Table, Tail, UnixSock, vmem, VServer, Wireless, Write Riemann and XMMS
|
||||||
|
plugins, the core collectd daemon, the collectdmon, collectd-nagios
|
||||||
|
and collectd-tg utilities, all the Targets and Matches, liboconfig,
|
||||||
|
most of the "utils_*" files and the plugin API.
|
||||||
|
* Tests: A test suite has been added. Thanks to Florian Forster.
|
||||||
|
* Threshold: The hysteresis calculation has been made more reliable.
|
||||||
|
Thanks to Jan Kundrát. #581
|
||||||
|
* Threshold: Various fixes and improvements have been made. Thanks to
|
||||||
|
Manuel Luis Sanmartín Rozada. #649, #644
|
||||||
|
* AMQP plugin: The "ConnectionRetryDelay" option has been added,
|
||||||
|
allowing to delay reconnection. Thanks to Yoga Ramalingam and Marc
|
||||||
|
Fournier. #833
|
||||||
|
* AMQP plugin: The "QueueDurable" and "QueueAutoDelete" options have
|
||||||
|
been added, giving control over queue creation and deletion. Thanks to
|
||||||
|
David Blundell and Marc Fournier. #623
|
||||||
|
* Apache, Ascent, BIND, cURL, cURL-JSON, cURL-XML, nginx and Write HTTP
|
||||||
|
plugins: Customizing the "User-Agent" field is now possible at
|
||||||
|
compile-time. Thanks to Jeremy Katz. #440
|
||||||
|
* Apache, Ascent, BIND, cURL, cURL-JSON, cURL-XML, nginx plugins: The
|
||||||
|
connection will be reset if it hasn't completed within the configured
|
||||||
|
"Interval". The new "Timeout" option gives control over this behavior.
|
||||||
|
Thanks to Jan Kundrát and Marc Fournier. #982, #983, #993
|
||||||
|
* Apache, Ascent, cURL, cURL-JSON, cURL-XML, nginx, Write HTTP plugins:
|
||||||
|
Allow usernames and passwords to contain colons if built against
|
||||||
|
libcurl ≧ 7.19.1. Thanks to Marc Fournier. #695, #947
|
||||||
|
* Apache plugin: The "SSLCiphers" option gives control over the
|
||||||
|
encryption algorithms to use with TLS connections. Thanks to Toni
|
||||||
|
Moreno. #946
|
||||||
|
* Barometer plugin: This new plugin reads sensor data from various
|
||||||
|
Freescale and Bosch digital barometers. Thanks to Tomas Menzl. #69,
|
||||||
|
#693
|
||||||
|
* Battery plugin: Reporting values as percentages and reporting degraded
|
||||||
|
batteries has been added. Thanks to Florian Forster.
|
||||||
|
* Battery plugin: Support for reading values from sysfs on Linux has
|
||||||
|
been added. Thanks to Andy Parkins, Nicholas Humfrey, Peter Wu and
|
||||||
|
Florian Forster. #725, #810, #998
|
||||||
|
* Battery plugin: The value for current is no longer supplied unless the
|
||||||
|
battery provides this information. Thanks to Florian Forster.
|
||||||
|
* BIND plugin: Bind's XML v3 API is now supported; Thanks to Victor
|
||||||
|
Berger, Bruno Prémont and Michal Humpula. #742, #847
|
||||||
|
* Ceph plugin: This new plugin collects statistics from the Ceph
|
||||||
|
distributed storage system. Thanks to Dan Ryder, Dennis Zou, Colin
|
||||||
|
McCabe, Sage Weil. #522, #598
|
||||||
|
* ConnTrack plugin: Support for reporting values as percentages as well
|
||||||
|
as legacy conntrack files in "/proc" has been added. Thanks to
|
||||||
|
Pierre-Yves Ritschard. #497, #680
|
||||||
|
* CPU plugin: The plugin is now able to report values as percentages and
|
||||||
|
aggregate values per-state and per-CPU. Thanks to Pierre-Yves
|
||||||
|
Ritschard, Florian Forster, Fabien Wernli, Nicholas Humfrey and
|
||||||
|
Wilfried Goesgens. #499, #516, #639 #734, #812, #802
|
||||||
|
* cURL-JSON plugin: Extracting values from complex JSON structures has
|
||||||
|
been enhanced. Thanks to Jim Radford. #408, #411
|
||||||
|
* cURL-JSON plugin: Intervals can now be configured on a per-URL basis.
|
||||||
|
Thanks to Stan Sawa. #685
|
||||||
|
* cURL-JSON, cURL-XML, Write HTTP plugins: These plugins now also follow
|
||||||
|
HTTP redirects. Thanks to Marc Fournier.
|
||||||
|
* cURL, cURL-JSON, cURL-XML plugins: HTTP Digest authentication has been
|
||||||
|
implemented. Thanks to Frank Cornelis. #482
|
||||||
|
* DBI, Oracle, PostgreSQL plugins: A "MetadataFrom" parameter has been
|
||||||
|
added which allows to set metadata from database columns. Thanks to
|
||||||
|
Mark Wong. #317, #321
|
||||||
|
* DBI plugin: Querying several databases in parallel is now possible.
|
||||||
|
Thanks to Vincent Bernat. #453
|
||||||
|
* Disk plugin: On the Linux platform, disk names can now get looked up
|
||||||
|
in udev with the "UdevNameAttr" option. Thanks to Patrick Mooney. #537
|
||||||
|
* Disk plugin: This plugin now collects several additional I/O-related
|
||||||
|
metrics on the Linux platform. Thanks to Florian Forster and Michael
|
||||||
|
Schenck. #705, #759
|
||||||
|
* DRBD plugin: This new plugin reads Linux's Distributed Replicated
|
||||||
|
Block Device (DRBD) statistics. Thanks to Tim Laszlo. #566, #700
|
||||||
|
* Exec, UnixSock plugins: The "PUTNOTIF" command now allows to set
|
||||||
|
metadata on notifications. Thanks to John-John Tedro. #416
|
||||||
|
* fhcount plugin: This new plugin reports the number of used file
|
||||||
|
handles. Thanks to Jiri Tyr. #1009
|
||||||
|
* GenericJMX plugin: A Class Loader for "JMXConnectorFactory" has been
|
||||||
|
added, allowing the plugin to work with JBOSS > 7. Thanks to Alexandre
|
||||||
|
Moutot. #452
|
||||||
|
* IPC plugin: This new plugin collects information related to shared
|
||||||
|
memory. Thanks to Andrés J. Díaz. #925
|
||||||
|
* Java plugin: Now uses the hostname defined in the configuration file.
|
||||||
|
Thanks to Pierre-Yves Ritschard. #530, #681
|
||||||
|
* Load plugin: The plugin is now able to report values as percentages.
|
||||||
|
Thanks to Vedran Bartonicek and Pierre-Yves Ritschard. #344, #498
|
||||||
|
* Log Logstash plugin: This new plugin writes collectd logs and events
|
||||||
|
as Logstash JSON formatted events. Thanks to Pierre-Yves Ritschard.
|
||||||
|
#360
|
||||||
|
* LVM plugin: The plugin collects thin pool data volumes size, and no
|
||||||
|
longer reports virtual volumes. Thanks to Benjamin Gilbert. #603
|
||||||
|
* memcached plugin: "listen_disabled_num" are now also reported. Thanks
|
||||||
|
to Matt Cottingham. #622
|
||||||
|
* Memory plugin: Slab memory reporting on the Linux platform has been
|
||||||
|
added. Thanks to Manuel CISSÉ and Marc Fournier. #560, #697
|
||||||
|
* Memory plugin: The plugin is now able to report values as percentages.
|
||||||
|
Thanks to Jeremy Katz, Florian Forster and Manuel CISSÉ. #501, #511,
|
||||||
|
#559
|
||||||
|
* Modbus plugin: Selecting between holding and input registers is now
|
||||||
|
possible. Thanks to Jan Vitek. #338
|
||||||
|
* Modbus plugin: Support for accessing devices through an RS-485 serial
|
||||||
|
port has been added. Thanks to Eric Sandeen.
|
||||||
|
* Multimeter plugin: This plugin isn't built by default on the AIX
|
||||||
|
platform anymore. Thanks to Manuel Luis Sanmartin Rozada. #549, #684
|
||||||
|
* MySQL and PostgreSQL plugins: Passing "127.0.0.1" as a host will now
|
||||||
|
result in the global Hostname being used in metric names. Thanks to
|
||||||
|
Jeremy Katz. #441
|
||||||
|
* MySQL plugin: InnoDB, Select and Sort statistics collection has been
|
||||||
|
added. Thanks to Wilson Felipe, Marek Becka and Pierre-Yves Ritschard.
|
||||||
|
#248, #621, #699, #824
|
||||||
|
* MySQL plugin: The "Alias" and "ConnectTimeout" options have been
|
||||||
|
added. Thanks to William Tisäter.
|
||||||
|
* Netlink plugin: Support for 64bit netlink counters has been added.
|
||||||
|
Thanks to Marek Becka. #435
|
||||||
|
* Network plugin: The "ReconnectInterval" configuration option has been
|
||||||
|
added. Thanks to John Ferlito. #732
|
||||||
|
* NFS plugin: Support for NFSv4.0 has been implemented. Thanks to Marek
|
||||||
|
Becka. #550
|
||||||
|
* OneWire plugin: Support for more temperature-providing sensor families
|
||||||
|
has been added. Thanks to Tomasz Torcz. #672
|
||||||
|
* OneWire plugin: Support for full OWFS path and more device families
|
||||||
|
has been implemented. Thanks to Tomas Menzl. #68
|
||||||
|
* OpenLDAP plugin: This new plugin reads monitoring information from
|
||||||
|
OpenLDAP's "cn=Monitor" subtree. Thanks to Kimo Rosenbaum, Marc
|
||||||
|
Fournier and Nicholas Humfrey. #719
|
||||||
|
* OpenVPN plugin: Support for OpenVPN 2.3.0 has been implemented. Thanks
|
||||||
|
to Ed Okerson. #252
|
||||||
|
* OpenVZ plugin: Various improvements have been made, making the plugin
|
||||||
|
report values like the other collectd plugins do. Thanks to Chris
|
||||||
|
Lundquist. #264
|
||||||
|
* Perl plugin: A new "listval_filter" method has been added, various
|
||||||
|
internal cleanups and improvements have been made and a test suite has
|
||||||
|
been added. Thanks to Matthias Bethke. #728
|
||||||
|
* PostgreSQL plugin: The new "ExpireDelay" option allows skipping older
|
||||||
|
values pending write when the database slows down. Thanks to Stephen
|
||||||
|
O'Dor. #593
|
||||||
|
* PowerDNS plugin: The plugin was updated for stats from pdns 3.4.3.
|
||||||
|
Thanks to Ruben Kerkhof. #965
|
||||||
|
* Processes plugin: A memory-usage related optimization for low-profile
|
||||||
|
systems has been added. Thanks to Florian Forster. #652
|
||||||
|
* Python plugin: Support for Python3 has been improved, "ModulePath" is
|
||||||
|
now prepended to "sys.path", and the "get_dataset()" function has been
|
||||||
|
added to the Python API. Thanks to Sven Trenkel and Patrick Browne.
|
||||||
|
#890, #751, #771
|
||||||
|
* Redis and Write_Redis plugins: The support library has been switched
|
||||||
|
from credis to hiredis. Thanks to Andrés J. Díaz, Victor Seva, Marc
|
||||||
|
Fournier, Johan Bergström, Michael Spiegle and brianpkelly. #296,
|
||||||
|
#464, #475, #799, #1030
|
||||||
|
* Redis plugin: Custom commands can now be used to fetch values stored
|
||||||
|
in Redis. Thanks to Pierre-Yves Ritschard. #816
|
||||||
|
* Redis plugin: Support for passwords up to 512 characters long has been
|
||||||
|
added. Thanks to Jeremy Katz. #532
|
||||||
|
* Sensors plugin: Support for lm_sensors' power sensors has been added.
|
||||||
|
Thanks to Jan Kundrát. #571
|
||||||
|
* SMART plugin: This new plugin collects SMART statistics from disk
|
||||||
|
drives. Thanks to Vincent Bernat. #797
|
||||||
|
* SNMP plugin: A blacklist/whitelist feature can now be used to filter
|
||||||
|
which OIDs to collect. Thanks to Christophe Courtaut. #414
|
||||||
|
* SNMP plugin: SNMPv3 authentication and encryption support has been
|
||||||
|
implemented. Thanks to Michael Pilat. #362
|
||||||
|
* SNMP plugin: Two error messages have been disambiguated. Thanks to
|
||||||
|
Sergey. #939, #952
|
||||||
|
* Swap plugin: The plugin is now able to report values as percentages.
|
||||||
|
Thanks to Jeremy Katz and Florian Forster. #500, #510
|
||||||
|
* Swap plugin: The plugin no longer fails on Linux systems where
|
||||||
|
"SwapCached" isn't exposed by the kernel. Thanks to Florian Forster.
|
||||||
|
#733
|
||||||
|
* Tail plugin: "GaugeInc" and "GaugeAdd" options have been implemented.
|
||||||
|
Thanks to Andre Ferraz. #673
|
||||||
|
* Tail plugin: Intervals can now be configured on a per-File basis.
|
||||||
|
Thanks to Tom Leaman. #446
|
||||||
|
* TCPConns plugin: The "AllPortsSummary" option, allowing to summarize
|
||||||
|
all connections, has been added. Thanks to Marek Becka. #488
|
||||||
|
* TCPConns plugin: Three metrics were renamed on the AIX platform, for
|
||||||
|
the sake of consistency. Thanks to Manuel Luis Sanmartín Rozada. #546
|
||||||
|
* Turbostat plugin: This new plugin reads CPU frequency and C-state
|
||||||
|
residency on modern Intel turbo-capable processors. Thanks to Vincent
|
||||||
|
Brillault, Jean Delvare and Nicolas Iooss. #651
|
||||||
|
* UnixSock plugin: The "GETTHRESHOLD" command has been re-added. Thanks
|
||||||
|
to Manuel Luis Sanmartín Rozada. #674
|
||||||
|
* Varnish plugin: Varnish 4 support has been added, as well as as
|
||||||
|
monitoring metrics only available in Varnish 4. Thanks to Marc
|
||||||
|
Fournier. #618, #783
|
||||||
|
* virt plugin: Guests memory usage is now also collected. Thanks to
|
||||||
|
Tiago Carvalho, jazzmes and Zollner Robert.
|
||||||
|
* virt plugin: It is now possible to chose between using guests' name or
|
||||||
|
UUID as plugin_instance. Thanks to Remi Ferrand. #385
|
||||||
|
* virt plugin: The libvirt plugin has been renamed to virt. Thanks to
|
||||||
|
Florian Forster.
|
||||||
|
* Write Graphite plugin: When the connection to graphite fails,
|
||||||
|
reconnection attempts are now limited to once per second. Thanks to
|
||||||
|
Florian Forster. #625
|
||||||
|
* Write HTTP plugin: Multi-instance support of this plugin has been
|
||||||
|
improved. The "<URL "url">" block has been deprecated in favor of
|
||||||
|
"<Node "identifier">". Thanks to Marc Fournier. #902
|
||||||
|
* Write HTTP plugin: Several TLS-related configuration options have been
|
||||||
|
added. Thanks to Ingmar Runge. #666
|
||||||
|
* Write HTTP plugin: The "LowSpeedLimit" and "Timeout" options allow to
|
||||||
|
reset slow/stalled network connections. Thanks to loginator17 and Marc
|
||||||
|
Fournier. #752, #985
|
||||||
|
* Write HTTP plugin: The size of the payload posted to the HTTP server
|
||||||
|
can now be controlled with the "BufferSize" option. Thanks to Florian
|
||||||
|
Forster. #722
|
||||||
|
* Write Kafka plugin: This new plugin sends data to Apache Kafka, a
|
||||||
|
distributed messaging queue. Thanks to Pierre-Yves Ritschard,
|
||||||
|
ciomaire, Vincent Bernat, Marc Fournier. #670, #694, #794, #853, #014
|
||||||
|
* Write Log plugin: This new plugin dispatches collected values to the
|
||||||
|
configured log destination(s). Thanks to Pierre-Yves Ritschard. #886
|
||||||
|
* Write Riemann plugin: Extra meta strings are now added as attributes
|
||||||
|
in notifications. Thanks to John-John Tedro. #417
|
||||||
|
* Write Riemann plugin: Notification message are now sent to the Riemann
|
||||||
|
server via the description field. Thanks to Adrian Miron. #575
|
||||||
|
* Write Riemann plugin: Support for custom attributes has been added.
|
||||||
|
Thanks to Pierre-Yves Ritschard. #459
|
||||||
|
* Write Riemann plugin: Support had been implemented for sending events
|
||||||
|
to Riemann in batches (when using TCP), and is enabled by default.
|
||||||
|
Thanks to Pierre-Yves Ritschard. #800
|
||||||
|
* Write Riemann plugin: The "EventServicePrefix" option has been added,
|
||||||
|
which adds a prefix to event service names. Thanks to Moshe Zada. #706
|
||||||
|
* Write Riemann plugin: Threshold checks can now be passed down to the
|
||||||
|
Riemann server. Thanks to Pierre-Yves Ritschard. #518
|
||||||
|
* Write Sensu plugin: This new plugin submits values to Sensu, a stream
|
||||||
|
processing and monitoring system. Thanks to Fabrice A. Marie and Marc
|
||||||
|
Fournier. #912, #1001, #1016
|
||||||
|
* Write TSDB plugin: This new plugin sends data to OpenTSDB, a scalable
|
||||||
|
time series database. Thanks to Kevin Bowling, Florian Forster, Dallin
|
||||||
|
Young, Michael Schenck and Pierre-Yves Ritschard. #703, #772, #945
|
||||||
|
* ZFS ARC plugin: Support for ZFS-on-Linux has been added. Thanks to
|
||||||
|
Marc Fournier and Wilfried Goesgens. #552
|
||||||
|
* Zookeeper plugin: This new plugin reads data from the Apache Zookeeper
|
||||||
|
"MNTR" command. Thanks to Jeremy Katz. #826
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Jan 14 10:53:13 UTC 2016 - aj@ajaissle.de
|
||||||
|
|
||||||
|
- Added %bcond for modbus
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Dec 17 17:56:16 CET 2015 - ro@suse.de
|
||||||
|
|
||||||
|
- add patch collectd-new_libstatgrab.patch:
|
||||||
|
fix build with recent libstatgrab (basically backport from git)
|
||||||
|
- do not (build)require sensors on s390/s390x
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Sep 12 10:58:03 UTC 2015 - matwey.kornilov@gmail.com
|
||||||
|
|
||||||
|
- Add modbus plugin
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jun 5 06:49:33 UTC 2015 - mpluskal@suse.com
|
Fri Jun 5 06:49:33 UTC 2015 - mpluskal@suse.com
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package collectd
|
# spec file for package collectd
|
||||||
#
|
#
|
||||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
# Copyright (c) 2005-2013 Pascal Bleser <pascal.bleser@opensuse.org>
|
# Copyright (c) 2005-2013 Pascal Bleser <pascal.bleser@opensuse.org>
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
@ -17,12 +17,21 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
%bcond_with modbus
|
||||||
|
|
||||||
%define madwifi_plugin madwifi
|
%define madwifi_plugin madwifi
|
||||||
%define pcap_version %({rpm -q --qf='%{VERSION}\n' libpcap-devel 2>/dev/null || echo 0.0.0} | gawk -F. '{print $1*10000+$2*100+$3}')
|
%define pcap_version %({rpm -q --qf='%{VERSION}\n' libpcap-devel 2>/dev/null || echo 0.0.0} | gawk -F. '{print $1*10000+$2*100+$3}')
|
||||||
%define snmp 1
|
%define snmp 1
|
||||||
%define with_esmtp 1
|
%define with_esmtp 1
|
||||||
%define ipvs_plugin ipvs
|
%define ipvs_plugin ipvs
|
||||||
%define plugins apache apcups battery %{expand:%{bind_plugin}} cgroups curl %{expand:%{curl_json_plugin}} %{expand:%{curl_xml_plugin}} conntrack contextswitch cpu cpufreq csv df disk %{expand:%{dns_plugin}} email entropy exec filecount fscache hddtemp interface %{expand:%{ipvs_plugin}} irq load logfile match_empty_counter match_hashed match_regex match_timediff match_value mbmon %{expand:%{memcached_plugin}} memory multimeter netlink network nfs nginx ntpd olsrd openvpn perl ping protocols powerdns processes rrdtool sensors serial statsd swap syslog table tail target_notification target_replace target_scale target_set target_v5upgrade tcpconns teamspeak2 ted thermal threshold unixsock uptime users uuid vmem vserver wireless write_http %{expand:%{ascent_plugin}} %{expand:%{iptables_plugin}} %{expand:%{madwifi_plugin}} %{expand:%{rrdcached_plugin}} aggregation ethstat md numa tail_csv write_graphite write_riemann
|
%define plugins apache apcups battery %{expand:%{bind_plugin}} cgroups curl %{expand:%{curl_json_plugin}} %{expand:%{curl_xml_plugin}} conntrack contextswitch cpu cpufreq csv df disk %{expand:%{dns_plugin}} email entropy exec filecount fscache hddtemp interface %{expand:%{ipvs_plugin}} irq load logfile match_empty_counter match_hashed match_regex match_timediff match_value mbmon %{expand:%{memcached_plugin}} memory multimeter netlink network nfs nginx ntpd olsrd openvpn perl ping protocols powerdns processes rrdtool %{expand:%{sensors_plugin}} serial statsd swap syslog table tail target_notification target_replace target_scale target_set target_v5upgrade tcpconns teamspeak2 ted thermal threshold unixsock uptime users uuid vmem vserver wireless write_http %{expand:%{ascent_plugin}} %{expand:%{iptables_plugin}} %{expand:%{madwifi_plugin}} %{expand:%{rrdcached_plugin}} aggregation ethstat md numa tail_csv write_graphite write_riemann ceph drbd fhcount ipc log_logstash turbostat write_log write_log write_sensu write_tsdb zfs_arc zookeeper
|
||||||
|
%ifnarch s390 s390x
|
||||||
|
%define sensors 1
|
||||||
|
%define sensors_plugin sensors
|
||||||
|
%else
|
||||||
|
%define sensors 0
|
||||||
|
%define sensors_plugin %{nil}
|
||||||
|
%endif
|
||||||
%if 0%{?_with_xmms:1}0
|
%if 0%{?_with_xmms:1}0
|
||||||
%define xmms 1
|
%define xmms 1
|
||||||
%else
|
%else
|
||||||
@ -114,7 +123,7 @@ BuildRequires: systemd
|
|||||||
PreReq: %insserv_prereq
|
PreReq: %insserv_prereq
|
||||||
%endif
|
%endif
|
||||||
Name: collectd
|
Name: collectd
|
||||||
Version: 5.4.2
|
Version: 5.5.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Statistics Collection Daemon for filling RRD Files
|
Summary: Statistics Collection Daemon for filling RRD Files
|
||||||
License: GPL-2.0
|
License: GPL-2.0
|
||||||
@ -128,13 +137,11 @@ Source3: collectd-js.apache2.conf
|
|||||||
# see https://bugzilla.novell.com/show_bug.cgi?id=388026
|
# see https://bugzilla.novell.com/show_bug.cgi?id=388026
|
||||||
Source20: collectd-pthread.pc
|
Source20: collectd-pthread.pc
|
||||||
Source99: collectd-rpmlintrc
|
Source99: collectd-rpmlintrc
|
||||||
Patch4: collectd-lib64.patch
|
|
||||||
Patch7: collectd-fix-config.patch
|
Patch7: collectd-fix-config.patch
|
||||||
Patch9: collectd-version.patch
|
Patch9: collectd-version.patch
|
||||||
Patch10: collectd-perl-vendor.patch
|
Patch10: collectd-perl-vendor.patch
|
||||||
# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=467072
|
# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=467072
|
||||||
Patch11: collectd-fix_broken_perl-5.10.patch
|
Patch11: collectd-fix_broken_perl-5.10.patch
|
||||||
Patch17: collectd-fix_libltdl_autoreconf.patch
|
|
||||||
Patch18: collectd-fix_collection_cgi.patch
|
Patch18: collectd-fix_collection_cgi.patch
|
||||||
Patch19: collectd-fix_spamassassin_doc.patch
|
Patch19: collectd-fix_spamassassin_doc.patch
|
||||||
Patch20: collectd-split_README.patch
|
Patch20: collectd-split_README.patch
|
||||||
@ -157,7 +164,6 @@ BuildRequires: intltool
|
|||||||
BuildRequires: kernel-source
|
BuildRequires: kernel-source
|
||||||
BuildRequires: libart_lgpl-devel
|
BuildRequires: libart_lgpl-devel
|
||||||
BuildRequires: libevent-devel
|
BuildRequires: libevent-devel
|
||||||
#BuildRequires: libmodbus-devel
|
|
||||||
BuildRequires: libmnl-devel
|
BuildRequires: libmnl-devel
|
||||||
BuildRequires: libnetlink-devel
|
BuildRequires: libnetlink-devel
|
||||||
BuildRequires: liboping-devel
|
BuildRequires: liboping-devel
|
||||||
@ -172,11 +178,13 @@ BuildRequires: perl
|
|||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: python-devel
|
BuildRequires: python-devel
|
||||||
BuildRequires: rrdtool
|
BuildRequires: rrdtool
|
||||||
BuildRequires: sensors
|
|
||||||
BuildRequires: xfsprogs-devel
|
BuildRequires: xfsprogs-devel
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
Requires: rrdtool
|
Requires: rrdtool
|
||||||
|
%if %{sensors}
|
||||||
|
BuildRequires: sensors
|
||||||
Requires: sensors
|
Requires: sensors
|
||||||
|
%endif
|
||||||
# FIXME: use proper Requires(pre/post/preun/...)
|
# FIXME: use proper Requires(pre/post/preun/...)
|
||||||
PreReq: %fillup_prereq
|
PreReq: %fillup_prereq
|
||||||
# in case we'd like to split it later:
|
# in case we'd like to split it later:
|
||||||
@ -253,6 +261,9 @@ BuildRequires: libdbi-devel
|
|||||||
%if %{memcachec}
|
%if %{memcachec}
|
||||||
BuildRequires: libmemcached-devel
|
BuildRequires: libmemcached-devel
|
||||||
%endif
|
%endif
|
||||||
|
%if %{with modbus}
|
||||||
|
BuildRequires: libmodbus-devel
|
||||||
|
%endif
|
||||||
%if %{protobuf}
|
%if %{protobuf}
|
||||||
BuildRequires: protobuf-c
|
BuildRequires: protobuf-c
|
||||||
%endif
|
%endif
|
||||||
@ -426,6 +437,16 @@ Requires: %{name} = %{version}-%{release}
|
|||||||
Optional %{name} plugin to sample memcached statistics.
|
Optional %{name} plugin to sample memcached statistics.
|
||||||
%endif #memcachec
|
%endif #memcachec
|
||||||
|
|
||||||
|
%if %{with modbus}
|
||||||
|
%package plugin-modbus
|
||||||
|
Summary: ModBus Plugin for %{name}
|
||||||
|
Group: System/Monitoring
|
||||||
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
|
||||||
|
%description plugin-modbus
|
||||||
|
Optional %{name} plugin to collect data using ModBus protocol.
|
||||||
|
%endif #modbus
|
||||||
|
|
||||||
%if %{protobuf}
|
%if %{protobuf}
|
||||||
%package plugin-pinba
|
%package plugin-pinba
|
||||||
Summary: Pinba Collector Plugin for %{name}
|
Summary: Pinba Collector Plugin for %{name}
|
||||||
@ -471,6 +492,9 @@ Requires: %{name}-plugin-dbi = %{version}-%{release}
|
|||||||
%if %{memcachec}
|
%if %{memcachec}
|
||||||
Requires: %{name}-plugin-memcachec = %{version}-%{release}
|
Requires: %{name}-plugin-memcachec = %{version}-%{release}
|
||||||
%endif #memcachec
|
%endif #memcachec
|
||||||
|
%if %{with modbus}
|
||||||
|
Requires: %{name}-plugin-modbus = %{version}-%{release}
|
||||||
|
%endif #modbus
|
||||||
%if %{protobuf}
|
%if %{protobuf}
|
||||||
Requires: %{name}-plugin-pinba = %{version}-%{release}
|
Requires: %{name}-plugin-pinba = %{version}-%{release}
|
||||||
%endif #protobuf
|
%endif #protobuf
|
||||||
@ -511,19 +535,15 @@ to write %{name} unixsock clients.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n "collectd-%{version}"
|
%setup -q -n "collectd-%{version}"
|
||||||
%if "%{_lib}"=="lib64"
|
|
||||||
%patch4
|
|
||||||
%endif
|
|
||||||
%patch7
|
%patch7
|
||||||
%patch9 -p1
|
%patch9 -p1
|
||||||
%patch10
|
%patch10
|
||||||
%patch11
|
%patch11
|
||||||
%patch17
|
|
||||||
%patch18
|
%patch18
|
||||||
%patch19
|
%patch19
|
||||||
%patch20
|
%patch20
|
||||||
%patch21
|
%patch21
|
||||||
%patch23
|
%patch23 -p1
|
||||||
%if 0%{?suse_version} <= 1140 && !0%{?sles_version}
|
%if 0%{?suse_version} <= 1140 && !0%{?sles_version}
|
||||||
%patch24 -p1
|
%patch24 -p1
|
||||||
%endif
|
%endif
|
||||||
@ -608,6 +628,11 @@ export KERNEL_DIR=%{_prefix}/src/linux
|
|||||||
%else
|
%else
|
||||||
--disable-memcached \
|
--disable-memcached \
|
||||||
%endif #memcachec
|
%endif #memcachec
|
||||||
|
%if %{with modbus}
|
||||||
|
--enable-modbus \
|
||||||
|
%else
|
||||||
|
--disable-modbus \
|
||||||
|
%endif #modbus
|
||||||
%if 0%{?suse_version} < 930
|
%if 0%{?suse_version} < 930
|
||||||
--disable-mysql \
|
--disable-mysql \
|
||||||
%endif
|
%endif
|
||||||
@ -908,8 +933,8 @@ ln -s "../..%{_initddir}/collectd" "%{buildroot}%{_sbindir}/rccollectd"
|
|||||||
%if %{virt}
|
%if %{virt}
|
||||||
%files plugin-virt
|
%files plugin-virt
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_libdir}/collectd/libvirt.so
|
%{_libdir}/collectd/virt.so
|
||||||
%{_libdir}/collectd/libvirt.la
|
%{_libdir}/collectd/virt.la
|
||||||
%endif #virt
|
%endif #virt
|
||||||
|
|
||||||
%if %{xmms}
|
%if %{xmms}
|
||||||
@ -933,6 +958,13 @@ ln -s "../..%{_initddir}/collectd" "%{buildroot}%{_sbindir}/rccollectd"
|
|||||||
%{_libdir}/collectd/memcachec.la
|
%{_libdir}/collectd/memcachec.la
|
||||||
%endif #memcachec
|
%endif #memcachec
|
||||||
|
|
||||||
|
%if %{with modbus}
|
||||||
|
%files plugin-modbus
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%{_libdir}/collectd/modbus.so
|
||||||
|
%{_libdir}/collectd/modbus.la
|
||||||
|
%endif #modbus
|
||||||
|
|
||||||
%files spamassassin
|
%files spamassassin
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%dir %{_datadir}/spamassassin
|
%dir %{_datadir}/spamassassin
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user