Code

collectd.git
10 years agoFix for number of nfs40 client fields on linux >=3.5
Marek Becka [Mon, 16 Jun 2014 09:01:00 +0000 (11:01 +0200)]
Fix for number of nfs40 client fields on linux >=3.5

10 years agoreduce switch statement
Marek Becka [Wed, 12 Feb 2014 14:17:21 +0000 (15:17 +0100)]
reduce switch statement

10 years agofix typos in comments
Marek Becka [Wed, 12 Feb 2014 14:12:57 +0000 (15:12 +0100)]
fix typos in comments

10 years agoAdd support for recent 4.0-only configurations
Marek Becka [Mon, 10 Feb 2014 20:28:48 +0000 (21:28 +0100)]
Add support for recent 4.0-only configurations

10 years agoAdded nfs4 support for linux
Marek Becka [Sun, 9 Feb 2014 21:14:44 +0000 (22:14 +0100)]
Added nfs4 support for linux

11 years agoBump version to 5.4.0; Update ChangeLog. collectd-5.4.0
Florian Forster [Sun, 18 Aug 2013 10:12:15 +0000 (12:12 +0200)]
Bump version to 5.4.0; Update ChangeLog.

11 years agoMerge branch 'collectd-5.3'
Florian Forster [Sun, 18 Aug 2013 10:14:39 +0000 (12:14 +0200)]
Merge branch 'collectd-5.3'

Conflicts:
configure.in

11 years agoMerge branch 'collectd-5.2' into collectd-5.3
Florian Forster [Sun, 18 Aug 2013 10:13:48 +0000 (12:13 +0200)]
Merge branch 'collectd-5.2' into collectd-5.3

11 years agoMerge branch 'ad/aquaero'
Florian Forster [Sun, 18 Aug 2013 09:13:32 +0000 (11:13 +0200)]
Merge branch 'ad/aquaero'

11 years agocollectd.conf(5): Improve markup of the aquaero plugin.
Florian Forster [Sun, 18 Aug 2013 09:13:27 +0000 (11:13 +0200)]
collectd.conf(5): Improve markup of the aquaero plugin.

11 years agoREADME: Add dependency "aerotools-ng".
Florian Forster [Sun, 18 Aug 2013 09:05:42 +0000 (11:05 +0200)]
README: Add dependency "aerotools-ng".

11 years agoaquaero plugin: Use the "complex" configuration.
Florian Forster [Sun, 18 Aug 2013 08:56:28 +0000 (10:56 +0200)]
aquaero plugin: Use the "complex" configuration.

Actually less LOC.

11 years agoaquaero plugin: Some coding style fixes.
Florian Forster [Sun, 18 Aug 2013 08:55:38 +0000 (10:55 +0200)]
aquaero plugin: Some coding style fixes.

* Break long lines.
* Rename temperatures. The type instances are now "sensor", "virtual",
  "software" and "other".
* Rename "flow-flow" to "flow-sensor".

11 years agoconfigure.in: Check for the libaquaero5.o file in "obj/".
Florian Forster [Sun, 18 Aug 2013 08:53:25 +0000 (10:53 +0200)]
configure.in: Check for the libaquaero5.o file in "obj/".

This is what the aerotools-ng Makefile is currently using.

11 years agoMerge branch 'jr/json'
Florian Forster [Sun, 18 Aug 2013 08:03:52 +0000 (10:03 +0200)]
Merge branch 'jr/json'

11 years agocollectd.conf(5): Markup improvements for the curl_json plugin.
Florian Forster [Sun, 18 Aug 2013 08:02:37 +0000 (10:02 +0200)]
collectd.conf(5): Markup improvements for the curl_json plugin.

11 years agocurl_json plugin: Random minor improvements.
Florian Forster [Sun, 18 Aug 2013 07:58:13 +0000 (09:58 +0200)]
curl_json plugin: Random minor improvements.

I did these changes while wrapping my head around the new array code.

* Added a comment to explain the cj_cb_map_key() function.
* Renamed some variabled and the arguments of the cj_cb_map_key() function.
* Renamed the "ignore" argument to "update_key" (inversing its meaning).

11 years agoMention libsigrok dependency
Bert Vermeulen [Sat, 17 Aug 2013 12:46:27 +0000 (14:46 +0200)]
Mention libsigrok dependency

11 years agoMerge remote-tracking branches 'github/pr/392' and 'github/pr/399' into jr/json
Florian Forster [Sun, 18 Aug 2013 07:04:45 +0000 (09:04 +0200)]
Merge remote-tracking branches 'github/pr/392' and 'github/pr/399' into jr/json

11 years agosrc/types.db: Remove the maximum value for "latency".
Florian Forster [Fri, 16 Aug 2013 10:31:01 +0000 (12:31 +0200)]
src/types.db: Remove the maximum value for "latency".

Github: #400

11 years agoMerge remote-tracking branch 'github/master'
Florian Forster [Fri, 16 Aug 2013 09:27:25 +0000 (11:27 +0200)]
Merge remote-tracking branch 'github/master'

11 years agoMerge remote-tracking branch 'github/pr/404'
Florian Forster [Fri, 16 Aug 2013 09:26:27 +0000 (11:26 +0200)]
Merge remote-tracking branch 'github/pr/404'

11 years agoAttempt to fix collectd/collectd#229 by doing user / group lookups before we fork.
Ceri Storey [Wed, 14 Aug 2013 15:56:24 +0000 (16:56 +0100)]
Attempt to fix collectd/collectd#229 by doing user / group lookups before we fork.

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoUpdate clean.sh
Jim Radford [Wed, 14 Aug 2013 18:54:04 +0000 (11:54 -0700)]
Update clean.sh

11 years agostatsd plugin: add TimerCount option
Marc Fournier [Fri, 26 Jul 2013 15:35:44 +0000 (17:35 +0200)]
statsd plugin: add TimerCount option

The "count" name was chosen over "num" to match the naming scheme
used by the node.js implementation.

11 years agostatsd plugin: add TimerSum option
Marc Fournier [Fri, 26 Jul 2013 13:24:37 +0000 (15:24 +0200)]
statsd plugin: add TimerSum option

11 years agostatsd plugin: add TimerLower and TimerUpper options
Marc Fournier [Fri, 26 Jul 2013 13:10:08 +0000 (15:10 +0200)]
statsd plugin: add TimerLower and TimerUpper options

The "lower" and "upper" names were chosen over "min" and "max"
to match the naming scheme used by the node.js implementation.

11 years agofix .gitignore of lcc_features.h
Jim Radford [Wed, 14 Aug 2013 01:59:23 +0000 (01:59 +0000)]
fix .gitignore of lcc_features.h

11 years ago.gitignore collectd-tg
Jim Radford [Wed, 14 Aug 2013 01:45:09 +0000 (01:45 +0000)]
.gitignore collectd-tg

11 years agocurl_json plugin: warn when config expects a map and a number is provided
Jim Radford [Wed, 14 Aug 2013 00:57:58 +0000 (17:57 -0700)]
curl_json plugin: warn when config expects a map and a number is provided

Moves the warning for strings in the number callback which was being called anyway.

This also serves to fix parsing numbers represented as JSON strings which was inadvertantly broken when adding array support.

11 years agoaquaero: Fix AC_CHECK configure setting for libaquaero5.
Alex Deymo [Tue, 13 Aug 2013 08:08:18 +0000 (01:08 -0700)]
aquaero: Fix AC_CHECK configure setting for libaquaero5.

11 years agoaquaero: Documentation for aquaero plugin.
Alex Deymo [Tue, 13 Aug 2013 07:29:55 +0000 (00:29 -0700)]
aquaero: Documentation for aquaero plugin.

This patch includes the manpage, smaller config sample file and
the README and AUTHORS description.

11 years agoaquaero: Fix sensor names
Alex Deymo [Tue, 13 Aug 2013 07:10:43 +0000 (00:10 -0700)]
aquaero: Fix sensor names

This patch replaces some sensor names to more reasonable ones.

11 years agoRedHat RPM spec: support for RHEL5
Marc Fournier [Tue, 6 Aug 2013 15:25:56 +0000 (17:25 +0200)]
RedHat RPM spec: support for RHEL5

plus some minor updates: bump version to 5.3.1 & add usage example.

11 years agocurl_json plugin: add an example of array access to the documented uWSGI example
Jim Radford [Sat, 10 Aug 2013 19:13:09 +0000 (12:13 -0700)]
curl_json plugin: add an example of array access to the documented uWSGI example

11 years agocurl_json plugin: document the new Sock option
Jim Radford [Sat, 10 Aug 2013 19:11:29 +0000 (12:11 -0700)]
curl_json plugin: document the new Sock option

11 years agocurl_json plugin: free the socket name
Jim Radford [Sat, 10 Aug 2013 16:06:44 +0000 (09:06 -0700)]
curl_json plugin: free the socket name

11 years agocurl_json plugin: style cleanups
Jim Radford [Thu, 8 Aug 2013 16:33:36 +0000 (09:33 -0700)]
curl_json plugin: style cleanups

11 years agocurl_json plugin: use sstrerr for thread safety
Jim Radford [Thu, 8 Aug 2013 16:31:46 +0000 (09:31 -0700)]
curl_json plugin: use sstrerr for thread safety

11 years agocurl_json plugin: support getting json from a Unix socket as well as a URL
Jim Radford [Wed, 7 Aug 2013 20:05:02 +0000 (13:05 -0700)]
curl_json plugin: support getting json from a Unix socket as well as a URL

11 years agocurl_json plugin: separate the cj_curl_perform in to the curl and yajl parts
Jim Radford [Wed, 7 Aug 2013 19:39:51 +0000 (12:39 -0700)]
curl_json plugin: separate the cj_curl_perform in to the curl and yajl parts

11 years agocurl_json plugin: document being able to access arrays
Jim Radford [Sat, 10 Aug 2013 19:23:29 +0000 (12:23 -0700)]
curl_json plugin: document being able to access arrays

11 years agocurl_json plugin: support arrays
Jim Radford [Sat, 10 Aug 2013 17:25:02 +0000 (10:25 -0700)]
curl_json plugin: support arrays

Allow access to data in JSON arrays.  For example

    { workers: [ { requests: 10 }, { requests: 10 } ] }

can all be accessed with

    workers/*/requests

or just one by using the index.

    workers/1/requests

11 years agodisable fields not available in varnish 2.0.x
Marc Fournier [Fri, 9 Aug 2013 15:23:48 +0000 (17:23 +0200)]
disable fields not available in varnish 2.0.x

Several fields were added in commit 8775392. 3 of them make the build
fail when varnish 2.0.x is used. This patch makes them available only
when using varnish 3.x.

The commit message of 8775392 gives more detail on the rationale behind
this way of doing.

11 years agoMerge remote-tracking branch 'origin/pr/376'
Marc Fournier [Fri, 9 Aug 2013 15:06:28 +0000 (17:06 +0200)]
Merge remote-tracking branch 'origin/pr/376'

11 years agoupdate copyright and authors list
Marc Fournier [Thu, 8 Aug 2013 15:06:11 +0000 (17:06 +0200)]
update copyright and authors list

11 years agoremove redundant inclusion of time.h
Marc Fournier [Thu, 8 Aug 2013 12:07:45 +0000 (14:07 +0200)]
remove redundant inclusion of time.h

11 years agoAdd sigrok to README/AUTHORS
Bert Vermeulen [Thu, 8 Aug 2013 08:17:23 +0000 (10:17 +0200)]
Add sigrok to README/AUTHORS

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agomemcached plugin: actually connect when using a unix socket
Jim Radford [Wed, 7 Aug 2013 20:05:47 +0000 (13:05 -0700)]
memcached plugin: actually connect when using a unix socket

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agocsv plugin: set datadir null when free
Manuel Luis Sanmartin Rozada [Tue, 6 Aug 2013 10:30:52 +0000 (12:30 +0200)]
csv plugin: set datadir null when free

If you define twice DataDir:

    <Plugin csv>
DataDir "/opt/collectd/var/lib/collectd/csv"
DataDir stdout
    </Plugin>

the second time datadir will not be null and
you will get garbage in value_list_to_filename

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agocsv plugin: fix forgotten "datadir" in re-implement value_list_to_filename()
Manuel Luis Sanmartin Rozada [Mon, 5 Aug 2013 23:05:01 +0000 (01:05 +0200)]
csv plugin: fix forgotten "datadir" in re-implement value_list_to_filename()

In the commit 7f90e30 the re-implementation of value_list_to_filename
forgot to prepend the datadir string.

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoMerge branch 'ff/statsd'
Florian Forster [Wed, 7 Aug 2013 06:39:28 +0000 (08:39 +0200)]
Merge branch 'ff/statsd'

11 years agoMerge branch 'pr/381'
Florian Forster [Wed, 7 Aug 2013 06:39:08 +0000 (08:39 +0200)]
Merge branch 'pr/381'

11 years agosrc/collectd.conf.in: Unify indentation.
Florian Forster [Wed, 7 Aug 2013 06:39:00 +0000 (08:39 +0200)]
src/collectd.conf.in: Unify indentation.

11 years agosigrok plugin: Ensure consistent logging prefix.
Florian Forster [Wed, 7 Aug 2013 06:33:13 +0000 (08:33 +0200)]
sigrok plugin: Ensure consistent logging prefix.

* Make sure all logging is using the "sigrok plugin: " prefix.
* Improved logging when handling the "LogLevel" option.
* Renamed free_drvopts() to sigrok_free_drvopts(). All functions now use the
  "sigrok_" prefix.
* Don't abort parsing a "Device" block when encountering an incorrect number of
  arguments. The cf_util_* functions will complain about that.

11 years agocollectd.conf(5): sigrok plugin: Improve markup.
Florian Forster [Wed, 7 Aug 2013 06:14:16 +0000 (08:14 +0200)]
collectd.conf(5): sigrok plugin: Improve markup.

11 years agouse pkg-config to locate libmnl and configure netlink plugin
Marc Fournier [Wed, 7 Aug 2013 05:55:01 +0000 (07:55 +0200)]
use pkg-config to locate libmnl and configure netlink plugin

11 years agorrdtool plugin: Minor performance improvement.
Florian Forster [Fri, 19 Jul 2013 05:39:47 +0000 (07:39 +0200)]
rrdtool plugin: Minor performance improvement.

Replace the value_list_to_string() function with a version which is optimized
for data sets with a single data source. The original function is still used
for data sets with multiple data sources. This allows to reduce the number of
calls to snprintf() in this (very common) case, resulting in ~2% speedup.

11 years agosigrok: Update docs to reflect config keyword change
Bert Vermeulen [Mon, 5 Aug 2013 20:33:55 +0000 (22:33 +0200)]
sigrok: Update docs to reflect config keyword change

11 years agosigrok: Change 'interval' option to 'MinimumInterval', and allow 0
Bert Vermeulen [Mon, 5 Aug 2013 20:21:41 +0000 (22:21 +0200)]
sigrok: Change 'interval' option to 'MinimumInterval', and allow 0

A MinimumInterval of 0 means whatever the device sends gets dispatched
to collectd. This is the default.

11 years agoFix temperature type to be unit-agnostic
Bert Vermeulen [Wed, 31 Jul 2013 09:30:16 +0000 (11:30 +0200)]
Fix temperature type to be unit-agnostic

The minimum value of -273.15 implies Celcius, which is not necessarily
what is used for this type.

11 years agoadd sound pressure level type
Bert Vermeulen [Wed, 31 Jul 2013 09:29:53 +0000 (11:29 +0200)]
add sound pressure level type

11 years agoUse value types according to sigrok measured quantity
Bert Vermeulen [Wed, 31 Jul 2013 09:24:36 +0000 (11:24 +0200)]
Use value types according to sigrok measured quantity

11 years agoCode consistency fixes
Bert Vermeulen [Tue, 30 Jul 2013 21:12:26 +0000 (23:12 +0200)]
Code consistency fixes

11 years agoCode cleanup
Bert Vermeulen [Mon, 29 Jul 2013 23:03:00 +0000 (01:03 +0200)]
Code cleanup

11 years agoaquaero: New Aquaero sensors plugin
Alex Deymo [Thu, 18 Jul 2013 06:55:58 +0000 (23:55 -0700)]
aquaero: New Aquaero sensors plugin

This plugin adds support for the Aquaero 5 sensors.

11 years agoaquaero: Include aquaero plugin in config files.
Alex Deymo [Thu, 18 Jul 2013 06:54:46 +0000 (23:54 -0700)]
aquaero: Include aquaero plugin in config files.

Adds the aquaero plugin into the build system.

11 years agoConfig errors should not be fatal
Bert Vermeulen [Mon, 29 Jul 2013 21:47:25 +0000 (23:47 +0200)]
Config errors should not be fatal

11 years agoFactor out device initialization
Bert Vermeulen [Mon, 29 Jul 2013 20:38:09 +0000 (22:38 +0200)]
Factor out device initialization

11 years agoUse gcc-specific __attribute__ to mark unused parameter
Bert Vermeulen [Mon, 29 Jul 2013 18:08:00 +0000 (20:08 +0200)]
Use gcc-specific __attribute__ to mark unused parameter

11 years agosigrok plugin
Bert Vermeulen [Fri, 26 Jul 2013 12:00:23 +0000 (14:00 +0200)]
sigrok plugin

11 years agostats plugin: Don't check the value of '(value_t).derive'.
Florian Forster [Fri, 26 Jul 2013 13:18:43 +0000 (15:18 +0200)]
stats plugin: Don't check the value of '(value_t).derive'.

statsd_parse_value() will write to (value_t).gauge, so don't read from another
member of the union. This also fixes problems with counter values being zero,
for whatever that is supposed to be useful for.

Github: #358

11 years agosigrok: build system setup
Bert Vermeulen [Wed, 10 Jul 2013 21:54:13 +0000 (23:54 +0200)]
sigrok: build system setup

11 years agoFix pointer confusion for nested attribute parsing
Andreas Henriksson [Thu, 25 Jul 2013 20:26:32 +0000 (22:26 +0200)]
Fix pointer confusion for nested attribute parsing

A reference to a pointer is passed as data,
the resulting attribute payload should be stored in
the dereferenced location to return it to the caller.

11 years agorrdcached, rrdtool plugins: Add directory separator after datadir.
Florian Forster [Wed, 24 Jul 2013 13:36:00 +0000 (15:36 +0200)]
rrdcached, rrdtool plugins: Add directory separator after datadir.

D'oh! Thanks to @rcpoison for pointing this out!

Github: #380

11 years agorrdcached, rrdtool plugins: Honor the "DataDir" setting.
Florian Forster [Wed, 24 Jul 2013 12:12:53 +0000 (14:12 +0200)]
rrdcached, rrdtool plugins: Honor the "DataDir" setting.

This fixes a regression introduced in:
bfd3f06ef4996707036756371c5724ebf2748821

Github: #380

11 years agoupdate build system to reflect switch to libmnl
Marc Fournier [Mon, 22 Jul 2013 14:34:04 +0000 (16:34 +0200)]
update build system to reflect switch to libmnl

"./configure" was previously checking for libnetlink and setting
"-lmnl" if found, which was obviously calling for trouble. With
this patch, the last references to libnetlink are dead and buried.

NB: linux/netlink.h and friends are still included here and there
though, but these are not related to libnetlink.

11 years agoupdate README to mention libmnl dependency
Marc Fournier [Mon, 22 Jul 2013 10:54:24 +0000 (12:54 +0200)]
update README to mention libmnl dependency

11 years agonetlink: __attribute__ usage clarification
Marc Fournier [Mon, 22 Jul 2013 10:02:13 +0000 (12:02 +0200)]
netlink: __attribute__ usage clarification

As requested by @octo in GitHub#376.

11 years agonetlink: comments & cleanup
Marc Fournier [Mon, 22 Jul 2013 09:23:25 +0000 (11:23 +0200)]
netlink: comments & cleanup

11 years agonetlink: indentation & whitespace/tab consistency
Marc Fournier [Mon, 22 Jul 2013 09:03:42 +0000 (11:03 +0200)]
netlink: indentation & whitespace/tab consistency

11 years agoMerge remote-tracking branch 'origin/pr/371'
Marc Fournier [Fri, 19 Jul 2013 18:48:40 +0000 (20:48 +0200)]
Merge remote-tracking branch 'origin/pr/371'

11 years agonetlink: fix segfault & make advanced options work again
Marc Fournier [Fri, 19 Jul 2013 14:23:56 +0000 (16:23 +0200)]
netlink: fix segfault & make advanced options work again

A type mismatch and offset mistake was preventing the interface list
from getting iterated. This was making collectd segfault when the
"QDisc", "Class" or "Filter" options were enabled.

11 years agolibmnl: fix 2 mistakes preventing building with --enable-debug
Marc Fournier [Thu, 18 Jul 2013 10:07:35 +0000 (12:07 +0200)]
libmnl: fix 2 mistakes preventing building with --enable-debug

11 years agoMore fixing of netlink build with different HAVE_...
Andreas Henriksson [Mon, 10 Jun 2013 21:26:19 +0000 (23:26 +0200)]
More fixing of netlink build with different HAVE_...

11 years agoRestructure to compile with all combos of HAVE_TCA_STATS(2)
Andreas Henriksson [Mon, 10 Jun 2013 21:18:04 +0000 (23:18 +0200)]
Restructure to compile with all combos of HAVE_TCA_STATS(2)

We want to compile with all combinations of
HAVE_TCA_STATS(2) set/unset and at the same time
protect against submitting the stats twice (if both
are supported).
Introduce "stats_found" and set and attribute on it
to avoid having the compiler complain about it.
This allows us to bury the specific structs under
each HAVE_TCA_STATS(2) #if ...

11 years agoFix HAVE_TCA_STATS(2) checks in configure.in
Andreas Henriksson [Mon, 10 Jun 2013 21:00:24 +0000 (23:00 +0200)]
Fix HAVE_TCA_STATS(2) checks in configure.in

11 years agoFix netlink.c to (almost) build
Andreas Henriksson [Mon, 10 Jun 2013 20:56:54 +0000 (22:56 +0200)]
Fix netlink.c to (almost) build

11 years agoUpdate configure script to link with -lmnl
Andreas Henriksson [Mon, 10 Jun 2013 20:42:43 +0000 (22:42 +0200)]
Update configure script to link with -lmnl

11 years agoInitial libmnl porting attempt
Andreas Henriksson [Mon, 10 Jun 2013 20:41:21 +0000 (22:41 +0200)]
Initial libmnl porting attempt

11 years agodf: remove trailing whitespaces
Marc Fournier [Wed, 17 Jul 2013 10:05:49 +0000 (12:05 +0200)]
df: remove trailing whitespaces

11 years agodf: rename percentage types to a more generic name
Marc Fournier [Wed, 17 Jul 2013 09:59:57 +0000 (11:59 +0200)]
df: rename percentage types to a more generic name

11 years agoAdd support for incr/decr counts
Blake Matheny [Wed, 6 Feb 2013 12:04:47 +0000 (07:04 -0500)]
Add support for incr/decr counts

11 years agoreplace nginx_{accepts,handled} DSs
Marc Fournier [Mon, 15 Jul 2013 16:01:39 +0000 (18:01 +0200)]
replace nginx_{accepts,handled} DSs

reusing an existing DS is preferred. GH#227.

11 years ago* change nginx plugin for collectd to submit "nginx_accepts" and
Patrick Shan [Thu, 3 Jan 2013 03:58:59 +0000 (14:58 +1100)]
* change nginx plugin for collectd to submit "nginx_accepts" and
* "nginx_handled"

11 years agolpar: make dots in configure.in consistent with other plugins
Marc Fournier [Mon, 15 Jul 2013 09:52:31 +0000 (11:52 +0200)]
lpar: make dots in configure.in consistent with other plugins

11 years agoadd 2 missing data types for df percentages
Marc Fournier [Mon, 15 Jul 2013 09:11:43 +0000 (11:11 +0200)]
add 2 missing data types for df percentages

11 years agotail plugin: Remove custom string config function.
Florian Forster [Sun, 14 Jul 2013 06:27:31 +0000 (08:27 +0200)]
tail plugin: Remove custom string config function.

11 years agoBump version to 5.3.1; Update ChangeLog. collectd-5.3.1
Florian Forster [Sat, 13 Jul 2013 09:41:35 +0000 (11:41 +0200)]
Bump version to 5.3.1; Update ChangeLog.

11 years agoMerge branch 'ym/limit_write_queue_length'
Florian Forster [Sat, 13 Jul 2013 09:24:39 +0000 (11:24 +0200)]
Merge branch 'ym/limit_write_queue_length'