Code

collectd.git
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

10 years agocurl_xml plugin: Fixed tautological pointer comparison error.
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>
10 years agorename prefix variable to eventServicePrefix
~/.gitconfig [Sun, 17 Aug 2014 14:19:55 +0000 (17:19 +0300)]
rename prefix variable to eventServicePrefix

10 years agocheck the status of cf_util_get_string
~/.gitconfig [Sun, 17 Aug 2014 14:16:34 +0000 (17:16 +0300)]
check the status of cf_util_get_string

10 years agoignore EventServicePrefix when its empty ("")
~/.gitconfig [Sun, 17 Aug 2014 08:45:19 +0000 (11:45 +0300)]
ignore EventServicePrefix when its empty ("")

10 years agoAdd documentation about the plugin in the pod file
~/.gitconfig [Sun, 17 Aug 2014 07:01:44 +0000 (10:01 +0300)]
Add documentation about the plugin in the pod file

10 years agoFix indentation, change Prefix to EventServicePrefix
~/.gitconfig [Fri, 15 Aug 2014 18:46:02 +0000 (21:46 +0300)]
Fix indentation, change Prefix to EventServicePrefix

10 years agoMerge remote-tracking branch 'github/pr/703'
Florian Forster [Thu, 14 Aug 2014 15:49:52 +0000 (17:49 +0200)]
Merge remote-tracking branch 'github/pr/703'

10 years agohandle prefix=null
~/.gitconfig [Thu, 14 Aug 2014 14:37:10 +0000 (17:37 +0300)]
handle prefix=null

10 years agorefactor prefix feature - cast directly to service_buffer
~/.gitconfig [Thu, 14 Aug 2014 13:50:24 +0000 (16:50 +0300)]
refactor prefix feature - cast directly to service_buffer

10 years ago[METRICS-383] Review fixes for octo
Kevin Bowling [Thu, 14 Aug 2014 09:21:17 +0000 (02:21 -0700)]
[METRICS-383] Review fixes for octo

10 years agoconfigure.ac: correct "if" condition altering generated example collectd.conf
Marc Fournier [Thu, 14 Aug 2014 08:27:47 +0000 (10:27 +0200)]
configure.ac: correct "if" condition altering generated example collectd.conf

10 years ago[METRICS-383] Add documentation for write_tsdb
Kevin Bowling [Wed, 13 Aug 2014 08:25:57 +0000 (01:25 -0700)]
[METRICS-383] Add documentation for write_tsdb

10 years ago[METRICS-383] Default to counters, not rates. Remove unused config code.
Kevin Bowling [Wed, 13 Aug 2014 08:21:11 +0000 (01:21 -0700)]
[METRICS-383] Default to counters, not rates. Remove unused config code.

10 years ago[METRICS-383] Add Brett Hawn and Kevin Bowling to AUTHORS
Kevin Bowling [Wed, 13 Aug 2014 07:16:06 +0000 (00:16 -0700)]
[METRICS-383] Add Brett Hawn and Kevin Bowling to AUTHORS

10 years agoadd the prefix feature to the src
~/.gitconfig [Wed, 13 Aug 2014 12:06:43 +0000 (15:06 +0300)]
add the prefix feature to the src

10 years ago[METRICS-390] Make sure HostTags is initialized if not configured
Kevin Bowling [Wed, 11 Jun 2014 08:44:02 +0000 (01:44 -0700)]
[METRICS-390] Make sure HostTags is initialized if not configured

10 years ago[METRICS-390] Fix string handling for TSDB prefix and tags
Kevin Bowling [Tue, 3 Jun 2014 04:11:27 +0000 (21:11 -0700)]
[METRICS-390] Fix string handling for TSDB prefix and tags

10 years ago[METRICS-390] Add tag writing from metadata using TSDB target_set patches
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

10 years ago[METRICS-383] Add HostTags which adds tags for all metrics from this writer
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

10 years agoUncrustify write_tsdb
Kevin Bowling [Fri, 30 May 2014 01:15:21 +0000 (18:15 -0700)]
Uncrustify write_tsdb

10 years ago[METRICS-383] write_tsdb plugin
Kevin Bowling [Tue, 22 Apr 2014 03:53:25 +0000 (20:53 -0700)]
[METRICS-383] write_tsdb plugin

10 years agocollectd.conf(5): add detail & example about multi-instance filterchain targets
Marc Fournier [Wed, 13 Aug 2014 07:09:14 +0000 (09:09 +0200)]
collectd.conf(5): add detail & example about multi-instance filterchain targets

10 years agoMerge pull request #700 from timl/drbd_warning_fix
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...

10 years agodrbd plugin: Make the warning message more readable when /proc/drbd is missing
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

10 years agocollectd.conf(5): fix typo
Marc Fournier [Mon, 11 Aug 2014 11:07:52 +0000 (13:07 +0200)]
collectd.conf(5): fix typo

10 years agoMerge pull request #694 from mfournier/kafka_missing_ifdef
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

10 years agosrc/utils_tail{,_match}.[ch]: Relicense to MIT license.
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

10 years agoMerge branch 'ff/innodb'
Florian Forster [Fri, 8 Aug 2014 19:20:52 +0000 (21:20 +0200)]
Merge branch 'ff/innodb'