collectd.git
10 years agoAttempt to fix collectd/collectd#229 by doing user / group lookups before we fork. collectd-5.2
Ceri Storey [Wed, 14 Aug 2013 15:56:24 +0000 (16:56 +0100)]
Attempt to fix collectd/collectd#229 by doing user / group lookups before we fork.

Signed-off-by: Florian Forster <octo@collectd.org>
10 years agomemcached plugin: actually connect when using a unix socket
Jim Radford [Wed, 7 Aug 2013 20:05:47 +0000 (13:05 -0700)]
memcached plugin: actually connect when using a unix socket

Signed-off-by: Florian Forster <octo@collectd.org>
10 years agocsv plugin: set datadir null when free
Manuel Luis Sanmartin Rozada [Tue, 6 Aug 2013 10:30:52 +0000 (12:30 +0200)]
csv plugin: set datadir null when free

If you define twice DataDir:

    <Plugin csv>
DataDir "/opt/collectd/var/lib/collectd/csv"
DataDir stdout
    </Plugin>

the second time datadir will not be null and
you will get garbage in value_list_to_filename

Signed-off-by: Florian Forster <octo@collectd.org>
10 years agocsv plugin: fix forgotten "datadir" in re-implement value_list_to_filename()
Manuel Luis Sanmartin Rozada [Mon, 5 Aug 2013 23:05:01 +0000 (01:05 +0200)]
csv plugin: fix forgotten "datadir" in re-implement value_list_to_filename()

In the commit 7f90e30 the re-implementation of value_list_to_filename
forgot to prepend the datadir string.

Signed-off-by: Florian Forster <octo@collectd.org>
10 years agorrdcached, rrdtool plugins: Add directory separator after datadir.
Florian Forster [Wed, 24 Jul 2013 13:36:00 +0000 (15:36 +0200)]
rrdcached, rrdtool plugins: Add directory separator after datadir.

D'oh! Thanks to @rcpoison for pointing this out!

Github: #380

10 years agorrdcached, rrdtool plugins: Honor the "DataDir" setting.
Florian Forster [Wed, 24 Jul 2013 12:12:53 +0000 (14:12 +0200)]
rrdcached, rrdtool plugins: Honor the "DataDir" setting.

This fixes a regression introduced in:
bfd3f06ef4996707036756371c5724ebf2748821

Github: #380

10 years agolpar: make dots in configure.in consistent with other plugins
Marc Fournier [Mon, 15 Jul 2013 09:52:31 +0000 (11:52 +0200)]
lpar: make dots in configure.in consistent with other plugins

10 years agosrc/plugin.c: Free the "data_sets" AVL tree.
Florian Forster [Sat, 13 Jul 2013 06:20:28 +0000 (08:20 +0200)]
src/plugin.c: Free the "data_sets" AVL tree.

This pops up every time I investigate memory leaks and it's annoying me.

10 years agowrite_graphite plugin: Don't call close() on invalid file descriptors.
Florian Forster [Sat, 13 Jul 2013 05:46:20 +0000 (07:46 +0200)]
write_graphite plugin: Don't call close() on invalid file descriptors.

10 years agowrite_graphite plugin: Don't call close() on invalid file descriptors.
Florian Forster [Sat, 13 Jul 2013 05:42:18 +0000 (07:42 +0200)]
write_graphite plugin: Don't call close() on invalid file descriptors.

10 years agowrite_graphite plugin: Actually check the return value of wg_send_message().
Florian Forster [Sat, 13 Jul 2013 05:38:05 +0000 (07:38 +0200)]
write_graphite plugin: Actually check the return value of wg_send_message().

Assignment to "status" was missing.

10 years agorrdtool, rrdcached plugins: Re-implement value_list_to_filename().
Florian Forster [Fri, 12 Jul 2013 16:19:29 +0000 (18:19 +0200)]
rrdtool, rrdcached plugins: Re-implement value_list_to_filename().

Faster version without snprintf().

10 years agocsv plugin: Re-implement value_list_to_filename().
Florian Forster [Fri, 12 Jul 2013 16:17:19 +0000 (18:17 +0200)]
csv plugin: Re-implement value_list_to_filename().

The new implementation is faster, because it doesn't use snprintf().

10 years agosrc/common.c: Reimplement format_name for performance.
Florian Forster [Thu, 11 Jul 2013 15:58:37 +0000 (17:58 +0200)]
src/common.c: Reimplement format_name for performance.

This is used from uc_update(), i.e. for every value list dispatched, and was
one of the most expensive functions thanks to snprintf().

This reduces total time spent in the format_name() function from 7.78% to 1.89%
during a network stress test.

10 years agocollectd-threshold(5): Correct the description of the "Interesting" config option.
Florian Forster [Tue, 18 Jun 2013 15:25:46 +0000 (17:25 +0200)]
collectd-threshold(5): Correct the description of the "Interesting" config option.

10 years agothreshold plugin: Fix the "Interesting" configuration option.
Björn [Tue, 18 Jun 2013 14:43:46 +0000 (16:43 +0200)]
threshold plugin: Fix the "Interesting" configuration option.

Signed-off-by: Florian Forster <octo@collectd.org>
10 years agoUnbreak type_inst value in collectd psql view.
Bernd Ahlers [Mon, 10 Jun 2013 13:48:14 +0000 (15:48 +0200)]
Unbreak type_inst value in collectd psql view.

Signed-off-by: Florian Forster <octo@collectd.org>
10 years agosrc/configfile.c: Let errors in included files propagate up to cf_read().
Florian Forster [Thu, 30 May 2013 06:58:06 +0000 (08:58 +0200)]
src/configfile.c: Let errors in included files propagate up to cf_read().

cf_read_generic() returned NULL in two cases: Unable to read file and
file was empty. Since we wanted to allow empty includes, the "include
file with errors" case was not handled properly.

Github: #323

10 years agoMerge branch 'collectd-4.10' into collectd-5.2
Florian Forster [Thu, 30 May 2013 06:10:42 +0000 (08:10 +0200)]
Merge branch 'collectd-4.10' into collectd-5.2

10 years agoDon't notify continuously when MySQL slave SQL thread is running
Joaquín Cuenca Abela [Wed, 29 May 2013 14:22:09 +0000 (16:22 +0200)]
Don't notify continuously when MySQL slave SQL thread is running

Signed-off-by: Florian Forster <octo@collectd.org>
10 years agoAdd "=encoding" header to all manual pages.
Florian Forster [Wed, 29 May 2013 07:26:28 +0000 (09:26 +0200)]
Add "=encoding" header to all manual pages.

http://bugs.debian.org/708718

10 years agoexec plugin: Document that defaulting to PUTVAL is no longer done
Dan Fandrich [Tue, 14 May 2013 21:58:40 +0000 (23:58 +0200)]
exec plugin: Document that defaulting to PUTVAL is no longer done

Signed-off-by: Florian Forster <octo@collectd.org>
10 years agoMerge branch 'document-varnish-instance-block' into collectd-5.2
Florian Forster [Sat, 25 May 2013 18:15:59 +0000 (20:15 +0200)]
Merge branch 'document-varnish-instance-block' into collectd-5.2

10 years agomodbus plugin: Refactor the new reconnection code.
Florian Forster [Sat, 25 May 2013 09:15:29 +0000 (11:15 +0200)]
modbus plugin: Refactor the new reconnection code.

Avoid the goto() and switch() statements.

Github: #294

10 years agoCleanup modbus connection if wrong result
Fabien Wernli [Tue, 15 May 2012 11:59:10 +0000 (13:59 +0200)]
Cleanup modbus connection if wrong result

Change-Id: I1b7520442d7663d5bc2529369e27e3e858fe2168
Signed-off-by: Florian Forster <octo@collectd.org>
10 years agoFix modbus segfault / New strategy for connecting
Stefan Nickl [Sat, 28 Jan 2012 18:21:10 +0000 (19:21 +0100)]
Fix modbus segfault / New strategy for connecting

The previous implementation had a reconnection loop which should not
really be necessary. Idea tried here is to check if connection is alive,
and establish it if not. Change was begun because previously connection
would only be attempted as a retry, so on first pass a NULL was handed to
libmodbus which caused segmentation faults reproducibly.

Signed-off-by: Florian Forster <octo@collectd.org>
10 years agovarnish: hint about missing <Instance> block
Marc Fournier [Fri, 17 May 2013 11:13:43 +0000 (13:13 +0200)]
varnish: hint about missing <Instance> block

The warning when the Collect* configuration options where used outside
of an <Instance> block was confusing. This patch warns the user the same
way the apache plugin does.

10 years agoImprove varnish section in manpage.
Marc Fournier [Fri, 17 May 2013 10:54:16 +0000 (12:54 +0200)]
Improve varnish section in manpage.

There previously was no mention of the mandatory <Instance> block.

10 years agodns plugin: Sleep for an interval before re-trying to read from interface.
Florian Forster [Fri, 26 Apr 2013 12:16:38 +0000 (14:16 +0200)]
dns plugin: Sleep for an interval before re-trying to read from interface.

Otherwise we'd just have the CPU hogging behavior shifted from libpcap
to collectd …

Github: #308

10 years agodns plugin: Resume after receiving a PCAP_ERROR from pcap_loop().
Florian Forster [Wed, 24 Apr 2013 19:55:06 +0000 (21:55 +0200)]
dns plugin: Resume after receiving a PCAP_ERROR from pcap_loop().

If an interface goes down while capturing, libpcap returns PCAP_ERROR.
Handle this case gracefully.

Github: #308

11 years agosrc/utils_mount.h: Add <stdio.h>.
Florian Forster [Thu, 18 Apr 2013 04:25:58 +0000 (06:25 +0200)]
src/utils_mount.h: Add <stdio.h>.

This is required on Solaris 10. Thanks to dannypoo@ for reporting this
problem.

Github: #306

11 years agoRecord load averages over 100
Aman Gupta [Mon, 15 Apr 2013 09:30:02 +0000 (02:30 -0700)]
Record load averages over 100

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoBump version to 5.2.2; Update ChangeLog. collectd-5.2.2
Florian Forster [Tue, 9 Apr 2013 00:59:28 +0000 (17:59 -0700)]
Bump version to 5.2.2; Update ChangeLog.

11 years agoMerge branch 'collectd-5.1' into collectd-5.2
Florian Forster [Tue, 9 Apr 2013 00:55:06 +0000 (17:55 -0700)]
Merge branch 'collectd-5.1' into collectd-5.2

Conflicts:
ChangeLog
version-gen.sh

11 years agoBump version to 5.1.3; Update ChangeLog. collectd-5.1 collectd-5.1.3
Florian Forster [Tue, 9 Apr 2013 00:54:19 +0000 (17:54 -0700)]
Bump version to 5.1.3; Update ChangeLog.

11 years agoMerge remote-tracking branch 'origin/collectd-4.10' into collectd-5.1
Florian Forster [Tue, 9 Apr 2013 00:44:55 +0000 (17:44 -0700)]
Merge remote-tracking branch 'origin/collectd-4.10' into collectd-5.1

Conflicts:
ChangeLog
version-gen.sh

11 years agoBump version to 4.10.9; Update ChangeLog. collectd-4.10.9
Florian Forster [Sun, 7 Apr 2013 18:45:10 +0000 (20:45 +0200)]
Bump version to 4.10.9; Update ChangeLog.

11 years agoMerge branch 'collectd-5.1' into collectd-5.2
Florian Forster [Sun, 7 Apr 2013 17:23:27 +0000 (19:23 +0200)]
Merge branch 'collectd-5.1' into collectd-5.2

11 years agoMerge branch 'jk/snmp' into collectd-5.1
Florian Forster [Sun, 7 Apr 2013 17:20:14 +0000 (19:20 +0200)]
Merge branch 'jk/snmp' into collectd-5.1

11 years agoMerge remote-tracking branch 'github-octo/ff/netapp' into collectd-5.1
Florian Forster [Sun, 7 Apr 2013 04:21:42 +0000 (06:21 +0200)]
Merge remote-tracking branch 'github-octo/ff/netapp' into collectd-5.1

11 years agoMerge branch 'collectd-5.1' into collectd-5.2
Florian Forster [Sun, 7 Apr 2013 03:54:24 +0000 (05:54 +0200)]
Merge branch 'collectd-5.1' into collectd-5.2

Conflicts:
configure.in

11 years agoMerge branch 'collectd-4.10' into collectd-5.1
Florian Forster [Sun, 7 Apr 2013 03:44:38 +0000 (05:44 +0200)]
Merge branch 'collectd-4.10' into collectd-5.1

Conflicts:
configure.in
src/mysql.c
src/network.c
src/thermal.c

11 years agobindings/Makefile: Hint the user at --with-perl-bindings.
Sebastian Harl [Tue, 20 Nov 2012 13:56:45 +0000 (14:56 +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@collectd.org>
11 years agobuild system (Perl bindings): Make Makefile.PL's PREFIX/INSTALL_BASE optional.
Sebastian Harl [Tue, 20 Nov 2012 13:44:43 +0000 (14:44 +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@collectd.org>
11 years agonetwork plugin: Make sure gcrypt is initialized before using any of its functions.
Florian Forster [Sat, 6 Apr 2013 16:23:16 +0000 (18:23 +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.

11 years agoDon't clobber TMPDIR during Java detection
Dave Cottlehuber [Thu, 7 Feb 2013 00:38:07 +0000 (01:38 +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@collectd.org>
11 years agonotify_email: Add charset in Content-Type header (seems required by some picky spam...
Manuel CISSÉ [Fri, 15 Feb 2013 10:03:00 +0000 (11:03 +0100)]
notify_email: Add charset in Content-Type header (seems required by some picky spam filters)

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agonetapp plugin: Fix intervals used when dispatching values.
Florian Forster [Fri, 5 Apr 2013 00:32:36 +0000 (17:32 -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.

11 years agosnmp plugin: Fix compilation issue.
Florian Forster [Wed, 3 Apr 2013 02:20:17 +0000 (19:20 -0700)]
snmp plugin: Fix compilation issue.

Thanks to Magnus for pointing this out.

11 years agonfs plugin: Copy the name before calling the non-const lookup function.
Florian Forster [Mon, 1 Apr 2013 14:54:45 +0000 (16:54 +0200)]
nfs plugin: Copy the name before calling the non-const lookup function.

Fixes Github issue #70. Thanks to Jeff for reporting this issue.

11 years agorrdcached plugin: Connect to the daemon in the read() callback.
Florian Forster [Mon, 1 Apr 2013 14:38:08 +0000 (16:38 +0200)]
rrdcached plugin: Connect to the daemon in the read() callback.

Fixes Github issue #275. Thanks to Yves Mettier for reporting this bug!

11 years agoMerge branch 'collectd-5.1' into collectd-5.2
Florian Forster [Fri, 29 Mar 2013 20:30:21 +0000 (13:30 -0700)]
Merge branch 'collectd-5.1' into collectd-5.2

11 years agosrc/libcollectdclient/network_buffer.c check for htonll exitence
gkos [Wed, 13 Mar 2013 16:19:04 +0000 (13:19 -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@collectd.org>
11 years agosnmp plugin: Allocate "oid_list" on the stack.
Florian Forster [Fri, 29 Mar 2013 19:50:23 +0000 (12:50 -0700)]
snmp plugin: Allocate "oid_list" on the stack.

11 years agosnmp plugin: Some coding style fixes.
Florian Forster [Fri, 29 Mar 2013 19:49:28 +0000 (12:49 -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.

11 years agocsnmp_read_table: Change GETNEXT request behaviour (+ bugfix 235)
jkrabbe [Tue, 26 Mar 2013 14:25:02 +0000 (15:25 +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@collectd.org>
11 years agoconfigure.in: Yet another attempt at fixing the mess that is AC_LANG_PROGRAM().
Florian Forster [Fri, 29 Mar 2013 13:43:39 +0000 (06:43 -0700)]
configure.in: Yet another attempt at fixing the mess that is AC_LANG_PROGRAM().

11 years agothermal plugin: set the hostname
Markus Knetschke [Sun, 23 Dec 2012 10:50:22 +0000 (11:50 +0100)]
thermal plugin: set the hostname

Signed-off-by: Markus Knetschke <markus.knetschke@gmail.com>
Signed-off-by: Florian Forster <octo@collectd.org>
11 years agothermal plugin: fixed value submitting
Markus Knetschke [Sun, 23 Dec 2012 10:02:42 +0000 (11:02 +0100)]
thermal plugin: fixed value submitting

Signed-off-by: Markus Knetschke <markus.knetschke@gmail.com>
Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoAllow parsing plugin_instance in parse_option().
Tommie Gannert [Thu, 7 Mar 2013 08:10:03 +0000 (09:10 +0100)]
Allow parsing plugin_instance in parse_option().

isalnum() is not enough to catch the underscore.

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agomysql plugin: Call mysql_init() only once.
Florian Forster [Mon, 25 Mar 2013 06:28:36 +0000 (07:28 +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.

11 years agoconfigure.in: Fix quoting of AC_LANG_PROGRAM().
Florian Forster [Thu, 21 Feb 2013 10:18:53 +0000 (11:18 +0100)]
configure.in: Fix quoting of AC_LANG_PROGRAM().

Autoconf 2.68 complains about that and aborts building the configure
script. *sigh*

11 years agoMerge branch 'collectd-5.1' into collectd-5.2
Florian Forster [Sat, 23 Mar 2013 09:01:19 +0000 (10:01 +0100)]
Merge branch 'collectd-5.1' into collectd-5.2

11 years agoconfigure.in: Quote AC_LANG_PROGRAM and remove AC_INCLUDES_DEFAULT.
Florian Forster [Fri, 22 Mar 2013 20:55:02 +0000 (21:55 +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 :\

11 years agosrc/filter_chain.c: Fixed typos in error messages
Dan Fandrich [Sat, 2 Mar 2013 23:24:48 +0000 (00:24 +0100)]
src/filter_chain.c: Fixed typos in error messages

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoMerge branch 'collectd-5.1' into collectd-5.2
Florian Forster [Sat, 16 Mar 2013 12:43:26 +0000 (13:43 +0100)]
Merge branch 'collectd-5.1' into collectd-5.2

11 years agoMerge branch 'collectd-4.10' into collectd-5.1
Florian Forster [Sat, 16 Mar 2013 12:40:14 +0000 (13:40 +0100)]
Merge branch 'collectd-4.10' into collectd-5.1

Conflicts:
src/curl_json.c

11 years agocurl_xml plugin: Check for a curl_easy_perform() error first
Dan Fandrich [Wed, 6 Feb 2013 22:35:04 +0000 (23:35 +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@collectd.org>
11 years agoFix memory leaks when plugin gets no results
Tomas Doran [Tue, 26 Feb 2013 12:43:21 +0000 (12:43 +0000)]
Fix memory leaks when plugin gets no results

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoexec plugin: Fix a copy'n'paste mistake in a comment.
Florian Forster [Thu, 21 Feb 2013 09:35:59 +0000 (10:35 +0100)]
exec plugin: Fix a copy'n'paste mistake in a comment.

Thanks to Robert Riches Jr for the hint.

11 years agoAdd upstart configuration file for Ubuntu, Debian and RedHat distros
Dave Cottlehuber [Mon, 18 Feb 2013 12:31:57 +0000 (13:31 +0100)]
Add upstart configuration file for Ubuntu, Debian and RedHat distros

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoMerge branch 'mf/redhat' into collectd-5.2
Florian Forster [Wed, 20 Feb 2013 13:40:46 +0000 (14:40 +0100)]
Merge branch 'mf/redhat' into collectd-5.2

Fixes Github issue #220.

11 years agocurl_json plugin: Call yajl_complete_parse() / yajl_parse_complete() only once.
Florian Forster [Wed, 20 Feb 2013 07:36:46 +0000 (08:36 +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.

11 years agoAdd protection from infinite redirect loops to curl-using plugins
Dan Fandrich [Mon, 4 Feb 2013 22:27:26 +0000 (23:27 +0100)]
Add protection from infinite redirect loops to curl-using plugins

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agocurl_xml plugin: Fix potential dereference of NULL pointer.
Dan Fandrich [Mon, 4 Feb 2013 23:02:17 +0000 (00:02 +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@collectd.org>
11 years agosrc/plugin.c: Initialize "next_read" field of read callbacks.
Florian Forster [Sun, 3 Feb 2013 22:04:17 +0000 (23:04 +0100)]
src/plugin.c: Initialize "next_read" field of read callbacks.

Fixes Github issue #230.

11 years agosrc/Makefile.am: Only add path to lcc_features.h to binaries linked against libcollec...
Florian Forster [Sun, 3 Feb 2013 12:10:35 +0000 (13:10 +0100)]
src/Makefile.am: Only add path to lcc_features.h to binaries linked against libcollectdclient.

11 years agoAllow out-of-tree builds
Dan Fandrich [Sat, 2 Feb 2013 00:26:43 +0000 (01:26 +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@collectd.org>
11 years agoMerge branch 'collectd-5.1' into collectd-5.2
Florian Forster [Sun, 3 Feb 2013 10:36:48 +0000 (11:36 +0100)]
Merge branch 'collectd-5.1' into collectd-5.2

11 years agoMerge branch 'collectd-4.10' into collectd-5.1
Florian Forster [Sun, 3 Feb 2013 10:36:37 +0000 (11:36 +0100)]
Merge branch 'collectd-4.10' into collectd-5.1

Conflicts:
src/curl_json.c

11 years agocurl's numeric options are always at minimum long, never int
Dan Fandrich [Sat, 2 Feb 2013 00:19:48 +0000 (01:19 +0100)]
curl's numeric options are always at minimum long, never int

This can affect portability to some architectures.

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agopostgresql plugin: Fix cast (was breaking aliasing rules).
Florian Forster [Sun, 3 Feb 2013 09:46:06 +0000 (10:46 +0100)]
postgresql plugin: Fix cast (was breaking aliasing rules).

postgresql.c: In function 'c_psql_flush':
postgresql.c:974: warning: dereferencing type-punned pointer will break strict-aliasing rules

11 years agopf plugin: Fix checking for <net/pfvar.h>.
Florian Forster [Sun, 3 Feb 2013 09:43:59 +0000 (10:43 +0100)]
pf plugin: Fix checking for <net/pfvar.h>.

The header is not self-contained, so we need to include appropriate
headers in the configure check as well.

11 years agopf plugin: Define {F,S}CNT_NAMES.
Florian Forster [Fri, 1 Feb 2013 10:48:31 +0000 (11:48 +0100)]
pf plugin: Define {F,S}CNT_NAMES.

Apparently they are only defined in the pfctl sources, not in the
system's header files for some reason.

11 years agopf plugin: Fix a typo.
Florian Forster [Fri, 1 Feb 2013 10:47:29 +0000 (11:47 +0100)]
pf plugin: Fix a typo.

s/status/state/g

11 years agocpu plugin: Remove broken debug message.
Florian Forster [Thu, 31 Jan 2013 20:08:25 +0000 (21:08 +0100)]
cpu plugin: Remove broken debug message.

The message was uninformative and did cast a pointer to an int,
resulting in a compile error.

11 years agoMerge remote-tracking branch 'github/collectd-5.2' into collectd-5.2
Florian Forster [Thu, 31 Jan 2013 20:07:45 +0000 (21:07 +0100)]
Merge remote-tracking branch 'github/collectd-5.2' into collectd-5.2

11 years agoChangeLog: Fix typo.
Florian Forster [Thu, 31 Jan 2013 20:07:05 +0000 (21:07 +0100)]
ChangeLog: Fix typo.

11 years agoChangeLog: Fixed version number for 5.2.1 ;-)
Sebastian Harl [Thu, 31 Jan 2013 07:59:24 +0000 (08:59 +0100)]
ChangeLog: Fixed version number for 5.2.1 ;-)

11 years agosrc/utils_tail.c: Remove multiple newlines at EOL.
Florian Forster [Tue, 29 Jan 2013 10:04:36 +0000 (11:04 +0100)]
src/utils_tail.c: Remove multiple newlines at EOL.

11 years agoUpdated ChangeLog. collectd-5.2.1
Florian Forster [Sun, 27 Jan 2013 13:37:29 +0000 (14:37 +0100)]
Updated ChangeLog.

11 years agoMerge remote-tracking branch 'origin/collectd-5.2' into collectd-5.2
Florian Forster [Sun, 27 Jan 2013 13:35:25 +0000 (14:35 +0100)]
Merge remote-tracking branch 'origin/collectd-5.2' into collectd-5.2

11 years agoBumped version to 5.2.1; Updated ChangeLog.
Florian Forster [Sun, 27 Jan 2013 13:24:31 +0000 (14:24 +0100)]
Bumped version to 5.2.1; Updated ChangeLog.

11 years agoMerge branch 'collectd-5.1' into collectd-5.2
Florian Forster [Fri, 25 Jan 2013 22:05:30 +0000 (23:05 +0100)]
Merge branch 'collectd-5.1' into collectd-5.2

Conflicts:
ChangeLog
src/write_graphite.c
version-gen.sh

11 years agoBumped version to 5.1.2; Updated ChangeLog. collectd-5.1.2
Florian Forster [Fri, 25 Jan 2013 22:04:03 +0000 (23:04 +0100)]
Bumped version to 5.1.2; Updated ChangeLog.

11 years agoAdded "tar-pax" (bugfix for long filenames with make distcheck)
Yves Mettier [Thu, 15 Nov 2012 13:14:59 +0000 (14:14 +0100)]
Added "tar-pax" (bugfix for long filenames with make distcheck)

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agosrc/Makefile.am: Fix "make distcheck".
Florian Forster [Fri, 25 Jan 2013 13:48:29 +0000 (14:48 +0100)]
src/Makefile.am: Fix "make distcheck".

protoc-c has a weird handling of files not in the CWD: They have to be
specified with the "-I" option _and_ you need to specify the full path
to the file.

11 years agobugfix ("cannot find collectd.h") for branch master (and 5.2)
Yves Mettier [Tue, 20 Nov 2012 17:13:39 +0000 (18:13 +0100)]
bugfix ("cannot find collectd.h") for branch master (and 5.2)

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agomake distcheck : perllocal.pod was missing. Fixed
Yves Mettier [Wed, 14 Nov 2012 15:42:04 +0000 (16:42 +0100)]
make distcheck : perllocal.pod was missing. Fixed

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoFix make distcheck (against release 5.1.1)
Yves Mettier [Wed, 14 Nov 2012 14:45:07 +0000 (15:45 +0100)]
Fix make distcheck (against release 5.1.1)

Signed-off-by: Florian Forster <octo@collectd.org>