[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'
Florian Forster
octo at verplant.org
Sun Jan 12 09:05:50 CET 2014
configure.ac | 5586 ++++++++++++++++++++++++++++++++++++++++++
configure.in | 5566 -----------------------------------------
contrib/redhat/collectd.spec | 146 +-
src/Makefile.am | 6 +-
src/aquaero.c | 4 +-
src/cgroups.c | 19 +-
src/collectd-snmp.pod | 59 +-
src/collectd.c | 2 +-
src/collectd.conf.in | 14 +-
src/collectd.conf.pod | 25 +-
src/cpu.c | 34 +
src/curl.c | 3 +-
src/curl_json.c | 9 +-
src/curl_xml.c | 1 +
src/interface.c | 11 +-
src/load.c | 74 +-
src/snmp.c | 471 ++--
src/target_replace.c | 4 +-
src/target_set.c | 4 +-
src/types.db | 3 +-
src/utils_mount.c | 3 -
src/write_graphite.c | 16 +-
src/zfs_arc.c | 8 +-
23 files changed, 6290 insertions(+), 5778 deletions(-)
New commits:
commit ac16c8169106f29d890982cce36bb4cfa7af0429
Merge: 4c6303e 54ef2ae
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Fri Jan 10 15:39:31 2014 +0100
Merge branch 'collectd-5.4'
Conflicts:
src/write_graphite.c
commit 54ef2ae58f8ef125cf1d3aefe3ac839ba7e67f8a
Merge: d9c8512 affac33
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Wed Jan 8 18:28:07 2014 +0100
Merge branch 'collectd-5.3' into collectd-5.4
Conflicts:
src/zfs_arc.c
commit affac33e83584e7538c358e3bd0a587d0c692bc3
Merge: 8e9bdd5 cde09b5
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Wed Jan 8 18:24:27 2014 +0100
Merge branch 'collectd-4.10' into collectd-5.3
commit cde09b547abbeb7595d91259fcc628504d0f55a9
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Wed Jan 8 18:05:40 2014 +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.
commit 645dadb3fcc466e8880fda4eb23b21ad433631fc
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue Jan 7 16:06:10 2014 +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 !
commit bbbf37d55a3959951604c4be482e9a705a0f86d9
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue Jan 7 11:30:59 2014 +0100
curl_xml.c: avoid using uninitalized variable in error message
Thanks to @trtrmitya for reporting this. Fixes GH#507
commit d9c851256eec5fa49821c6f1a7f3381c90850a71
Author: Michael Hart <michael.hart at arcticwolf.com>
Date: Fri Dec 20 09:56:54 2013 -0500
fix wg_send_buffer to reconnect tcp sockets on failure
Conflicts:
src/write_graphite.c
commit 8e9bdd5a63e67c6adb403c2aac4a25e0595ea147
Author: Sebastian Harl <sh at tokkee.org>
Date: Sun Dec 22 13:59:44 2013 +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
commit 4c6303ec6be673df6c9e0964dfc9419c697bf47c
Merge: 08c508d 937c7cc
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Fri Dec 20 15:51:35 2013 -0800
Merge pull request #502 from rtkmhart/write_graphite_issue_430
Fix issue #430 where write_graphite fails to reconnect
commit 08c508d00ada75d8d7e1a369a47459d9291ee259
Merge: 32b4405 9e29ecf
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Fri Dec 20 15:48:45 2013 -0800
Merge pull request #414 from kri5/master
Adds Blacklist/Whitelist support to snmp plugin
commit 937c7cc7f9195b1579c7ebc198a9086eeec1a205
Author: Michael Hart <michael.hart at arcticwolf.com>
Date: Fri Dec 20 09:56:54 2013 -0500
fix wg_send_buffer to reconnect tcp sockets on failure
commit 9e29ecf54c1c8ee6cfa36d9b3db34717d216ce97
Author: Christophe Courtaut <christophe.courtaut at gmail.com>
Date: Thu Aug 29 15:45:55 2013 +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 at gmail.com>
commit 32b4405ae54dea89c2a919bb5de28ae3664f3f5d
Merge: d3a6321 7eeb7ff
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Fri Dec 20 00:18:03 2013 -0800
Merge pull request #499 from pyr/feature-cpu-active
Report a CPU "active" value, summing non-idle values
commit d3a6321b788076b268e76b3deea4369a88a57837
Merge: 4ab54de 4a244f9
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Fri Dec 20 00:17:51 2013 -0800
Merge pull request #498 from pyr/feature-relative-load
Feature relative load
commit 4ab54ded3b73d5051230bb35eecf766a51dee786
Merge: b19aa60 0281aa4
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Fri Dec 20 00:15:21 2013 -0800
Merge pull request #362 from mikepilat/add-snmpv3
Add SNMPv3 authentication and encryption support
commit 7eeb7ff76567e14f86ad1ef239442afdc2e10dc2
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Wed Dec 18 11:34:42 2013 +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).
commit 4a244f921a2f6a2df663c1e149cc2b2b9c6ce9f1
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Wed Dec 18 11:12:33 2013 +0100
Document changes, mostly taken from @vbartoni's original work
commit ce92030e5d706d74da5a56af00be460b60461bfa
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Wed Dec 18 11:07:45 2013 +0100
Adapt to @octo's comments for PR #344
commit 147690b3baf04341851757c9424596ceb37c45ba
Author: Rainer Müller <raimue at codingfarm.de>
Date: Wed Feb 27 19:46:41 2013 +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.
commit 30aaad03b66ff22d8cc50de2116b2d93a9d445f2
Author: Rainer Müller <raimue at codingfarm.de>
Date: Sun Nov 10 03:51:40 2013 +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 at collectd.org>
commit 8f85126d19f0444d79ec6d5aea12b6ef52130549
Author: Florian Forster <octo at collectd.org>
Date: Wed Nov 13 19:59:27 2013 +0100
src/types.db: Remove maximum value on "cache_size".
Fixes #466. Thanks to @dlacko for pointing this out!
commit 8327ee64139eae2172f35cfdd7ee41998b806bcf
Author: Rainer Müller <raimue at codingfarm.de>
Date: Sun Nov 10 03:39:22 2013 +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 at collectd.org>
commit 0281aa42cf1f988ebb15518441d54560d00e5595
Author: Michael Pilat <mike at mikepilat.com>
Date: Sun Oct 20 04:10:25 2013 -0500
Refactor / modernize config parsing with configfile helpers
... as requested by @octo
commit 0c4da4eb1348f032d6845e192d71e7a3908126c1
Merge: 6dcd94c 5fea70d
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Mon Oct 14 06:47:05 2013 -0700
Merge pull request #393 from mfournier/prevent-building-with-old-libpcap
Prevent building with old libpcap
commit 6dcd94cf362b78541cfd1c5b7c80a04c415beb88
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Mon Oct 7 23:11:44 2013 +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
commit 0ebd7011d139760eab8c96d0b4ec4584c4fcd9f5
Author: Fabien Wernli <github at faxm0dem.org>
Date: Fri Sep 27 09:42:46 2013 +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 at collectd.org>
commit 0b6adfd256599f1bb944246435488eeddb7dc617
Author: Tim Laszlo <Tim.Laszlo at magnetar.com>
Date: Tue Sep 24 13:20:29 2013 -0500
Avoid using first person in the error message
Signed-off-by: Florian Forster <octo at collectd.org>
commit 9f37f0c4e2b5957e96351a9064f7b2304a5b3924
Author: Tim Laszlo <Tim.Laszlo at magnetar.com>
Date: Tue Sep 24 10:35:22 2013 -0500
Replace you with your in error message
Signed-off-by: Florian Forster <octo at collectd.org>
commit a2983ff80886d944e67269c204c326621c1f42ea
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Sat Sep 21 16:38:03 2013 +0200
make build outputs more quiet
"make V=1" reverts the output to the usual verbosity level
Thanks to @jbergstroem for suggesting this !
commit d4fcceb7794eed59bd14ff7ebea545efcc1457d0
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Sep 15 17:35:34 2013 +0200
Autoupdate
commit 064c98a37b3f01a119c78a311912facf4024f60b
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Sep 15 16:57:56 2013 +0200
configure.in has been deprecated for a while now
commit fa6404e461bf26a225d60b8dd963917894a8f846
Author: Wilfried Goesgens <dothebart at citadel.org>
Date: Tue Sep 17 21:15:02 2013 +0200
write_graphite: avoid printing out the NULL value in error messages
commit 39ea1661f666b6ce8f56ff1e310666331fb53f9b
Author: Alex Deymo <deymo at chromium.org>
Date: Tue Sep 3 00:18:26 2013 -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.
commit 825058c3e21b01b3f615eb86a87fe51cb12a54dc
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Sep 15 15:59:36 2013 +0200
Display status of mic module
commit 6be256a584f4d19d105f6fa06e5634cedc21db64
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Sep 19 23:27:02 2013 +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
commit 0a62f6d35733648b47e218b97a0fb79d962f4418
Author: Sebastian Harl <sh at tokkee.org>
Date: Sun Sep 15 14:56:37 2013 +0200
collectd.conf: Added an example write_riemann TTLFactor option.
commit 6ac4c8a3cf7857f33909ecd5a589113ce7d8959d
Author: Sebastian Harl <sh at tokkee.org>
Date: Sun Sep 15 14:53:58 2013 +0200
collectd.conf: Added example df plugin ValuesAbsolute/Percentage options.
commit ef668895077ac536524e4994447bf4ad456b39ff
Author: Sebastian Harl <sh at tokkee.org>
Date: Sun Sep 15 14:48:58 2013 +0200
collectd.conf: Added example cgroups plugin config section.
commit 4518acb70866a93fedeaabd56c142c51f0c881e1
Merge: 7d5037e 296fec5
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Fri Sep 6 14:34:59 2013 +0200
Merge remote-tracking branch 'origin/pr/409' into collectd-5.4
commit 7d5037e3522e5a95c3639233c8850d19026a3949
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Fri Sep 6 14:32:54 2013 +0200
correct default write_graphite protocol in manpage
commit 9875cce31c8aee20cae090d319f9885334bcf237
Merge: 57bd4c5 c94e448
Author: Florian Forster <octo at collectd.org>
Date: Wed Aug 28 15:22:37 2013 +0200
Merge remote-tracking branch 'github/pr/413' into collectd-5.4
commit 57bd4c578e337319d4a190311bb08ef98d0d7358
Author: Florian Forster <octo at collectd.org>
Date: Wed Aug 28 15:19:48 2013 +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
commit 3dcfbf12d5ec0b62bc540ac59944ddf50c37c1f2
Author: Florian Forster <octo at collectd.org>
Date: Wed Aug 28 15:18:11 2013 +0200
src/utils_mount.c: Fix wrong behavior in cu_mount_getoptionvalue().
Github: #412
commit c94e448d41d1852c2dd6ca4dc402ca6e225b5f37
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Wed Aug 21 16:54:10 2013 +0200
correct typo
commit 4b4eee900b167cfdf17528e70c9c0659eb0329b0
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Wed Aug 21 16:22:32 2013 +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
commit 510108ba3eb7ef594ec35c4d4cf1d816522a86fd
Author: Florian Forster <octo at collectd.org>
Date: Mon Aug 19 17:04:11 2013 +0200
zfs_arc plugin: Collect "allocated" and "stolen" on FreeBSD only.
The appropriate log messages have been demoted to WARNING.
Github: #305
commit 2aefd2f1927ab78258d8ad218eb5a351d668d412
Author: Jim Radford <radford at galvanix.com>
Date: Sat Aug 10 09:14:27 2013 -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 at collectd.org>
commit d130204df3256c39e104aa9a4346d116458c745e
Author: Jim Radford <radford at galvanix.com>
Date: Sat Aug 10 09:10:56 2013 -0700
curl_json plugin: avoid unlikely overrun
Signed-off-by: Florian Forster <octo at collectd.org>
commit 296fec5ad60587485013993c5f5aad2a38834049
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Aug 8 18:37:26 2013 +0200
RedHat RPM spec: updates for 5.4.0
commit 5fea70dbfa292536761c95ee7021a61ef925b73e
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Fri Aug 9 14:53:24 2013 +0200
check if libpcap has PCAP_ERROR_IFACE_NOT_UP
This should prevent DNS plugin from being built on systems with libpcap
older than 1.0.0.
GitHub issue #373
commit 3007e142b24f402a6df26c5be9564722f155a297
Author: Michael Pilat <mike at mikepilat.com>
Date: Fri Jun 28 05:45:54 2013 -0500
Add SNMPv3 authentication and encryption support
Adds the following configuration options to support SNMPv3 authentication:
* SecurityLevel - authPriv | authNoPriv | noAuthNoPriv
* Username - username for authentication
* AuthPassphrase - passphrase for authentication
* AuthProtocol - MD5 or SHA
* PrivacyPassphrase - passphrase for encryption
* PrivacyProtocol - AES or DES
* Context - Optional authentication context
More information about the collectd-changes
mailing list