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
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>
Marc Fournier [Sat, 21 Sep 2013 14:38:03 +0000 (16:38 +0200)]
make build outputs more quiet
"make V=1" reverts the output to the usual verbosity level
Thanks to @jbergstroem for suggesting this !
Ruben Kerkhof [Sun, 15 Sep 2013 15:35:34 +0000 (17:35 +0200)]
Autoupdate
Ruben Kerkhof [Sun, 15 Sep 2013 14:57:56 +0000 (16:57 +0200)]
configure.in has been deprecated for a while now
Wilfried Goesgens [Tue, 17 Sep 2013 19:15:02 +0000 (21:15 +0200)]
write_graphite: avoid printing out the NULL value in error messages
Alex Deymo [Tue, 3 Sep 2013 07:18:26 +0000 (00:18 -0700)]
aquaero: Fix type names on aquaero plugin.
The percentage values are now reported as "percent" and the "flow"
type is included in the types.db list.
Ruben Kerkhof [Sun, 15 Sep 2013 13:59:36 +0000 (15:59 +0200)]
Display status of mic module
Marc Fournier [Thu, 19 Sep 2013 21:27:02 +0000 (23:27 +0200)]
switch default write_graphite protocol back to TCP
The *default* protocol was switched to UDP in
498a0dcd, when UDP support
was added to the plugin.
Switching this default back to TCP, because it makes the plugin break
for users upgrading to 5.4, and also because the UDP listener is disabled
in a default graphite installation (cf.
https://github.com/graphite-project/carbon/blob/0.9.x/conf/carbon.conf.example#L78)
Fixes GH#428
Sebastian Harl [Sun, 15 Sep 2013 12:56:37 +0000 (14:56 +0200)]
collectd.conf: Added an example write_riemann TTLFactor option.
Sebastian Harl [Sun, 15 Sep 2013 12:53:58 +0000 (14:53 +0200)]
collectd.conf: Added example df plugin ValuesAbsolute/Percentage options.
Sebastian Harl [Sun, 15 Sep 2013 12:48:58 +0000 (14:48 +0200)]
collectd.conf: Added example cgroups plugin config section.
Marc Fournier [Fri, 6 Sep 2013 12:34:59 +0000 (14:34 +0200)]
Merge remote-tracking branch 'origin/pr/409' into collectd-5.4
Marc Fournier [Fri, 6 Sep 2013 12:32:54 +0000 (14:32 +0200)]
correct default write_graphite protocol in manpage
Florian Forster [Wed, 28 Aug 2013 13:22:37 +0000 (15:22 +0200)]
Merge remote-tracking branch 'github/pr/413' into collectd-5.4
Florian Forster [Wed, 28 Aug 2013 13:19:48 +0000 (15:19 +0200)]
cgroups plugin: Use cu_mount_checkoption().
cu_mount_checkoption() behaves a bit like strstr() in that it returns a pointer
into the buffer. cu_mount_getoptionvalue() allocated memory that was never
freed, slowly leaking memory (although very little).
Github: #412
Florian Forster [Wed, 28 Aug 2013 13:18:11 +0000 (15:18 +0200)]
src/utils_mount.c: Fix wrong behavior in cu_mount_getoptionvalue().
Github: #412
Marc Fournier [Wed, 21 Aug 2013 14:54:10 +0000 (16:54 +0200)]
correct typo
Marc Fournier [Wed, 21 Aug 2013 14:22:32 +0000 (16:22 +0200)]
cgroups: don't fail parsing when colon not found
The format of cpuacct.stat seems to not always have a colon as separator.
It appears to *not* have the colon at least on debian's kernel 3.2.41 and
3.2.35, as well as on RHEL6 with 2.6.32. All of them have decent support for
cgroups/lxc, and the cgroups plugin fails to work with them without this patch.
Also, looking at other implementations shows that they *don't* expect a colon:
https://bitbucket.org/dotcloud/liblxcstats/src/
2558b4fbbf589c609895b0badbfc7d413466d716/probes/cpuacct.c?at=default#cl-71
https://github.com/BrightcoveOS/Diamond/blob/master/src/collectors/cpuacct_cgroup/cpuacct_cgroup.py#L55
Marc Fournier [Thu, 8 Aug 2013 16:37:26 +0000 (18:37 +0200)]
RedHat RPM spec: updates for 5.4.0
Florian Forster [Sun, 18 Aug 2013 10:12:15 +0000 (12:12 +0200)]
Bump version to 5.4.0; Update ChangeLog.
Florian Forster [Sun, 18 Aug 2013 10:14:39 +0000 (12:14 +0200)]
Merge branch 'collectd-5.3'
Conflicts:
configure.in
Florian Forster [Sun, 18 Aug 2013 10:13:48 +0000 (12:13 +0200)]
Merge branch 'collectd-5.2' into collectd-5.3
Florian Forster [Sun, 18 Aug 2013 09:13:32 +0000 (11:13 +0200)]
Merge branch 'ad/aquaero'
Florian Forster [Sun, 18 Aug 2013 09:13:27 +0000 (11:13 +0200)]
collectd.conf(5): Improve markup of the aquaero plugin.
Florian Forster [Sun, 18 Aug 2013 09:05:42 +0000 (11:05 +0200)]
README: Add dependency "aerotools-ng".
Florian Forster [Sun, 18 Aug 2013 08:56:28 +0000 (10:56 +0200)]
aquaero plugin: Use the "complex" configuration.
Actually less LOC.
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".
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.
Florian Forster [Sun, 18 Aug 2013 08:03:52 +0000 (10:03 +0200)]
Merge branch 'jr/json'
Florian Forster [Sun, 18 Aug 2013 08:02:37 +0000 (10:02 +0200)]
collectd.conf(5): Markup improvements for the curl_json plugin.
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).
Bert Vermeulen [Sat, 17 Aug 2013 12:46:27 +0000 (14:46 +0200)]
Mention libsigrok dependency
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
Florian Forster [Fri, 16 Aug 2013 10:31:01 +0000 (12:31 +0200)]
src/types.db: Remove the maximum value for "latency".
Github: #400
Florian Forster [Fri, 16 Aug 2013 09:27:25 +0000 (11:27 +0200)]
Merge remote-tracking branch 'github/master'
Florian Forster [Fri, 16 Aug 2013 09:26:27 +0000 (11:26 +0200)]
Merge remote-tracking branch 'github/pr/404'
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>
Jim Radford [Wed, 14 Aug 2013 18:54:04 +0000 (11:54 -0700)]
Update clean.sh
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.
Marc Fournier [Fri, 26 Jul 2013 13:24:37 +0000 (15:24 +0200)]
statsd plugin: add TimerSum option
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.
Jim Radford [Wed, 14 Aug 2013 01:59:23 +0000 (01:59 +0000)]
fix .gitignore of lcc_features.h
Jim Radford [Wed, 14 Aug 2013 01:45:09 +0000 (01:45 +0000)]
.gitignore collectd-tg
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.
Alex Deymo [Tue, 13 Aug 2013 08:08:18 +0000 (01:08 -0700)]
aquaero: Fix AC_CHECK configure setting for libaquaero5.
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.
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.
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.
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
Jim Radford [Sat, 10 Aug 2013 19:11:29 +0000 (12:11 -0700)]
curl_json plugin: document the new Sock option
Jim Radford [Sat, 10 Aug 2013 16:06:44 +0000 (09:06 -0700)]
curl_json plugin: free the socket name
Jim Radford [Thu, 8 Aug 2013 16:33:36 +0000 (09:33 -0700)]
curl_json plugin: style cleanups
Jim Radford [Thu, 8 Aug 2013 16:31:46 +0000 (09:31 -0700)]
curl_json plugin: use sstrerr for thread safety
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
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
Jim Radford [Sat, 10 Aug 2013 19:23:29 +0000 (12:23 -0700)]
curl_json plugin: document being able to access 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
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.
Marc Fournier [Fri, 9 Aug 2013 15:06:28 +0000 (17:06 +0200)]
Merge remote-tracking branch 'origin/pr/376'
Marc Fournier [Thu, 8 Aug 2013 15:06:11 +0000 (17:06 +0200)]
update copyright and authors list
Marc Fournier [Thu, 8 Aug 2013 12:07:45 +0000 (14:07 +0200)]
remove redundant inclusion of time.h
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>
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>
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>
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>
Florian Forster [Wed, 7 Aug 2013 06:39:28 +0000 (08:39 +0200)]
Merge branch 'ff/statsd'
Florian Forster [Wed, 7 Aug 2013 06:39:08 +0000 (08:39 +0200)]
Merge branch 'pr/381'
Florian Forster [Wed, 7 Aug 2013 06:39:00 +0000 (08:39 +0200)]
src/collectd.conf.in: Unify indentation.
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.
Florian Forster [Wed, 7 Aug 2013 06:14:16 +0000 (08:14 +0200)]
collectd.conf(5): sigrok plugin: Improve markup.
Marc Fournier [Wed, 7 Aug 2013 05:55:01 +0000 (07:55 +0200)]
use pkg-config to locate libmnl and configure netlink plugin
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.
Bert Vermeulen [Mon, 5 Aug 2013 20:33:55 +0000 (22:33 +0200)]
sigrok: Update docs to reflect config keyword change
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.
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.
Bert Vermeulen [Wed, 31 Jul 2013 09:29:53 +0000 (11:29 +0200)]
add sound pressure level type
Bert Vermeulen [Wed, 31 Jul 2013 09:24:36 +0000 (11:24 +0200)]
Use value types according to sigrok measured quantity
Bert Vermeulen [Tue, 30 Jul 2013 21:12:26 +0000 (23:12 +0200)]
Code consistency fixes
Bert Vermeulen [Mon, 29 Jul 2013 23:03:00 +0000 (01:03 +0200)]
Code cleanup
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.
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.
Bert Vermeulen [Mon, 29 Jul 2013 21:47:25 +0000 (23:47 +0200)]
Config errors should not be fatal
Bert Vermeulen [Mon, 29 Jul 2013 20:38:09 +0000 (22:38 +0200)]
Factor out device initialization
Bert Vermeulen [Mon, 29 Jul 2013 18:08:00 +0000 (20:08 +0200)]
Use gcc-specific __attribute__ to mark unused parameter
Bert Vermeulen [Fri, 26 Jul 2013 12:00:23 +0000 (14:00 +0200)]
sigrok plugin
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
Bert Vermeulen [Wed, 10 Jul 2013 21:54:13 +0000 (23:54 +0200)]
sigrok: build system setup
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.
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
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
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.
Marc Fournier [Mon, 22 Jul 2013 10:54:24 +0000 (12:54 +0200)]
update README to mention libmnl dependency
Marc Fournier [Mon, 22 Jul 2013 10:02:13 +0000 (12:02 +0200)]
netlink: __attribute__ usage clarification
As requested by @octo in GitHub#376.
Marc Fournier [Mon, 22 Jul 2013 09:23:25 +0000 (11:23 +0200)]
netlink: comments & cleanup
Marc Fournier [Mon, 22 Jul 2013 09:03:42 +0000 (11:03 +0200)]
netlink: indentation & whitespace/tab consistency
Marc Fournier [Fri, 19 Jul 2013 18:48:40 +0000 (20:48 +0200)]
Merge remote-tracking branch 'origin/pr/371'
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.
Marc Fournier [Thu, 18 Jul 2013 10:07:35 +0000 (12:07 +0200)]
libmnl: fix 2 mistakes preventing building with --enable-debug
Andreas Henriksson [Mon, 10 Jun 2013 21:26:19 +0000 (23:26 +0200)]
More fixing of netlink build with different HAVE_...