Code

collectd.git
10 years agomention new options to cpu plugin in example config
Marc Fournier [Tue, 24 Jun 2014 13:38:12 +0000 (15:38 +0200)]
mention new options to cpu plugin in example config

10 years agoadd brackets to the list of characters graphite chokes on
Marc Fournier [Tue, 1 Apr 2014 22:22:34 +0000 (00:22 +0200)]
add brackets to the list of characters graphite chokes on

(cherry-pick of 109cc80a to avoid a merge conflict later on)

10 years agoMerge pull request #636 from dothebart/config_debug_nonsilent
Marc Fournier [Fri, 20 Jun 2014 14:48:36 +0000 (16:48 +0200)]
Merge pull request #636 from dothebart/config_debug_nonsilent

Syslog: don't go all silent on 'debug' with production binary

10 years agoAdd support for durable AMQP queues
David Blundell [Fri, 23 May 2014 19:13:52 +0000 (20:13 +0100)]
Add support for durable AMQP queues

The collectd amqp plugin allows setting messages as persistent but is hardcoded to create or use transient queues that are set to auto_delete.  This commit adds support for QueueDurable and QueueAutoDelete boolean values in the config file and changes the queue creation as appropriate.

If the values are not set in the config file, QueueDurable defaults to false and QueueAutoDelete defaults to true.

Tested with RabbitMQ 3.3.1

10 years agoSyslog: if we can't find the loglevel specified by the configuration string default...
Wilfried Goesgens [Sat, 7 Jun 2014 10:01:32 +0000 (12:01 +0200)]
Syslog: if we can't find the loglevel specified by the configuration string default to 'info' and warn about the unknown configuration option. no way to make syslog totaly silent anymore.

10 years agoRemove _num suffix from listen_disabled_num collected value
Matt Cottingham [Sun, 25 May 2014 19:46:32 +0000 (20:46 +0100)]
Remove _num suffix from listen_disabled_num collected value

10 years agoSubmit listen_disabled_num in memcached.c
Matt Cottingham [Fri, 23 May 2014 15:23:11 +0000 (16:23 +0100)]
Submit listen_disabled_num in memcached.c

This is a counter which increments when the connection limit to
memcached is reached and a socket listen is disabled.

10 years agoFix link to memcached protocol
Matt Cottingham [Fri, 23 May 2014 15:19:51 +0000 (16:19 +0100)]
Fix link to memcached protocol

10 years agowrite_http plugin: Remove custom string and boolean config handlers.
Florian Forster [Thu, 8 May 2014 13:16:54 +0000 (15:16 +0200)]
write_http plugin: Remove custom string and boolean config handlers.

10 years agocollection.cgi: Use -l 0 for df_complex graphs.
Sebastian Harl [Sat, 26 Apr 2014 19:37:51 +0000 (21:37 +0200)]
collection.cgi: Use -l 0 for df_complex graphs.

10 years agocollection.cgi: Added support for df_complex types.
Sebastian Harl [Sat, 26 Apr 2014 16:31:18 +0000 (18:31 +0200)]
collection.cgi: Added support for df_complex types.

10 years agocollection.cgi: Fixed apache data-sources.
Fabiano Pires [Mon, 7 Apr 2014 20:19:34 +0000 (17:19 -0300)]
collection.cgi: Fixed apache data-sources.

10 years agoexamples/myplugin: Updated to the current plugin API.
Sebastian Harl [Sat, 26 Apr 2014 14:57:40 +0000 (16:57 +0200)]
examples/myplugin: Updated to the current plugin API.

10 years agoMerge pull request #569 from manuelluis/mlsr/MSG_DONTWAIT-aix
Marc Fournier [Sun, 30 Mar 2014 22:14:44 +0000 (00:14 +0200)]
Merge pull request #569 from manuelluis/mlsr/MSG_DONTWAIT-aix

AIX doesn't have MSG_DONTWAIT, define as MSG_NONBLOCK

10 years agoMerge pull request #546 from manuelluis/mlsr/tcpconns-aix
Marc Fournier [Sun, 30 Mar 2014 22:10:44 +0000 (00:10 +0200)]
Merge pull request #546 from manuelluis/mlsr/tcpconns-aix

Fix tcp state names in AIX to be like others.

10 years agoMerge pull request #446 from bugsduggan/feature/tail_plugin_interval_per_file
Pierre-Yves Ritschard [Thu, 27 Mar 2014 15:49:08 +0000 (16:49 +0100)]
Merge pull request #446 from bugsduggan/feature/tail_plugin_interval_per_file

Allow Interval per File block for tail plugin

10 years agoMerge pull request #575 from amiron/riemann_notification_message
Pierre-Yves Ritschard [Mon, 10 Mar 2014 15:33:06 +0000 (16:33 +0100)]
Merge pull request #575 from amiron/riemann_notification_message

write_riemann: send notification message

10 years agotypo in plugin descr header
Pierre-Yves Ritschard [Mon, 10 Mar 2014 12:49:23 +0000 (13:49 +0100)]
typo in plugin descr header

10 years agoadd documentation for #516
Pierre-Yves Ritschard [Mon, 10 Mar 2014 12:46:00 +0000 (13:46 +0100)]
add documentation for #516

10 years agoMerge pull request #516 from pyr/feature-normalized-cpu
Pierre-Yves Ritschard [Mon, 10 Mar 2014 12:12:09 +0000 (13:12 +0100)]
Merge pull request #516 from pyr/feature-normalized-cpu

Add ReportByCpu and ValuesPercentage for cpu plugin

10 years agowrite_riemann: send notification message to riemann via description field
Adrian Miron [Sat, 8 Mar 2014 18:17:09 +0000 (20:17 +0200)]
write_riemann: send notification message to riemann via description field

10 years agoAIX doesn't have MSG_DONTWAIT, define as MSG_NONBLOCK
Manuel Luis Sanmartín Rozada [Tue, 4 Mar 2014 17:27:54 +0000 (18:27 +0100)]
AIX doesn't have MSG_DONTWAIT, define as MSG_NONBLOCK

10 years agoindents
Frank Cornelis [Fri, 22 Nov 2013 11:38:54 +0000 (12:38 +0100)]
indents

10 years agoHTTP Digest support for curl plugins
Frank Cornelis [Fri, 22 Nov 2013 10:51:46 +0000 (11:51 +0100)]
HTTP Digest support for curl plugins

10 years agomemory plugin: fix submit multivalue (fill vl.type)
Manuel CISSÉ [Thu, 20 Feb 2014 14:58:57 +0000 (15:58 +0100)]
memory plugin: fix submit multivalue (fill vl.type)

10 years agoFix tcp state names to be like others.
Manuel Luis Sanmartín Rozada [Sat, 8 Feb 2014 21:42:21 +0000 (22:42 +0100)]
Fix tcp state names to be like others.

10 years agoredis allows passwords up to 512 characters long
Jeremy Katz [Mon, 3 Feb 2014 15:41:16 +0000 (10:41 -0500)]
redis allows passwords up to 512 characters long

10 years agoMerge pull request #525 from collectd/feature-better-graphite-escape
Pierre-Yves Ritschard [Sun, 2 Feb 2014 08:25:46 +0000 (00:25 -0800)]
Merge pull request #525 from collectd/feature-better-graphite-escape

Graphite deals poorly with metric names containing quotes.

10 years agoGraphite deals poorly with metric names containing quotes.
Pierre-Yves Ritschard [Fri, 24 Jan 2014 15:49:22 +0000 (16:49 +0100)]
Graphite deals poorly with metric names containing quotes.

Sanitize graphite metrics with our own escaping function,
better suited for this use-case than the one in `utils_parse_option`

10 years agoMerge remote-tracking branch 'origin/pr/524'
Marc Fournier [Thu, 23 Jan 2014 22:22:34 +0000 (23:22 +0100)]
Merge remote-tracking branch 'origin/pr/524'

10 years agoremoved invalid space from macro definition
Marek Becka [Thu, 23 Jan 2014 18:02:56 +0000 (19:02 +0100)]
removed invalid space from macro definition

10 years agoMerge remote-tracking branch 'github/master'
Florian Forster [Mon, 20 Jan 2014 16:56:00 +0000 (17:56 +0100)]
Merge remote-tracking branch 'github/master'

10 years agocontrib/collection.cgi: Add license header.
Florian Forster [Mon, 20 Jan 2014 16:55:19 +0000 (17:55 +0100)]
contrib/collection.cgi: Add license header.

Thanks for Mirko and Sebastian to agreeing to this licensing!

10 years agobetter indentation.
Pierre-Yves Ritschard [Fri, 17 Jan 2014 08:18:36 +0000 (09:18 +0100)]
better indentation.

10 years agoMerge branch 'master' into feature-normalized-cpu
Pierre-Yves Ritschard [Fri, 17 Jan 2014 07:54:24 +0000 (08:54 +0100)]
Merge branch 'master' into feature-normalized-cpu

10 years agotypo fixes.
Pierre-Yves Ritschard [Thu, 16 Jan 2014 21:16:02 +0000 (22:16 +0100)]
typo fixes.

10 years agoas advised by @octo move to a rate computing function
Pierre-Yves Ritschard [Thu, 16 Jan 2014 18:24:05 +0000 (19:24 +0100)]
as advised by @octo move to a rate computing function

10 years agoadd a value_to_rate function.
Pierre-Yves Ritschard [Thu, 16 Jan 2014 18:23:52 +0000 (19:23 +0100)]
add a value_to_rate function.

10 years agoFix a typo in the manpage
Ruben Kerkhof [Thu, 16 Jan 2014 11:12:14 +0000 (12:12 +0100)]
Fix a typo in the manpage

Signed-off-by: Ruben Kerkhof <ruben@rubenkerkhof.com>
10 years agoMerge pull request #497 from pyr/feature-conntrack-pct
Pierre-Yves Ritschard [Thu, 16 Jan 2014 09:48:43 +0000 (01:48 -0800)]
Merge pull request #497 from pyr/feature-conntrack-pct

Report used, max and percent values for conntrack consumption

10 years agokeep plugin instance for first cpu
Pierre-Yves Ritschard [Thu, 16 Jan 2014 07:06:25 +0000 (08:06 +0100)]
keep plugin instance for first cpu

10 years agofix typos
Pierre-Yves Ritschard [Wed, 15 Jan 2014 22:43:18 +0000 (23:43 +0100)]
fix typos

10 years agohandle comments from @octo
Pierre-Yves Ritschard [Wed, 15 Jan 2014 22:10:33 +0000 (23:10 +0100)]
handle comments from @octo

10 years agoAdd ReportByCpu and ValuesPercentage for cpu plugin
Pierre-Yves Ritschard [Wed, 15 Jan 2014 20:26:19 +0000 (21:26 +0100)]
Add ReportByCpu and ValuesPercentage for cpu plugin

ReportByCpu defaults to true, ValuesPercentage to false

This enables the following use cases:

- ReportByCpu false: emits normalized percentage values
- ValuesPercentage true: emits percentage values
- default: send per core ticks, as previously

10 years agointegrate comments by @octo
Pierre-Yves Ritschard [Wed, 15 Jan 2014 14:23:24 +0000 (15:23 +0100)]
integrate comments by @octo

10 years agoprovide conntrack percentage values
Pierre-Yves Ritschard [Wed, 15 Jan 2014 13:10:13 +0000 (14:10 +0100)]
provide conntrack percentage values

10 years agocollectd.conf(5): Correct default value used.
Florian Forster [Tue, 14 Jan 2014 08:08:01 +0000 (09:08 +0100)]
collectd.conf(5): Correct default value used.

10 years agomemory plugin: Use the new plugin_dispatch_multivalue() interface.
Florian Forster [Tue, 14 Jan 2014 08:04:48 +0000 (09:04 +0100)]
memory plugin: Use the new plugin_dispatch_multivalue() interface.

This takes calculation of percentages off of our hands.

10 years agoMerge branch 'master' into katzj/memory
Florian Forster [Tue, 14 Jan 2014 07:43:06 +0000 (08:43 +0100)]
Merge branch 'master' into katzj/memory

10 years agoMerge branch 'katzj/swap'
Florian Forster [Tue, 14 Jan 2014 07:40:53 +0000 (08:40 +0100)]
Merge branch 'katzj/swap'

10 years agoswap plugin: Remove the swap_submit() function.
Florian Forster [Tue, 14 Jan 2014 07:34:42 +0000 (08:34 +0100)]
swap plugin: Remove the swap_submit() function.

This function was used only by swap_submit_derive(), which was declared
conditionally. This resulted in "defined but not used" warnings, e.g. on
FreeBSD.

10 years agosrc/common.[ch]: Rewrite the escape_slashes() function.
Florian Forster [Tue, 14 Jan 2014 06:55:02 +0000 (07:55 +0100)]
src/common.[ch]: Rewrite the escape_slashes() function.

Cleaner and slightly more efficient (3.8% faster) version of escape_slashes().
This function is quite hot with, depending on the configuration, between 1.2%
and 2.6% of total CPU time spent here.

10 years agosrc/utils_cache.c: Very minor performance improvement.
Florian Forster [Tue, 14 Jan 2014 06:24:40 +0000 (07:24 +0100)]
src/utils_cache.c: Very minor performance improvement.

cache_compare() is one of the hottest functions in collectd. Depending how many
metrics collectd handles (how deep the tree is) it gets called an order of
magnitude or two more often than the number of metrics handled. With 100k
metrics, about 6.6% of the CPU time were spent within cache_compare(), with
this commit this reduces to 6.3% (that's, uhm, 4.7% faster?).

10 years agoswap plugin: Use the "complex" configuration.
Florian Forster [Mon, 13 Jan 2014 15:46:00 +0000 (16:46 +0100)]
swap plugin: Use the "complex" configuration.

It's actually shorter and handles non-boolean arguments more intelligently.

10 years agoswap plugin: Remove left-over debugging message.
Florian Forster [Mon, 13 Jan 2014 15:39:17 +0000 (16:39 +0100)]
swap plugin: Remove left-over debugging message.

10 years agoswap plugin: Switch to the new plugin_dispatch_multivalue() interface.
Florian Forster [Mon, 13 Jan 2014 14:59:54 +0000 (15:59 +0100)]
swap plugin: Switch to the new plugin_dispatch_multivalue() interface.

10 years agosrc/plugin.[ch]: Implement plugin_dispatch_multivalue().
Florian Forster [Mon, 13 Jan 2014 14:57:34 +0000 (15:57 +0100)]
src/plugin.[ch]: Implement plugin_dispatch_multivalue().

10 years agocollectd.conf(5): Document the memory plugin's Values{Absolute,Percentage} options.
Florian Forster [Sun, 12 Jan 2014 11:26:36 +0000 (12:26 +0100)]
collectd.conf(5): Document the memory plugin's Values{Absolute,Percentage} options.

10 years agomemory plugin: Move calculation of the percentage to memory_submit().
Florian Forster [Sun, 12 Jan 2014 11:12:26 +0000 (12:12 +0100)]
memory plugin: Move calculation of the percentage to memory_submit().

This removed the need for a lot of duplicate calls. It also changes the
naming schema to use the "percent" type rather than the "memory" type,
putting the information that these are percentages into the type
instance field.

10 years agomemory plugin: Use the "complex" configuration.
Florian Forster [Sun, 12 Jan 2014 10:04:56 +0000 (11:04 +0100)]
memory plugin: Use the "complex" configuration.

10 years agoswap plugin: Improvements for the percent code:
Florian Forster [Sun, 12 Jan 2014 09:25:29 +0000 (10:25 +0100)]
swap plugin: Improvements for the percent code:

* Don't rely on the left-to-right evaluation order, i.e. move the
  division to the right.
* Avoid casting by making many of the internally used variables gauge_t.
  They were derive_t in many cases for historical reasons that no longer
  apply.
* Change the naming: Don't use the "swap" type for percentages (putting
  the information that it *is* a percentage into the type instance) and
  use "percent" instead.

10 years agoSupport sending percentages for memory utilization
Jeremy Katz [Sat, 21 Sep 2013 16:00:01 +0000 (18:00 +0200)]
Support sending percentages for memory utilization

Allow setting ReportPercentage and ReportAbsolute to enable
sending percentages of memory usage instead of absolute values.
This is useful when trying to compare across a heterogeneous
set of systems.

Signed-off-by: Florian Forster <octo@collectd.org>
10 years agocollectd.conf(5): Document "Values{Absolute,Percentage} for the swap plugin.
Florian Forster [Sun, 12 Jan 2014 08:37:42 +0000 (09:37 +0100)]
collectd.conf(5): Document "Values{Absolute,Percentage} for the swap plugin.

10 years agoAdd support for ReportAbsolute and ReportPercentage in swap plugin
Jeremy Katz [Sat, 21 Sep 2013 15:25:10 +0000 (17:25 +0200)]
Add support for ReportAbsolute and ReportPercentage in swap plugin

Add ReportAbsolute and ReportPercentage options to the swap plugin
so that values can be converted to percentages much like in the
df plugin

Signed-off-by: Florian Forster <octo@collectd.org>
10 years agowrite_riemann plugin: Coding style fixes.
Florian Forster [Sun, 12 Jan 2014 08:17:21 +0000 (09:17 +0100)]
write_riemann plugin: Coding style fixes.

10 years agoMerge branch 'collectd-5.4'
Marc Fournier [Fri, 10 Jan 2014 14:39:31 +0000 (15:39 +0100)]
Merge branch 'collectd-5.4'

Conflicts:
src/write_graphite.c

10 years agoMerge branch 'collectd-5.3' into collectd-5.4
Marc Fournier [Wed, 8 Jan 2014 17:28:07 +0000 (18:28 +0100)]
Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
src/zfs_arc.c

10 years agoMerge branch 'collectd-4.10' into collectd-5.3
Marc Fournier [Wed, 8 Jan 2014 17:24:27 +0000 (18:24 +0100)]
Merge branch 'collectd-4.10' into collectd-5.3

10 years agoRevert "curl_xml.c: avoid using uninitalized variable in error message"
Marc Fournier [Wed, 8 Jan 2014 17:05:40 +0000 (18:05 +0100)]
Revert "curl_xml.c: avoid using uninitalized variable in error message"

This reverts commit bbbf37d55a3959951604c4be482e9a705a0f86d9.

A different fix for this problem was commited to the collectd-5.4 branch
(8327ee64) and conflicts with this patch. Also, initializing url the
same way as 8327ee64 does it, to avoid a merge conflict.

10 years agointerface.c: FreeBSD-10 support
Marc Fournier [Tue, 7 Jan 2014 15:06:10 +0000 (16:06 +0100)]
interface.c: FreeBSD-10 support

Quoting @trtrmitya in github issue #506 : "[...] it is broken on
FreeBSD-10, in which getifaddrs() returns not only link level stats for
a particular interface, but also entries for each IP configured on that
interface. As a result if_submit() is called several times for each
interface, which results in incorrect data being logged.

I am attaching a patch which fixes a problem on FreeBSD (9/10), but it
should work for every *BSD because [...] the getifaddrs implementation
first appeared in BSDi BSD/OS."

Many thanks to @trtrmitya for providing the patch !

10 years agocurl_xml.c: avoid using uninitalized variable in error message
Marc Fournier [Tue, 7 Jan 2014 10:30:59 +0000 (11:30 +0100)]
curl_xml.c: avoid using uninitalized variable in error message

Thanks to @trtrmitya for reporting this. Fixes GH#507

10 years agofix wg_send_buffer to reconnect tcp sockets on failure
Michael Hart [Fri, 20 Dec 2013 14:56:54 +0000 (09:56 -0500)]
fix wg_send_buffer to reconnect tcp sockets on failure

Conflicts:
src/write_graphite.c

10 years agocurl plugin: Fixed a segfault when using <Match> without an Instance.
Sebastian Harl [Sun, 22 Dec 2013 12:59:44 +0000 (13:59 +0100)]
curl plugin: Fixed a segfault when using <Match> without an Instance.

Thanks to Alexander Golovko for reporting this in
http://bugs.debian.org/732701

10 years agoMerge pull request #502 from rtkmhart/write_graphite_issue_430
Pierre-Yves Ritschard [Fri, 20 Dec 2013 23:51:35 +0000 (15:51 -0800)]
Merge pull request #502 from rtkmhart/write_graphite_issue_430

Fix issue #430 where write_graphite fails to reconnect

10 years agoMerge pull request #414 from kri5/master
Pierre-Yves Ritschard [Fri, 20 Dec 2013 23:48:45 +0000 (15:48 -0800)]
Merge pull request #414 from kri5/master

Adds Blacklist/Whitelist support to snmp plugin

10 years agofix wg_send_buffer to reconnect tcp sockets on failure
Michael Hart [Fri, 20 Dec 2013 14:56:54 +0000 (09:56 -0500)]
fix wg_send_buffer to reconnect tcp sockets on failure

10 years agoAdds Blacklist/Whitelist support to snmp plugin
Christophe Courtaut [Thu, 29 Aug 2013 13:45:55 +0000 (15:45 +0200)]
Adds Blacklist/Whitelist support to snmp plugin

Adds two options to snmp plugin Data Section:
- Ignore -> A List of string containing patterns to blacklist
- InvertMatch -> A Boolean value to tell if using blacklist or
  whitelist (true is whitelist, false (default) is blacklist)

Signed-off-by: Christophe Courtaut <christophe.courtaut@gmail.com>
10 years agoMerge pull request #499 from pyr/feature-cpu-active
Pierre-Yves Ritschard [Fri, 20 Dec 2013 08:18:03 +0000 (00:18 -0800)]
Merge pull request #499 from pyr/feature-cpu-active

Report a CPU "active" value, summing non-idle values

10 years agoMerge pull request #498 from pyr/feature-relative-load
Pierre-Yves Ritschard [Fri, 20 Dec 2013 08:17:51 +0000 (00:17 -0800)]
Merge pull request #498 from pyr/feature-relative-load

Feature relative load

10 years agoMerge pull request #362 from mikepilat/add-snmpv3
Pierre-Yves Ritschard [Fri, 20 Dec 2013 08:15:21 +0000 (00:15 -0800)]
Merge pull request #362 from mikepilat/add-snmpv3

Add SNMPv3 authentication and encryption support

10 years agoReport a CPU "active" value, summing non-idle values
Pierre-Yves Ritschard [Wed, 18 Dec 2013 10:34:42 +0000 (11:34 +0100)]
Report a CPU "active" value, summing non-idle values

This small change provides a per-core aggregate of non-idle
values for CPUs. This is a good indicator to apply a threshold
on (especially if aggregated by means of the aggregation plugin).

10 years agoDocument changes, mostly taken from @vbartoni's original work
Pierre-Yves Ritschard [Wed, 18 Dec 2013 10:12:33 +0000 (11:12 +0100)]
Document changes, mostly taken from @vbartoni's original work

10 years agoAdapt to @octo's comments for PR #344
Pierre-Yves Ritschard [Wed, 18 Dec 2013 10:07:45 +0000 (11:07 +0100)]
Adapt to @octo's comments for PR #344

10 years agoMerge remote-tracking branch 'github/master'
Florian Forster [Mon, 16 Dec 2013 16:17:55 +0000 (17:17 +0100)]
Merge remote-tracking branch 'github/master'

10 years agoMerge pull request #495 from abhinav-upadhyay/fix-readme
Pierre-Yves Ritschard [Mon, 9 Dec 2013 09:56:40 +0000 (01:56 -0800)]
Merge pull request #495 from abhinav-upadhyay/fix-readme

Remove 'the' from in front of collectd.

10 years agoRemove 'the' from in front of collectd.
Abhinav Upadhyay [Mon, 9 Dec 2013 09:53:42 +0000 (15:23 +0530)]
Remove 'the' from in front of collectd.

11 years agocollection3: Fix data source names
Rainer Müller [Wed, 27 Feb 2013 18:46:41 +0000 (19:46 +0100)]
collection3: Fix data source names

Data sources were renamed in 6c1415d, but the data source names for some
of these entries still referenced the old data sources.

11 years agoAllow Interval per File block for tail plugin
Tom Leaman [Fri, 4 Oct 2013 13:12:42 +0000 (14:12 +0100)]
Allow Interval per File block for tail plugin

The allows each <File> block in the tail plugin config to specify
its own Interval value. If ommitted, will use the default.

11 years agoMerge branch 'collection3-data-sources' of git://github.com/raimue/collectd
Florian Forster [Wed, 13 Nov 2013 19:31:29 +0000 (20:31 +0100)]
Merge branch 'collection3-data-sources' of git://github.com/raimue/collectd

11 years agoMerge branch 'netlinkfix' of git://github.com/marekbecka/collectd
Florian Forster [Wed, 13 Nov 2013 19:24:59 +0000 (20:24 +0100)]
Merge branch 'netlinkfix' of git://github.com/marekbecka/collectd

11 years agoMerge branch 'ff/network'
Florian Forster [Wed, 13 Nov 2013 19:09:24 +0000 (20:09 +0100)]
Merge branch 'ff/network'

11 years agoLink to IOKit using -framework
Rainer Müller [Sun, 10 Nov 2013 02:51:40 +0000 (03:51 +0100)]
Link to IOKit using -framework

The libIOKit.dylib symlink no longer exists in OS X 10.9 Mavericks, we
now have to link using -framework. This should also work in all previous
versions of OS X.

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agosrc/types.db: Remove maximum value on "cache_size".
Florian Forster [Wed, 13 Nov 2013 18:59:27 +0000 (19:59 +0100)]
src/types.db: Remove maximum value on "cache_size".

Fixes #466. Thanks to @dlacko for pointing this out!

11 years agocurl_json, curl_xml: Fix unitialized variable
Rainer Müller [Sun, 10 Nov 2013 02:39:22 +0000 (03:39 +0100)]
curl_json, curl_xml: Fix unitialized variable

The variable url is used unintialized here. The code used to be the same
in both plugins, but diverged in 19808b44. The solution applied there
does not work correctly as the effective URL can only be queried after
performing the request. Instead, just use the original request URL.

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agocollection3: Fix data source names
Rainer Müller [Wed, 27 Feb 2013 18:46:41 +0000 (19:46 +0100)]
collection3: Fix data source names

Data sources were renamed in 6c1415d, but the data source names for some
of these entries still referenced the old data sources.

11 years agoMerge pull request #459 from pyr/feature-riemann-attributes
Pierre-Yves Ritschard [Mon, 28 Oct 2013 13:31:16 +0000 (06:31 -0700)]
Merge pull request #459 from pyr/feature-riemann-attributes

Add support for custom attributes.

11 years agoIgnore more build artifacts
Pierre-Yves Ritschard [Mon, 28 Oct 2013 13:23:33 +0000 (14:23 +0100)]
Ignore more build artifacts

This hides:

- vl_utils_lookup_test
- junk left behind by pod2man
- the buildperl dir

11 years agoAdd documentation bits for the new 'Attribute' directive
Pierre-Yves Ritschard [Mon, 28 Oct 2013 13:18:02 +0000 (14:18 +0100)]
Add documentation bits for the new 'Attribute' directive

11 years agoAdd support for custom attributes.
Pierre-Yves Ritschard [Mon, 28 Oct 2013 12:47:03 +0000 (13:47 +0100)]
Add support for custom attributes.

11 years agoRefactor / modernize config parsing with configfile helpers
Michael Pilat [Sun, 20 Oct 2013 09:10:25 +0000 (04:10 -0500)]
Refactor / modernize config parsing with configfile helpers

... as requested by @octo