Marc Fournier [Tue, 14 Apr 2015 06:35:28 +0000 (08:35 +0200)]
notify_email: avoid linking against libdl
This flag seems to have been accidentally added in
451d75bae1 and
prevents building the plugin on platforms which don't have GNU libc.
Marc Fournier [Sun, 12 Apr 2015 07:26:52 +0000 (09:26 +0200)]
Merge remote-tracking branch 'origin/pr/998'
Marc Fournier [Wed, 8 Apr 2015 23:14:40 +0000 (01:14 +0200)]
Merge branch 'collectd-5.4'
Marc Fournier [Wed, 8 Apr 2015 23:09:33 +0000 (01:09 +0200)]
README: ordering
Marc Fournier [Wed, 8 Apr 2015 22:58:56 +0000 (00:58 +0200)]
RPM specfile: add write_sensu and ipc plugins
Marc Fournier [Wed, 8 Apr 2015 22:53:49 +0000 (00:53 +0200)]
Merge branch 'collectd-5.3' into collectd-5.4
Marc Fournier [Wed, 8 Apr 2015 22:51:16 +0000 (00:51 +0200)]
ipc: don't enable by default in example config file
Marc Fournier [Wed, 8 Apr 2015 22:50:44 +0000 (00:50 +0200)]
ipc: build on AIX by default
Marc Fournier [Wed, 8 Apr 2015 22:50:24 +0000 (00:50 +0200)]
ipc: don't document plugin without any options
Marc Fournier [Wed, 8 Apr 2015 22:49:28 +0000 (00:49 +0200)]
ipc: remove extraneous call to sysconf()
Marc Fournier [Wed, 8 Apr 2015 22:32:50 +0000 (00:32 +0200)]
Merge remote-tracking branch 'origin/pr/925'
Marc Fournier [Wed, 8 Apr 2015 22:27:13 +0000 (00:27 +0200)]
write_sensu: documentation wording, wrap long lines
Thanks to @jamtur01 for reviewing !
Marc Fournier [Wed, 8 Apr 2015 22:16:37 +0000 (00:16 +0200)]
Merge remote-tracking branch 'origin/pr/912'
Marc Fournier [Wed, 8 Apr 2015 22:14:37 +0000 (00:14 +0200)]
Merge remote-tracking branch 'origin/pr/946'
Conflicts:
src/collectd.conf.pod
Marc Fournier [Wed, 8 Apr 2015 20:58:22 +0000 (22:58 +0200)]
curl-based plugins: disable Timeout option if libcurl < 7.16.2
This could be done better, but as it's a non-essential feature and
7.16.2 is 8 years old, I favor not over-complicating things.
Marc Fournier [Wed, 8 Apr 2015 22:08:21 +0000 (00:08 +0200)]
Merge remote-tracking branch 'origin/pr/993'
Marc Fournier [Wed, 8 Apr 2015 22:07:07 +0000 (00:07 +0200)]
Merge remote-tracking branch 'origin/pr/985'
Marc Fournier [Wed, 8 Apr 2015 22:06:25 +0000 (00:06 +0200)]
Merge remote-tracking branch 'origin/pr/693'
Conflicts:
src/collectd.conf.pod
Vincent Bernat [Sat, 12 Oct 2013 20:37:00 +0000 (22:37 +0200)]
dbi plugin: fix a warning mentioning snmp plugin
Marc Fournier [Sat, 4 Apr 2015 23:44:50 +0000 (01:44 +0200)]
write_http: make sure CURLOPT_* only get longs
... to avoid portability problems.
Marc Fournier [Sat, 4 Apr 2015 23:16:13 +0000 (01:16 +0200)]
make sure CURLOPT_TIMEOUT_MS only gets longs
... to avoid portability problems.
Marc Fournier [Sat, 4 Apr 2015 22:54:37 +0000 (00:54 +0200)]
bind: fix a memory leak
Bruno Prémont [Sat, 15 Nov 2014 21:21:21 +0000 (22:21 +0100)]
Bind plugin: Add support for per-zone stats in v3 XML
Contrary to Victor's saying in commit
78e89b2e0c205 (bind plugin: add
support for the new XML v3 API.), XML v3 API does support per-zone
statistics.
By default those statistics are limited to zone serial as if
zone-statistics terse;
was listed in each zone definition block.
To obtain full statistics the above default must be overridden with:
zone-statistics full;
Signed-off-by: Bruno Prémont <bonbons@linux-vserver.org>
Marc Fournier [Sat, 4 Apr 2015 21:27:48 +0000 (23:27 +0200)]
collectd.conf.pod: clarify possibly confusing statement
Marc Fournier [Sat, 4 Apr 2015 20:35:55 +0000 (22:35 +0200)]
curl: correct typo in error message
Marc Fournier [Sat, 4 Apr 2015 20:34:41 +0000 (22:34 +0200)]
doc & comments: s/mili/milli/
Marc Fournier [Sat, 4 Apr 2015 20:29:22 +0000 (22:29 +0200)]
ascent: Add support for specifying a connection timeout
Marc Fournier [Sat, 4 Apr 2015 20:28:47 +0000 (22:28 +0200)]
nginx: Add support for specifying a connection timeout
Marc Fournier [Sat, 4 Apr 2015 20:27:53 +0000 (22:27 +0200)]
bind: Add support for specifying a connection timeout
Marc Fournier [Sat, 4 Apr 2015 20:26:34 +0000 (22:26 +0200)]
apache: Add support for specifying a connection timeout
Marc Fournier [Sat, 4 Apr 2015 20:20:07 +0000 (22:20 +0200)]
curl_xml: Add support for specifying a connection timeout
Marc Fournier [Thu, 2 Apr 2015 16:29:05 +0000 (18:29 +0200)]
curl: adapt Timeout doc bits to new behaviour
Also clarify the ins and outs of stalled network connections regarding
threads consumption and add warning about timeouts and
MeasureResponseTime.
Marc Fournier [Thu, 2 Apr 2015 21:05:23 +0000 (23:05 +0200)]
Merge branch 'collectd-4.10' into collectd-5.3
Thomas Kho [Thu, 2 Apr 2015 17:14:24 +0000 (13:14 -0400)]
Fix type instance sanitization in bind plugin
Marc Fournier [Thu, 2 Apr 2015 16:25:42 +0000 (18:25 +0200)]
curl_json: allow Timeout to be set to 0
also use the per-instance interval or plugin_get_interval() as the
default value, depending on which one is configured.
Marc Fournier [Thu, 2 Apr 2015 16:21:52 +0000 (18:21 +0200)]
curl: allow Timeout to be set to 0
also use plugin_get_interval() rather than cf_get_default_interval() to
take per-plugin interval in account.
Jan Kundrát [Wed, 25 Mar 2015 17:06:50 +0000 (18:06 +0100)]
curl_json: Add support for specifying a connection timeout
There's apparently no need to init the config values in the `db` struct;
memset() is used earlier in the process. This patch doesn't change this
convention.
Jan Kundrát [Sat, 21 Feb 2015 15:12:27 +0000 (16:12 +0100)]
curl: Add support for specifying a connection timeout
Peter Wu [Tue, 31 Mar 2015 21:17:32 +0000 (23:17 +0200)]
battery: do not report sysfs ENODEV failure
Linux reports ENODEV if the reported battery values are equal to
ACPI_BATTERY_VALUE_UNKNOWN. This can be observed for an unpatched Clevo
B7130 laptop while reading the "Battery Present Charge" attribute.
Since this is a non-fatal, non-recoverable event, do not report such
errors. Also change the error message to report the filename triggering
this error to ease hunting down the error.
Peter Wu [Mon, 30 Mar 2015 16:48:06 +0000 (18:48 +0200)]
battery: report current if known
The power field is not always available (take my Clevo B7130 laptop for
example). The current is reported though via "current_now".
According to the ACPI spec v5.0, sect. 10.2.2.6 _BST (Battery Status),
the reported field is "battery present rate" which is always positive
(its direction depends on the charging state).
Contents of /sys/class/power_supply/BAT0/uevent for my laptop:
POWER_SUPPLY_NAME=BAT0
POWER_SUPPLY_STATUS=Discharging
POWER_SUPPLY_PRESENT=1
POWER_SUPPLY_TECHNOLOGY=Li-ion
POWER_SUPPLY_CYCLE_COUNT=0
POWER_SUPPLY_VOLTAGE_MIN_DESIGN=
11100000
POWER_SUPPLY_VOLTAGE_NOW=
11824000
POWER_SUPPLY_CURRENT_NOW=
1498000
POWER_SUPPLY_CHARGE_FULL_DESIGN=
5200000
POWER_SUPPLY_CHARGE_FULL=
5280000
POWER_SUPPLY_CHARGE_NOW=
4797000
POWER_SUPPLY_CAPACITY=90
POWER_SUPPLY_CAPACITY_LEVEL=Normal
POWER_SUPPLY_MODEL_NAME=BAT
POWER_SUPPLY_MANUFACTURER=NOTEBOOK
POWER_SUPPLY_SERIAL_NUMBER=0001
Note for Clevo B7130 owners, the charging rate is not reported when
discharging but this can be [patched][1].
[1]: https://github.com/Lekensteyn/acpi-stuff/blob/master/Clevo-B7130/BatteryFix.dsl
Marc Fournier [Thu, 26 Mar 2015 21:03:29 +0000 (22:03 +0100)]
write_http: add 2 new options to example config
Marc Fournier [Thu, 26 Mar 2015 20:52:39 +0000 (21:52 +0100)]
write_http: control rate using only one parameter
- do not enable the feature with an on/off switch. Enable it by setting
a positive value to the parameter instead. Therefore drop the
arbitrary default value used previously.
- rename LowLimitBytesPerSec to LowSpeedLimit.
- make LowSpeedLimit refer to bytes per second rather than bytes per
Interval.
Marc Fournier [Wed, 25 Mar 2015 23:01:54 +0000 (00:01 +0100)]
write_http: adapt the behaviour of Timeout option
- rename PostTimeoutSec parameter to Timeout
- change Timeout to take milliseconds rather than seconds, for the sake
of consistency: collectd allow working at the sub-second scale if need
be, so it's a shame to restrain this here.
- do *not* set the default timeout to the value of Interval. Rationale:
what matters here is that each POST request completes before the send
buffer fills up again. How fast the send buffer fills up completely
depends on how much data is collected. Interval is unrelated to this,
and unlike read plugins, I don't think it makes a good value to use as
the default timeout.
Fabrice A. Marie [Tue, 24 Mar 2015 08:43:13 +0000 (16:43 +0800)]
fix functions indentation and statuses initialization.
Fabrice A. Marie [Tue, 24 Mar 2015 08:42:40 +0000 (16:42 +0800)]
write_sensu cannot be endpoint/proxy.
Marc Fournier [Tue, 24 Mar 2015 06:37:18 +0000 (07:37 +0100)]
Merge remote-tracking branch 'origin/pr/752' into wh_low_speed_limit
Conflicts:
src/write_http.c
Also slipped in a couple of conding-style consistentcy related changes.
Poil [Mon, 23 Mar 2015 10:18:56 +0000 (11:18 +0100)]
Upgrade spec to 5.4.2
Marc Fournier [Tue, 24 Mar 2015 06:00:35 +0000 (07:00 +0100)]
Merge branch 'collectd-5.3' into collectd-5.4
Conflicts:
contrib/redhat/collectd.spec
src/collectd.conf.pod
Marc Fournier [Tue, 24 Mar 2015 05:51:40 +0000 (06:51 +0100)]
RPM specfile: bump version number
Thanks to @Poil for pointing that out !
Marc Fournier [Tue, 17 Mar 2015 17:27:05 +0000 (18:27 +0100)]
log_logstash: adapt JSON format to logstash 1.2+
Fixes #974
Fabrice A. Marie [Mon, 26 Jan 2015 09:43:23 +0000 (17:43 +0800)]
write_sensu plugin to write datapoints and notification to sensu client TCP socket. Inspired from write_riemann.
Marc Fournier [Thu, 12 Mar 2015 20:02:32 +0000 (21:02 +0100)]
collectd.conf(5): move misplaced block in postgresql section
Marc Fournier [Thu, 12 Mar 2015 17:47:52 +0000 (18:47 +0100)]
Remove more references to the Globals option
This is a follow up to commit
5eabeb9248
At this point, the last reference to Globals in the doc & examples is
the detailed explanation in collectd.conf(5).
Ruben Kerkhof [Sun, 1 Mar 2015 14:04:55 +0000 (15:04 +0100)]
Setting Globals to true is not needed anymore
003c6e86b480 made this happen by default
Marc Fournier [Thu, 12 Mar 2015 09:07:27 +0000 (10:07 +0100)]
Merge branch 'collectd-5.4'
Conflicts:
configure.ac
src/dbi.c
src/utils_latency.c
Marc Fournier [Thu, 12 Mar 2015 08:58:28 +0000 (09:58 +0100)]
Revert "add a conditional for the new dbi reentrant driver interface"
This reverts commit
f1907a6d0775bc2ed9f2de79bd82b05e06e3e214.
With @pyr's acknowledgement, thanks !
Fixes #962
Marc Fournier [Wed, 11 Mar 2015 21:42:11 +0000 (22:42 +0100)]
Merge pull request #947 from mfournier/avoid_using_curlopt_userpwd
avoid using CURLOPT_USERPWD when possible
Marc Fournier [Wed, 11 Mar 2015 21:15:13 +0000 (22:15 +0100)]
amqp: add documentation bits for ConnectionRetryDelay feature
Marc Fournier [Wed, 11 Mar 2015 21:12:16 +0000 (22:12 +0100)]
amqp: disable reconnection delaying feature by default
Marc Fournier [Wed, 11 Mar 2015 21:11:15 +0000 (22:11 +0100)]
amqp: coding-style consistency
Yoga Ramalingam [Fri, 31 Oct 2014 20:03:31 +0000 (16:03 -0400)]
AMQP connection failure leads collectd to use 100%CPU
Summary:
Issue : https://ipm.bloomberg.com/jira/browse/SS-103
Solution : When amqp connection fails, it retries for every message, added a fix to retry only after a delay. A new configuration "ConnectionRetryDelay" has been introduced with default value as 60 seconds.
Test Plan:
1. Tested without the new configuration
2. Tested with the new configuration
In both the cases, verified connection is retried only after the delay and made sure collectd is not taking 100% cpu.
Reviewers: skhajamo
Reviewed By: skhajamo
CC: arcyd
Differential Revision: https://all.phab.dev.bloomberg.com/
D149956
Conflicts:
src/amqp.c
Marc Fournier [Tue, 10 Mar 2015 20:10:19 +0000 (21:10 +0100)]
Merge pull request #965 from rubenk/powerdns-update-auth-stats
powerdns: update plugin with stats for pdns 3.4.3
Marc Fournier [Tue, 10 Mar 2015 18:43:23 +0000 (19:43 +0100)]
Merge pull request #959 from rubenk/fix-ceph-plugin
Ceph: do not define _BSD_SOURCE
Florian Forster [Tue, 10 Mar 2015 14:34:10 +0000 (15:34 +0100)]
write_tsdb plugin: Fix name generation even more.
There were more cases in which "type" or "type_instance" were omitted.
Fixes: #945
Dallin Young [Fri, 20 Feb 2015 18:33:00 +0000 (19:33 +0100)]
write_tsdb plugin: Add type and type_instance to the metric name in any case.
Previously, the generated names were wrong, especially when no
plugin instance was used for a metric.
Fixes: #945
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Tue, 10 Mar 2015 14:13:59 +0000 (15:13 +0100)]
Makefile.am: s/INCLUDES/AM_CPPFLAGS/
Fixes the following warning:
Makefile.am:5: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
Ruben Kerkhof [Mon, 9 Mar 2015 21:31:52 +0000 (22:31 +0100)]
powerdns: update plugin with stats for pdns 3.4.3
Florian Forster [Mon, 9 Mar 2015 09:59:38 +0000 (10:59 +0100)]
write_mongodb plugin: Fix BSON memory handling even further.
According to the mongo-c-driver 0.8.1 documentation, each call to
bson_alloc() needs to be matched by a call to bson_dealloc() and each
call to bson_init() needs to be matched by a call to bson_destroy().
Additionally, this patch adds macros for mongo-c-driver < 0.8.0 to map
the new bson_alloc() and bson_deallow() names to the old bson_create()
and bson_dispose() symbol names.
Tested with mongo-c-driver 0.8.1 and 0.7.1.
Fixes: #331, #956
Florian Forster [Mon, 9 Mar 2015 07:56:39 +0000 (08:56 +0100)]
write_mongodb plugin: s/bson_dispose/bson_destroy/
Thanks to @eremenko for providing the initial patch!
Fixes: #331, #956
Ruben Kerkhof [Wed, 4 Mar 2015 14:38:06 +0000 (15:38 +0100)]
Ceph: define _DEFAULT_SOURCE next to _BSD_SOURCE
Fixes:
make[3]: Entering directory '/home/ruben/src/collectd/src'
CC ceph_la-ceph.lo
In file included from /usr/include/stdio.h:27:0,
from ./daemon/collectd.h:34,
from ceph.c:26:
/usr/include/features.h:148:3: error: #warning "_BSD_SOURCE and
_SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Werror=cpp]
# warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use
# _DEFAULT_SOURCE"
^
cc1: all warnings being treated as errors
Makefile:4120: recipe for target 'ceph_la-ceph.lo' failed
make[3]: *** [ceph_la-ceph.lo] Error 1
make[3]: Leaving directory '/home/ruben/src/collectd/src'
Makefile:5096: recipe for target 'all-recursive' failed
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory '/home/ruben/src/collectd/src'
Makefile:3142: recipe for target 'all' failed
make[1]: *** [all] Error 2
make[1]: Leaving directory '/home/ruben/src/collectd/src'
Makefile:551: recipe for target 'all-recursive' failed
make: *** [all-recursive] Error 1
Wilfried Goesgens [Tue, 29 Jul 2014 11:58:23 +0000 (13:58 +0200)]
Statsd: avoid doing a division by zero when calculating the percentile with an empty histogram.
Wilfried Goesgens [Sat, 21 Jun 2014 19:14:28 +0000 (21:14 +0200)]
Statsd: avoid doing a division by zero when calculating the average if we didn't get any values.
Marc Fournier [Tue, 27 Jan 2015 13:46:02 +0000 (14:46 +0100)]
utils_latency: use portable format string
Yoga Ramalingam [Fri, 14 Nov 2014 14:23:13 +0000 (09:23 -0500)]
statsd histogram to support more than 1 second
Summary:
Problem: Collectd/Statsd supports configurable percentiles for timers but it limits the value to be 1 to 1000ms. If the timer value is more than 1000ms, it uses for min, max, average,... and drops it for percentile computation.
Solution: Added support for increasing bin width when the value is above histogram's range.
Test Plan: Tested by sending metrics within range and out-of-range (ie above 1000 ms)
Reviewers: skhajamo, shalstea
Reviewed By: skhajamo
CC: arcyd
Differential Revision: https://all.phab.dev.bloomberg.com/
D156454
Pierre-Yves Ritschard [Fri, 6 Mar 2015 07:30:38 +0000 (08:30 +0100)]
Merge pull request #838 from yogeswaran/histogram
statsd histogram to support more than 1 second
Marc Fournier [Tue, 3 Mar 2015 23:41:42 +0000 (00:41 +0100)]
configure: add liblvm2app to summary output
Marc Fournier [Tue, 3 Mar 2015 23:39:09 +0000 (00:39 +0100)]
Merge branch 'collectd-5.3' into collectd-5.4
Conflicts:
configure.ac
Marc Fournier [Tue, 3 Mar 2015 23:29:58 +0000 (00:29 +0100)]
configure: add missing entries in summary output
... and reorder alphabetically.
Marc Fournier [Tue, 3 Mar 2015 23:08:37 +0000 (00:08 +0100)]
Merge pull request #951 from tokkee/sh/debian-patches
plugin: Use strcasecmp rather than strncasecmp to find a plugin.
Marc Fournier [Tue, 3 Mar 2015 22:59:38 +0000 (23:59 +0100)]
Merge pull request #953 from rubenk/powerdns-do-not-look-past-the-end-of-array
Powerdns plugin: fix logging on failed lookup
Ruben Kerkhof [Sat, 28 Feb 2015 19:05:14 +0000 (20:05 +0100)]
Powerdns plugin: fix logging on failed lookup
Don't look past the end of the array but check the boundary first.
Marc Fournier [Tue, 3 Mar 2015 22:55:28 +0000 (23:55 +0100)]
Merge pull request #954 from rubenk/remove-outdated-advice
Setting Globals to true is not needed anymore
Ruben Kerkhof [Sun, 1 Mar 2015 14:04:55 +0000 (15:04 +0100)]
Setting Globals to true is not needed anymore
003c6e86b480 made this happen by default
Marc Fournier [Tue, 3 Mar 2015 22:41:57 +0000 (23:41 +0100)]
clean.sh: take new 'src/daemon' dir in account
Sergey [Tue, 3 Mar 2015 21:36:03 +0000 (22:36 +0100)]
snmp plugin: add hostname to "csnmp_value_list_to_value" error message
Fixes #952
Marc Fournier [Mon, 24 Nov 2014 09:41:14 +0000 (10:41 +0100)]
RPM specfile: add ceph plugin
Marc Fournier [Tue, 3 Mar 2015 20:54:58 +0000 (21:54 +0100)]
README/AUTHORS: mention ceph plugin
Marc Fournier [Tue, 3 Mar 2015 20:36:21 +0000 (21:36 +0100)]
Merge remote-tracking branch 'origin/pr/598'
Conflicts:
src/collectd.conf.in
src/types.db
daryder [Mon, 2 Mar 2015 14:33:01 +0000 (09:33 -0500)]
Remove superfluous debug statements
Ruben Kerkhof [Sun, 1 Mar 2015 14:04:55 +0000 (15:04 +0100)]
Setting Globals to true is not needed anymore
003c6e86b480 made this happen by default
Ruben Kerkhof [Sat, 28 Feb 2015 19:05:14 +0000 (20:05 +0100)]
Powerdns plugin: fix logging on failed lookup
Don't look past the end of the array but check the boundary first.
Sebastian Harl [Fri, 27 Feb 2015 15:49:01 +0000 (16:49 +0100)]
plugin: Use strcasecmp rather than strncasecmp to find a plugin.
This makes collectd resistant against vulnerable copies of libltdl
(CVE-2009-3736). See <http://bugs.debian.org/559801#15> for further
details.
Florian Forster [Thu, 26 Feb 2015 14:06:36 +0000 (15:06 +0100)]
Bump version to 5.4.2; Update ChangeLog.
Florian Forster [Thu, 26 Feb 2015 11:49:58 +0000 (12:49 +0100)]
Merge branch 'collectd-5.3' into collectd-5.4
Florian Forster [Thu, 26 Feb 2015 11:19:39 +0000 (12:19 +0100)]
ChangeLog: Add libdbi fix.
Florian Forster [Thu, 26 Feb 2015 11:16:00 +0000 (12:16 +0100)]
dbi plugin: Switch to libdbi's thread-safe interface.
Macros are in place to make buliding with libdbi <0.9.0 possible.
Fixes: #950
Florian Forster [Thu, 26 Feb 2015 10:31:03 +0000 (11:31 +0100)]
Bump version to 5.3.2; Update ChangeLog.
Florian Forster [Thu, 26 Feb 2015 08:11:02 +0000 (09:11 +0100)]
collectd-exec(5): Clarify the format of the Time: header.
Florian Forster [Thu, 26 Feb 2015 08:04:37 +0000 (09:04 +0100)]
Revert "Plugin exec: change notification time to integer."
This was working as intended.
This reverts commit
07e4683f7f985668641d79137b64d148bc18ba8a.
Andrés J. Díaz [Tue, 24 Feb 2015 16:54:08 +0000 (17:54 +0100)]
Change IPC plugin to use type_instances.
Now the IPC plugin uses a combination of plugin_instance and type_instance
to avoid creation of types.db. Just "segments" type is needed now.