Marc Fournier [Fri, 29 Aug 2014 15:07:18 +0000 (17:07 +0200)]
improve CollectInternalStats's documentation
Marc Fournier [Mon, 8 Sep 2014 09:41:25 +0000 (11:41 +0200)]
Merge remote-tracking branch 'origin/pr/691'
Florian Forster [Mon, 8 Sep 2014 09:21:50 +0000 (11:21 +0200)]
Merge branch 'pr-713'
Florian Forster [Mon, 8 Sep 2014 09:19:26 +0000 (11:19 +0200)]
src/plugin.c: Parse "MaxReadInterval" with global_option_get_time().
Florian Forster [Mon, 8 Sep 2014 09:16:39 +0000 (11:16 +0200)]
src/configfile.[ch]: Implement global_option_get_time().
Florian Forster [Mon, 8 Sep 2014 09:16:18 +0000 (11:16 +0200)]
src/configfile.c: Use cf_util_get_cdtime() to parse the "Interval" settings.
Florian Forster [Sun, 7 Sep 2014 06:13:19 +0000 (08:13 +0200)]
set target: Simplify config parsing.
Florian Forster [Sat, 6 Sep 2014 09:47:37 +0000 (11:47 +0200)]
disk plugin: Add metric for pending I/O operations.
This is only supported on Linux right now.
Fixes: #705
Florian Forster [Sat, 6 Sep 2014 09:30:20 +0000 (11:30 +0200)]
Merge branch 'collectd-5.4'
Florian Forster [Sat, 6 Sep 2014 09:27:56 +0000 (11:27 +0200)]
Merge branch 'collectd-5.3' into collectd-5.4
Conflicts:
src/curl.c
Florian Forster [Sat, 6 Sep 2014 08:58:45 +0000 (10:58 +0200)]
network plugin: Improve client connecting behavior.
This moves the socket creation logic so it's called from
networt_send_buffer_plain(). This allows us to recover after network
failures or when collectd was started before the network was available.
Fixes: #627
Florian Forster [Fri, 5 Sep 2014 13:54:48 +0000 (15:54 +0200)]
network plugin: Improve "Buffer too small" error message.
References: #724
Florian Forster [Fri, 5 Sep 2014 05:16:20 +0000 (07:16 +0200)]
write_http plugin: Don't compare pointer with numeric literal.
Not even zero. Not even once.
References: #722
Florian Forster [Thu, 4 Sep 2014 08:54:35 +0000 (10:54 +0200)]
collectd.conf(5): s/metircs/metrics/
Florian Forster [Thu, 4 Sep 2014 05:20:14 +0000 (07:20 +0200)]
collectd.conf(5): Improve markup of the write_kafka documentation.
Florian Forster [Thu, 4 Sep 2014 05:18:51 +0000 (07:18 +0200)]
write_http plugin: Implement the "BufferSize" option.
Fixes: #722
Florian Forster [Wed, 3 Sep 2014 07:10:00 +0000 (09:10 +0200)]
src/utils_match.[ch]: Implement match_value_reset().
This is called from the curl and memcachec plugins. Previously, gauge
average, minimum and maximum values were calculated since the start of
the daemon, rather than per-interval. This is not the documented
functionality.
Fixes: #663
Florian Forster [Wed, 3 Sep 2014 05:39:27 +0000 (07:39 +0200)]
curl plugin: Use the utility functions for config handling.
Florian Forster [Tue, 2 Sep 2014 17:51:37 +0000 (19:51 +0200)]
Merge remote-tracking branch 'github/collectd-5.3' into collectd-5.3
Florian Forster [Tue, 2 Sep 2014 17:50:47 +0000 (19:50 +0200)]
src/meta_data.c: If the meta_data_t is empty, avoid calling malloc(0).
Florian Forster [Tue, 2 Sep 2014 17:49:11 +0000 (19:49 +0200)]
src/utils_format_json.c: Handle empty meta_data_t gracefully.
Previously, `meta != NULL` and `keys_num == 0` was possible and would
result in "{}", which is not valid JSON.
Fixes: 716
Florian Forster [Tue, 2 Sep 2014 17:48:10 +0000 (19:48 +0200)]
python plugin: Don't create empty meta_data_t objects.
Fixes: #716
Florian Forster [Tue, 2 Sep 2014 14:54:07 +0000 (16:54 +0200)]
src/utils_rrdcreate.c: Free "args".
Thanks to Yves Mettier for pointing this out!
Fixes: #661
Marc Fournier [Mon, 1 Sep 2014 08:29:34 +0000 (10:29 +0200)]
Merge pull request #695 from mfournier/curlopt_username-fixups
Allow curl digest feature to build against older libcurl versions
Alexey Remizov [Sun, 31 Aug 2014 17:33:06 +0000 (21:33 +0400)]
parse option MaxReadInterval in the plugin_init_all()
Florian Forster [Sun, 31 Aug 2014 06:40:37 +0000 (08:40 +0200)]
apache plugin: Remove custom string/bool config functions.
Marc Fournier [Fri, 29 Aug 2014 15:26:41 +0000 (17:26 +0200)]
Merge branch 'collectd-5.3' into collectd-5.4
Conflicts:
contrib/redhat/collectd.spec
Marc Fournier [Fri, 29 Aug 2014 15:20:57 +0000 (17:20 +0200)]
RPM specfile: update changelog without incrementing release number
Florian Forster [Fri, 29 Aug 2014 09:14:31 +0000 (11:14 +0200)]
src/collectd.h: Enable __attribute__() for clang, too.
Florian Forster [Thu, 28 Aug 2014 18:55:45 +0000 (20:55 +0200)]
GenericJMXConfConnection: Remove unused imports.
Florian Forster [Thu, 28 Aug 2014 18:41:25 +0000 (20:41 +0200)]
java plugin: Make sure cjni_thread_detach() is called on all paths.
Each call to cjni_thread_attach() much be accompanied by
a call to cjni_thread_detach(). Some error handling cases were missing
the call, potentially locking the plugin up.
Florian Forster [Fri, 29 Aug 2014 05:00:33 +0000 (07:00 +0200)]
collectd.conf(5): Improve AutoLoadPlugin documentation.
Make it clear that plugins without a <Plugin /> block will still need a
LoadPlugin line.
References: #715
Florian Forster [Wed, 27 Aug 2014 11:04:59 +0000 (13:04 +0200)]
collectd.conf(5): Improve documentation of LoadPlugin.
Mention AutoLoadPlugin in the relevant places. Add a <Plugin /> block
for the "df" plugin to make it easier to spot that it is preceded by a
<LoadPlugin /> *block*.
Fixes: #715
Yves Mettier [Tue, 26 Aug 2014 11:02:49 +0000 (13:02 +0200)]
renamed the option to CollectInternalStats; renamed 'internal' to 'collectd'; no more lock when not recording internal stats
Alexey Remizov [Mon, 25 Aug 2014 14:05:25 +0000 (18:05 +0400)]
document MaxReadInterval option
Yves Mettier [Mon, 25 Aug 2014 11:47:33 +0000 (13:47 +0200)]
nb_values missing in types.db; renaming as cache_size
Alexey Remizov [Mon, 25 Aug 2014 07:58:24 +0000 (11:58 +0400)]
rename option MaxEffectiveInterval -> MaxReadInterval
Marc Fournier [Fri, 22 Aug 2014 21:22:34 +0000 (23:22 +0200)]
Merge branch 'feature/ZOL'
Conflicts:
configure.ac
Kevin Bowling [Thu, 14 Aug 2014 09:30:45 +0000 (02:30 -0700)]
EL <6 provide perl-ExtUtils-Embed with base perl
Conflicts:
contrib/redhat/collectd.spec
Alexey Remizov [Fri, 22 Aug 2014 07:02:47 +0000 (11:02 +0400)]
allow to configure the maximum effective interval between attempts to read data by plugins
Florian Forster [Fri, 22 Aug 2014 05:23:28 +0000 (07:23 +0200)]
Merge remote-tracking branch 'github/pr/706'
Conflicts:
src/write_riemann.c
Moshe Zada [Thu, 21 Aug 2014 12:23:27 +0000 (15:23 +0300)]
Small naming conventions fixes, let the user to choose its delimiter
Moshe Zada [Thu, 21 Aug 2014 06:06:31 +0000 (09:06 +0300)]
s/appended/used/ according to PR 706
John Leach [Mon, 18 Aug 2014 20:36:35 +0000 (21:36 +0100)]
Statsd: support samplerate field in timing metric types
Fixes "Unable to parse line" bug, often seen receiving stats from
OpenStack Swift. Should fix GH issue #461
Florian Forster [Thu, 21 Aug 2014 05:47:03 +0000 (07:47 +0200)]
Merge remote-tracking branch 'github/pr/711'
Marc Fournier [Wed, 20 Aug 2014 19:13:34 +0000 (21:13 +0200)]
Merge pull request #712 from tas50/master
Fix spelling and split words where appropriate in readme / authors
Tim Smith [Wed, 20 Aug 2014 19:04:37 +0000 (12:04 -0700)]
Fix spelling and split words where appropriate in readme / authors
John Leach [Mon, 18 Aug 2014 20:36:35 +0000 (21:36 +0100)]
Statsd: support samplerate field in timing metric types
Fixes "Unable to parse line" bug, often seen receiving stats from
OpenStack Swift. Should fix GH issue #461
Florian Forster [Mon, 18 Aug 2014 07:58:34 +0000 (09:58 +0200)]
collectd.conf: Fix default packet size of the network plugin.
Fixes: #710
Florian Forster [Mon, 18 Aug 2014 07:50:34 +0000 (09:50 +0200)]
Merge branch 'collectd-5.4'
Conflicts:
configure.ac
src/curl_json.c
src/lvm.c
src/write_riemann.c
Florian Forster [Mon, 18 Aug 2014 07:35:04 +0000 (09:35 +0200)]
Merge branch 'collectd-5.3' into collectd-5.4
Conflicts:
contrib/redhat/collectd.spec
Florian Forster [Mon, 18 Aug 2014 07:33:29 +0000 (09:33 +0200)]
Merge branch 'collectd-4.10' into collectd-5.3
Arthur Marble [Sun, 17 Aug 2014 22:34:04 +0000 (17:34 -0500)]
curl_xml plugin: Fixed tautological pointer comparison error.
Fixes: http://bugs.debian.org/758481
Signed-off-by: Florian Forster <octo@collectd.org>
~/.gitconfig [Sun, 17 Aug 2014 14:19:55 +0000 (17:19 +0300)]
rename prefix variable to eventServicePrefix
~/.gitconfig [Sun, 17 Aug 2014 14:16:34 +0000 (17:16 +0300)]
check the status of cf_util_get_string
~/.gitconfig [Sun, 17 Aug 2014 08:45:19 +0000 (11:45 +0300)]
ignore EventServicePrefix when its empty ("")
~/.gitconfig [Sun, 17 Aug 2014 07:01:44 +0000 (10:01 +0300)]
Add documentation about the plugin in the pod file
~/.gitconfig [Fri, 15 Aug 2014 18:46:02 +0000 (21:46 +0300)]
Fix indentation, change Prefix to EventServicePrefix
Florian Forster [Thu, 14 Aug 2014 15:49:52 +0000 (17:49 +0200)]
Merge remote-tracking branch 'github/pr/703'
~/.gitconfig [Thu, 14 Aug 2014 14:37:10 +0000 (17:37 +0300)]
handle prefix=null
~/.gitconfig [Thu, 14 Aug 2014 13:50:24 +0000 (16:50 +0300)]
refactor prefix feature - cast directly to service_buffer
Kevin Bowling [Thu, 14 Aug 2014 09:21:17 +0000 (02:21 -0700)]
[METRICS-383] Review fixes for octo
Marc Fournier [Thu, 14 Aug 2014 08:27:47 +0000 (10:27 +0200)]
configure.ac: correct "if" condition altering generated example collectd.conf
Kevin Bowling [Wed, 13 Aug 2014 08:25:57 +0000 (01:25 -0700)]
[METRICS-383] Add documentation for write_tsdb
Kevin Bowling [Wed, 13 Aug 2014 08:21:11 +0000 (01:21 -0700)]
[METRICS-383] Default to counters, not rates. Remove unused config code.
Kevin Bowling [Wed, 13 Aug 2014 07:16:06 +0000 (00:16 -0700)]
[METRICS-383] Add Brett Hawn and Kevin Bowling to AUTHORS
~/.gitconfig [Wed, 13 Aug 2014 12:06:43 +0000 (15:06 +0300)]
add the prefix feature to the src
Kevin Bowling [Wed, 11 Jun 2014 08:44:02 +0000 (01:44 -0700)]
[METRICS-390] Make sure HostTags is initialized if not configured
Kevin Bowling [Tue, 3 Jun 2014 04:11:27 +0000 (21:11 -0700)]
[METRICS-390] Fix string handling for TSDB prefix and tags
Kevin Bowling [Sat, 31 May 2014 02:42:14 +0000 (19:42 -0700)]
[METRICS-390] Add tag writing from metadata using TSDB target_set patches
Kevin Bowling [Fri, 30 May 2014 02:58:51 +0000 (19:58 -0700)]
[METRICS-383] Add HostTags which adds tags for all metrics from this writer
Kevin Bowling [Fri, 30 May 2014 01:15:21 +0000 (18:15 -0700)]
Uncrustify write_tsdb
Kevin Bowling [Tue, 22 Apr 2014 03:53:25 +0000 (20:53 -0700)]
[METRICS-383] write_tsdb plugin
Marc Fournier [Wed, 13 Aug 2014 07:09:14 +0000 (09:09 +0200)]
collectd.conf(5): add detail & example about multi-instance filterchain targets
Marc Fournier [Tue, 12 Aug 2014 15:54:51 +0000 (17:54 +0200)]
Merge pull request #700 from timl/drbd_warning_fix
drbd plugin: Make the warning message more readable when /proc/drbd is m...
Tim Laszlo [Tue, 12 Aug 2014 13:33:09 +0000 (08:33 -0500)]
drbd plugin: Make the warning message more readable when /proc/drbd is missing
Marc Fournier [Mon, 11 Aug 2014 11:07:52 +0000 (13:07 +0200)]
collectd.conf(5): fix typo
Pierre-Yves Ritschard [Mon, 11 Aug 2014 08:54:58 +0000 (10:54 +0200)]
Merge pull request #694 from mfournier/kafka_missing_ifdef
write_kafka: avoid unused function build error
Florian Forster [Mon, 11 Aug 2014 08:27:17 +0000 (10:27 +0200)]
src/utils_tail{,_match}.[ch]: Relicense to MIT license.
Date: Sun, 10 Aug 2014 07:11:04 -0700
From: "waynec@c-ware.com" <waynec@c-ware.com>
To: Luke Heberling <luke@ivylink.net>
Subject: Re: [octo@collectd.org: Relicensing collectd]
No objection. MIT licence is good with me.
- Wayne
Florian Forster [Fri, 8 Aug 2014 19:20:52 +0000 (21:20 +0200)]
Merge branch 'ff/innodb'
Marc Fournier [Fri, 8 Aug 2014 13:55:10 +0000 (15:55 +0200)]
snmp: free snmp_pdu struct allocated by snmp_pdu_create()
This should fix the leak reported in issue #610.
Florian Forster [Fri, 8 Aug 2014 07:36:10 +0000 (09:36 +0200)]
mysql plugin: Remove TODO comment, improve line wrapping.
Florian Forster [Wed, 6 Aug 2014 13:38:40 +0000 (15:38 +0200)]
mysql plugin: Document the InnodbStats option.
Resolves #248
Marc Fournier [Fri, 8 Aug 2014 07:30:34 +0000 (09:30 +0200)]
lvm: change vg_read() return value to void
To match function prototype change from
55cd1f9a and avoid conflict with
bugfix from
25d7de9.
Jan Kundrát [Thu, 20 Feb 2014 01:13:20 +0000 (02:13 +0100)]
lvm: Do not segfault when there are no VGs
Marc Fournier [Fri, 8 Aug 2014 07:28:31 +0000 (09:28 +0200)]
Merge remote-tracking branch 'origin/pr/603'
Marc Fournier [Thu, 7 Aug 2014 15:30:01 +0000 (17:30 +0200)]
Merge pull request #566 from timl/drbd
Collect drbd statistics on linux
Marc Fournier [Thu, 7 Aug 2014 13:42:22 +0000 (15:42 +0200)]
Merge pull request #540 from tokkee/configure
configure: Fixed check for libsigrok and AM_PATH_GLIB_2_0.
Marc Fournier [Thu, 7 Aug 2014 12:32:47 +0000 (14:32 +0200)]
Merge pull request #689 from ymettier/ym/cd53_fix_tcpconns_inet_diag
Fix for 'linux/inet_diag.h: No such file or directory'
Marc Fournier [Wed, 6 Aug 2014 14:59:21 +0000 (16:59 +0200)]
RedHat RPM spec: add modbus plugin
... now that EPEL6 provides libmodbus
Marc Fournier [Wed, 6 Aug 2014 14:28:07 +0000 (16:28 +0200)]
write_kafka: avoid unused function build error
Marc Fournier [Wed, 6 Aug 2014 14:25:16 +0000 (16:25 +0200)]
misc additions to curl* plugins doc & examples
Wilson Felipe [Mon, 4 Feb 2013 19:31:11 +0000 (11:31 -0800)]
mysql plugin: adding select and sort counters
Wilson Felipe [Mon, 4 Feb 2013 19:27:49 +0000 (11:27 -0800)]
mysql plugin: adding innodb counters
Marc Fournier [Wed, 6 Aug 2014 13:24:33 +0000 (15:24 +0200)]
curl*: use CURLOPT_USERNAME if libcurl is recent enough
CURLOPT_USERNAME and CURLOPT_PASSWORD were introduced in curl 7.19.1.
They supersed CURLOPT_USERPWD which couldn't handle colons in the
username or password.
Marc Fournier [Wed, 6 Aug 2014 12:53:25 +0000 (14:53 +0200)]
curl*: remove unneeded option declarations
They are equivalent to CURLOPT_USERPWD used a couple of line above and
aren't supported by curl versions older than 7.19.1
Yves Mettier [Tue, 5 Aug 2014 08:17:53 +0000 (10:17 +0200)]
New InternalStatistics
Benjamin Gilbert [Mon, 4 Aug 2014 17:29:56 +0000 (13:29 -0400)]
Revert "lvm: Fix segfault if a VG contains no LVs"
Avoid merge conflict with
25d7de9 in 5.4 branch, per #603.
This reverts commit
45805cf888cda0e840d774f1d42cd21525a722ea.
Yves Mettier [Mon, 4 Aug 2014 12:01:01 +0000 (14:01 +0200)]
Fix for 'linux/inet_diag.h: No such file or directory'
Marc Fournier [Mon, 4 Aug 2014 11:37:09 +0000 (13:37 +0200)]
fix: use DOUBLE_TO_CDTIME_T() to match input type
... as strtod() returns a double not a time_t.
Follow-up to
7d1d59fb to match what
ada80db25 does (currently in
master) and avoid a merge conflict.