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?).
Florian Forster [Sun, 12 Jan 2014 08:17:21 +0000 (09:17 +0100)]
write_riemann plugin: Coding style fixes.
Marc Fournier [Fri, 10 Jan 2014 14:39:31 +0000 (15:39 +0100)]
Merge branch 'collectd-5.4'
Conflicts:
src/write_graphite.c
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
Marc Fournier [Wed, 8 Jan 2014 17:24:27 +0000 (18:24 +0100)]
Merge branch 'collectd-4.10' into collectd-5.3
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.
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 !
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
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
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
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
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
Michael Hart [Fri, 20 Dec 2013 14:56:54 +0000 (09:56 -0500)]
fix wg_send_buffer to reconnect tcp sockets on failure
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>
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
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
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
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).
Pierre-Yves Ritschard [Wed, 18 Dec 2013 10:12:33 +0000 (11:12 +0100)]
Document changes, mostly taken from @vbartoni's original work
Pierre-Yves Ritschard [Wed, 18 Dec 2013 10:07:45 +0000 (11:07 +0100)]
Adapt to @octo's comments for PR #344
Florian Forster [Mon, 16 Dec 2013 16:17:55 +0000 (17:17 +0100)]
Merge remote-tracking branch 'github/master'
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.
Abhinav Upadhyay [Mon, 9 Dec 2013 09:53:42 +0000 (15:23 +0530)]
Remove 'the' from in front of collectd.
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.
Florian Forster [Wed, 13 Nov 2013 19:31:29 +0000 (20:31 +0100)]
Merge branch 'collection3-data-sources' of git://github.com/raimue/collectd
Florian Forster [Wed, 13 Nov 2013 19:24:59 +0000 (20:24 +0100)]
Merge branch 'netlinkfix' of git://github.com/marekbecka/collectd
Florian Forster [Wed, 13 Nov 2013 19:09:24 +0000 (20:09 +0100)]
Merge branch 'ff/network'
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>
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!
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>
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.
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.
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
Pierre-Yves Ritschard [Mon, 28 Oct 2013 13:18:02 +0000 (14:18 +0100)]
Add documentation bits for the new 'Attribute' directive
Pierre-Yves Ritschard [Mon, 28 Oct 2013 12:47:03 +0000 (13:47 +0100)]
Add support for custom attributes.
Michael Pilat [Sun, 20 Oct 2013 09:10:25 +0000 (04:10 -0500)]
Refactor / modernize config parsing with configfile helpers
... as requested by @octo
Pierre-Yves Ritschard [Tue, 15 Oct 2013 13:49:22 +0000 (06:49 -0700)]
Merge pull request #453 from vincentbernat/feature/parallel-dbi
Handle several databases in parallel with dbi plugin
Marc Fournier [Mon, 14 Oct 2013 13:47:05 +0000 (06:47 -0700)]
Merge pull request #393 from mfournier/prevent-building-with-old-libpcap
Prevent building with old libpcap
Pierre-Yves Ritschard [Mon, 14 Oct 2013 12:58:29 +0000 (05:58 -0700)]
Merge pull request #441 from katzj/localhost-sql
Fix handling of 127.0.0.1 instead of localhost for *sql plugins
Pierre-Yves Ritschard [Mon, 14 Oct 2013 11:27:53 +0000 (04:27 -0700)]
Merge pull request #452 from alexscott/master
Add a JMXProvider Class Loader to be able to load Provider using
Vincent Bernat [Sat, 12 Oct 2013 20:38:57 +0000 (22:38 +0200)]
dbi plugin: register one read callback for each database block
By using a distinct read callback for each database block, collectd
will be able to query several databases in parallel. This is useful if
the plugin should handle many queries. This lets the user split them in
chunks and speed up the retrieval.
Vincent Bernat [Sat, 12 Oct 2013 20:37:00 +0000 (22:37 +0200)]
dbi plugin: fix a warning mentioning snmp plugin
Pierre-Yves Ritschard [Thu, 10 Oct 2013 08:57:08 +0000 (01:57 -0700)]
Merge pull request #444 from falzm/master
Append rules/targets to existing chain.
Alexandre Moutot [Wed, 9 Oct 2013 13:47:48 +0000 (15:47 +0200)]
Add a JMXProvider Class Loader to be able to load Provider using
getConnectorAsService from JMXConnectorFactory. The protocol remoting-jmx
using by JBOSS > 7 need that to work.
Marc Fournier [Mon, 7 Oct 2013 21:11:44 +0000 (23:11 +0200)]
fix error message in target_{replace,set}
Remove erroneous hint that "Type" can be altered. Also correct a small
typo. Thanks to @mjulian for pointing that out !
Fixes GH#448
Marc Falzon [Tue, 1 Oct 2013 20:20:41 +0000 (22:20 +0200)]
Rewritten condition more clearly.
Marc Falzon [Tue, 1 Oct 2013 16:53:39 +0000 (18:53 +0200)]
Append rules/targets to existing chain.
This patch allows appending rules/targets to an existing chain instead
of overwriting it. This way, it is possible to split filter chains
definition among several files.
Pierre-Yves Ritschard [Mon, 30 Sep 2013 08:58:42 +0000 (01:58 -0700)]
Merge pull request #417 from udoprog/udoprog/riemann
write_riemann: Add extra meta strings as attributes in notifications
Pierre-Yves Ritschard [Mon, 30 Sep 2013 08:56:56 +0000 (01:56 -0700)]
Merge pull request #425 from spotify/master
write_riemann plugin: Receive acknowledge message when using TCP.
Fabien Wernli [Fri, 27 Sep 2013 07:42:46 +0000 (09:42 +0200)]
Update collectd.conf.pod
spotted by lukas227 in IRC:
23:43 < lukas227> Hi, I think I found a mistake in the threshold.conf(5) man page: the example
THRESHOLD CONFIGURATION is within <Threshold></Threshold> tags, but should
probably be within <Plugin "threshold"></Plugin> tags (doesn work with
<Threshold> for me)
Day changed to 27 Sep 2013
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Thu, 26 Sep 2013 17:28:19 +0000 (19:28 +0200)]
configure.in: Move the useragent config to a more appropriate block.
Tim Laszlo [Tue, 24 Sep 2013 18:20:29 +0000 (13:20 -0500)]
Avoid using first person in the error message
Signed-off-by: Florian Forster <octo@collectd.org>
Jeremy Katz [Wed, 25 Sep 2013 18:36:48 +0000 (14:36 -0400)]
Fix handling of 127.0.0.1 instead of localhost for *sql plugins
The mysql and postgresql plugins have special handling if you
use localhost as your hostname. Sometimes you need to use 127.0.0.1
instead and want to not have that make changes to the hostname
for the metrics.
Jeremy Katz [Sun, 22 Sep 2013 19:50:05 +0000 (21:50 +0200)]
Add support for a custom user agent at compile-time
Make it possible to specify a custom user agent at compile time
and then use on all libcurl calls instead of just going with
PACKAGE_NAME/PACKAGE_VERSION
Florian Forster [Wed, 25 Sep 2013 09:53:11 +0000 (11:53 +0200)]
libcollectdclient: Implement the lcc_server_set_interface() function.
Copied from the network plugin. License changed to MIT with permission
from Max Henkel, thank you very much!
Tim Laszlo [Tue, 24 Sep 2013 15:35:22 +0000 (10:35 -0500)]
Replace you with your in error message
Signed-off-by: Florian Forster <octo@collectd.org>
Marek Becka [Mon, 23 Sep 2013 00:38:41 +0000 (02:38 +0200)]
fix typos
Marek Becka [Sun, 22 Sep 2013 22:19:46 +0000 (00:19 +0200)]
Add support for 64bit netlink counters to the netlink plugin
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
Florian Forster [Fri, 20 Sep 2013 13:32:27 +0000 (15:32 +0200)]
Merge remote-tracking branch 'origin/master'
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
John-John Tedro [Tue, 17 Sep 2013 13:40:13 +0000 (15:40 +0200)]
write_riemann plugin: Receive acknowledge message when using TCP.
Not receiving an acknowledge message when communicating with riemann over TCP
will cause the riemann instance to eventually hang for extended periods of time
because of resource exhaustion.
Took the time to reaorganize the riemann_send function to simplify locking.
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
John-John Tedro [Mon, 2 Sep 2013 21:53:34 +0000 (21:53 +0000)]
write_riemann: Add extra meta strings as attributes in notifications
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
Florian Forster [Mon, 19 Aug 2013 15:04:11 +0000 (17:04 +0200)]
zfs_arc plugin: Collect "allocated" and "stolen" on FreeBSD only.
The appropriate log messages have been demoted to WARNING.
Github: #305
Jim Radford [Sat, 10 Aug 2013 16:14:27 +0000 (09:14 -0700)]
curl_json plugin: avoid accessing off the end of the avl_tree_s
It's not written this way, but really we have a union { *key; *tree; }
which is differentiated by checking for the presence a magic field
which only exists in key. This leads to accesses off the end of the
tree. Putting the magic at start of the key avoids this.
Signed-off-by: Florian Forster <octo@collectd.org>
Jim Radford [Sat, 10 Aug 2013 16:10:56 +0000 (09:10 -0700)]
curl_json plugin: avoid unlikely overrun
Signed-off-by: Florian Forster <octo@collectd.org>
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>