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.
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".
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.
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.
Marc Fournier [Fri, 1 May 2015 10:10:17 +0000 (12:10 +0200)]
RPM specfile: correct copy-paste error
Marc Fournier [Wed, 29 Apr 2015 22:15:19 +0000 (00:15 +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).
Marc Fournier [Tue, 28 Apr 2015 05:39:02 +0000 (07:39 +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.
Ruben Kerkhof [Sun, 18 Nov 2012 10:38:24 +0000 (11:38 +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.
Vincent Brillault [Wed, 22 Apr 2015 19:45:05 +0000 (21:45 +0200)]
Turbostat: test asm/msr-index.h compatibility
Olds versions of asm/msr-index.h don't contain the required macros.
Test at least if it contains MSR_CORE_C3_RESIDENCY
Marc Fournier [Wed, 22 Apr 2015 08:12:32 +0000 (10:12 +0200)]
cleanup test-related files
Marc Fournier [Wed, 22 Apr 2015 08:11:14 +0000 (10:11 +0200)]
update ignored test-related files
Marc Fournier [Wed, 22 Apr 2015 08:05:33 +0000 (10:05 +0200)]
tests: include tests/macros.h in release tarballs
This is needed to run the tests outside of the git repository.
Marc Fournier [Wed, 22 Apr 2015 06:46:00 +0000 (08:46 +0200)]
Merge branch 'collectd-4.10' into collectd-5.3
Marc Fournier [Wed, 22 Apr 2015 06:39:50 +0000 (08:39 +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.
Remi Collet [Tue, 21 Apr 2015 15:40:43 +0000 (17:40 +0200)]
check if AMQP_VERSION exists
Remi Collet [Tue, 21 Apr 2015 15:40:43 +0000 (17:40 +0200)]
check if AMQP_VERSION exists
Remi Collet [Tue, 21 Apr 2015 07:33:20 +0000 (09:33 +0200)]
fix build with librabbitmq 0.6.0
Remi Collet [Tue, 21 Apr 2015 07:33:20 +0000 (09:33 +0200)]
fix build with librabbitmq 0.6.0
hshopeful [Mon, 20 Apr 2015 12:35:40 +0000 (20:35 +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);
Vincent Brillault [Sat, 18 Apr 2015 08:58:20 +0000 (10:58 +0200)]
Turbostat: fix thread max number detection
There is no "thread_id" and the value we compute is the direct number.
It can only be '1' or '2' and do not start at 0 like other values.
Vincent Brillault [Sat, 18 Apr 2015 08:49:46 +0000 (10:49 +0200)]
Turbostat: Initialize non existing threads cpu_id
Vincent Brillault [Sat, 18 Apr 2015 08:49:37 +0000 (10:49 +0200)]
Turbostat: Remove useless initialization
Vincent Brillault [Fri, 17 Apr 2015 15:18:06 +0000 (17:18 +0200)]
Turbostat: build only if requirements are met
Vincent Brillault [Fri, 17 Apr 2015 15:17:07 +0000 (17:17 +0200)]
Turbostat: add missing types in configure.ac
Vincent Brillault [Fri, 17 Apr 2015 15:03:35 +0000 (17:03 +0200)]
Turbostat: Only check capabilities if supported
Vincent Brillault [Fri, 17 Apr 2015 08:03:59 +0000 (10:03 +0200)]
Turbostat: remove 'common' headers
This headers are already included by the collectd headers
Vincent Brillault [Thu, 16 Apr 2015 19:33:02 +0000 (21:33 +0200)]
Turbostat: Fix a 64b to 32b truncation
Found while compiling with clang and -Wshorten-64-to-32 enabled
Vincent Brillault [Thu, 16 Apr 2015 19:23:47 +0000 (21:23 +0200)]
Turbostat: cpu/core/package number are > 0
Use unsigned integers to reprensent the cpu, core and package
numbers. Do not set it to -1 at init time.
Vincent Brillault [Thu, 16 Apr 2015 18:59:08 +0000 (20:59 +0200)]
Turbostat: Use uint32_t for 32b wrapping
ciomaire [Wed, 15 Apr 2015 13:19:27 +0000 (06:19 -0700)]
fix double free errors found by valgrind
ciomaire [Wed, 15 Apr 2015 12:31:55 +0000 (05:31 -0700)]
Create kafka handles from within write callback
Marc Fournier [Tue, 14 Apr 2015 16:48:07 +0000 (18:48 +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]
Marc Fournier [Tue, 14 Apr 2015 07:27:00 +0000 (09:27 +0200)]
Merge branch 'collectd-5.4'
Conflicts:
src/Makefile.am
src/network.c
Marc Fournier [Tue, 14 Apr 2015 07:25:02 +0000 (09:25 +0200)]
Merge branch 'collectd-5.3' into collectd-5.4
Marc Fournier [Tue, 14 Apr 2015 06:33:14 +0000 (08:33 +0200)]
write_kafka: correct mistyped function name
Marc Fournier [Tue, 14 Apr 2015 06:30:17 +0000 (08:30 +0200)]
write_kafka: fix typo preventing --with-librdkafka from working as expected
Marc Fournier [Tue, 14 Apr 2015 07:23:22 +0000 (09:23 +0200)]
Merge remote-tracking branch 'origin/pr/1001'
Marc Fournier [Tue, 14 Apr 2015 07:17:27 +0000 (09:17 +0200)]
Merge branch 'collectd-4.10' into collectd-5.3
Marc Fournier [Tue, 14 Apr 2015 06:35:28 +0000 (08:35 +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
Marc Fournier [Tue, 14 Apr 2015 06:35:28 +0000 (08:35 +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.
Marc Fournier [Mon, 13 Apr 2015 22:24:46 +0000 (00:24 +0200)]
Merge branch 'collectd-5.3' into collectd-5.4
Marc Fournier [Mon, 13 Apr 2015 22:21:57 +0000 (00:21 +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.
Marc Fournier [Sun, 12 Apr 2015 20:01:39 +0000 (22:01 +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
Marc Fournier [Sun, 12 Apr 2015 07:26:52 +0000 (09:26 +0200)]
Merge remote-tracking branch 'origin/pr/998'
Tim Laszlo [Fri, 20 Jun 2014 14:00:43 +0000 (09:00 -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.
Tim Laszlo [Fri, 20 Jun 2014 13:37:19 +0000 (08:37 -0500)]
Warn if ttl is out of bounds
Florian Forster [Sun, 14 Sep 2014 17:28:05 +0000 (19:28 +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
Marc Fournier [Wed, 8 Apr 2015 23:14:40 +0000 (01:14 +0200)]
Merge branch 'collectd-5.4'
Marc Fournier [Wed, 8 Apr 2015 23:09:33 +0000 (01:09 +0200)]
README: ordering
Marc Fournier [Wed, 8 Apr 2015 22:58:56 +0000 (00:58 +0200)]
RPM specfile: add write_sensu and ipc plugins
Marc Fournier [Wed, 8 Apr 2015 22:53:49 +0000 (00:53 +0200)]
Merge branch 'collectd-5.3' into collectd-5.4
Marc Fournier [Wed, 8 Apr 2015 22:51:16 +0000 (00:51 +0200)]
ipc: don't enable by default in example config file
Marc Fournier [Wed, 8 Apr 2015 22:50:44 +0000 (00:50 +0200)]
ipc: build on AIX by default
Marc Fournier [Wed, 8 Apr 2015 22:50:24 +0000 (00:50 +0200)]
ipc: don't document plugin without any options
Marc Fournier [Wed, 8 Apr 2015 22:49:28 +0000 (00:49 +0200)]
ipc: remove extraneous call to sysconf()
Marc Fournier [Wed, 8 Apr 2015 22:32:50 +0000 (00:32 +0200)]
Merge remote-tracking branch 'origin/pr/925'
Marc Fournier [Wed, 8 Apr 2015 22:27:13 +0000 (00:27 +0200)]
write_sensu: documentation wording, wrap long lines
Thanks to @jamtur01 for reviewing !
Marc Fournier [Wed, 8 Apr 2015 22:16:37 +0000 (00:16 +0200)]
Merge remote-tracking branch 'origin/pr/912'