[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'
Florian Forster
octo at verplant.org
Sat Mar 16 16:32:26 CET 2013
configure.in | 2 +
contrib/redhat/apache.conf | 8 -
contrib/redhat/collectd.conf | 210 ----
contrib/redhat/collectd.spec | 1959 ++++++++++++++++++++++++++++++++----
contrib/redhat/collection3.conf | 5 +
contrib/redhat/email.conf | 8 -
contrib/redhat/init.d-collectd | 38 +-
contrib/redhat/mysql.conf | 9 -
contrib/redhat/nginx.conf | 8 -
contrib/redhat/php-collection.conf | 6 +
contrib/redhat/sensors.conf | 9 -
contrib/redhat/snmp.conf | 44 -
contrib/upstart.collectd.conf | 47 +
src/Makefile.am | 3 +
src/apache.c | 3 +-
src/ascent.c | 3 +-
src/bind.c | 3 +-
src/collectd.conf.pod | 59 +-
src/curl.c | 32 +-
src/curl_json.c | 39 +-
src/curl_xml.c | 127 ++-
src/exec.c | 2 +-
src/libcollectdclient/Makefile.am | 2 +-
src/mysql.c | 4 +
src/nginx.c | 3 +-
src/write_http.c | 2 +-
26 files changed, 2073 insertions(+), 562 deletions(-)
New commits:
commit 1a02ec9a549ff7145db028f9ff2b3d9b2e9a6ef6
Merge: ff4e029 ce8b96a
Author: Florian Forster <octo at collectd.org>
Date: Sat Mar 16 16:31:50 2013 +0100
Merge remote branch 'origin/master'
commit ff4e029e7335574d1be6600953f97704bd122839
Author: Florian Forster <octo at collectd.org>
Date: Sat Mar 16 15:08:39 2013 +0100
curl_xml plugin: Change the "Namespace" config option …
… to expect two strings: prefix and URL separately. This way the parsing
is done in the config parser and we don't have to interpret special
characters in a string.
commit 597ada32b2fa15ec637e4e7385d7a821c2f6e682
Author: Dan Fandrich <dan at coneharvesters.com>
Date: Sat Mar 2 18:13:27 2013 +0100
Fix automatic link flags with libgcrypt 1.5.0
AM_PATH_LIBGCRYPT from libgcrypt 1.5.0 sets the variables
LIBGCRYPT_CPPFLAGS and LIBGCRYPT_LIBS with their proper
values, not GCRYPT_CPPFLAGS and GCRYPT_LIBS.
Signed-off-by: Florian Forster <octo at collectd.org>
commit c45ba8debef82d3785b83e35c5f7b0991b57a97e
Author: Dan Fandrich <dan at coneharvesters.com>
Date: Wed Feb 6 21:47:10 2013 +0100
curl_xml plugin: Added support for XML namespaces
Signed-off-by: Florian Forster <octo at collectd.org>
commit fb6381172837b9bb87c739dbec26bcad20c5db2d
Author: Dan Fandrich <dan at coneharvesters.com>
Date: Wed Feb 6 21:44:03 2013 +0100
curl_xml plugin: Allow XML element nodes to be selected for text
This is a pretty basic use case, namely to select text within an XML
element, instead of just attribute values.
Signed-off-by: Florian Forster <octo at collectd.org>
commit a49486bffc401f74009037b49fb7feb420c92452
Author: Dan Fandrich <dan at coneharvesters.com>
Date: Mon Feb 4 23:29:01 2013 +0100
curl* plugins: Added support for POST and arbitrary headers
These plugins can now be used for things like SOAP or XML-RPC calls.
Signed-off-by: Florian Forster <octo at collectd.org>
commit 7285e5f59ffa4efb391485fe9b35ee02f3dc856f
Merge: b48fe5c 3b51243
Author: Florian Forster <octo at collectd.org>
Date: Sat Mar 16 13:44:01 2013 +0100
Merge branch 'collectd-5.2'
Conflicts:
src/plugin.c
commit 3b51243382501d5f3cdda79d30c7ecf39d22dd87
Merge: 9706a20 d6021a8
Author: Florian Forster <octo at collectd.org>
Date: Sat Mar 16 13:43:26 2013 +0100
Merge branch 'collectd-5.1' into collectd-5.2
commit d6021a800b12c89b5a78877af2c5b9abc1a8e609
Merge: e33a2a5 56c7b21
Author: Florian Forster <octo at collectd.org>
Date: Sat Mar 16 13:40:14 2013 +0100
Merge branch 'collectd-4.10' into collectd-5.1
Conflicts:
src/curl_json.c
commit 56c7b21899e44b57b5031a21ca3652b30f4fc1aa
Author: Dan Fandrich <dan at coneharvesters.com>
Date: Wed Feb 6 23:35:04 2013 +0100
curl_xml plugin: Check for a curl_easy_perform() error first
The value of CURLINFO_RESPONSE_CODE isn't valid otherwise.
Also, use the symbolic name CURLE_OK in all plugins where
appropriate.
Change-Id: I17ae9c7eea393ee4641296b5484c93809a662dd9
Signed-off-by: Florian Forster <octo at collectd.org>
commit 61f60a27181027b73181dcb805ce319335a64fb2
Author: Tomas Doran <tomas.doran at timgroup.com>
Date: Tue Feb 26 12:43:21 2013 +0000
Fix memory leaks when plugin gets no results
Signed-off-by: Florian Forster <octo at collectd.org>
commit c639797924c64912d71cf83cd50c3508671c9088
Author: Florian Forster <octo at collectd.org>
Date: Thu Feb 21 10:35:59 2013 +0100
exec plugin: Fix a copy'n'paste mistake in a comment.
Thanks to Robert Riches Jr for the hint.
commit e33a2a5fffa6e57f8cea775ce2201606d49e155f
Author: Dave Cottlehuber <dch at jsonified.com>
Date: Mon Feb 18 13:31:57 2013 +0100
Add upstart configuration file for Ubuntu, Debian and RedHat distros
Signed-off-by: Florian Forster <octo at collectd.org>
commit 9706a2064c099666f24ba2fa8576629fc97310cd
Merge: ff49d36 97e4e03
Author: Florian Forster <octo at collectd.org>
Date: Wed Feb 20 14:40:46 2013 +0100
Merge branch 'mf/redhat' into collectd-5.2
Fixes Github issue #220.
commit 59c22282427eb6c38d6651cdaa205533752284cb
Author: Florian Forster <octo at collectd.org>
Date: Wed Feb 20 08:36:46 2013 +0100
curl_json plugin: Call yajl_complete_parse() / yajl_parse_complete() only once.
The cURL callback may be called several times, so we need to call the
complete() function after perform() returns.
commit a7aec0ae6160be6aa6b1b2b06574bb0dd47497f2
Author: Dan Fandrich <dan at coneharvesters.com>
Date: Mon Feb 4 23:27:26 2013 +0100
Add protection from infinite redirect loops to curl-using plugins
Signed-off-by: Florian Forster <octo at collectd.org>
commit b0c32ea6b670877e573913139f05d5c110e50861
Author: Dan Fandrich <dan at coneharvesters.com>
Date: Tue Feb 5 00:02:17 2013 +0100
curl_xml plugin: Fix potential dereference of NULL pointer.
I managed to get collectd to segfault in a couple of places while
playing with it a bit. The first is in the curl_xml module when the
XPATH expression doesn't quite match the input. The crash occurs on line
407 when instance_node->nodeTab[0] is dereferenced. At this point, all
members of instance_node are 0, so dereferencing the array isn't a good
idea. This patch fixes the problem, although I'm not sure if this
particular case actually deserves its own error message.
Signed-off-by: Florian Forster <octo at collectd.org>
commit 26b7959e12217415fd86507476a736e8b4562a99
Author: Florian Forster <octo at collectd.org>
Date: Sun Feb 3 23:04:17 2013 +0100
src/plugin.c: Initialize "next_read" field of read callbacks.
Fixes Github issue #230.
commit ff49d364812e0b93f1ab13d3da6ef6ce56bdf9e7
Author: Florian Forster <octo at collectd.org>
Date: Sun Feb 3 13:10:35 2013 +0100
src/Makefile.am: Only add path to lcc_features.h to binaries linked against libcollectdclient.
commit 25750ca71fa119430b722df6be2d557e375158f8
Author: Dan Fandrich <dan at coneharvesters.com>
Date: Sat Feb 2 01:26:43 2013 +0100
Allow out-of-tree builds
The generated header file lcc_features.h and collectd.h cause problems
otherwise.
Signed-off-by: Florian Forster <octo at collectd.org>
commit 97e4e035cc2ce01844c205fee6c8b698b041657a
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Fri Jan 11 11:23:52 2013 +0100
RedHat RPM spec: remove unnecessary dependency on libstatgrab
commit 7bf59f1941ce7ca97a25564b5c6f89dbaff050a4
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Fri Jan 4 10:00:59 2013 +0100
RedHat RPM spec: bump release number
commit 3825dd522fb4a0ae24c8da10918757f42a550474
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Jan 3 18:10:19 2013 +0100
RedHat RPM spec: package php-collection/collection3 independently
commit 028ccb39af6af88d10ddd4920a9eaa0a917efc89
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Jan 3 16:19:51 2013 +0100
redhat/collectd.spec - typo.
commit 252bd53fa6a5bfa9c538b520cb81a16c06e54251
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Fri Dec 21 16:55:15 2012 +0100
RedHat specfile: updated for 5.2.0
Also includes a couple of cleanups mentioned in github#186.
commit 8aad25c7472224e1c76cfc2b40403aea1a93ca13
Author: Ruben Kerkhof <ruben at tilaa.nl>
Date: Sun Nov 18 15:56:31 2012 +0100
Allow for conditional compilation of plugins
To enable/disable a plugin you can toggle the
%define for that plugin at the top of the specfile.
You can also pass the plugin as argument to rpmbuild,
for example:
rpmbuild -ba --without rrdtool
or:
rpmbuild -ba --with rrdcached
commit 2454e4800d433b95670be60b2356575e2f3cd71e
Author: Ruben Kerkhof <ruben at tilaa.nl>
Date: Sun Nov 18 11:44:51 2012 +0100
Quote arguments
commit 22110a36bc04bf1361b77a007efaf17f4a31a27c
Author: Ruben Kerkhof <ruben at tilaa.nl>
Date: Sun Nov 18 10:14:29 2012 +0100
No need to edit collectd.conf anymore.
This was fixed by in commit 25fa4ad
commit 2e3a1720ce7bb3c0a0cf2b1fd5aa3dd302754216
Author: Ruben Kerkhof <ruben at tilaa.nl>
Date: Sun Nov 18 10:03:17 2012 +0100
Follow Fedora Packaging Guidelines in java subpackage
commit d8efba32853690bd0148a1e7eb5380dc01efbc45
Author: Ruben Kerkhof <ruben at tilaa.nl>
Date: Sat Nov 17 15:39:29 2012 +0100
Cleanup redhat specfile
Fixed a few rpmlint warnings
Updated (mostly) to Fedora Packaging Guidelines
commit 930b35b39cbcb4efee5c77ae69127fec3581d2dc
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Fri Nov 16 16:06:18 2012 +0100
RedHat RPM spec: update for 5.1 + improvements
* Enabled all buildable plugins based on libraries available on EL6 +
EPEL
* All plugins requiring external libraries are now shipped in seperate
packages.
* No longer treat Java plugin as an exception, correctly set
$JAVA_HOME during the build process + ensure build deps are installed.
* Dropped per-plugin configuration files, as they tend to diverge from
upstream defaults.
* Moved perl stuff to /usr/share/perl5/
* Don't alter Interval and ReadThreads by default, let the user change
this himself.
* Drop collection.cgi from main package, as it's been obsoleted by
collection3
* Moved contrib/ to its own package, to avoid cluttering the main
package with non-essential stuff.
* Replaced BuildPrereq by BuildRequires
commit 289f06be0b36ec0da43d7ab2567251c55538ac76
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Fri Nov 16 16:03:41 2012 +0100
RedHat initscript: small improvements
* checks configuration before (re)starting, based on debian's
initscript
* use /etc/sysconfig instdead of /etc/default
* include optional $ARGS in arguments passed to collectd.
More information about the collectd-changes
mailing list