[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'
Florian Forster
octo at verplant.org
Tue Jul 29 16:25:07 CEST 2014
bindings/java/org/collectd/api/Collectd.java | 7 ++
.../collectd/java/GenericJMXConfConnection.java | 10 +-
src/collectd-exec.pod | 13 +++
src/collectd-unixsock.pod | 17 ++-
src/collectd.c | 2 +
src/collectd.conf.in | 6 +
src/collectd.conf.pod | 60 +++++++++-
src/collectd.h | 1 +
src/configfile.c | 7 ++
src/conntrack.c | 27 ++++-
src/cpu.c | 123 ++++++++++++--------
src/curl_json.c | 9 +-
src/java.c | 31 ++++-
src/libvirt.c | 119 ++++++++++++++++---
src/onewire.c | 46 +++++++-
src/openvpn.c | 90 +++++++++++++-
src/threshold.c | 51 +++++---
src/utils_cmd_putnotif.c | 12 ++
src/utils_db_query.c | 94 ++++++++++++++-
src/utils_latency.c | 4 +-
src/utils_parse_option.c | 2 +-
version-gen.sh | 2 +-
22 files changed, 615 insertions(+), 118 deletions(-)
New commits:
commit cadc1d5581d3024f4c5ebb940cd49a0dec45c9d4
Merge: 0fe1b2a f554ef2
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Tue Jul 29 16:20:09 2014 +0200
Merge pull request #681 from pyr/feature/use-collectd-hostname
Bring in hostname as defined in the main configuration by default
commit f554ef29b3a20ff058878a3940e97d1dc21f1df0
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Tue Jul 29 14:37:05 2014 +0200
Bring in hostname as defined in the main configuration by default
supersedes collectd/collectd#530
commit 0fe1b2a1938c00413dc2cae4412c1de6674db006
Merge: d89088e 60dffff
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Tue Jul 29 14:04:41 2014 +0200
Merge pull request #655 from dothebart/statsd_fix_division_by_zero
Statsd: avoid doing a division by zero when calculating the average
commit 60dffffa1cfc945160a1b85930117d69c3fd98ad
Author: Wilfried Goesgens <dothebart at citadel.org>
Date: Tue Jul 29 13:58:23 2014 +0200
Statsd: avoid doing a division by zero when calculating the percentile with an empty histogram.
commit d89088ea0673ef8bb38f292169378f7688db44a2
Merge: b31c0f2 98cb04f
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Tue Jul 29 11:33:46 2014 +0200
Merge pull request #416 from udoprog/master
PUTNOTIF: Add the ability to populate meta options
commit b31c0f22f96123aaba7b895361ab075c6b8d150b
Merge: cc7ac93 c339d93
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Tue Jul 29 11:28:59 2014 +0200
Merge pull request #252 from eokerson/vpnfixes
Add support for OpenVPN 2.3.0 status files.
commit cc7ac931beb379f43fa08a145140a37dd8c1b449
Merge: d437681 e975b17
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Tue Jul 29 11:10:51 2014 +0200
Merge pull request #680 from pyr/feature/older-conntrack-files
Support older conntrack files with an option
commit e975b173f612fee4fbc04a7ffb270a6f064a8cf5
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Tue Jul 29 11:10:45 2014 +0200
Support older conntrack files with an option
supersedes collectd/collectd#605
commit d437681a04278fa6292338b4959231f825652785
Merge: 400ec28 6bac150
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Tue Jul 29 10:29:06 2014 +0200
Merge pull request #385 from ccin2p3/libvirt-plugin-instance
libvirt plugin: Add "PluginInstanceFormat" option.
commit 6bac15094742e5cd4b649c7f5d35fb8de63d2c09
Author: Remi Ferrand <remi.ferrand at cc.in2p3.fr>
Date: Tue Jul 29 10:24:43 2014 +0200
Add final documentation for new libvirt plugin option PluginInstanceFormat
commit 400ec2892e52d1635cae720544b60ebe64830eb4
Merge: de155cc 51ffd55
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Tue Jul 29 10:22:22 2014 +0200
Merge pull request #679 from ccin2p3/f/cpu-percent-vs-ticks
ReportByCpu and ValuesPercentage are now independant
commit 51ffd552609aef1c716467751bc32670060c1f18
Author: Fabien Wernli <cpan at faxm0dem.org>
Date: Tue Jul 29 09:02:13 2014 +0200
ReportByCpu and ValuesPercentage are now independant
ReportActive false now actually does as advertised
Change-Id: I93d9c36778253373c05b4efada5b082147656d89
commit de155ccd5c6ec9f58ae26ef8041b0b634c9d59cf
Merge: c7c13ab 1415c4e
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Mon Jul 28 23:20:15 2014 +0200
Merge pull request #427 from kbingham/version_fix
version-gen.sh: Ensure only collectd repository versions are used
commit c7c13abc4c3c72b9baf58dfeec059c9c71e815ea
Merge: 9685c38 5de561c
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Mon Jul 28 23:08:36 2014 +0200
Merge pull request #321 from mwongatemma/db_meta_data
Annotate meta data for db plugins
commit 9685c388b5954800d0e4ceb741844c2682464759
Merge: 5c515b8 31451e5
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Mon Jul 28 23:03:00 2014 +0200
Merge pull request #408 from radford/curl-json-cache-aliasing
curl_json plugin: avoid cache aliasing by using all fields instead of just two
commit 5c515b8d58b994b9a916abf5b7b5377d1f62b6d1
Merge: e560f21 09fb81e
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Mon Jul 28 23:00:28 2014 +0200
Merge pull request #553 from Whissi/issue_553
collectd ignores command line argument "-P"
commit e560f215eebf564b4b5f5005059bf3ad56f3cf29
Merge: 2ab196d 5ea2525
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Mon Jul 28 17:02:57 2014 +0200
Merge pull request #672 from zdzichu/master
onewire: add other temperature-providing sensor families
commit 2ab196d6fab9e2e4613a2a41412333a4bff1b4bf
Merge: 4e09461 0cd67d9
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Mon Jul 28 17:02:04 2014 +0200
Merge pull request #675 from mfournier/write_http_doc
document new options to write_http plugin
commit 4e09461f3fee004b8777fa02584434786289b5fb
Merge: ed48410 1a739fc
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Mon Jul 28 16:03:33 2014 +0200
Merge pull request #581 from jktjkt/hysteresis
Fix transitions between FAILURE and WARNING when using option Hysteresis in Thresholds
commit 0cd67d96b4c6755faccc0886b928d04479ff0238
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Sat Jul 26 11:30:32 2014 +0200
document new options to write_http plugin
... which were added in 6d2bcca2.
commit 5ea2525b20bb135d732c334c73f84f3242da5aac
Author: Tomasz Torcz <tomek at pipebreaker.pl>
Date: Wed Jul 23 20:17:04 2014 +0200
onewire: add other temperature-providing sensor families
commit 804ef69e8163aa3de6652d52f89935444accbb4f
Author: Wilfried Goesgens <dothebart at citadel.org>
Date: Sat Jun 21 21:14:28 2014 +0200
Statsd: avoid doing a division by zero when calculating the average if we didn't get any values.
commit 1a739fc3bfd9627784e35d793452cd2d0da4513d
Author: Jan Kundrát <jan.kundrat at cesnet.cz>
Date: Tue Mar 11 11:00:22 2014 +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.
commit 9ea1cc9352ecd3ea9644fa9e93a4f4cd11cd7350
Author: Jan Kundrát <jan.kundrat at cesnet.cz>
Date: Tue Mar 11 10:59:32 2014 +0100
thresholds: Log the current value of a DS value when generating an OKAY notification
commit 710d9305715622700e4eefbf20b4cba307d7ef57
Author: Jan Kundrát <jan.kundrat at cesnet.cz>
Date: Tue Mar 11 10:57:45 2014 +0100
Coding style: fix indents
commit 09fb81e130ad70bf0547cec3d3c349ce8cb092cf
Author: Thomas D <whissi at whissi.de>
Date: Wed Feb 12 15:32:15 2014 +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.
commit 98cb04f7cbba2a8cf87b88e2fc5f74ba8a0d1900
Author: John-John Tedro <johnjohn.tedro at gmail.com>
Date: Sun Sep 29 16:48:52 2013 +0000
[doc] Added documentation for adding of meta information using PUTNOTIF
commit 1415c4ed9149c134813368caf728a79fd6e69800
Author: Kieran Bingham <kieranbingham at gmail.com>
Date: Tue Sep 17 18:35:38 2013 +0100
version-gen.sh: Ensure only collectd repository versions are used
When cross compiling in hosted environments using RPM,
the extracted tar-ball can be located in a parent .git repository.
The version-gen.sh script will then take the version number from
this repository as if it represents collectd.
This can be even more erroneous when the version returned is non
numerical and breaks the build
Signed-off-by: Kieran Bingham <kieran.bingham at st.com>
commit a0c86a3004f3fe47cc094f689f5a8fc37ecc135f
Author: Remi Ferrand <remi.ferrand at cc.in2p3.fr>
Date: Tue Sep 3 14:44:03 2013 +0200
Applying modifications as requested by octo from GitHub
commit d30d3dfa061850cdc8daf9a8b52c8d838d4b4f35
Author: John-John Tedro <johnjohn.tedro at gmail.com>
Date: Mon Sep 2 21:30:51 2013 +0000
PUTNOTIF: Add the ability to populate meta options
commit 31451e507c73a58255f7bd5feb703d013e1a622d
Author: Jim Radford <radford at galvanix.com>
Date: Fri Aug 16 16:19:46 2013 -0700
curl_json plugin: avoid cache aliasing by using all fields instead of the final two
The following two keys
Key workers/*/requests
Key workers/*/apps/*/requests
can both lead to type_instance's of say
0-requests
which would alias in the cache. If, instead of just the final two key
name components, we use all of them it would lead to these
Key workers-0-requests
Key workers-0-apps-0-requests
which would not overlap.
commit 5522955452af22ea2fbacd38e178a5feebc7969b
Author: Remi Ferrand <remi.ferrand at cc.in2p3.fr>
Date: Tue Jul 30 15:01:38 2013 +0200
Add PluginInstanceFormat option to add plugin instance support
commit 5de561cbf87704310ce6d26499132c9285bd7a33
Author: Mark Wong <mark.wong at myemma.com>
Date: Thu May 9 11:06:26 2013 -0700
Annotate meta data for db plugins
Provide a MetadataFrom setting to name columns whose content is to be
added as metadata to the data collected. Similar in usage to the
ValuesFrom setting.
commit c339d93f3e88278ff02dad480dd008cef633fb9a
Author: Ed Okerson <ed at okerson.com>
Date: Mon Feb 11 15:46:10 2013 -0600
Add support for OpenVPN 2.3.0 status files.
Fix a bug that breaks this module if a server is running multiple instances of OpenVPN and one instance does not have any clients connected.
More information about the collectd-changes
mailing list