improve CollectInternalStats's documentation
Merge remote-tracking branch 'origin/pr/691'
Merge branch 'pr-713'
src/plugin.c: Parse "MaxReadInterval" with global_option_get_time().
src/configfile.[ch]: Implement global_option_get_time().
src/configfile.c: Use cf_util_get_cdtime() to parse the "Interval" settings.
set target: Simplify config parsing.
disk plugin: Add metric for pending I/O operations.
This is only supported on Linux right now.
Fixes: #705
This is only supported on Linux right now.
Fixes: #705
Merge branch 'collectd-5.4'
Merge branch 'collectd-5.3' into collectd-5.4
Conflicts:
src/curl.c
Conflicts:
src/curl.c
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
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
network plugin: Improve "Buffer too small" error message.
References: #724
References: #724
write_http plugin: Don't compare pointer with numeric literal.
Not even zero. Not even once.
References: #722
Not even zero. Not even once.
References: #722
collectd.conf(5): s/metircs/metrics/
collectd.conf(5): Improve markup of the write_kafka documentation.
write_http plugin: Implement the "BufferSize" option.
Fixes: #722
Fixes: #722
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
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
curl plugin: Use the utility functions for config handling.
Merge remote-tracking branch 'github/collectd-5.3' into collectd-5.3
src/meta_data.c: If the meta_data_t is empty, avoid calling malloc(0).
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
Previously, `meta != NULL` and `keys_num == 0` was possible and would
result in "{}", which is not valid JSON.
Fixes: 716
python plugin: Don't create empty meta_data_t objects.
Fixes: #716
Fixes: #716
src/utils_rrdcreate.c: Free "args".
Thanks to Yves Mettier for pointing this out!
Fixes: #661
Thanks to Yves Mettier for pointing this out!
Fixes: #661
Merge pull request #695 from mfournier/curlopt_username-fixups
Allow curl digest feature to build against older libcurl versions
Allow curl digest feature to build against older libcurl versions
parse option MaxReadInterval in the plugin_init_all()
apache plugin: Remove custom string/bool config functions.
Merge branch 'collectd-5.3' into collectd-5.4
Conflicts:
contrib/redhat/collectd.spec
Conflicts:
contrib/redhat/collectd.spec
RPM specfile: update changelog without incrementing release number
src/collectd.h: Enable __attribute__() for clang, too.
GenericJMXConfConnection: Remove unused imports.
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.
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.
collectd.conf(5): Improve AutoLoadPlugin documentation.
Make it clear that plugins without a <Plugin /> block will still need a
LoadPlugin line.
References: #715
Make it clear that plugins without a <Plugin /> block will still need a
LoadPlugin line.
References: #715
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
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
renamed the option to CollectInternalStats; renamed 'internal' to 'collectd'; no more lock when not recording internal stats
document MaxReadInterval option
nb_values missing in types.db; renaming as cache_size
rename option MaxEffectiveInterval -> MaxReadInterval
Merge branch 'feature/ZOL'
Conflicts:
configure.ac
Conflicts:
configure.ac
EL <6 provide perl-ExtUtils-Embed with base perl
Conflicts:
contrib/redhat/collectd.spec
Conflicts:
contrib/redhat/collectd.spec
allow to configure the maximum effective interval between attempts to read data by plugins
Merge remote-tracking branch 'github/pr/706'
Conflicts:
src/write_riemann.c
Conflicts:
src/write_riemann.c
Small naming conventions fixes, let the user to choose its delimiter
s/appended/used/ according to PR 706
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
Fixes "Unable to parse line" bug, often seen receiving stats from
OpenStack Swift. Should fix GH issue #461
Merge remote-tracking branch 'github/pr/711'
Merge pull request #712 from tas50/master
Fix spelling and split words where appropriate in readme / authors
Fix spelling and split words where appropriate in readme / authors
Fix spelling and split words where appropriate in readme / authors
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
Fixes "Unable to parse line" bug, often seen receiving stats from
OpenStack Swift. Should fix GH issue #461
collectd.conf: Fix default packet size of the network plugin.
Fixes: #710
Fixes: #710
Merge branch 'collectd-5.4'
Conflicts:
configure.ac
src/curl_json.c
src/lvm.c
src/write_riemann.c
Conflicts:
configure.ac
src/curl_json.c
src/lvm.c
src/write_riemann.c
Merge branch 'collectd-5.3' into collectd-5.4
Conflicts:
contrib/redhat/collectd.spec
Conflicts:
contrib/redhat/collectd.spec
Merge branch 'collectd-4.10' into collectd-5.3
curl_xml plugin: Fixed tautological pointer comparison error.
Fixes: http://bugs.debian.org/758481
Signed-off-by: Florian Forster <octo@collectd.org>
Fixes: http://bugs.debian.org/758481
Signed-off-by: Florian Forster <octo@collectd.org>
rename prefix variable to eventServicePrefix
check the status of cf_util_get_string
ignore EventServicePrefix when its empty ("")
Add documentation about the plugin in the pod file
Fix indentation, change Prefix to EventServicePrefix
Merge remote-tracking branch 'github/pr/703'
handle prefix=null
refactor prefix feature - cast directly to service_buffer
[METRICS-383] Review fixes for octo
configure.ac: correct "if" condition altering generated example collectd.conf
[METRICS-383] Add documentation for write_tsdb
[METRICS-383] Default to counters, not rates. Remove unused config code.
[METRICS-383] Add Brett Hawn and Kevin Bowling to AUTHORS
add the prefix feature to the src
[METRICS-390] Make sure HostTags is initialized if not configured
[METRICS-390] Fix string handling for TSDB prefix and tags
[METRICS-390] Add tag writing from metadata using TSDB target_set patches
[METRICS-383] Add HostTags which adds tags for all metrics from this writer
Uncrustify write_tsdb
[METRICS-383] write_tsdb plugin
collectd.conf(5): add detail & example about multi-instance filterchain targets
Merge pull request #700 from timl/drbd_warning_fix
drbd plugin: Make the warning message more readable when /proc/drbd is m...
drbd plugin: Make the warning message more readable when /proc/drbd is m...
drbd plugin: Make the warning message more readable when /proc/drbd is missing
collectd.conf(5): fix typo
Merge pull request #694 from mfournier/kafka_missing_ifdef
write_kafka: avoid unused function build error
write_kafka: avoid unused function build error
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
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
Merge branch 'ff/innodb'
snmp: free snmp_pdu struct allocated by snmp_pdu_create()
This should fix the leak reported in issue #610.
This should fix the leak reported in issue #610.
mysql plugin: Remove TODO comment, improve line wrapping.
mysql plugin: Document the InnodbStats option.
Resolves #248
Resolves #248
lvm: change vg_read() return value to void
To match function prototype change from 55cd1f9a and avoid conflict with
bugfix from 25d7de9.
To match function prototype change from 55cd1f9a and avoid conflict with
bugfix from 25d7de9.
lvm: Do not segfault when there are no VGs
Merge remote-tracking branch 'origin/pr/603'
Merge pull request #566 from timl/drbd
Collect drbd statistics on linux
Collect drbd statistics on linux
Merge pull request #540 from tokkee/configure
configure: Fixed check for libsigrok and AM_PATH_GLIB_2_0.
configure: Fixed check for libsigrok and AM_PATH_GLIB_2_0.
Merge pull request #689 from ymettier/ym/cd53_fix_tcpconns_inet_diag
Fix for 'linux/inet_diag.h: No such file or directory'
Fix for 'linux/inet_diag.h: No such file or directory'
RedHat RPM spec: add modbus plugin
... now that EPEL6 provides libmodbus
... now that EPEL6 provides libmodbus
write_kafka: avoid unused function build error
misc additions to curl* plugins doc & examples
mysql plugin: adding select and sort counters
mysql plugin: adding innodb counters
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.
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.
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
They are equivalent to CURLOPT_USERPWD used a couple of line above and
aren't supported by curl versions older than 7.19.1
New InternalStatistics
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.
Avoid merge conflict with 25d7de9 in 5.4 branch, per #603.
This reverts commit 45805cf888cda0e840d774f1d42cd21525a722ea.
Fix for 'linux/inet_diag.h: No such file or directory'