[collectd-changes] collectd, the system statistics collection daemon: Changes to 'ff/netcmd'
Florian Forster
octo at verplant.org
Thu Apr 11 17:38:44 CEST 2013
.gitignore | 3 +
AUTHORS | 3 +
ChangeLog | 122 ++
README | 6 +-
bindings/Makefile.am | 8 +-
configure.in | 335 +++---
contrib/redhat/apache.conf | 8 -
contrib/redhat/collectd.conf | 210 ----
contrib/redhat/collectd.spec | 1999 ++++++++++++++++++++++++++++----
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 | 39 +-
src/apache.c | 3 +-
src/ascent.c | 3 +-
src/bind.c | 3 +-
src/collectd.conf.in | 31 +
src/collectd.conf.pod | 174 ++-
src/common.c | 16 +
src/common.h | 7 +
src/curl.c | 32 +-
src/curl_json.c | 39 +-
src/curl_xml.c | 127 +-
src/disk.c | 2 +-
src/exec.c | 2 +-
src/filter_chain.c | 4 +-
src/libcollectdclient/Makefile.am | 2 +-
src/libcollectdclient/network_buffer.c | 2 +
src/libvirt.c | 22 +-
src/mysql.c | 64 +-
src/netapp.c | 28 +-
src/netcmd.c | 2 +-
src/network.c | 34 +-
src/nfs.c | 15 +-
src/nginx.c | 3 +-
src/notify_email.c | 2 +-
src/plugin.c | 6 +
src/riemann.proto | 8 +-
src/rrdcached.c | 10 +-
src/rrdtool.c | 28 +-
src/snmp.c | 288 ++---
src/tail_csv.c | 565 +++++++++
src/thermal.c | 3 +
src/utils_parse_option.c | 2 +-
src/utils_random.c | 75 ++
src/utils_random.h | 40 +
src/utils_rrdcreate.c | 3 +-
src/uuid.c | 101 +-
src/write_http.c | 2 +-
src/write_mongodb.c | 53 +-
src/write_riemann.c | 247 ++--
version-gen.sh | 2 +-
58 files changed, 3784 insertions(+), 1173 deletions(-)
New commits:
commit 08af8b36c97aab39a7b991aee3ace5ab84e19930
Author: Florian Forster <octo at collectd.org>
Date: Thu Apr 11 08:38:21 2013 -0700
collectd.conf(5): netcmd plugin: Document how to enable TLS.
commit a98f70ac442def974c94925116255b65e0b7605f
Author: Florian Forster <octo at collectd.org>
Date: Thu Apr 11 08:37:51 2013 -0700
netcmd plugin: Use cf_util_get_service() to handle the "Port" option.
commit 84dfdb5ab214542516cf2260a1b886be366c4bc7
Merge: 1c96b78 24f69e4
Author: Florian Forster <octo at collectd.org>
Date: Thu Apr 11 08:24:15 2013 -0700
Merge branch 'master' into ff/netcmd
commit 24f69e4d1d6d41c049561431e01c937772b95ba6
Author: Florian Forster <octo at collectd.org>
Date: Thu Apr 11 08:09:11 2013 -0700
snmp plugin: Removed "mixed delaration".
This should fix this warning Fabien Wernli reported:
snmp.c:1381: warning: ISO C90 forbids mixed declarations and code
commit e7bac61d99d3c5e13962c9e697a1bb734f910451
Author: Florian Forster <octo at collectd.org>
Date: Wed Apr 10 17:38:48 2013 +0200
src/Makefile.am: Really don't distribute *.pb-c.[ch].
commit 455309ed2ae4872633e03fbcb620016f5ba3d2b5
Author: Florian Forster <octo at collectd.org>
Date: Wed Apr 10 16:54:27 2013 +0200
src/Makefile.am: Add *.proto to EXTRA_DIST. D'oh!
commit 24f1130f1cce3c23aef00279dd30516dc82a4669
Author: Florian Forster <octo at collectd.org>
Date: Wed Apr 10 16:46:14 2013 +0200
Build system: Don't ship the generated *.pb-c.[ch] files.
They depend on specific versions of the protobuf-c.h header file, so
shipping this will cause problems for people having a different version
of protoc-c installed. This reverts some of the work done in #269, but
distcheck should still work. Meh.
commit f0f69df46f36d78a8e01e76d6843f03df3ba0519
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Wed Apr 10 14:39:13 2013 +0200
RedHat RPM spec: updated for 5.3.0
Signed-off-by: Florian Forster <octo at collectd.org>
commit b8ae524a25614fc2ddf4ce85e6afa7809e8074f4
Author: Florian Forster <octo at collectd.org>
Date: Wed Apr 10 04:33:23 2013 +0200
configure.in: Fix libgcrypt flags on FreeBSD.
On FreeBSD, AM_PATH_LIBGCRYPT sets LIBGCRYPT_CFLAGS but not
LIBGCRYPT_CPPFLAGS. Use both variables to be on the save side.
commit 022e67641dff6d4de7de5815a66298ade3c539a6
Author: Florian Forster <octo at collectd.org>
Date: Tue Apr 9 19:08:59 2013 -0700
Bump version to 5.3.0; Update ChangeLog.
commit d11c1f68458465f1c9dcfd0396704b7fba7d5804
Merge: 33fdd7d 424841e
Author: Florian Forster <octo at collectd.org>
Date: Tue Apr 9 18:44:29 2013 -0700
Merge branch 'collectd-5.2'
commit 424841e452e65ab2f470b2553d425cfed9b42b64
Author: Florian Forster <octo at collectd.org>
Date: Mon Apr 8 17:59:28 2013 -0700
Bump version to 5.2.2; Update ChangeLog.
commit 7d5c193fce64d04cee72619c0b54d624d5011e35
Merge: 842c1a2 3b16869
Author: Florian Forster <octo at collectd.org>
Date: Mon Apr 8 17:55:06 2013 -0700
Merge branch 'collectd-5.1' into collectd-5.2
Conflicts:
ChangeLog
version-gen.sh
commit 3b168699841135aa3e6d02eec0eb548cba8880d5
Author: Florian Forster <octo at collectd.org>
Date: Mon Apr 8 17:54:19 2013 -0700
Bump version to 5.1.3; Update ChangeLog.
commit 32e0d9078b73eeb889b9a1e62be72ded48d33d7d
Merge: 86d3fe4 d4fcd06
Author: Florian Forster <octo at collectd.org>
Date: Mon Apr 8 17:44:55 2013 -0700
Merge remote-tracking branch 'origin/collectd-4.10' into collectd-5.1
Conflicts:
ChangeLog
version-gen.sh
commit d4fcd06107c3c3b0cfcbc8a5014f60d874509b76
Author: Florian Forster <octo at collectd.org>
Date: Sun Apr 7 20:45:10 2013 +0200
Bump version to 4.10.9; Update ChangeLog.
commit 33fdd7d22e7e122c337b0092d3c8d26e5f3caa70
Author: Florian Forster <octo at collectd.org>
Date: Sun Apr 7 19:26:13 2013 +0200
netapp plugin: Fix the interval used by the SnapVault and quota metrics.
Additional fix for Github issue #288.
commit 77a69360da55e89f2ede7b5c8942703221bfde9a
Merge: 1e317eb 842c1a2
Author: Florian Forster <octo at collectd.org>
Date: Sun Apr 7 19:23:40 2013 +0200
Merge branch 'collectd-5.2'
commit 842c1a2d2a640151a89b9de7f4acd3b6a058c799
Merge: 5efcb2f 86d3fe4
Author: Florian Forster <octo at collectd.org>
Date: Sun Apr 7 19:23:27 2013 +0200
Merge branch 'collectd-5.1' into collectd-5.2
commit 86d3fe407e7a9553709304a88c0b7ab1f8c0e4d9
Merge: 0819379 fcdef56
Author: Florian Forster <octo at collectd.org>
Date: Sun Apr 7 19:20:14 2013 +0200
Merge branch 'jk/snmp' into collectd-5.1
commit 1e317eba1b4f4732adc2bd6a43ee719998910e70
Author: Florian Forster <octo at collectd.org>
Date: Sun Apr 7 17:45:47 2013 +0200
write_riemann plugin: Reorder the functions to get rid or prototypes.
commit 941e316054ad263dea2a0cc2e84a07d4c8d51da6
Author: Florian Forster <octo at collectd.org>
Date: Sun Apr 7 07:10:20 2013 +0200
write_riemann plugin: Use the "Attributes" of an Event rather than abuse the "Tags".
Riemann 0.2.0 provides "Attributes", which are key-value pairs. Since
the plugin previously basically abused the tag system for adding this
kind of data, switch to the new and shiny thing :)
commit 198f18fd8c9c0cd04c653f034277ec1669122f68
Author: Florian Forster <octo at collectd.org>
Date: Sun Apr 7 07:08:47 2013 +0200
src/riemann.proto: Import the protocol buffer for Riemann 0.2.0.
commit 081937982256f1f1ecbcff36a76422b05058a832
Merge: 9cbc0fe d3868c0
Author: Florian Forster <octo at collectd.org>
Date: Sun Apr 7 06:21:42 2013 +0200
Merge remote-tracking branch 'github-octo/ff/netapp' into collectd-5.1
commit 47b7950c0bd0ae0b3823b8bfc4442d6a5dad36c5
Merge: 2ca216c 5efcb2f
Author: Florian Forster <octo at collectd.org>
Date: Sun Apr 7 06:17:49 2013 +0200
Merge branch 'collectd-5.2'
commit 5efcb2fe5ca723225e4100314a8668d8abc9424a
Merge: 5ac466c 9cbc0fe
Author: Florian Forster <octo at collectd.org>
Date: Sun Apr 7 05:54:24 2013 +0200
Merge branch 'collectd-5.1' into collectd-5.2
Conflicts:
configure.in
commit 9cbc0fe63abd2bd3658b42f19ee144f803b658fa
Merge: d21cf7f 0ec776a
Author: Florian Forster <octo at collectd.org>
Date: Sun Apr 7 05:44:38 2013 +0200
Merge branch 'collectd-4.10' into collectd-5.1
Conflicts:
configure.in
src/mysql.c
src/network.c
src/thermal.c
commit 2ca216cdb1448df90add943702f0af9ba1bcd0c5
Author: Florian Forster <octo at collectd.org>
Date: Sat Apr 6 12:29:07 2013 -0700
.gitignore: Add src/*.pb-c.[ch]
commit 418f91fb7fef4815f12dea465adf161a2d548a58
Author: Florian Forster <octo at collectd.org>
Date: Sat Apr 6 12:26:50 2013 -0700
configure.in: Fix dependency of the pinba and write_riemann plugins.
Since the generated *.pb-c.[ch] files are now included in the
distribution, they only depend on the <google/protobuf-c/protobuf-c.h>
header file, not the protobuf compiler.
commit 743dc15efbfebc5a3feefff14dcec03236fb3cb0
Author: Florian Forster <octo at collectd.org>
Date: Sat Apr 6 12:25:26 2013 -0700
src/Makefile.am: Move *.pb-c.[ch] to MAINTAINERCLEANFILES.
Only generate build rules for these files if protoc-c is available and
use the provided files from the distribution if it is not.
commit 0f9c7ce19f32c64ae54f0132763d9f38cf57b5b1
Author: Yves Mettier <ymettier at free.fr>
Date: Sat Apr 6 11:14:27 2013 -0700
src/Makefile.am: Include .c and .h files generated from Protocol Buffers in the distribution.
Fixes Github issue #269.
Signed-off-by: Florian Forster <octo at collectd.org>
commit 5ac466c7515653ad6c931116643c31f51dabba2e
Author: Sebastian Harl <sh at tokkee.org>
Date: Tue Nov 20 14:56:45 2012 +0100
bindings/Makefile: Hint the user at --with-perl-bindings.
… in case 'perl Makefile.PL' fails.
Fixes Github issue #290.
Signed-off-by: Florian Forster <octo at collectd.org>
commit 6c769cf76d74ac758252062668ff07037eb421f1
Author: Sebastian Harl <sh at tokkee.org>
Date: Tue Nov 20 14:44:43 2012 +0100
build system (Perl bindings): Make Makefile.PL's PREFIX/INSTALL_BASE optional.
Both options may cause problems:
- PREFIX might clash with INSTALL_BASE being set in $PERL_MM_OPT.
- INSTALL_BASE without any further options set will install into non-standard
directories in many cases.
Rather, use PREFIX=${prefix} as default but overwrite that if
--with-perl-bindings=... has been used.
Thanks to faxm0dem for reporting the INSTALL_BASE problems on IRC and
bvarner and nirik for reporting this in GH #177 and #196.
This is a follow-up / fix for 97e8f346a88eccf4d1608c21d5cc6ee9620c1c41.
Fixes Github issue #290.
Signed-off-by: Florian Forster <octo at collectd.org>
commit 0ec776abf45ef3989f38d966e74b588f9ef15ebe
Author: Florian Forster <octo at collectd.org>
Date: Sat Apr 6 18:23:16 2013 +0200
network plugin: Make sure gcrypt is initialized before using any of its functions.
@marekbecka found that sockent_open() is called during the configuration
phase, but gcrypt is initialized later, during the initialization phase.
This patch will initialize gcrypt in sockent_open() if any sockets with
security are configured.
Fixes Github issue #273.
commit 5680622ee9d70a9df30564a34e0cc01afcf0d05b
Author: Dave Cottlehuber <dch at jsonified.com>
Date: Thu Feb 7 01:38:07 2013 +0100
Don't clobber TMPDIR during Java detection
- Java detection used TMPDIR as var to parse command output
- TMPDIR is used in libltdl later on in ./configure
- alternative fix is local var or subshell
- fixes issue introduced via #33163ee
Conflicts:
configure.in
Signed-off-by: Florian Forster <octo at collectd.org>
commit d21cf7f8376b6ce5dd3bbeb41da3aff0e85c6e28
Author: Manuel CISSÉ <manuel_cisse at yahoo.fr>
Date: Fri Feb 15 11:03:00 2013 +0100
notify_email: Add charset in Content-Type header (seems required by some picky spam filters)
Signed-off-by: Florian Forster <octo at collectd.org>
commit 8a09193a175fc6fc4ebb1e828ae10bdd97a5f571
Author: Florian Forster <octo at collectd.org>
Date: Fri Apr 5 07:31:35 2013 +0200
configure.in: Check for protobuf-c.h.
Thanks to Yves Mettier pointing this out in #269 and for providing an
initial patch.
commit d3868c02ee3a1140b0da620088db5664cf798be9
Author: Florian Forster <octo at collectd.org>
Date: Thu Apr 4 17:32:36 2013 -0700
netapp plugin: Fix intervals used when dispatching values.
It used to use the interval of the <Host /> block when in fact it should
have used the interval of the data blocks.
Fixes Github issue #288.
commit fcdef5642be518d6115583c65b0582e3d9d8d65b
Author: Florian Forster <octo at collectd.org>
Date: Tue Apr 2 19:20:17 2013 -0700
snmp plugin: Fix compilation issue.
Thanks to Magnus for pointing this out.
commit 73b6265b03bc2dcff8c5d96f909b390dffb12a01
Author: Florian Forster <octo at collectd.org>
Date: Mon Apr 1 16:54:45 2013 +0200
nfs plugin: Copy the name before calling the non-const lookup function.
Fixes Github issue #70. Thanks to Jeff for reporting this issue.
commit df58a0a6b68ae55e9888455d30424e86b787c802
Author: Florian Forster <octo at collectd.org>
Date: Mon Apr 1 16:38:08 2013 +0200
rrdcached plugin: Connect to the daemon in the read() callback.
Fixes Github issue #275. Thanks to Yves Mettier for reporting this bug!
commit 912c9b3f7c4a57fbf9ddd16db13d2651932ddb65
Merge: f522f21 e0552af
Author: Florian Forster <octo at collectd.org>
Date: Fri Mar 29 13:30:21 2013 -0700
Merge branch 'collectd-5.1' into collectd-5.2
commit f522f2111990f89c09507aa867ad63bbc44d9b7a
Author: gkos <danielhilst at gmail.com>
Date: Wed Mar 13 13:19:04 2013 -0300
src/libcollectdclient/network_buffer.c check for htonll exitence
before defining it. I have to to this to get it compiled on AIX6
Signed-off-by: Florian Forster <octo at collectd.org>
commit 33bda9d4afd99d74566b84b735585f8038af852e
Author: Florian Forster <octo at collectd.org>
Date: Fri Mar 29 12:50:23 2013 -0700
snmp plugin: Allocate "oid_list" on the stack.
commit cdb488b994519d3392f35ec65ac9525d06b8a204
Author: Florian Forster <octo at collectd.org>
Date: Fri Mar 29 12:49:28 2013 -0700
snmp plugin: Some coding style fixes.
* Rename "oid_todo_list" to "oid_list_todo".
* Rename "j" to "oid_list_todo_num".
* Fix indentation.
* Declare variables at beginning of block.
commit 080f01b95a5f6006438e2ffee6ae3d093263d148
Author: jkrabbe <jkrabbe at rot13.de>
Date: Tue Mar 26 15:25:02 2013 +0100
csnmp_read_table: Change GETNEXT request behaviour (+ bugfix 235)
This patch changes the snmp GETNEXT request behaviour implemented in snmp.c.
The old implementation requested all OIDs using GETNEXT requests until all OIDs
left their own subtree. In cases were trees in a Data template are much longer
than other trees the shorter subtrees were re-requested over and over again.
The new implementation will only request OIDs that did not already leave their
subtrees (see the oid_todo_list implementation for details). This renders the
function csnmp_check_res_left_subtree useless as the oid_todo_list keeps track
if all OIDs have finished.
During tests against Cat6500 (CatOS/IOS) as well as Nexus5k (NX-OS) it looks as
though GETNEXT requests (when requesting multiple OIDs like all 14 dot3Stats
errors from Etherlike-MIB) can take about 5-10ms (CatOS 30ms) longer if they wrap
to the next OID.
This does not sound much but when collecting data for the Etherlike-MIB (that only
has entries for physical interfaces) with a collectd "Instance" variable in IF-MIB
(that has entries for all physical as well as pseudo [SVIs, VLANs, ...] interfaces)
this can make a notable difference (e.g. for core routers that have all SVIs and
VLANs but only some switches attached):
IOS-Core-Router ifName 550 entries
dot3StatsFCSErrors 70 entries
------------
480 entries * 10ms = 4.8s overhead
CatOS-Access-Sw. ifName 840 entries
dot3StatsFCSErrors 490 entries
------------
350 entries * 30ms = 10.5s overhead
After refactoring csnmp_read_table "Instance" and "Value" OIDs are now handled
consistently (so no pointer-forward foo needed). It doesn't change any logic
and data structures, though - so there should not be any impact to other
functions.
The refactored code also fixes GitHub bugs #235 and #258. This bug is due to
reusing the status variable in following code section which might lead to errors
if the subtrees are of different length:
1436 /* Calculate the current suffix. This is later used to check that the
1437 * suffix is increasing. This also checks if we left the subtree */
1438 status = csnmp_oid_suffix (&suffix, &vb_name, data->values + i);
Signed-off-by: Florian Forster <octo at collectd.org>
commit e0552af6e56d23a027b9fdb226ee6d8217dcb36a
Author: Florian Forster <octo at collectd.org>
Date: Fri Mar 29 06:43:39 2013 -0700
configure.in: Yet another attempt at fixing the mess that is AC_LANG_PROGRAM().
commit 7df90f7adea4acfddcc10a3b671130aae81265ae
Author: Markus Knetschke <markus.knetschke at gmail.com>
Date: Sun Dec 23 11:50:22 2012 +0100
thermal plugin: set the hostname
Signed-off-by: Markus Knetschke <markus.knetschke at gmail.com>
Signed-off-by: Florian Forster <octo at collectd.org>
commit d2c70797b18c2b532119b1264841f551e013dcad
Author: Markus Knetschke <markus.knetschke at gmail.com>
Date: Sun Dec 23 11:02:42 2012 +0100
thermal plugin: fixed value submitting
Signed-off-by: Markus Knetschke <markus.knetschke at gmail.com>
Signed-off-by: Florian Forster <octo at collectd.org>
commit ecdfcecbc70b51de12ed695fbace42e6076473c1
Author: Tommie Gannert <tommie at spotify.com>
Date: Thu Mar 7 09:10:03 2013 +0100
Allow parsing plugin_instance in parse_option().
isalnum() is not enough to catch the underscore.
Signed-off-by: Florian Forster <octo at collectd.org>
commit dee89f856ffba3fcfccf530cd98f4d515bb46728
Author: Florian Forster <octo at collectd.org>
Date: Mon Mar 25 07:28:36 2013 +0100
mysql plugin: Call mysql_init() only once.
Apparently, if you call it with a structure allocated by mysql_init()
itself, it leaks memory. Thanks to Yves Mettier for pointing this out!
Fixes Github issue #274.
commit 01a4d0ac2dec01b668a6cb80136a166ec8548a97
Author: Florian Forster <octo at collectd.org>
Date: Thu Feb 21 11:18:53 2013 +0100
configure.in: Fix quoting of AC_LANG_PROGRAM().
Autoconf 2.68 complains about that and aborts building the configure
script. *sigh*
commit 639cdb38830b206598d99bd22898adcdba2877a3
Author: Florian Forster <octo at collectd.org>
Date: Sun Mar 24 14:21:27 2013 +0100
rrdtool plugin: Use cdrand_range() for the random variation.
commit bb65913ad6d4145c4c452882b03883206033b03a
Author: Florian Forster <octo at collectd.org>
Date: Sun Mar 24 14:15:16 2013 +0100
src/utils_random.[ch]: Provide thread-safe random numbers.
commit 391ae7a50c94a3f560dcbfb8af7bca3903da84f8
Author: Florian Forster <octo at collectd.org>
Date: Sat Mar 23 18:07:03 2013 +0100
write_mongodb plugin: Add authentication options.
Fixes Github issue #282.
commit 3665b5d2b5c6c3ab34ef729f27f6e1fca741a6c2
Author: Greg Mason <gmason at msu.edu>
Date: Thu Mar 14 15:21:33 2013 -0400
Increase MAX_NUMDISKS
On large systems (particularly ZFS systems using large JBODs), it's
quite possible to have more than 256 disks.
Signed-off-by: Florian Forster <octo at collectd.org>
commit 357a7a8a2d392d2ede198ef8f5e99515306eab30
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Thu Mar 7 09:18:04 2013 +0100
respect riemann's terminology
Signed-off-by: Florian Forster <octo at collectd.org>
commit a38c24034ce1831ebfaa41ca6231bb15e17086a7
Author: Dan Fandrich <dan at coneharvesters.com>
Date: Mon Mar 18 23:17:16 2013 +0100
Get rid of a compiler warning with gcc 4.6.3
...a futile warning that nevertheless kills the build thanks
to -Werror: "variable 'status' set but not used"
Signed-off-by: Florian Forster <octo at collectd.org>
commit 094bea135e8932101e889ed9ed0965c9067a1db5
Author: Dan Fandrich <dan at coneharvesters.com>
Date: Thu Mar 21 22:19:48 2013 +0100
curl_xml plugin: Fixed typo in documentation
Signed-off-by: Florian Forster <octo at collectd.org>
commit 632e1074beb71748f866087bcdf9b0ba1b1d2405
Merge: 9de567a 21b429b
Author: Florian Forster <octo at collectd.org>
Date: Sat Mar 23 10:13:02 2013 +0100
Merge branch 'collectd-5.2'
Conflicts:
configure.in
commit 21b429b6b5ecd2f9820d9a2516c12577a0e59d19
Merge: 3b51243 ef3e165
Author: Florian Forster <octo at collectd.org>
Date: Sat Mar 23 10:01:19 2013 +0100
Merge branch 'collectd-5.1' into collectd-5.2
commit 9de567ab3fd0725ce08f0581b6374518e1220e7e
Merge: 044cb79 3da36d6
Author: Florian Forster <octo at collectd.org>
Date: Sat Mar 23 09:54:39 2013 +0100
Merge branch 'kn/snort'
commit 044cb79594f94632eedf24a7bbfb8e645691a6d3
Author: Florian Forster <octo at collectd.org>
Date: Sat Mar 23 09:53:28 2013 +0100
src/plugin.c: Assert that "data_sets" is non-NULL.
Otherwise we might run into an assertion in the AVL tree. This can be
triggered e.g. when calling plugin_get_ds() from within a config
callback.
commit 3da36d67b99b4bcfd124c5c1d0877307ce7d8c24
Author: Florian Forster <octo at collectd.org>
Date: Sat Mar 23 09:27:24 2013 +0100
tail_csv plugin: Implement the "TimeFrom" option.
commit 92b0dd636352e8f8e2cbdd8dc33a523e010d63f7
Author: Florian Forster <octo at collectd.org>
Date: Sat Mar 23 08:57:43 2013 +0100
tail_csv plugin: Rename the "Index" option to "ValueFrom".
commit c842ed2091ed748da35295856d5c4a1042291a17
Author: Florian Forster <octo at collectd.org>
Date: Sat Mar 23 08:47:02 2013 +0100
tail_csv plugin: Some bug fixes.
* Query types in the init-phase rather than the config-phase. The
types.db is not guaranteed to be available at that time.
* Make sure the "Instance" option in the <File /> blocks is optional.
commit 344be4992285313e8855c8114993b692ae08775e
Merge: 5b7a7ff b58ab61
Author: Florian Forster <octo at collectd.org>
Date: Fri Mar 22 23:05:08 2013 +0100
Merge branch 'jw/libvirt'
commit 5e136b4d9ab110b0a23e48404ca00374063c0184
Author: Florian Forster <octo at collectd.org>
Date: Fri Mar 22 22:57:43 2013 +0100
tail_csv plugin: Rename "Instance" blocks to "File".
This way the syntax of tail_csv's configuration is closer to that of the
csv plugin.
commit 88ed4433eaa37f5859420cc41487ec5ee080d477
Author: Florian Forster <octo at collectd.org>
Date: Fri Mar 22 22:21:57 2013 +0100
tail_csv plugin: Rename the "snort" plugin to "tail_csv".
It's actually much more generic than just Snort, so give it an
appropriately generic name.
commit ef3e165050891997ae1564a58ea1992d1d77dd2b
Author: Florian Forster <octo at collectd.org>
Date: Fri Mar 22 21:55:02 2013 +0100
configure.in: Quote AC_LANG_PROGRAM and remove AC_INCLUDES_DEFAULT.
The latter isn't expanded anymore when quoted. There's no easy way
around this :\
commit b58ab618148b3bad82eead8e69e5fad2f40e1ab0
Author: Johan Wirén <johan.wiren.se at gmail.com>
Date: Mon Mar 18 23:55:39 2013 +0100
Added instance type "total"
commit 7bf99b36d8ed91472a7f0491baaad9d4e579500a
Author: Johan Wirén <johan.wiren.se at gmail.com>
Date: Mon Mar 18 22:56:55 2013 +0100
Reports memory allocation in bytes, not kilobytes.
commit 571adf14833c5425a80cd2e33790daee1c0735d5
Author: Johan Wirén <johan.wiren.se at gmail.com>
Date: Mon Mar 18 22:49:32 2013 +0100
Applied the suggested changes.
commit 5b7a7ff99f191d419cf19df001b81d123c93783f
Author: Florian Forster <octo at collectd.org>
Date: Sun Mar 17 15:50:16 2013 +0100
uuid plugin: Improve parsing of the dmidecode output.
The entire business of dividing by sizeof(char) only made the code
unreadable, because by specification sizeof(char) evaluates to 1. The
defines were expanded and the parsing is now less sensitive to
formatting changes in the dmidecode output. Module global variables have
been moved to the top.
Fixes Github issue #267 in the process.
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 b81ed4b28b408db3198e11a3c4e0efbcc757cc5f
Author: Dan Fandrich <dan at coneharvesters.com>
Date: Sun Mar 3 00:24:48 2013 +0100
src/filter_chain.c: Fixed typos in error messages
Signed-off-by: Florian Forster <octo at collectd.org>
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 2eb4e445aaa65f27833ec446175955b28e099a18
Author: Florian Forster <octo at collectd.org>
Date: Wed Mar 6 08:15:35 2013 +0100
snort plugin: Replace the mmap() code with the tail-code from collectd.
This makes following along a file more I/O friendly, I hope. Also, we
don't need to do quite as much buffer processing because lines are
already split for us. Also, in the unlikely case that Snort is writing
the stats file more often than collectd reads it, this will pick up all
intermediate values.
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 99fa51782d5f407e3587d00f8335feee2e0a669b
Author: Florian Forster <octo at collectd.org>
Date: Wed Feb 27 08:18:21 2013 +0100
AUTHORS, README: Add Kris and the snort plugin.
commit eb713c1a6b98e996dc4d539afb5cdace07c2c88a
Author: Florian Forster <octo at collectd.org>
Date: Wed Feb 27 08:17:54 2013 +0100
collectd.conf(5): Add information about the snort plugin.
commit 47f1214f85d7c9ea199f17d976dada4b49e328ce
Author: Florian Forster <octo at collectd.org>
Date: Tue Feb 26 07:42:21 2013 +0100
snort plugin: Free md->instance in snort_metric_definition_destroy().
commit 055c714460257cd2b09f7d23aea4a300abe809ab
Author: Johan Wirén <johan.wiren.se at gmail.com>
Date: Wed Feb 6 23:37:00 2013 +0100
libvirt: Added support for memory allocation
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 67100d8b7cba7fd8da8966f9f24940a216c66da7
Author: Florian Forster <octo at collectd.org>
Date: Wed Feb 20 14:36:15 2013 +0100
snort plugin: Implement the "Instance" config option.
commit b4d7785d1c3d8ee532a8e955cf534801fa1093c2
Author: Florian Forster <octo at collectd.org>
Date: Wed Feb 20 09:31:12 2013 +0100
snort plugin: Assert that the configured "type" has only one data source.
Also uses the utility function from configfile.h to read the metric
definition's name.
commit 53d05e8592dc3277c88df320c26302c24c918c5b
Author: Florian Forster <octo at collectd.org>
Date: Wed Feb 20 09:14:15 2013 +0100
snort plugin: Split the snort_read() function.
snort_read() handles the file opening / mmap part of the process.
snort_read_buffer() parses the buffer, splits the last line and calls
the submit function. This way cleaning up the FD and memory mapping is
easier in case of an error when parsing the file.
commit c97c8756a28969fea924a80bfc42c989dcd20ced
Author: Florian Forster <octo at collectd.org>
Date: Wed Feb 20 09:06:39 2013 +0100
snort plugin: Improve error handling.
This prevents file descriptors and memory from leaking if something goes
wrong, e.g. the last line in the file is a comment.
commit d0d845e6e44cf123de6647bc095862ebe4b4feb3
Author: Florian Forster <octo at collectd.org>
Date: Wed Feb 20 08:54:46 2013 +0100
snort plugin: Replace strsep() (a BSD extension).
commit 40b7e63a847baa4b11cdab40747a466946c91928
Author: Florian Forster <octo at collectd.org>
Date: Wed Feb 20 08:47:51 2013 +0100
snort plugin: Add a bounady check when reading from the metrics array.
Also renamed "count" to "metrics_num" to make it clear that the two
relate to one another.
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 5f4cf918e4952271849943d3b6546cb0c1be4635
Author: Kris Nielander <krisnielander at gmail.com>
Date: Tue Feb 19 23:36:14 2013 +0100
Updated configuration directives.
--
commit 56d9d18e1741661f7ef8870022387a02220ac8ce
Author: Kris Nielander <krisnielander at gmail.com>
Date: Mon Feb 18 23:17:42 2013 +0100
Requested changes committed.
commit 8475240ad74e29bb52363509659663d856b3894f
Author: Kris Nielander <krisnielander at gmail.com>
Date: Thu Feb 14 22:45:07 2013 +0100
Requested changes applied.
--
commit 08aff19113c75def38df69a8e84a224efc484bdf
Author: Kris Nielander <krisnielander at gmail.com>
Date: Sun Feb 10 14:41:06 2013 +0100
snort plugin added
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