Marc Fournier [Wed, 8 Apr 2015 22:53:49 +0000 (00:53 +0200)]
Merge branch 'collectd-5.3' into collectd-5.4
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 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 [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
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 [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
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')
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
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
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.
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.
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
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.
Marc Fournier [Tue, 24 Feb 2015 08:57:29 +0000 (09:57 +0100)]
Merge branch 'collectd-5.3' into collectd-5.4
Marc Fournier [Tue, 24 Feb 2015 06:43:22 +0000 (07:43 +0100)]
Merge branch 'collectd-4.10' into collectd-5.3
Conflicts:
src/collectd.conf.pod
Jim Radford [Tue, 17 Sep 2013 17:52:03 +0000 (17:52 +0000)]
perl plugin: plugins are linked with *_LIBADD and LIBS not *_LIBS and LIBS
Conflicts:
src/Makefile.am
Jim Radford [Wed, 7 Aug 2013 20:21:08 +0000 (13:21 -0700)]
libperl's ldopts include libaries and therefore should go in LIBS not LDFLAGS
Without this configure fails compile its libperl test program because
-lperl comes before the test program on the compiler command line.
Conflicts:
src/Makefile.am
Marc Fournier [Mon, 2 Feb 2015 10:24:08 +0000 (11:24 +0100)]
Merge pull request #899 from mfournier/write_http-multiple-destionations
write_http: make callback names context-dependent
Marc Fournier [Wed, 28 Jan 2015 14:06:28 +0000 (15:06 +0100)]
RPM specfile: doc clarification
Vincent Bernat [Fri, 23 Jan 2015 17:55:04 +0000 (18:55 +0100)]
ipmi: use SIGIO instead of SIGUSR2 to avoid conflict with JVM
Java uses SIGUSR2 to suspend/resume threads. The OpenIPMI plugins also
need a signal to resume its event loop when setting a timer. They can't
both use the same signal. We ask OpenIPMI to use SIGIO instead.
This should fix #114.
Micha Krause [Fri, 23 Jan 2015 13:24:54 +0000 (14:24 +0100)]
added doc CollectStatistics to section rrdcached
Fixes #907
Conflicts:
src/collectd.conf.pod
Marc Fournier [Fri, 23 Jan 2015 14:01:52 +0000 (15:01 +0100)]
mysql: document defaults to boolean config options
Marc Fournier [Sat, 17 Jan 2015 15:10:46 +0000 (16:10 +0100)]
write_http: make callback names context-dependent
This allows multiple destinations to work again (fixes #821), using the
same logic as other write plugins.
The callback name would now be something like:
`write_http/http://example.com/endpoint`
which is not very nice.
The next step would be to change this plugin to use `<Node>` blocks
like many others, and pass the URL as a parameter inside each instance
block. So I see this patch as the minimum required to let 5.3 and 5.4
users use this plugin with multiple destinations.
Marc Fournier [Fri, 16 Jan 2015 16:57:00 +0000 (17:57 +0100)]
RPM specfile: misc improvements related to perl files
Avoids installing some files in two different packages & locations. Also
avoid unnecessary dependencies on -perl and -contrib packages.
Supersedes #896.
Thanks to @faxm0dem for helping work things out !
Marc Fournier [Wed, 7 Jan 2015 23:17:37 +0000 (00:17 +0100)]
Merge branch 'collectd-5.3' into collectd-5.4
Marc Fournier [Wed, 7 Jan 2015 22:32:21 +0000 (23:32 +0100)]
Merge branch 'collectd-4.10' into collectd-5.3
Manuel Luis Sanmartin Rozada [Mon, 31 Mar 2014 19:08:05 +0000 (21:08 +0200)]
Fix check for htonll in configure.ac
Marc Fournier [Wed, 31 Dec 2014 13:54:37 +0000 (14:54 +0100)]
types_list: fix carriage return sign
Many thanks to @NsLib for mentioning this !
Marc Fournier [Tue, 23 Dec 2014 11:59:44 +0000 (12:59 +0100)]
RPM specfile: avoid packaging some files twice
Fixes #874
Yoga Ramalingam [Mon, 8 Dec 2014 18:09:47 +0000 (13:09 -0500)]
configure: Fixed check for AM_PATH_LIBCCRYPT
Marc Fournier [Mon, 15 Dec 2014 15:10:41 +0000 (16:10 +0100)]
collectd.conf example: remove erroneous quotes
Thanks to @ymettier for pointing that out !
Marc Fournier [Fri, 12 Dec 2014 22:13:15 +0000 (23:13 +0100)]
Merge branch 'collectd-4.10' into collectd-5.3
Conflicts:
src/libvirt.c
Ruben Kerkhof [Tue, 9 Dec 2014 16:06:43 +0000 (17:06 +0100)]
virt plugin: only gather stats for running domains
Conflicts:
src/libvirt.c
Marc Fournier [Fri, 5 Dec 2014 12:52:09 +0000 (13:52 +0100)]
redhat initscript: move restart block to a function
This ensures the "condrestart" option will work.
Marc Fournier [Wed, 3 Dec 2014 15:15:28 +0000 (16:15 +0100)]
netlink: ensure size_t portability in DEBUG() statement
This prevents the following error when building on 32bit systems with
gcc 4.7.2:
netlink.c: In function 'ir_read':
netlink.c:783:7: error: format '%lu' expects argument of type 'long unsigned int', but argument 5 has type 'size_t' [-Werror=format]
trenkel [Wed, 3 Dec 2014 19:59:29 +0000 (20:59 +0100)]
Merge pull request #839 from yogeswaran/python
Fix Py list length check in cpy_build_meta()
Yoga Ramalingam [Wed, 3 Dec 2014 19:37:06 +0000 (14:37 -0500)]
Fixed indentation and decreased reference count
Yoga Ramalingam [Wed, 3 Dec 2014 17:20:17 +0000 (12:20 -0500)]
Fix Py list length check in cpy_build_meta()
Pierre-Yves Ritschard [Wed, 3 Dec 2014 15:06:13 +0000 (16:06 +0100)]
Merge pull request #827 from yogeswaran/collectdctl
collectdctl command hangs on AIX and returns error 0 on Solaris.
Yoga Ramalingam [Wed, 3 Dec 2014 13:40:18 +0000 (08:40 -0500)]
Removed extra semicolon
Marc Fournier [Tue, 2 Dec 2014 22:42:06 +0000 (23:42 +0100)]
RPM specfile: require package providing ltdl.h
Yoga Ramalingam [Mon, 1 Dec 2014 14:55:10 +0000 (09:55 -0500)]
Wrap the content of macro with do/while to make it safer as per code review comment
Marc Fournier [Mon, 1 Dec 2014 08:07:30 +0000 (09:07 +0100)]
cpu: remove legacy assignment to undefiend variable
This finishes up the cleanup done by
f7100301fa. It also fixes #828
(build error on Mac OS).
Many thanks to @njh for pointing that out !
Yoga Ramalingam [Wed, 12 Nov 2014 21:07:15 +0000 (16:07 -0500)]
collectdctl command hangs on AIX and returns error 0 on Solaris.
Summary:
Problem: collectdctl command hangs on AIX and returns error 0 on Solaris.
Root cause - client (collectdctl) and server (collectd daemon) are using fprintf to communicate using Unix domain socket, Since fprintf buffers, command sent by client did not reach server, since client does not get the response, it closes the socket which forces the client to flush the command, now server receives the command, when responding, it gets socket error because the client already closed the socket.
Solution: Added flush after all fprintf calls.
Test Plan: Tested collectdctl on AIX and SunOS for listval, getval commands
Reviewers: skhajamo
Reviewed By: skhajamo
CC: arcyd
Differential Revision: https://all.phab.dev.bloomberg.com/
D155584
Marc Fournier [Mon, 24 Nov 2014 08:23:18 +0000 (09:23 +0100)]
Merge branch 'collectd-5.3' into collectd-5.4
Conflicts:
src/write_graphite.c
Marc Fournier [Mon, 24 Nov 2014 08:18:44 +0000 (09:18 +0100)]
Merge branch 'collectd-4.10' into collectd-5.3
Marc Fournier [Wed, 19 Nov 2014 16:59:30 +0000 (17:59 +0100)]
Revert "Let snmp_synch_response deal with PDU freeing"
This reverts commit
9d6f72e5054cfbb183585991fefcf119259d71c4.
The proper fix to this issue is in the collectd-4.10 branch. See also
79e90bba.
Marc Fournier [Wed, 19 Nov 2014 16:49:30 +0000 (17:49 +0100)]
Revert "Let snmp_synch_response deal with PDU freeing"
This reverts commit
e767dc103a142e1c57800f06a9c384f21a48aef5.
The proper fix to this issue is in the collectd-4.10 branch. See also
79e90bba.
Marc Fournier [Wed, 19 Nov 2014 16:54:09 +0000 (17:54 +0100)]
snmp: avoid freeing req under normal operation
Equivalent patch to
79e90bba5, to avoid issue #804 introduced while
fixing #610.
Pierre-Yves Ritschard [Wed, 19 Nov 2014 15:00:54 +0000 (16:00 +0100)]
Let snmp_synch_response deal with PDU freeing
When reading from tables, upon errors the PDUs sent are already
freed by snmp_synch_response since they are right after
snmp_send is called.
This commit syncs collectd's approach with other occurences of
snmp_synch_response calls.
There might be a few corner cases where we leak PDUs, but it
is unclear how to check for those since we would need to
have an indication that snmp_send was never called, which
as far as I can tell is not possible.
The potential for failure in snmp_send is rather low and will
be easily spotted though, since when crafting invalid PDUs
snmp send will constantly fail and since valid configurations
can never leak memory.
This fixes #804
Pierre-Yves Ritschard [Wed, 19 Nov 2014 15:00:54 +0000 (16:00 +0100)]
Let snmp_synch_response deal with PDU freeing
When reading from tables, upon errors the PDUs sent are already
freed by snmp_synch_response since they are right after
snmp_send is called.
This commit syncs collectd's approach with other occurences of
snmp_synch_response calls.
There might be a few corner cases where we leak PDUs, but it
is unclear how to check for those since we would need to
have an indication that snmp_send was never called, which
as far as I can tell is not possible.
The potential for failure in snmp_send is rather low and will
be easily spotted though, since when crafting invalid PDUs
snmp send will constantly fail and since valid configurations
can never leak memory.
This fixes #804
Pierre-Yves Ritschard [Sat, 15 Nov 2014 14:45:00 +0000 (15:45 +0100)]
Merge pull request #796 from mfournier/write_redis-colon-mistake
write_redis: re-add colon dropped in
b7984797 + manpage
Bjørn Nordbø [Wed, 12 Nov 2014 11:27:43 +0000 (12:27 +0100)]
Link aggregation.so to libm.so
Conflicts:
src/Makefile.am
Pierre-Yves Ritschard [Tue, 11 Nov 2014 18:39:58 +0000 (19:39 +0100)]
Merge pull request #765 from tokkee/sh/write-err
Use the complain mechanism to report write failures.
Vincent Bernat [Fri, 7 Nov 2014 14:20:22 +0000 (15:20 +0100)]
network: don't enable gcrypt thread callbacks when gcrypt recent enough
From `gcrypt.h`:
> NOTE: Since Libgcrypt 1.6 the thread callbacks are not anymore used.
> However we keep it to allow for some source code compatibility if used
> in the standard way.
Otherwise, we get a deprecation warning which is turned into an error:
```
CC libcollectdclient_la-network_buffer.lo
../../../src/libcollectdclient/network_buffer.c:58:15: error: 'gcry_thread_cbs' is deprecated (declared at /usr/include/gcrypt.h:213) [-Werror=deprecated-declarations]
GCRY_THREAD_OPTION_PTHREAD_IMPL;
```
Fixes: #632
Marc Fournier [Tue, 11 Nov 2014 10:39:40 +0000 (11:39 +0100)]
add write_redis to manpage
Marc Fournier [Sat, 8 Nov 2014 23:16:11 +0000 (00:16 +0100)]
write_redis: re-add colon dropped in
b7984797
When running
f3706b0b87, the following command gets sent to redis:
"ZADD" "collectd/hostname/entropy/entropy" "
1415487432.000000" "
1415487432:932"
Meaning the value actually stored, and later returned by redis is:
"<timstamp>:<value>".
b7984797 accidentally dropped the comma separating the timestamp and the
value, which leads the plugin to store a somewhat confusing value in
redis:
"ZADD" "collectd/hostname/entropy/entropy" "
1415487432.000000" "
1415487432932"
Marc Fournier [Fri, 7 Nov 2014 16:37:40 +0000 (17:37 +0100)]
redhat initscript: add timeout when stopping the daemon
This mitigates the risk of having 2 daemons running simultaneously
during a short period, on restart.
The debian package's initscript does the same thing, using the same
timeout value.
Pierre-Yves Ritschard [Tue, 4 Nov 2014 16:41:38 +0000 (17:41 +0100)]
Merge pull request #764 from tokkee/sh/collectd-5.3
write_graphite plugin: Improved error reporting when connecting to the server.
Katelyn Perry [Mon, 3 Nov 2014 23:11:14 +0000 (17:11 -0600)]
fix grammar in plugin loading error message
"cause for this problem are" => "cause for this problem is"
Marc Fournier [Tue, 24 Jun 2014 15:47:08 +0000 (17:47 +0200)]
logfile: avoid total silence in case of a misconfiguration
Basically the same patch that was applied to syslog.c in
84c38056
Marc Fournier [Tue, 24 Jun 2014 15:48:26 +0000 (17:48 +0200)]
correct typo in error message
Wilfried Goesgens [Sat, 7 Jun 2014 10:01:32 +0000 (12:01 +0200)]
Syslog: if we can't find the loglevel specified by the configuration string default to 'info' and warn about the unknown configuration option. no way to make syslog totaly silent anymore.
Wilfried Goesgens [Thu, 30 Oct 2014 20:32:17 +0000 (21:32 +0100)]
curl_json: fix the array access implemented in
f1e1e37e
In the avl-tree we store two different structs, cj_key_t for the value
we search, c_avl_tree_t for sub-nodes.
The old version does assume when it will find a key, and when a tree,
which doesn't have to be right in all cases.
Therefore we utilize the magic to revalidate this cast.
Being able to tell tree from key, we now can also implement array access
on the right most node of the tree-path.
Sebastian Harl [Sun, 19 Oct 2014 18:25:50 +0000 (20:25 +0200)]
Use the complain mechanism to report write failures.
This ensures that we don't spam the log for each submitted value. Instead, an
exponential backup is used to report permanent errors starting at one message
per second.
Sebastian Harl [Sun, 19 Oct 2014 16:22:09 +0000 (18:22 +0200)]
write_graphite plugin: Improved error reporting when connecting to the server.
Marc Fournier [Thu, 25 Sep 2014 16:54:56 +0000 (18:54 +0200)]
statsd: clarify/simplify documentation & example
Denis Boulas [Tue, 23 Sep 2014 08:08:25 +0000 (11:08 +0300)]
Added documentation for StatsD module per added functionality in issue #403.
Scott Sanders [Fri, 19 Sep 2014 14:31:18 +0000 (10:31 -0400)]
Bit shift right by 8 to get return code from exit status
Pull-Request: #741
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Wed, 17 Sep 2014 06:24:57 +0000 (08:24 +0200)]
cpu plugin: Remove temperature code for Mac OS X.
This code would throw an error for some systems, because the temperature
couldn't be read. Since the plugin still works in general, this was very
confusing to users. Becaus the temperature, even when read sucessfully, was
never dispatched, remove the code entirely. We might want to add this back to
the apple_sensors plugin eventually.
Fixes: #22
Florian Forster [Wed, 17 Sep 2014 05:41:38 +0000 (07:41 +0200)]
swap plugin: Make "cached" optional under Linux.
This is the smallest possible fix for OpenVZ, where cached is not available.
master has a more complete fix which should be used going forward.
Fixes: #733
Vladimir Smirnov [Wed, 10 Sep 2014 19:08:50 +0000 (21:08 +0200)]
Fix typo in if caluse
Fixes #729
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Wed, 10 Sep 2014 15:15:24 +0000 (17:15 +0200)]
Merge branch 'collectd-5.3' into collectd-5.4
Florian Forster [Wed, 10 Sep 2014 14:54:26 +0000 (16:54 +0200)]
src/common.c: Fix strstripnewline().
Because the length of the string was decremented too late, the function
would actually overwrite the trailing null byte instead of the newline.
Marc Fournier [Mon, 8 Sep 2014 15:29:14 +0000 (17:29 +0200)]
RPM specfile: enable lvm plugin on RHEL7
Marc Fournier [Mon, 8 Sep 2014 15:21:38 +0000 (17:21 +0200)]
Merge branch 'collectd-5.3' into collectd-5.4
Conflicts:
contrib/redhat/collectd.spec
Marc Fournier [Mon, 8 Sep 2014 14:59:30 +0000 (16:59 +0200)]
RPM specfile: enable netlink plugin on RHEL > 5
Marc Fournier [Mon, 8 Sep 2014 14:42:14 +0000 (16:42 +0200)]
RPM specfile: fix bogus dates
modern rpmbuild versions appear to be more strict on this point.
Marc Fournier [Mon, 8 Sep 2014 14:41:21 +0000 (16:41 +0200)]
RPM specfile: support for RHEL7
Marc Fournier [Mon, 8 Sep 2014 12:12:51 +0000 (14:12 +0200)]
RPM specfile: add missing %files section for modbus plugin
complement to
a781eb2c5