Marc Fournier [Sun, 7 Jun 2015 14:21:37 +0000 (16:21 +0200)]
varnish: update plugin_register_complex_read() to new default value
... just a follow up to
cce136946b, in which one of the two
plugin_register_complex_read() calls got missed out.
Arthur Gautier [Sat, 6 Jun 2015 21:06:25 +0000 (21:06 +0000)]
processes: revert re-introduction of ps_read_tasks
This commit partially revert
30eeeee996124de666f907877f8196e5580101ed
which solved incorrectly the merge conflict
Signed-off-by: Arthur Gautier <baloo@gandi.net>
Florian Forster [Sat, 6 Jun 2015 20:33:34 +0000 (22:33 +0200)]
src/daemon/plugin.[ch]: Use cdtime_t for the interval argument of "register complex read".
All plugins converted to "struct timespec", just so that
plugin_register_complex_read() would convert back to cdtime_t again. This patch
removed this crazyness; the new "determine automatically" value is zero (used
to be NULL).
Florian Forster [Sat, 6 Jun 2015 19:43:28 +0000 (21:43 +0200)]
Merge remote-tracking branch 'github/pr/1036'
Conflicts:
src/processes.c
Florian Forster [Sat, 6 Jun 2015 19:39:16 +0000 (21:39 +0200)]
Merge branch 'pr/1033'
Florian Forster [Sat, 6 Jun 2015 19:37:00 +0000 (21:37 +0200)]
processes plugin: Read number of threads from /proc/$pid/stat as a fallback.
Should reading the number of threads from /prod/$pid/status fail, use the
number provided by /prod/$pid/stat as a fallback. If that fails, too, use 1.
As discussed with @manuelluis in #1033.
Chris Mayo [Sat, 6 Jun 2015 16:35:02 +0000 (17:35 +0100)]
Remove old systemd unit
collectd.service superseded by systemd.collectd.service
Florian Forster [Mon, 1 Jun 2015 17:15:58 +0000 (19:15 +0200)]
Merge remote-tracking branch 'github/pr/1056'
Manuel Luis Sanmartín Rozada [Sun, 31 May 2015 20:46:11 +0000 (22:46 +0200)]
Plugin network: add support for the timeout argument in the flush callback
Manuel Luis Sanmartín Rozada [Sun, 31 May 2015 19:19:16 +0000 (21:19 +0200)]
processes: change type to contextswitch and types to derive_t
Manuel Luis Sanmartín Rozada [Sun, 31 May 2015 18:56:49 +0000 (20:56 +0200)]
processes: use cf_util_get_boolean for get "CollectContextSwitch"
Manuel Luis Sanmartín Rozada [Sun, 31 May 2015 18:49:58 +0000 (20:49 +0200)]
processes: delete added white spaces
Manuel Luis Sanmartín Rozada [Sun, 31 May 2015 18:48:27 +0000 (20:48 +0200)]
processes: rename ps_ctx_switch to report_ctx_switch
Manuel Luis Sanmartín Rozada [Sun, 31 May 2015 18:25:31 +0000 (20:25 +0200)]
processes: remove function ps_read_tasks
Manuel Luis Sanmartín Rozada [Sat, 30 May 2015 23:34:30 +0000 (01:34 +0200)]
Processes: fix types in ps_read_status, change to unsigned long.
Manuel Luis Sanmartín Rozada [Sat, 30 May 2015 22:52:18 +0000 (00:52 +0200)]
Processes: in ps_read_status fix check to skip lines
if it doesn't start with "Vm" and it doesn't start "Threads".
Marc Fournier [Thu, 28 May 2015 19:06:52 +0000 (21:06 +0200)]
zone: add mentions to README and AUTHORS files
Marc Fournier [Thu, 28 May 2015 19:06:29 +0000 (21:06 +0200)]
RPM specfile: handle new zone plugin
Florian Forster [Thu, 28 May 2015 12:09:35 +0000 (14:09 +0200)]
Merge remote-tracking branch 'github/pr/1054'
Dagobert Michelsen [Thu, 28 May 2015 12:02:16 +0000 (14:02 +0200)]
Make flow more obvious
Dagobert Michelsen [Thu, 28 May 2015 11:27:59 +0000 (13:27 +0200)]
Add myself
Dagobert Michelsen [Thu, 28 May 2015 11:24:41 +0000 (13:24 +0200)]
No busy looping around open()
Dagobert Michelsen [Thu, 28 May 2015 11:22:29 +0000 (13:22 +0200)]
Use sizeof() instead of duplicating the variable length
Dagobert Michelsen [Thu, 28 May 2015 11:19:02 +0000 (13:19 +0200)]
Handle case when zone_scandir() returns NULL
Dagobert Michelsen [Thu, 28 May 2015 11:15:59 +0000 (13:15 +0200)]
Return -1 in zone_read on error
Dagobert Michelsen [Thu, 28 May 2015 11:14:26 +0000 (13:14 +0200)]
Get pagesize only once during initialization
Dagobert Michelsen [Thu, 28 May 2015 11:09:49 +0000 (13:09 +0200)]
Handle case when zone_find_stats() returns NULL
Dagobert Michelsen [Thu, 28 May 2015 11:06:04 +0000 (13:06 +0200)]
Use ZONENAME_MAX and handle errors returned by getzonenamebyid()
Dagobert Michelsen [Thu, 28 May 2015 10:54:11 +0000 (12:54 +0200)]
Prefix all warnings and error messages with plugin name
Dagobert Michelsen [Thu, 28 May 2015 10:51:26 +0000 (12:51 +0200)]
Use (void *) in c_avl_create()
Dagobert Michelsen [Thu, 28 May 2015 10:47:27 +0000 (12:47 +0200)]
Use type 'percent' instead of 'zone_cpu'
Marc Fournier [Wed, 27 May 2015 07:41:36 +0000 (09:41 +0200)]
update changelog + bump release dates
Florian Forster [Tue, 26 May 2015 19:43:10 +0000 (21:43 +0200)]
Build system: Fix linking with libheap.la and depend on testing.h.
collectd-tg tried to link with libheap.a (instead of ….la), which
doesn't exist. testing.h was not mentioned by any target, leading to it
being missing form the tarballs.
Florian Forster [Tue, 26 May 2015 06:52:39 +0000 (08:52 +0200)]
Build system: Build tested units as libraries.
This simplifies the build rules for the tests, aka. check programs.
* test_foo.c have been renamed to foo_test.c.
* foo_test.c now reside right next to foo.c and foo.h.
* Build and refer to .la files, rather than depending on .c files from
other directories.
Fixes: #1042
Marc Fournier [Tue, 26 May 2015 13:41:47 +0000 (15:41 +0200)]
Filter chains helper: minor cleanups
This is a couple of trivial followups to
809a8973.
root [Wed, 20 May 2015 19:17:10 +0000 (14:17 -0500)]
write_redis: Replaced method for checking for a NULL value for the redis connection
root [Wed, 20 May 2015 15:46:26 +0000 (10:46 -0500)]
write_redis: Log error message from redis command failures
root [Wed, 20 May 2015 14:38:23 +0000 (09:38 -0500)]
write_redis: improve checking the redis connection
Wilfried Goesgens [Sat, 23 May 2015 13:44:24 +0000 (15:44 +0200)]
Filterchain: if we don't find a writer, output the available writers to syslog.
Florian Forster [Sat, 23 May 2015 09:01:19 +0000 (11:01 +0200)]
bindings/java/Makefile.am: Add "uninstall-local" target.
Otherwise "make distcheck" will complain about leftover files.
Florian Forster [Sat, 23 May 2015 09:00:38 +0000 (11:00 +0200)]
bindings/java/Makefile.am: Use $(srcdir) when specifying dependencies.
This fixes out-of-tree builds, like "make distcheck" does.
Florian Forster [Fri, 22 May 2015 11:32:00 +0000 (13:32 +0200)]
ChangeLog: Update date to 2015-05-22.
Florian Forster [Fri, 22 May 2015 09:48:17 +0000 (11:48 +0200)]
write_sensu, write_tsdb plugins: Use GAUGE_FORMAT.
Issue #1039
Florian Forster [Fri, 22 May 2015 09:33:27 +0000 (11:33 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Conflicts:
src/write_redis.c
Florian Forster [Fri, 22 May 2015 09:29:12 +0000 (11:29 +0200)]
write_redis: Fix timestamp sent to Redis.
Florian Forster [Fri, 22 May 2015 09:25:01 +0000 (11:25 +0200)]
Various plugins: Use the global GAUGE_FORMAT.
This fixes the postgresql, rrdtool, target_notification, write_graphite and
write_redis plugins to use the globally defined format for gauges.
Issue #1039
Florian Forster [Fri, 22 May 2015 09:11:27 +0000 (11:11 +0200)]
src/collectd.h: Define GAUGE_FORMAT.
This format is also used in format_values(), so exported gauges follow a common
format.
See also issue #1039
Florian Forster [Fri, 22 May 2015 08:25:35 +0000 (10:25 +0200)]
src/utils_format_json.[ch]: Export gauges with 15 decimal places of precision.
Fixes: #1039
Florian Forster [Thu, 21 May 2015 11:59:49 +0000 (13:59 +0200)]
ChangeLog: Import changes from the wiki.
Marc Fournier [Wed, 20 May 2015 21:37:53 +0000 (23:37 +0200)]
RPM specfile: fix changelog formatting
Marc Fournier [Wed, 20 May 2015 20:40:52 +0000 (22:40 +0200)]
RPM specfile: also bump release number
Marc Fournier [Wed, 20 May 2015 20:35:42 +0000 (22:35 +0200)]
RPM specfile: update changelog for 5.5
Manuel Luis Sanmartín Rozada [Wed, 20 May 2015 20:37:41 +0000 (22:37 +0200)]
Plugin process: collect voluntary and involuntary context switches.
Florian Forster [Wed, 20 May 2015 20:25:28 +0000 (22:25 +0200)]
contrib/wiki2changelog.pl: Add script converting from wiki to ChangeLog.
Florian Forster [Wed, 20 May 2015 20:18:05 +0000 (22:18 +0200)]
ChangeLog: Change text width to 80 characters.
Florian Forster [Wed, 20 May 2015 20:13:38 +0000 (22:13 +0200)]
Bump version to 5.5.0; Update ChangeLog.
Florian Forster [Wed, 20 May 2015 20:08:50 +0000 (22:08 +0200)]
ipc plugin: Group functions by operating system.
Manuel Luis Sanmartín Rozada [Wed, 20 May 2015 17:15:37 +0000 (19:15 +0200)]
Plugin process: in Linux read the number of threads from
/proc/pid/status instead of counter the number of files in
/proc/pid/task/*.
Marc Fournier [Tue, 19 May 2015 20:44:27 +0000 (22:44 +0200)]
Merge branch 'collectd-5.4'
Marc Fournier [Tue, 19 May 2015 20:44:15 +0000 (22:44 +0200)]
Merge branch 'collectd-5.3' into collectd-5.4
Marc Fournier [Tue, 19 May 2015 16:37:19 +0000 (18:37 +0200)]
Merge branch 'collectd-4.10' into collectd-5.3
Marc Fournier [Tue, 12 May 2015 20:14:23 +0000 (22:14 +0200)]
curl_xml: fix 3 small memory leaks
Discovered while testing the previous 2 commits. NB: valgrind
already complained about these before
0afea606 was applied, so this
isn't related to issue #935.
Fabien Wernli [Thu, 30 Apr 2015 08:05:35 +0000 (10:05 +0200)]
Fix test for tables and empty instance
Change-Id: I9a3fc3ded9566bd68c80e5fbce2d8b717ea1848d
Fabien Wernli [Mon, 9 Feb 2015 20:16:32 +0000 (21:16 +0100)]
Revert "curl_xml plugin: Fixed tautological pointer comparison error."
Fixes #931
This reverts commit
0afea60611f115a28b8ec331aba610e3038c1ef2.
Jan Andres [Sat, 31 Jan 2015 09:03:13 +0000 (10:03 +0100)]
Enable the processes plugin by default on Solaris.
It now builds and works correctly in both 32-bit and 64-bit mode.
Jan Andres [Sat, 31 Jan 2015 09:00:31 +0000 (10:00 +0100)]
processes: Solaris: Consistently use long to represent a pid
pid_t may be defined as an int or a long depending on circumstances.
Use a long everywhere so we don't have to fiddle with typecasts.
This fixes an issue where an incorrect printf format string would
be used for a pid_t in 32-bit builds.
Jan Andres [Sat, 31 Jan 2015 08:43:30 +0000 (09:43 +0100)]
processes: Fix build for Solaris 32-bit binary
Work around a #error in <sys/procfs.h> that occurs when building a
32-bit binary with _FILE_OFFSET_BITS=64. This uses a hack similar
to the one in swap.c.
Jan Andres [Wed, 28 Jan 2015 19:00:41 +0000 (20:00 +0100)]
processes: Fix ps_get_cmdline() on Solaris.
Return value of read_file_contents() was checked incorrectly.
Jan Andres [Wed, 28 Jan 2015 14:06:04 +0000 (15:06 +0100)]
zfs_arc: Don't spam the log if we fail to read the "l2_size" kstat value.
The value got lost with some patch to Solaris 10 and has only reappeared
recently in 11.2. If we ever fail to read this value, stop trying, so we
don't report an error on every interval.
Marc Fournier [Tue, 12 May 2015 20:40:27 +0000 (22:40 +0200)]
oconfig: fix oconfig_free to free all elements
The recursive nature of this function made it difficult to free the root
node of the config tree. Splitting it in 2 allows to work around this
problem.
Florian Forster [Tue, 19 May 2015 15:40:36 +0000 (17:40 +0200)]
Merge remote-tracking branch 'github/pr/1009'
Jiri Tyr [Thu, 23 Apr 2015 13:43:16 +0000 (14:43 +0100)]
Adding fhcount plugin
Marc Fournier [Tue, 19 May 2015 12:44:55 +0000 (14:44 +0200)]
README: add mention to libcap
Marc Fournier [Tue, 19 May 2015 11:34:10 +0000 (13:34 +0200)]
Merge remote-tracking branch 'origin/pr/651'
Conflicts:
contrib/redhat/collectd.spec
Marc Fournier [Tue, 19 May 2015 10:02:28 +0000 (12:02 +0200)]
Merge pull request #919 from baryonix/solaris-misc-fixes
Fixes for zfs_arc and processes plugins on Solaris
Marc Fournier [Tue, 19 May 2015 10:01:18 +0000 (12:01 +0200)]
Merge pull request #1023 from ciomaire/write_kafka_ldflags
when --with-librdkafka arg is not a path searched by linker
Vincent Brillault [Tue, 19 May 2015 08:51:05 +0000 (10:51 +0200)]
Turbostat: Use the 'count' gauge to count SMIs
Florian Forster [Tue, 19 May 2015 08:45:57 +0000 (10:45 +0200)]
Merge remote-tracking branch 'github/pr/1027'
Florian Forster [Tue, 21 Apr 2015 08:00:23 +0000 (10:00 +0200)]
libcollectdclient: Propagate errors when signing / encrypting network packets.
Dagobert Michelsen [Wed, 13 May 2015 14:39:26 +0000 (16:39 +0200)]
Zone support for Solaris, forward-port of https://mail-archive.com/collectd@verplant.org/msg01232.html
Marc Fournier [Tue, 12 May 2015 20:40:27 +0000 (22:40 +0200)]
oconfig: fix oconfig_free to free all elements
The recursive nature of this function made it difficult to free the root
node of the config tree. Splitting it in 2 allows to work around this
problem.
Marc Fournier [Sat, 9 May 2015 22:14:18 +0000 (00:14 +0200)]
Merge branch 'collectd-5.4'
Marc Fournier [Sat, 9 May 2015 22:13:19 +0000 (00:13 +0200)]
Merge branch 'collectd-5.3' into collectd-5.4
Ruben Kerkhof [Sat, 9 May 2015 18:34:52 +0000 (20:34 +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
Marc Fournier [Sat, 9 May 2015 22:10:36 +0000 (00:10 +0200)]
Merge pull request #1024 from rubenk/fix-version-gen-on-osx
/bin/sh on OSX doesn't understand -n
Marc Fournier [Sat, 9 May 2015 22:06:42 +0000 (00:06 +0200)]
Merge pull request #1016 from mfournier/write_sensu-format-string
write_sensu: fix format-string portability problem
Ruben Kerkhof [Sat, 9 May 2015 18:34:52 +0000 (20:34 +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
ciomaire [Fri, 8 May 2015 14:48:54 +0000 (07:48 -0700)]
when --with-librdkafka arg is not a path searched by linker
Pierre-Yves Ritschard [Thu, 7 May 2015 13:00:37 +0000 (15:00 +0200)]
Merge pull request #1002 from ciomaire/master
write_kafka plugin : Create kafka handles from kafka_write callback rather than the config callback
Marc Fournier [Tue, 5 May 2015 20:10:16 +0000 (22:10 +0200)]
Turbostat: reorganise metric names
The `plugin_instance` now always is the hardware element
(cpuNN/coreNN/pkgNN) the data belongs to. Any optional identifier string
is moved to the `type_instance`.
Also remove the "_W" unit suffix as the "power" `type` implies we're
dealing with Watts.
The idea is to have the naming scheme in line with the way most other
plugins usually organise data.
Marc Fournier [Tue, 5 May 2015 19:40:09 +0000 (21:40 +0200)]
Merge pull request #1014 from mfournier/fix-path-to-java
improve java detection/defaults in configure script
Marc Fournier [Tue, 5 May 2015 16:18:26 +0000 (18:18 +0200)]
RPM specfile: update summary to be consistent with .deb packages
Marc Fournier [Tue, 5 May 2015 16:17:27 +0000 (18:17 +0200)]
RPM specfile: remove superfluous '--without-*' configure flags
ale@biancalanas.net [Tue, 5 May 2015 02:01:29 +0000 (02:01 +0000)]
- use _POSIX2_LINE_MAX for errbuf as stated by kvm(3).
- fix error msg on kvm_openfiles failure
ale@biancalanas.net [Fri, 1 May 2015 16:48:30 +0000 (16:48 +0000)]
fixes swap plugin on FreeBSD Jail
ale@biancalanas.net [Fri, 1 May 2015 16:48:28 +0000 (16:48 +0000)]
fixes processes plugin on FreeBSD Jail
Marc Fournier [Sat, 2 May 2015 08:08:23 +0000 (10:08 +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"`.
Marc Fournier [Fri, 1 May 2015 20:09:25 +0000 (22:09 +0200)]
RPM specfile: take turbostat plugin in account
Marc Fournier [Fri, 1 May 2015 18:45:58 +0000 (20:45 +0200)]
Turbostat: downcase plugin name in log messages
... to be consistent with the other plugins.
Marc Fournier [Fri, 1 May 2015 18:40:59 +0000 (20:40 +0200)]
Turbostat: confine AC_COMPILE_IFELSE() inside a AC_CACHE_CHECK block
The previous way of doing worked as expected, but didn't print out
anything in the summary, making it difficult to know why the plugin
wasn't built on older systems.