Jeremy Katz [Mon, 27 Jan 2014 01:43:19 +0000 (20:43 -0500)]
Call curl_global_init() in _init of plugins using curl
Need to call curl_global_init() or curl_easy_init() during init
for plugins when we're still running single threaded. This
updates the remaining ones
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
Jan Kundrát [Tue, 11 Mar 2014 10:00:22 +0000 (11:00 +0100)]
thresholds: Fix calculation of hysteresis
The old code would never emit a notification when the value changed between the
WARNING and FAILURE; the reason was that each branch in the switch statement
only checked the "old" thresholds valid for the previously encountered state.
That is wrong and pretty dangerous, as there will be no notification when a
values progresses slowly from OK to WARN to FAIL.
Fixes #578.
Jan Kundrát [Tue, 11 Mar 2014 09:59:32 +0000 (10:59 +0100)]
thresholds: Log the current value of a DS value when generating an OKAY notification
Jan Kundrát [Tue, 11 Mar 2014 09:57:45 +0000 (10:57 +0100)]
Coding style: fix indents
Marc Fournier [Mon, 10 Mar 2014 20:28:36 +0000 (21:28 +0100)]
link iptables plugin against flags from pkg-config
This solves issue #326 for ubuntu versions >= 13.10
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
Pierre-Yves Ritschard [Mon, 10 Mar 2014 12:49:23 +0000 (13:49 +0100)]
typo in plugin descr header
Pierre-Yves Ritschard [Mon, 10 Mar 2014 12:46:00 +0000 (13:46 +0100)]
add documentation for #516
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
Adrian Miron [Sat, 8 Mar 2014 18:17:09 +0000 (20:17 +0200)]
write_riemann: send notification message to riemann via description field
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
Frank Cornelis [Fri, 22 Nov 2013 11:38:54 +0000 (12:38 +0100)]
indents
Frank Cornelis [Fri, 22 Nov 2013 10:51:46 +0000 (11:51 +0100)]
HTTP Digest support for curl plugins
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.
Jan Kundrát [Thu, 20 Feb 2014 01:13:20 +0000 (02:13 +0100)]
lvm: Do not segfault when there are no VGs
Tim Laszlo [Fri, 28 Feb 2014 18:43:36 +0000 (12:43 -0600)]
Collect drbd statistics on linux
Jan Kundrát [Wed, 26 Feb 2014 14:45:01 +0000 (15:45 +0100)]
Add support for monitoring lm_sensors' "power" sensors
The patch shall probably be extended to include additional sensor names in
future. My servers, however, use "power1" for all of the readings, so I'm not
making that change now.
Manuel CISSÉ [Thu, 20 Feb 2014 14:58:57 +0000 (15:58 +0100)]
memory plugin: fix submit multivalue (fill vl.type)
Thomas D [Wed, 12 Feb 2014 14:32:15 +0000 (15:32 +0100)]
Make sure that "PIDFile" option cannot be set when command-line option "-P" was used. (Fixes #553)
The "PIDFile" value from command-line option "-P", which should take
precedence over any "PIDFile" value from configuration files, could be
overwritten if a configuration file contained the "PIDFile" option.
We introduced a new global variable "pidfile_from_cli" which will be set
to 1 when the command-line option "-P" was detected and the
"global_option_set" function will only set the "PIDFile" option if
"pidfile_from_cli" is 0.
Marek Becka [Wed, 12 Feb 2014 14:17:21 +0000 (15:17 +0100)]
reduce switch statement
Marek Becka [Wed, 12 Feb 2014 14:12:57 +0000 (15:12 +0100)]
fix typos in comments
Marc Fournier [Fri, 7 Feb 2014 13:51:31 +0000 (14:51 +0100)]
zfs_arc: support for zfsonlinux
The plugin is structured for Solaris & FreeBSD's get_kstat_value() &
sysctlbyname() functions, which return a single metric based on its
name. ZFS-on-Linux publishes all the stats together in a file in /proc,
which is quite a different approach.
So the idea is to simulate the Solaris/FreeBSD way of doing by using
llist_search() on a linked-list containing all the key/values from the
/proc file. This prevents having to parse it over and over again for
each metric we request.
Marek Becka [Mon, 10 Feb 2014 20:28:48 +0000 (21:28 +0100)]
Add support for recent 4.0-only configurations
Patrick Mooney [Mon, 10 Feb 2014 16:00:15 +0000 (10:00 -0600)]
disk: Add udev-based device renaming on Linux
On systems with large collections of allocated disk resources, the
kernel provided names can be difficult to use to logically group or
compare collected values. To grant users the ability to assign custom
instance names for disk devices, collectd can query for a specified udev
attribute. If the attribute is present, its value is subsituted for the
kernel name when submitting the data points.
Marek Becka [Sun, 9 Feb 2014 21:14:44 +0000 (22:14 +0100)]
Added nfs4 support for linux
Manuel Luis Sanmartín Rozada [Sat, 8 Feb 2014 21:42:21 +0000 (22:42 +0100)]
Fix tcp state names to be like others.
Sebastian Harl [Sat, 8 Feb 2014 11:14:10 +0000 (12:14 +0100)]
configure: Fixed check for libsigrok and AM_PATH_GLIB_2_0.
Matthias Urlichs [Wed, 5 Feb 2014 09:49:24 +0000 (10:49 +0100)]
Please free strings *after* printing them ;-)
Signed-off-by: Florian Forster <octo@collectd.org>
Jeremy Katz [Mon, 3 Feb 2014 15:41:16 +0000 (10:41 -0500)]
redis allows passwords up to 512 characters long
Marc Fournier [Mon, 3 Feb 2014 00:08:00 +0000 (01:08 +0100)]
auto{conf,make} kernel-related macros consistency
- add AC_DEFINEs for 2 kernels which were missing them.
- declare AM_CONDITIONALs for all kernels we know about + move
declaration at a more sensible location in the file.
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.
Florian Forster [Sun, 26 Jan 2014 07:52:52 +0000 (08:52 +0100)]
Bump version to 5.4.1; Update ChangeLog.
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`
Marc Fournier [Thu, 23 Jan 2014 22:22:34 +0000 (23:22 +0100)]
Merge remote-tracking branch 'origin/pr/524'
Marek Becka [Thu, 23 Jan 2014 18:02:56 +0000 (19:02 +0100)]
removed invalid space from macro definition
Marc Fournier [Thu, 23 Jan 2014 13:19:20 +0000 (14:19 +0100)]
Merge branch 'collectd-5.3' into collectd-5.4
Marc Fournier [Thu, 23 Jan 2014 13:18:08 +0000 (14:18 +0100)]
Merge remote-tracking branch 'origin/collectd-4.10' into collectd-5.3
Marc Fournier [Thu, 23 Jan 2014 13:17:25 +0000 (14:17 +0100)]
Merge remote-tracking branch 'origin/pr/490' into collectd-5.3
Sebastian Harl [Wed, 22 Jan 2014 12:34:30 +0000 (13:34 +0100)]
configure: Fixed linker options when checking for amqp_tcp_socket_new.
This fixes the check when using GCC's --as-needed which fails when options are
not specified in the right order. Libraries (-l options) have to be specified
after any source files. autoconf does the right thing when using $LIBS for
that case rather than $LDFLAGS.
Sebastian Harl [Wed, 22 Jan 2014 12:29:53 +0000 (13:29 +0100)]
amqp plugin: Don't use C++ style comments.
Sebastian Harl [Wed, 22 Jan 2014 12:27:30 +0000 (04:27 -0800)]
Merge pull request #2 from mfournier/amqp-symbol_lookup
amqp: fix symbol lookup error with librabbitmq >= 0.4.0
Marc Fournier [Tue, 21 Jan 2014 09:24:53 +0000 (10:24 +0100)]
amqp: fix symbol lookup error with librabbitmq >= 0.4.0
amqp_socket_close() which we were using isn't exported anymore.
See https://github.com/alanxz/rabbitmq-c/commit/
bdda7ab
amqp_destroy_connection() implicitly closes the socket, so we don't need
to bother about this if using librabbitmq >= 0.4.0
credits to @tokkee for figuring that out !
Florian Forster [Mon, 20 Jan 2014 16:56:00 +0000 (17:56 +0100)]
Merge remote-tracking branch 'github/master'
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!
Pierre-Yves Ritschard [Fri, 17 Jan 2014 12:17:12 +0000 (13:17 +0100)]
Merge branch 'feature-log-logstash' of github.com:pyr/collectd into feature-log-logstash
Conflicts:
configure.ac
Pierre-Yves Ritschard [Fri, 17 Jan 2014 10:05:49 +0000 (11:05 +0100)]
Add threshold checks for riemann output.
Pierre-Yves Ritschard [Fri, 17 Jan 2014 08:25:46 +0000 (09:25 +0100)]
Merge branch 'feature-riemann-threshold' of github.com:pyr/collectd into feature-riemann-threshold
Pierre-Yves Ritschard [Fri, 17 Jan 2014 08:18:36 +0000 (09:18 +0100)]
better indentation.
Pierre-Yves Ritschard [Fri, 17 Jan 2014 07:54:24 +0000 (08:54 +0100)]
Merge branch 'master' into feature-normalized-cpu
Pierre-Yves Ritschard [Thu, 16 Jan 2014 22:28:11 +0000 (23:28 +0100)]
import thresholds from thresholds.c
Pierre-Yves Ritschard [Thu, 16 Jan 2014 21:16:02 +0000 (22:16 +0100)]
typo fixes.
Pierre-Yves Ritschard [Thu, 16 Jan 2014 18:24:05 +0000 (19:24 +0100)]
as advised by @octo move to a rate computing function
Pierre-Yves Ritschard [Thu, 16 Jan 2014 18:23:52 +0000 (19:23 +0100)]
add a value_to_rate function.
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>
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
Pierre-Yves Ritschard [Thu, 16 Jan 2014 07:06:25 +0000 (08:06 +0100)]
keep plugin instance for first cpu
Marc Fournier [Wed, 15 Jan 2014 23:30:42 +0000 (00:30 +0100)]
network: comment libgcrypt initalization process
Florian Forster [Wed, 15 Jan 2014 22:47:33 +0000 (23:47 +0100)]
apache plugin: Call curl_global_init() from the init function.
This is a shot in the dark in trying to address #513. By calling this
from an init() callback, I hope to be initializing the curl and gcrypt
libraries before collectd becomes multi-threaded, avoiding the problems
described in the issue.
Pierre-Yves Ritschard [Wed, 15 Jan 2014 22:43:18 +0000 (23:43 +0100)]
fix typos
Chris Lundquist [Wed, 15 Jan 2014 02:33:13 +0000 (18:33 -0800)]
[network] set_thread_cbs so we initialize the right threading mode in gcry_check_version
Signed-off-by: Florian Forster <octo@collectd.org>
Pierre-Yves Ritschard [Wed, 15 Jan 2014 22:10:33 +0000 (23:10 +0100)]
handle comments from @octo
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
Pierre-Yves Ritschard [Wed, 15 Jan 2014 14:23:24 +0000 (15:23 +0100)]
integrate comments by @octo
Pierre-Yves Ritschard [Wed, 15 Jan 2014 13:10:13 +0000 (14:10 +0100)]
provide conntrack percentage values
Florian Forster [Tue, 14 Jan 2014 08:08:01 +0000 (09:08 +0100)]
collectd.conf(5): Correct default value used.
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.
Florian Forster [Tue, 14 Jan 2014 07:43:06 +0000 (08:43 +0100)]
Merge branch 'master' into katzj/memory
Florian Forster [Tue, 14 Jan 2014 07:40:53 +0000 (08:40 +0100)]
Merge branch 'katzj/swap'
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.
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.
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?).
Marc Fournier [Mon, 13 Jan 2014 16:56:48 +0000 (17:56 +0100)]
fix cgroups plugin name in example config
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.
Florian Forster [Mon, 13 Jan 2014 15:39:17 +0000 (16:39 +0100)]
swap plugin: Remove left-over debugging message.
Florian Forster [Mon, 13 Jan 2014 14:59:54 +0000 (15:59 +0100)]
swap plugin: Switch to the new plugin_dispatch_multivalue() interface.
Florian Forster [Mon, 13 Jan 2014 14:57:34 +0000 (15:57 +0100)]
src/plugin.[ch]: Implement plugin_dispatch_multivalue().
Sebastian Harl [Mon, 13 Jan 2014 14:46:43 +0000 (15:46 +0100)]
amqp plugin: Fixed compilation when using rabbitmq-c < 0.4.
Thanks to Marc Fournier for noticing!
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.
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.
Florian Forster [Sun, 12 Jan 2014 10:04:56 +0000 (11:04 +0100)]
memory plugin: Use the "complex" configuration.
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.
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>
Florian Forster [Sun, 12 Jan 2014 08:37:42 +0000 (09:37 +0100)]
collectd.conf(5): Document "Values{Absolute,Percentage} for the 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>
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