Code

collectd.git
10 years agoAdded support for the last two additional columns in add-linux-io-time
Michael Schenck [Tue, 7 Oct 2014 02:40:24 +0000 (22:40 -0400)]
Added support for the last two additional columns in add-linux-io-time

10 years agoMerge pull request #751 from ptbrowne/prepend-sys-path
trenkel [Wed, 1 Oct 2014 14:10:10 +0000 (16:10 +0200)]
Merge pull request #751 from ptbrowne/prepend-sys-path

feat(python-plugin): prepend instead of append ModulePath to sys.path

10 years agodoc(collectd-python): update
Patrick Browne [Wed, 1 Oct 2014 09:18:40 +0000 (11:18 +0200)]
doc(collectd-python): update

10 years agofeat(python-plugin): prepend instead of append ModulePath to sys.path
Patrick Browne [Tue, 30 Sep 2014 08:31:05 +0000 (10:31 +0200)]
feat(python-plugin): prepend instead of append ModulePath to sys.path

When importing a module, you expect the plugin repertory to have higher priority
than your site-packages. It will prevent hard to debug clashing module names problems.
At least, if there is a problem, it will fail more loudly than "module did not register
any config callback"

10 years agocpu plugin: Don't report empty cpu states.
Florian Forster [Fri, 26 Sep 2014 02:10:32 +0000 (19:10 -0700)]
cpu plugin: Don't report empty cpu states.

10 years agosrc/Makefile.am: Make sure plugins only export "module_register".
Florian Forster [Tue, 23 Sep 2014 14:52:04 +0000 (07:52 -0700)]
src/Makefile.am: Make sure plugins only export "module_register".

While there, put the LDFLAGS shared between all plugins into a separate
variable.

10 years agoMerge remote-tracking branch 'github/pr/697'
Florian Forster [Tue, 23 Sep 2014 14:13:52 +0000 (07:13 -0700)]
Merge remote-tracking branch 'github/pr/697'

10 years agoMerge remote-tracking branch 'github/pr/734'
Florian Forster [Tue, 23 Sep 2014 14:09:47 +0000 (07:09 -0700)]
Merge remote-tracking branch 'github/pr/734'

10 years agobind plugin: split bind_xml_stats to v3 and v1_v2.
Victor Berger [Mon, 22 Sep 2014 14:51:36 +0000 (16:51 +0200)]
bind plugin: split bind_xml_stats to v3 and v1_v2.

And minor change to bind_parse_generic_name_attr_value_list.

10 years agobind plugin: add support for the new XML v3 API.
Victor Berger [Sat, 20 Sep 2014 13:15:51 +0000 (15:15 +0200)]
bind plugin: add support for the new XML v3 API.

Unfortunately, this new API does not provide per-zone data
any more, thus 'Zone' options like

     Zone "example.com/IN"

are ignored if API version is 3.

10 years agoCOPYING: Add the MIT License and add a note about plugins being licensed individually.
Florian Forster [Sat, 20 Sep 2014 05:31:23 +0000 (07:31 +0200)]
COPYING: Add the MIT License and add a note about plugins being licensed individually.

10 years agoMove utils_parse_option.[ch] out of the daemon/ directory.
Florian Forster [Sat, 20 Sep 2014 05:18:03 +0000 (07:18 +0200)]
Move utils_parse_option.[ch] out of the daemon/ directory.

10 years agocommon.[ch]: Move escape_string() to here.
Florian Forster [Sat, 20 Sep 2014 05:11:17 +0000 (07:11 +0200)]
common.[ch]: Move escape_string() to here.

10 years agoMove collectd daemon files to the src/daemon/ directory.
Florian Forster [Sat, 20 Sep 2014 04:49:01 +0000 (06:49 +0200)]
Move collectd daemon files to the src/daemon/ directory.

10 years agomemory: make linux slab reporting work with older kernels
Marc Fournier [Fri, 8 Aug 2014 09:34:20 +0000 (11:34 +0200)]
memory: make linux slab reporting work with older kernels

10 years agomemory: adjust safeguard to changes from previous commit
Marc Fournier [Fri, 8 Aug 2014 09:05:33 +0000 (11:05 +0200)]
memory: adjust safeguard to changes from previous commit

10 years agosrc/collectd.c: Set the LC_NUMERIC locale to "C".
Florian Forster [Wed, 17 Sep 2014 08:52:36 +0000 (10:52 +0200)]
src/collectd.c: Set the LC_NUMERIC locale to "C".

When using ASCII protocols, such as the Graphite protocol, doubles are
converted to strings using sprintf(3) and parsed with strtod(3). If the
effective locale uses something different from a dot (".") as the
decimal separator (e.g. Portuguese, German), this breaks.

This patch sets the LC_NUMERIC locale to "C" on start-up, so that
strings are produced and parsed in a well-defined manner.

Fixes: #512
10 years agowrite_graphite plugin: Limit number of reconnection attempts per time.
Florian Forster [Tue, 16 Sep 2014 14:05:52 +0000 (16:05 +0200)]
write_graphite plugin: Limit number of reconnection attempts per time.

Fixes: #625
10 years agomemory plugin: Add slab memory stats (linux)
Manuel CISSÉ [Thu, 20 Feb 2014 15:06:56 +0000 (16:06 +0100)]
memory plugin: Add slab memory stats (linux)

Pull-Request: #560

10 years agovirt plugin: Rename the "libvirt" plugin to "virt".
Florian Forster [Tue, 16 Sep 2014 09:17:55 +0000 (11:17 +0200)]
virt plugin: Rename the "libvirt" plugin to "virt".

"libvirt" confused libtool and caused problems when re-building from source.

10 years agocpu plugin: Various, random fixes and improvements:
Florian Forster [Tue, 16 Sep 2014 07:52:10 +0000 (09:52 +0200)]
cpu plugin: Various, random fixes and improvements:

* Add Pierre-Yves to the list of copyright holders.
* Make sure the entire file is consistently indented.
* Renamed the "ReportActive" config option to "ReportByState"
  (with negated logic).
* Renamed internal functions to better reflect their use.
* Let cpu_stage() (née submit()) work on individual counters / derives
  rather than an array, removing logic from the cpu_read() function.
* Rename CPU_SUBMIT_* to CPU_STATE_*.
* Move legacy behavior it its own function, cpu_commit_without_aggregation().

10 years agoswap plugin: Make SwapCached optional under Linux.
Florian Forster [Tue, 16 Sep 2014 05:19:09 +0000 (07:19 +0200)]
swap plugin: Make SwapCached optional under Linux.

OpenVZ doesn't provide the line, which caused swap collection to be
skipped entirely on these systems. Instead, "cached" should simply be
ignored, as it is on other systems. Thanks to @zerkms for reporting this
problem!

Fixes: #733
10 years agocpu plugin: Fix parsing of SoftIRQ under Linux.
Florian Forster [Mon, 15 Sep 2014 17:21:22 +0000 (19:21 +0200)]
cpu plugin: Fix parsing of SoftIRQ under Linux.

10 years agoopenvpn plugin: Don't signal an error when no clients are connected.
Florian Forster [Sun, 14 Sep 2014 17:28:05 +0000 (19:28 +0200)]
openvpn plugin: Don't signal an error when no clients are connected.

In the multi1_read() function, an error (zero) was returned when no
clients were currently connected to the OpenVPN server, because the
"read" variable was initialized to zero and the while loop exited before
it was set to one. This is not the intended behavior.

Thanks to @srix for reporting this issue!

Fixes: #731
10 years agoAdd ReconnectInterval option to Network plugin
John Ferlito [Sat, 13 Sep 2014 01:24:14 +0000 (11:24 +1000)]
Add ReconnectInterval option to Network plugin

The Network plugin only performs DNS resolution at initialization. This
can be problematic when trying to performs migrations of collectd
infrastructure or when trying to create HA solutions which are dependant
on DNS.

The ReconnectInterval options forces a reconnect of all the sockets at
the defined number of seconds. By default no re-connections are attempted
if this option is not set.

10 years agoMove sockent_client_disconnect above sockent_client_disconnect so we can use it there
John Ferlito [Sat, 13 Sep 2014 01:15:30 +0000 (11:15 +1000)]
Move sockent_client_disconnect above sockent_client_disconnect so we can use it there

10 years agocollectd.conf(5): Document the ReportDegraded" option.
Florian Forster [Sat, 13 Sep 2014 08:25:31 +0000 (10:25 +0200)]
collectd.conf(5): Document the ReportDegraded" option.

10 years agobattery plugin: Implement the "ReportDegraded" option.
Florian Forster [Fri, 12 Sep 2014 15:06:53 +0000 (17:06 +0200)]
battery plugin: Implement the "ReportDegraded" option.

10 years agobattery plugin: Implement the ValuesPercentage option.
Florian Forster [Thu, 11 Sep 2014 05:16:19 +0000 (07:16 +0200)]
battery plugin: Implement the ValuesPercentage option.

10 years agobattery plugin: Only report "current" when actually supplied by the battery.
Florian Forster [Wed, 10 Sep 2014 15:26:16 +0000 (17:26 +0200)]
battery plugin: Only report "current" when actually supplied by the battery.

I think the commend in the file sums it up pretty good, read that ;)

10 years agoAUTHORS: Add Andy Parkins.
Florian Forster [Wed, 10 Sep 2014 15:04:41 +0000 (17:04 +0200)]
AUTHORS: Add Andy Parkins.

10 years agoFix typo in if caluse
Vladimir Smirnov [Wed, 10 Sep 2014 19:08:50 +0000 (21:08 +0200)]
Fix typo in if caluse

Fixes #729

10 years agobattery plugin: Import code to read metrics from sysfs.
Florian Forster [Wed, 10 Sep 2014 14:53:51 +0000 (16:53 +0200)]
battery plugin: Import code to read metrics from sysfs.

This started as a simple import of Andy Parkins' sysfsbattery plugin into
the battery plugin. Since the battery plugin is ancient and hasn't been
touched in a while, this quickly escalated to a much bigger refactoring.
Sorry!

On the other hand, this fixes a couple of bugs. For example, all metrics
were always dispatched with plugin_instance "0". This is correct for the
majority of laptops, of course, but in theory this could be wrong.

Also ACPI charging / discharging rate is reported as "current", when
modern batteries actually report "power". The sysfs code does this
correctly, ACPI still needs to be patched.

Fixes: #725
10 years agosrc/common.[ch]: Implement strtogauge().
Florian Forster [Wed, 10 Sep 2014 14:15:40 +0000 (16:15 +0200)]
src/common.[ch]: Implement strtogauge().

10 years agosrc/configfile.c: Fix the default interval setting.
Florian Forster [Tue, 9 Sep 2014 21:43:11 +0000 (23:43 +0200)]
src/configfile.c: Fix the default interval setting.

Also fixes a bug in global_option_get_time(): Values smaller than or
equal to zero are illegal and the default value should be returned.
Thanks to @anandkarthik for spotting this!

Fixes: #727
10 years agoRPM specfile: take all new plugins and dependencies in account
Marc Fournier [Mon, 8 Sep 2014 13:10:18 +0000 (15:10 +0200)]
RPM specfile: take all new plugins and dependencies in account

10 years agoMerge branch 'collectd-5.4'
Marc Fournier [Mon, 8 Sep 2014 15:32:54 +0000 (17:32 +0200)]
Merge branch 'collectd-5.4'

10 years agoRPM specfile: enable lvm plugin on RHEL7
Marc Fournier [Mon, 8 Sep 2014 15:29:14 +0000 (17:29 +0200)]
RPM specfile: enable lvm plugin on RHEL7

10 years agoMerge branch 'collectd-5.3' into collectd-5.4
Marc Fournier [Mon, 8 Sep 2014 15:21:38 +0000 (17:21 +0200)]
Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
contrib/redhat/collectd.spec

10 years agoMerge remote-tracking branch 'github/master'
Florian Forster [Mon, 8 Sep 2014 15:11:56 +0000 (17:11 +0200)]
Merge remote-tracking branch 'github/master'

10 years agoprocesses plugin: Limit the buffer size used for command line matching.
Florian Forster [Mon, 8 Sep 2014 15:07:39 +0000 (17:07 +0200)]
processes plugin: Limit the buffer size used for command line matching.

ARG_MAX is quite big on many systems, for example >100 kByte on
GNU/Linux. This is a problem for systems with tight memory constraints,
for example embedded devices.

This patch uses at most 4 kByte for this, which out to be enough for the
vast majority of users. Users with specific requirements can compile
with "CMDLINE_BUFFER_SIZE=${LOTS}" in their CPPFLAGS to override this
default.

Fixes: #652
10 years agoRPM specfile: enable netlink plugin on RHEL > 5
Marc Fournier [Mon, 8 Sep 2014 14:59:30 +0000 (16:59 +0200)]
RPM specfile: enable netlink plugin on RHEL > 5

10 years agoRPM specfile: fix bogus dates
Marc Fournier [Mon, 8 Sep 2014 14:42:14 +0000 (16:42 +0200)]
RPM specfile: fix bogus dates

modern rpmbuild versions appear to be more strict on this point.

10 years agoRPM specfile: support for RHEL7
Marc Fournier [Mon, 8 Sep 2014 14:41:21 +0000 (16:41 +0200)]
RPM specfile: support for RHEL7

10 years agoRPM specfile: add missing %files section for modbus plugin
Marc Fournier [Mon, 8 Sep 2014 12:12:51 +0000 (14:12 +0200)]
RPM specfile: add missing %files section for modbus plugin

complement to a781eb2c5

10 years agoRPM specfile: remove define accidentally re-added when handling merge conflict
Marc Fournier [Mon, 8 Sep 2014 10:49:49 +0000 (12:49 +0200)]
RPM specfile: remove define accidentally re-added when handling merge conflict

10 years agoRPM specfile: remove macro accidentally re-added when handling merge conflict
Marc Fournier [Mon, 8 Sep 2014 10:38:53 +0000 (12:38 +0200)]
RPM specfile: remove macro accidentally re-added when handling merge conflict

10 years agoRPM specfile: remove duplicate modbus block
Marc Fournier [Mon, 8 Sep 2014 10:26:55 +0000 (12:26 +0200)]
RPM specfile: remove duplicate modbus block

10 years agoimprove CollectInternalStats's documentation
Marc Fournier [Fri, 29 Aug 2014 15:07:18 +0000 (17:07 +0200)]
improve CollectInternalStats's documentation

10 years agoMerge remote-tracking branch 'origin/pr/691'
Marc Fournier [Mon, 8 Sep 2014 09:41:25 +0000 (11:41 +0200)]
Merge remote-tracking branch 'origin/pr/691'

10 years agoMerge branch 'pr-713'
Florian Forster [Mon, 8 Sep 2014 09:21:50 +0000 (11:21 +0200)]
Merge branch 'pr-713'

10 years agosrc/plugin.c: Parse "MaxReadInterval" with global_option_get_time().
Florian Forster [Mon, 8 Sep 2014 09:19:26 +0000 (11:19 +0200)]
src/plugin.c: Parse "MaxReadInterval" with global_option_get_time().

10 years agosrc/configfile.[ch]: Implement 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().

10 years agosrc/configfile.c: Use cf_util_get_cdtime() to parse the "Interval" settings.
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.

10 years agoset target: Simplify config parsing.
Florian Forster [Sun, 7 Sep 2014 06:13:19 +0000 (08:13 +0200)]
set target: Simplify config parsing.

10 years agodisk plugin: Add metric for pending I/O operations.
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
10 years agoMerge branch 'collectd-5.4'
Florian Forster [Sat, 6 Sep 2014 09:30:20 +0000 (11:30 +0200)]
Merge branch 'collectd-5.4'

10 years agoMerge branch 'collectd-5.3' into 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

10 years agonetwork plugin: Improve client connecting behavior.
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
10 years agonetwork plugin: Improve "Buffer too small" error message.
Florian Forster [Fri, 5 Sep 2014 13:54:48 +0000 (15:54 +0200)]
network plugin: Improve "Buffer too small" error message.

References: #724

10 years agowrite_http plugin: Don't compare pointer with numeric literal.
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

10 years agocollectd.conf(5): s/metircs/metrics/
Florian Forster [Thu, 4 Sep 2014 08:54:35 +0000 (10:54 +0200)]
collectd.conf(5): s/metircs/metrics/

10 years agocollectd.conf(5): Improve markup of the write_kafka documentation.
Florian Forster [Thu, 4 Sep 2014 05:20:14 +0000 (07:20 +0200)]
collectd.conf(5): Improve markup of the write_kafka documentation.

10 years agowrite_http plugin: Implement the "BufferSize" option.
Florian Forster [Thu, 4 Sep 2014 05:18:51 +0000 (07:18 +0200)]
write_http plugin: Implement the "BufferSize" option.

Fixes: #722
10 years agosrc/utils_match.[ch]: Implement match_value_reset().
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
10 years agocurl plugin: Use the utility functions for config handling.
Florian Forster [Wed, 3 Sep 2014 05:39:27 +0000 (07:39 +0200)]
curl plugin: Use the utility functions for config handling.

10 years agoMerge remote-tracking branch 'github/collectd-5.3' into collectd-5.3
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

10 years agosrc/meta_data.c: If the meta_data_t is empty, avoid calling malloc(0).
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).

10 years agosrc/utils_format_json.c: Handle empty meta_data_t gracefully.
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
10 years agopython plugin: Don't create empty meta_data_t objects.
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
10 years agosrc/utils_rrdcreate.c: Free "args".
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
10 years agoMerge pull request #695 from mfournier/curlopt_username-fixups
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

10 years agoparse option MaxReadInterval in the plugin_init_all()
Alexey Remizov [Sun, 31 Aug 2014 17:33:06 +0000 (21:33 +0400)]
parse option MaxReadInterval in the plugin_init_all()

10 years agoapache plugin: Remove custom string/bool config functions.
Florian Forster [Sun, 31 Aug 2014 06:40:37 +0000 (08:40 +0200)]
apache plugin: Remove custom string/bool config functions.

10 years agoMerge branch 'collectd-5.3' into collectd-5.4
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

10 years agoRPM specfile: update changelog without incrementing release number
Marc Fournier [Fri, 29 Aug 2014 15:20:57 +0000 (17:20 +0200)]
RPM specfile: update changelog without incrementing release number

10 years agosrc/collectd.h: Enable __attribute__() for clang, too.
Florian Forster [Fri, 29 Aug 2014 09:14:31 +0000 (11:14 +0200)]
src/collectd.h: Enable __attribute__() for clang, too.

10 years agoGenericJMXConfConnection: Remove unused imports.
Florian Forster [Thu, 28 Aug 2014 18:55:45 +0000 (20:55 +0200)]
GenericJMXConfConnection: Remove unused imports.

10 years agojava plugin: Make sure cjni_thread_detach() is called on all paths.
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.

10 years agocollectd.conf(5): Improve AutoLoadPlugin documentation.
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

10 years agocollectd.conf(5): Improve documentation of LoadPlugin.
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
10 years agorenamed the option to CollectInternalStats; renamed 'internal' to 'collectd'; no...
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

10 years agodocument MaxReadInterval option
Alexey Remizov [Mon, 25 Aug 2014 14:05:25 +0000 (18:05 +0400)]
document MaxReadInterval option

10 years agonb_values missing in types.db; renaming as cache_size
Yves Mettier [Mon, 25 Aug 2014 11:47:33 +0000 (13:47 +0200)]
nb_values missing in types.db; renaming as cache_size

10 years agorename option MaxEffectiveInterval -> MaxReadInterval
Alexey Remizov [Mon, 25 Aug 2014 07:58:24 +0000 (11:58 +0400)]
rename option MaxEffectiveInterval -> MaxReadInterval

10 years agoMerge branch 'feature/ZOL'
Marc Fournier [Fri, 22 Aug 2014 21:22:34 +0000 (23:22 +0200)]
Merge branch 'feature/ZOL'

Conflicts:
configure.ac

10 years agoEL <6 provide perl-ExtUtils-Embed with base perl
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

10 years agoallow to configure the maximum effective interval between attempts to read data by...
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

10 years agoMerge remote-tracking branch 'github/pr/706'
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

10 years agoSmall naming conventions fixes, let the user to choose its delimiter
Moshe Zada [Thu, 21 Aug 2014 12:23:27 +0000 (15:23 +0300)]
Small naming conventions fixes, let the user to choose its delimiter

10 years agos/appended/used/ according to PR 706
Moshe Zada [Thu, 21 Aug 2014 06:06:31 +0000 (09:06 +0300)]
s/appended/used/ according to PR 706

10 years agoStatsd: support samplerate field in timing metric types
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

10 years agoMerge remote-tracking branch 'github/pr/711'
Florian Forster [Thu, 21 Aug 2014 05:47:03 +0000 (07:47 +0200)]
Merge remote-tracking branch 'github/pr/711'

10 years agoMerge pull request #712 from tas50/master
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

10 years agoFix 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

10 years agoStatsd: support samplerate field in timing metric types
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

10 years agocollectd.conf: Fix default packet size of the network plugin.
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
10 years agoMerge branch 'collectd-5.4'
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

10 years agoMerge branch 'collectd-5.3' into collectd-5.4
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

10 years agoMerge branch 'collectd-4.10' into collectd-5.3
Florian Forster [Mon, 18 Aug 2014 07:33:29 +0000 (09:33 +0200)]
Merge branch 'collectd-4.10' into collectd-5.3