[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'
Florian Forster
octo at verplant.org
Tue May 19 09:49:35 CEST 2015
.gitignore | 3 +-
AUTHORS | 3 +
README | 34 +-
clean.sh | 7 +
configure.ac | 36 +-
contrib/redhat/collectd.spec | 38 +-
src/Makefile.am | 16 +-
src/amqp.c | 4 +
src/apache.c | 19 +
src/ascent.c | 14 +-
src/barometer.c | 598 +++++++++++++--
src/battery.c | 19 +-
src/bind.c | 78 +-
src/collectd-perl.pod | 6 -
src/collectd.conf.in | 30 +-
src/collectd.conf.pod | 317 ++++++--
src/curl.c | 16 +-
src/curl_json.c | 16 +
src/curl_xml.c | 13 +
src/daemon/meta_data.c | 2 +-
src/ipc.c | 313 ++++++++
src/libcollectdclient/network.c | 10 +-
src/libcollectdclient/network_buffer.c | 6 +-
src/log_logstash.c | 16 +-
src/nginx.c | 18 +-
src/powerdns.c | 6 +-
src/processes.c | 4 +-
src/swap.c | 13 +-
src/types.db | 1 +
src/write_http.c | 25 +
src/write_kafka.c | 110 ++-
src/write_sensu.c | 1242 ++++++++++++++++++++++++++++++++
version-gen.sh | 4 +-
33 files changed, 2811 insertions(+), 226 deletions(-)
New commits:
commit b99f2ef5c262080cdd55d4dc056aaf23ba2ff907
Author: Florian Forster <octo at collectd.org>
Date: Tue Apr 21 10:00:23 2015 +0200
libcollectdclient: Propagate errors when signing / encrypting network packets.
commit b57d6e25aa792f0461aee4e5bd6d1838c478af50
Merge: fed6710 9708614
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Sun May 10 00:14:18 2015 +0200
Merge branch 'collectd-5.4'
commit 9708614487ec93df67ad1095f3cf5a0987b9cc28
Merge: 02c45fc a2c0ff8
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Sun May 10 00:13:19 2015 +0200
Merge branch 'collectd-5.3' into collectd-5.4
commit a2c0ff89b4792142dff02ee46bc5a578a5e6063e
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sat May 9 20:34:52 2015 +0200
/bin/sh on OSX doesn't understand -n
This breaks PACKAGEVERSION since the -n is left verbatim in the string.
Use the more portable printf instead
commit fed6710c8e31db8fd84219be418b62713cd2b331
Merge: 25342c6 b2086f2
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Sun May 10 00:10:36 2015 +0200
Merge pull request #1024 from rubenk/fix-version-gen-on-osx
/bin/sh on OSX doesn't understand -n
commit 25342c6a01df83e84bdb41047d8a38e551581ae5
Merge: f87af5a 4c38525
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Sun May 10 00:06:42 2015 +0200
Merge pull request #1016 from mfournier/write_sensu-format-string
write_sensu: fix format-string portability problem
commit b2086f25ed8449cc63f2459ad67d06fa39ae263c
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sat May 9 20:34:52 2015 +0200
/bin/sh on OSX doesn't understand -n
This breaks PACKAGEVERSION since the -n is left verbatim in the string.
Use the more portable printf instead
commit f87af5a58fa6a51d0268e47a0e55988db692a372
Merge: ce41683 2177f82
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Thu May 7 15:00:37 2015 +0200
Merge pull request #1002 from ciomaire/master
write_kafka plugin : Create kafka handles from kafka_write callback rather than the config callback
commit 144a9eaae63e939f31476319d35cb3504474a2a3
Merge: 22da0c2 db7c38f
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue May 5 21:40:09 2015 +0200
Merge pull request #1014 from mfournier/fix-path-to-java
improve java detection/defaults in configure script
commit 22da0c2d6ae132767d0b806f5447a7b7e36fb3e2
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue May 5 18:18:26 2015 +0200
RPM specfile: update summary to be consistent with .deb packages
commit bc16a9fce8c389a2ee3c6e1d1a7b7b7f103a8d1d
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue May 5 18:17:27 2015 +0200
RPM specfile: remove superfluous '--without-*' configure flags
commit 3361d7acbc9d1338db56396f43eae89459d2055d
Author: ale at biancalanas.net <ale at biancalanas.net>
Date: Tue May 5 02:01:29 2015 +0000
- use _POSIX2_LINE_MAX for errbuf as stated by kvm(3).
- fix error msg on kvm_openfiles failure
commit b5230d45188e81ae58c889fa69e7e87b79359482
Author: ale at biancalanas.net <ale at biancalanas.net>
Date: Fri May 1 16:48:30 2015 +0000
fixes swap plugin on FreeBSD Jail
commit acad0c60161f6ccc4bb17e6860c99c174d5f85ca
Author: ale at biancalanas.net <ale at biancalanas.net>
Date: Fri May 1 16:48:28 2015 +0000
fixes processes plugin on FreeBSD Jail
commit 39d06560bc5df5064d2f2e461013ad8bf57afa6f
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Sat May 2 10:08:23 2015 +0200
configure: add return() statements in 3 AC_LANG_PROGRAM() blocks
This allows the dns and df plugins to get built also in the case the
configure script is run with `CC="gcc -Wall -Werror"`.
commit 82045e68dec4864bbbee2257d52d412d5c76ca2d
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Fri May 1 12:10:17 2015 +0200
RPM specfile: correct copy-paste error
commit 4c385259da89a7d9b9f3fff23faa4b03a528252d
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Apr 30 00:15:19 2015 +0200
write_sensu: fix format-string portability problem
Casting counters, derives and abolutes to int64_t was incorrect, as they
are respectively `unsigned long long`, `int64_t` and `uint64_t`.
Apart from potentially loosing precision, the `%ld` format-string made
clang choke on the 32bit architecture (follow-up to 78340212).
commit db7c38fe510ddae9891091d8b580ba1bdee96860
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue Apr 28 07:39:02 2015 +0200
make java components discovery follow symlinks
When `--with-java` points to a symlink, `find` should resolve it, making
the configure script work seamlessly with symlinks pointing to JDK
installations.
This fixes the confusing discrepancy between `--with-java=/path/to/java`
failing and `--with-java=/path/to/java/` working.
commit fc6dcff7db47c2be34f84ce95e74dc46ad1fa22f
Author: Ruben Kerkhof <ruben at tilaa.nl>
Date: Sun Nov 18 11:38:24 2012 +0100
Fallback to /usr/lib/jvm if JAVA_HOME is not set
This makes the java plugin build out of the box
on systems with a JDK installed.
/usr/lib/jvm is the default location for the JDK
on at least Fedora, Red Hat and Debian.
commit ce416835a543a520f651b7c72fcb99daad20a236
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Wed Apr 22 10:12:32 2015 +0200
cleanup test-related files
commit f2a7a1e63d9294d417235a96547f483139fbf188
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Wed Apr 22 10:11:14 2015 +0200
update ignored test-related files
commit 45ddc80b80d20d9839f8f5a38cb50f279f981940
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Wed Apr 22 10:05:33 2015 +0200
tests: include tests/macros.h in release tarballs
This is needed to run the tests outside of the git repository.
commit ef4a3db895a0aba7107c0f1c6c2ef2a7f128aaf8
Merge: 7fd4607 15037c9
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Wed Apr 22 08:46:00 2015 +0200
Merge branch 'collectd-4.10' into collectd-5.3
commit 244eda2b9f8dacfbbca886cac8773ae0ccfccd94
Merge: 7834021 5887216
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Wed Apr 22 08:39:50 2015 +0200
Merge pull request #1008 from remicollet/issue-librabbitmq-060
fix build with librabbitmq 0.6.0
Also backported to the collectd-5.3 branch as bd60e5 and 7fd46078d.
commit 7fd46078dc313f752423ccb66eba5134aa56f6c5
Author: Remi Collet <fedora at famillecollet.com>
Date: Tue Apr 21 17:40:43 2015 +0200
check if AMQP_VERSION exists
commit 58872160e593a09c2af8088cbbed7b2c049f9402
Author: Remi Collet <fedora at famillecollet.com>
Date: Tue Apr 21 17:40:43 2015 +0200
check if AMQP_VERSION exists
commit bd60e580f462ff3fc5d6faff4b0251e84f7f3728
Author: Remi Collet <fedora at famillecollet.com>
Date: Tue Apr 21 09:33:20 2015 +0200
fix build with librabbitmq 0.6.0
commit 534642e9d65763b67d73433ebcfaa90de88d76c6
Author: Remi Collet <fedora at famillecollet.com>
Date: Tue Apr 21 09:33:20 2015 +0200
fix build with librabbitmq 0.6.0
commit 15037c9f4b3c43ac3d09040e16c3a430c9fc2b22
Author: hshopeful <daifeiyahs at 163.com>
Date: Mon Apr 20 20:35:40 2015 +0800
Update meta_data.c
In the function meta_data_get_string(), when the type mismatchs,the ERROR statement should be
ERROR ("meta_data_get_string: Type mismatch for key `%s'", e->key);
not
ERROR ("meta_data_get_signed_int: Type mismatch for key `%s'", e->key);
commit 2177f827c757854087f179e63016bb0980d4655e
Author: ciomaire <cmacaniomaire at gmail.com>
Date: Wed Apr 15 06:19:27 2015 -0700
fix double free errors found by valgrind
commit 585e552936cc92e437ce1f58695a6d1b3caf785e
Author: ciomaire <cmacaniomaire at gmail.com>
Date: Wed Apr 15 05:31:55 2015 -0700
Create kafka handles from within write callback
commit 783402127eed3d74e8dc893fdac1922fdc5acea5
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue Apr 14 18:48:07 2015 +0200
write_sensu: fix 2 format-related details
The default CC on freebsd-10 (clang 3.4) spotted these issues:
write_sensu.c:494:38: error: format specifies type 'long long' but the argument has type 'int64_t' (aka 'long') [-Werror,-Wformat]
write_sensu.c:494:45: error: data argument not used by format string [-Werror,-Wformat-extra-args]
commit eea01a8f212634414a21462ba79dc058dc5fb304
Merge: 0cf5df3 02c45fc
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue Apr 14 09:27:00 2015 +0200
Merge branch 'collectd-5.4'
Conflicts:
src/Makefile.am
src/network.c
commit 02c45fc2ecb087fb140e90217e5b701959306c1a
Merge: e9ef1a2 82e2767
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue Apr 14 09:25:02 2015 +0200
Merge branch 'collectd-5.3' into collectd-5.4
commit 0cf5df3dbcf508d419b52d3deecac9ba74b2e260
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue Apr 14 08:33:14 2015 +0200
write_kafka: correct mistyped function name
commit cc5653ae5d61cfd0ce94f0ecec5399f12d430ef4
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue Apr 14 08:30:17 2015 +0200
write_kafka: fix typo preventing --with-librdkafka from working as expected
commit 021237b2bf08bd39f93ac44f88d56f3193f63078
Merge: 4342c79 70df26d
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue Apr 14 09:23:22 2015 +0200
Merge remote-tracking branch 'origin/pr/1001'
commit 82e27678f8972d2625b466e7e7ba9daaa6395c98
Merge: 8df7333 0632ace
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue Apr 14 09:17:27 2015 +0200
Merge branch 'collectd-4.10' into collectd-5.3
commit 0632ace737ca2d9808c3daf61935ff94bfe9e503
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue Apr 14 08:35:28 2015 +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.
Conflicts:
src/Makefile.am
commit 4342c79ff0d47f561a28e7100c25b205803fa09f
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue Apr 14 08:35:28 2015 +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.
commit e9ef1a2f33fb6fb5a379f877fb8c5bb0d3810fed
Merge: 079f487 8df7333
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue Apr 14 00:24:46 2015 +0200
Merge branch 'collectd-5.3' into collectd-5.4
commit 8df7333d670cf2a8da8716a2411844f6fc553fa9
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue Apr 14 00:21:57 2015 +0200
Revert "version-gen.sh: Switch to bash due to bashisms."
The last bashism was removed in 4d376681. Reverting to /bin/sh prevents
build errors on platforms without bash installed by default.
This reverts commit 3bda88e8b425f43644e303e6957e38ae59c1bc83.
commit 70df26d1edc6cceba9a4d25d1678aa6c812eb47f
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Sun Apr 12 22:01:39 2015 +0200
write_sensu: pass literal string to ERROR() macro
This allows building with gcc's `-Werror=format-security` flag, which is
enforced when building debian packages.
See https://wiki.debian.org/Hardening
commit dc7e14787cc4273927d5d0cdbd00fd41a0bee928
Merge: 9e5cdde 125f3be
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Sun Apr 12 09:26:52 2015 +0200
Merge remote-tracking branch 'origin/pr/998'
commit 9eec9ae8492611149a5824f7bec172e81d0f2f58
Author: Tim Laszlo <Tim.Laszlo at magnetar.com>
Date: Fri Jun 20 09:00:43 2014 -0500
network: set ttl before opening server sockets
If TimeToLive is defined in collectd.conf after Server options, the
net_config_ttl value is updated after network_config_add_server and
the desired ttl is not used.
commit 0d5096466777809ad0b63fba58997cb9e0ea9426
Author: Tim Laszlo <Tim.Laszlo at magnetar.com>
Date: Fri Jun 20 08:37:19 2014 -0500
Warn if ttl is out of bounds
commit 759b3c5616f5d4ecb393ee8a74b919465a9070d5
Author: Florian Forster <octo at collectd.org>
Date: Sun Sep 14 19:28:05 2014 +0200
openvpn plugin: Don't signal an error when no clients are connected.
In the multi1_read() function, an error (zero) was returned when no
clients were currently connected to the OpenVPN server, because the
"read" variable was initialized to zero and the while loop exited before
it was set to one. This is not the intended behavior.
Thanks to @srix for reporting this issue!
Fixes: #731
commit 9e5cdde4656070893ecf59c6234af0593bdda1a0
Merge: 705e259 079f487
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Apr 9 01:14:40 2015 +0200
Merge branch 'collectd-5.4'
commit 705e2594b3e6ce864f05e88e7d1772fa0a85742c
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Apr 9 01:09:33 2015 +0200
README: ordering
commit 81b4cf805f67ddd2c5e1292edb78e7833a802893
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Apr 9 00:58:56 2015 +0200
RPM specfile: add write_sensu and ipc plugins
commit 079f487bae003575e360dcd6034546485f69b5c8
Merge: 2b96645 c5da45d
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Apr 9 00:53:49 2015 +0200
Merge branch 'collectd-5.3' into collectd-5.4
commit a4cd2c37290cae6fa28ac5ef3f7b54b383bb6b20
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Apr 9 00:51:16 2015 +0200
ipc: don't enable by default in example config file
commit 3d78ade1bf57703ca9df24e9be54bc2398fc7fad
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Apr 9 00:50:44 2015 +0200
ipc: build on AIX by default
commit 7fa139deb9688e3be15c681eea0a9a56fcae868a
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Apr 9 00:50:24 2015 +0200
ipc: don't document plugin without any options
commit 8ca57814f6ff273288552746f523631f9c6abe68
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Apr 9 00:49:28 2015 +0200
ipc: remove extraneous call to sysconf()
commit cfe801cf0236ea2fade924e0f2b5ce3d1a51698a
Merge: 52b5def 42af0f2
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Apr 9 00:32:50 2015 +0200
Merge remote-tracking branch 'origin/pr/925'
commit 52b5def4017f552f02eb3ca5716c4ee9d7a43145
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Apr 9 00:27:13 2015 +0200
write_sensu: documentation wording, wrap long lines
Thanks to @jamtur01 for reviewing !
commit 7c5cd3178a903871e57a8399bb19ce7ee15dd0f1
Merge: de64a91 c19a8c2
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Apr 9 00:16:37 2015 +0200
Merge remote-tracking branch 'origin/pr/912'
commit de64a9127f1a6da9052f5d4d55eeadce9d574c85
Merge: 8a2c605 3d274ef
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Apr 9 00:14:37 2015 +0200
Merge remote-tracking branch 'origin/pr/946'
Conflicts:
src/collectd.conf.pod
commit 8a2c605b07917885438eb80f1d5097cb58e6193b
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Wed Apr 8 22:58:22 2015 +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.
commit 76d9c9033e021cbdb0da0fc2b0ad23bc3d7ad487
Merge: 09c57e6 6466bdb
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Apr 9 00:08:21 2015 +0200
Merge remote-tracking branch 'origin/pr/993'
commit 09c57e6f2fa67509f815245329610ef0658709f7
Merge: cb314c1 943d508
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Apr 9 00:07:07 2015 +0200
Merge remote-tracking branch 'origin/pr/985'
commit cb314c15d51352ebcc4cfd2bbf1d6a3042c2402f
Merge: 5d0ef48 c0a9b8c
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Apr 9 00:06:25 2015 +0200
Merge remote-tracking branch 'origin/pr/693'
Conflicts:
src/collectd.conf.pod
commit c5da45dfcfa86313c381af15519e304c995d9f59
Author: Vincent Bernat <bernat at luffy.cx>
Date: Sat Oct 12 22:37:00 2013 +0200
dbi plugin: fix a warning mentioning snmp plugin
commit 943d5088b10e88009b98948d016c623f1d61bb17
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Sun Apr 5 01:44:50 2015 +0200
write_http: make sure CURLOPT_* only get longs
... to avoid portability problems.
commit 6466bdb79c1f36b9f2867b92605928ddc39d0605
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Sun Apr 5 01:16:13 2015 +0200
make sure CURLOPT_TIMEOUT_MS only gets longs
... to avoid portability problems.
commit 5d0ef486144dea177f42f2d8ff88dd83adb2d367
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Sun Apr 5 00:54:37 2015 +0200
bind: fix a memory leak
commit cf19c40fd20c80cf4ca81143628b22470bccfc62
Author: Bruno Prémont <bonbons at linux-vserver.org>
Date: Sat Nov 15 22:21:21 2014 +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 at linux-vserver.org>
commit 38697ec45ac8728c63feb115da0b3e3c77bd209b
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Sat Apr 4 23:27:48 2015 +0200
collectd.conf.pod: clarify possibly confusing statement
commit 2b9664594b14d33b989924657dd2ef4b1a53589a
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Sat Apr 4 22:35:55 2015 +0200
curl: correct typo in error message
commit 254878cea0e2b6f5c32298a7d26406f62c4b7f7c
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Sat Apr 4 22:34:41 2015 +0200
doc & comments: s/mili/milli/
commit 4b0440039f4f3cf47346de666ac775dfb3c74e9b
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Sat Apr 4 22:29:22 2015 +0200
ascent: Add support for specifying a connection timeout
commit 293ef78a6140221ccf524d4e52a0f475f027815a
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Sat Apr 4 22:28:47 2015 +0200
nginx: Add support for specifying a connection timeout
commit b20df0bde244c3638cbc92ec0a75c88c6aa254be
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Sat Apr 4 22:27:53 2015 +0200
bind: Add support for specifying a connection timeout
commit c279c0e5bff589bd7be9a4d63e7bef3ca9ac65d2
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Sat Apr 4 22:26:34 2015 +0200
apache: Add support for specifying a connection timeout
commit 87768c58e44c2d879b6d0c28f849fd18741dc995
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Sat Apr 4 22:20:07 2015 +0200
curl_xml: Add support for specifying a connection timeout
commit 328fc70ebb2a2bdfe7c63a3945a52c10e1490291
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Apr 2 18:29:05 2015 +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.
commit b61a03b05c1f4040a6599334b65141aa3bd134f5
Merge: 2578770 ba51433
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Apr 2 23:05:23 2015 +0200
Merge branch 'collectd-4.10' into collectd-5.3
commit ba51433eb374ccf21da089132f1f6f1a342f06bd
Author: Thomas Kho <tom at hioscar.com>
Date: Thu Apr 2 13:14:24 2015 -0400
Fix type instance sanitization in bind plugin
commit bce14a848714aa347c0eab462e952d86c3347da6
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Apr 2 18:25:42 2015 +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.
commit 3dae3b4a426b3302227f58f015e33bea9813c9c9
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Apr 2 18:21:52 2015 +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.
commit 39a1828548656b7f1fe486d48b8a08bf475277f1
Author: Jan Kundrát <jan.kundrat at cesnet.cz>
Date: Wed Mar 25 18:06:50 2015 +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.
commit 60bcd476c4c3f275f891e1c7ef979624fb44909c
Author: Jan Kundrát <jan.kundrat at cesnet.cz>
Date: Sat Feb 21 16:12:27 2015 +0100
curl: Add support for specifying a connection timeout
commit 125f3bece6725fba00e5961882692bd671e38bcb
Author: Peter Wu <peter at lekensteyn.nl>
Date: Tue Mar 31 23:17:32 2015 +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.
commit af5eb0ca07aac94bf4ebf5429e9d5c2c1fb7d4e9
Author: Peter Wu <peter at lekensteyn.nl>
Date: Mon Mar 30 18:48:06 2015 +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
commit 08c3c58643ed42244dda7931df73daa5414e571b
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Mar 26 22:03:29 2015 +0100
write_http: add 2 new options to example config
commit 439a4cda22c4bd7f3ae3754599f1884ad3280cf1
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Mar 26 21:52:39 2015 +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.
commit aa434cf4f73aec28334943ce04f8e5e2e370f9c3
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Mar 26 00:01:54 2015 +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.
commit c19a8c21200de02f3b2c6fdd128d8caf2345d093
Author: Fabrice A. Marie <fabrice at kibinlabs.com>
Date: Tue Mar 24 16:43:13 2015 +0800
fix functions indentation and statuses initialization.
commit 2f7b2925aa17f2e7d825032c94366717b736ce29
Author: Fabrice A. Marie <fabrice at kibinlabs.com>
Date: Tue Mar 24 16:42:40 2015 +0800
write_sensu cannot be endpoint/proxy.
commit 5b1d67d04e490d48dd72dbb9f84d1a74bfb9dcc1
Merge: f03005b fc1c7d7
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue Mar 24 07:37:18 2015 +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.
commit 73c94f8512b457348b5ba05ee44619620a0c35c7
Author: Poil <poil at quake.fr>
Date: Mon Mar 23 11:18:56 2015 +0100
Upgrade spec to 5.4.2
commit 491b8f0185c63c662bb3f395630a6d8b9913b49e
Merge: 0ea3dd8 2578770
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue Mar 24 07:00:35 2015 +0100
Merge branch 'collectd-5.3' into collectd-5.4
Conflicts:
contrib/redhat/collectd.spec
src/collectd.conf.pod
commit 257877038f937becbcc9075d4ee0c4ea48c8671b
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue Mar 24 06:51:40 2015 +0100
RPM specfile: bump version number
Thanks to @Poil for pointing that out !
commit f03005bd330f0c060025aef8b6fcac1bc55a3ca5
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue Mar 17 18:27:05 2015 +0100
log_logstash: adapt JSON format to logstash 1.2+
Fixes #974
commit f85010ec34eb65ceebd0d7c921dea5dd6ce9fd6f
Author: Fabrice A. Marie <fabrice at kibinlabs.com>
Date: Mon Jan 26 17:43:23 2015 +0800
write_sensu plugin to write datapoints and notification to sensu client TCP socket. Inspired from write_riemann.
commit 21a30f509b9124404318969ec20f913fa16556d0
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Mar 12 21:02:32 2015 +0100
collectd.conf(5): move misplaced block in postgresql section
commit 5e75e531a8930317afc13ea0049a466e7d54b127
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Mar 12 18:47:52 2015 +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).
commit 5eabeb9248cc3171243c517f364b35b4610e593a
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Mar 1 15:04:55 2015 +0100
Setting Globals to true is not needed anymore
003c6e86b480 made this happen by default
commit 42af0f20eb918019564eeae3339f94cea7e49834
Author: Andrés J. DÃaz <ajdiaz at connectical.com>
Date: Tue Feb 24 17:54:08 2015 +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.
commit 2782a51c42dbbd5109a5d403954db65499106e0a
Author: Andrés J. DÃaz <ajdiaz at connectical.com>
Date: Tue Feb 3 23:16:00 2015 +0100
Add IPC plugin documentation in collectd.conf.pod
commit a0ba86d57e39b5146d9fc06311b91af2af065e65
Author: Andrés J. DÃaz <ajdiaz at connectical.com>
Date: Tue Feb 3 23:09:01 2015 +0100
Add IPC module.
The IPC module allows collectd to gather information about process IPC
mechanims, like used semaphores, size of shared memory segments and so
on...
commit 3d274ef2b6049d2a903f2795bb18fbb993990957
Author: toni-moreno <toni.moreno at gmail.com>
Date: Tue Feb 24 11:53:41 2015 +0100
added SSLCiphers into Instance section to select ciphers from client
commit fc1c7d7583eefd8fc3f2740015e5665dffe3e7c9
Author: loginator17 <loginator17 at users.noreply.github.com>
Date: Mon Oct 27 13:00:04 2014 +0000
Update write_http.c
Changing default post timeout to plugin's interval and fixing low speed interval to use correct method for plugin interval (plugin_get_interval())
commit 764a9843d4003dfd5f91e729062c04f8afa50778
Author: loginator17 <loginator17 at users.noreply.github.com>
Date: Fri Oct 10 18:37:55 2014 +0100
Update collectd.conf.pod - adding PostTimeout parameter description
commit 214c709caed745ea0b844a94c1605c7063c26e50
Author: loginator17 <loginator17 at users.noreply.github.com>
Date: Fri Oct 10 18:30:47 2014 +0100
Update write_http.c - adding Post timeout
Adding PostTimeoutSec to set max timeout on http post
commit 0b83faf69359fe21c0a364215b649356bf217f88
Author: loginator17 <loginator17 at users.noreply.github.com>
Date: Wed Oct 1 11:13:49 2014 +0100
Update write_http.c - indentation again
commit 79cf4d2eab293bde01c1e966ec37194b655649bb
Author: loginator17 <loginator17 at users.noreply.github.com>
Date: Wed Oct 1 10:36:17 2014 +0100
Update collectd.conf.pod - adding LowLimit params
Adding LowSpeedLimit and LowLimitBytesPerSec to spec
commit 97059f09db24b6ff3f1c40a66814ceca84b817f5
Author: loginator17 <loginator17 at users.noreply.github.com>
Date: Wed Oct 1 10:01:53 2014 +0100
write_http.c - removed duplicate line
commit 3ab91ca099c56bbcf8d0831fd41979b5722dc033
Author: loginator17 <loginator17 at users.noreply.github.com>
Date: Wed Oct 1 09:50:31 2014 +0100
write_http.c - Indentation fix
Indentation fix
commit a69e121086508eed03831e7d3616430f71888257
Author: loginator17 <loginator17 at users.noreply.github.com>
Date: Tue Sep 30 17:03:20 2014 +0100
Update write_http.c - adding Low Speed Limit
Adding possibility to configure curl connection abort on slow connections. Reconnect on stuck or really slow connection sounds better than been stuck.
commit 9552451c88ea3e482783f2a328bec457373fb3e0
Author: loginator17 <loginator17 at users.noreply.github.com>
Date: Tue Sep 30 15:45:25 2014 +0100
Update write_http.c
Adding abort on stuck connection
commit c0a9b8c3fea7ccf4bdf2c7706877c7aed6a03be5
Author: Tomas <tomasamot at gmail.com>
Date: Thu Aug 7 22:16:08 2014 +0200
Bugfix - wrong constant in the mean sea level pressure formula
commit 3b5316b9b766e13c3e6212dcc9781e290a32987f
Merge: db3d3a9 6d3196b
Author: Tomas <tomasamot at gmail.com>
Date: Wed Aug 6 13:02:20 2014 +0200
Merge branch 'barometer_bmp085' of github.com:tmtom/collectd into barometer_bmp085
commit db3d3a96fef68c440bd66d31445404c05e263dc0
Author: tomas <tomas at ubu32.(none)>
Date: Wed Aug 6 12:04:15 2014 +0200
Added support for barometer sensor BMP085 from Bosch
commit 6d3196b510375ebc54e89f9eb86d7fc0b0c24b03
Author: tomas <tomas at ubu32.(none)>
Date: Wed Aug 6 12:04:15 2014 +0200
Added support for barometer sensor BMP085 from Bosch
More information about the collectd-changes
mailing list