Florian Forster [Wed, 27 Sep 2017 10:31:37 +0000 (12:31 +0200)]
Merge remote-tracking branch 'github/pr/2437'
Florian Forster [Wed, 27 Sep 2017 09:37:57 +0000 (11:37 +0200)]
Merge remote-tracking branch 'github/pr/2034'
Denes Matetelki [Fri, 22 Sep 2017 15:25:04 +0000 (17:25 +0200)]
Updating the varnish plugin
Florian Forster [Wed, 27 Sep 2017 06:23:51 +0000 (08:23 +0200)]
Merge remote-tracking branch 'github/pr/2388'
Pavel Rochnyack [Mon, 31 Jul 2017 05:21:24 +0000 (12:21 +0700)]
Proper return value from 'swrite()' when connection has been closed
According to POSIX, errno is set only if 'recv()' returns -1.
When connection has been closed, 'recv()' returns 0 and errno left untouched.
For functions which check errno value after 'swrite()', errno now is set to ECONNRESET,
so they produce correct message 'Connection reset by peer'.
Pavel Rochnyack [Tue, 26 Sep 2017 19:41:18 +0000 (02:41 +0700)]
memcached: Style fix
Florian Forster [Tue, 26 Sep 2017 17:47:01 +0000 (19:47 +0200)]
Merge remote-tracking branch 'github/pr/2446'
Vincent Brillault [Tue, 26 Sep 2017 17:34:03 +0000 (19:34 +0200)]
msr-index: include GPLv2 header
Pavel Rochnyack [Sun, 30 Jul 2017 11:10:00 +0000 (18:10 +0700)]
memcached: Report connections rate
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Tue, 26 Sep 2017 09:57:34 +0000 (11:57 +0200)]
Merge remote-tracking branch 'github/pr/1979'
Vincent Brillault [Mon, 25 Sep 2017 19:35:50 +0000 (21:35 +0200)]
turbostat: better support for mutli packages
If multiple packages are defined, support non-logical core enumeration
by prefixing each core id by its package id
Vincent Brillault [Mon, 25 Sep 2017 19:21:45 +0000 (21:21 +0200)]
turbostat: import msr-index header from linux
Since Linux 4.12, the kernel does not expose msr-index.h to the userland
anymore. This commit pulls and hardcode the required definitions.
Florian Forster [Mon, 25 Sep 2017 18:58:35 +0000 (20:58 +0200)]
Merge remote-tracking branch 'github/pr/2440'
Tomofumi Hayashi [Thu, 21 Sep 2017 09:10:30 +0000 (18:10 +0900)]
Add max_set_duration to set duration for value
This change introduces max_set_duration, the duration for the value
as max_set_size. max_set_size can keep the db size, however, sometime
max_set_size allows to contain old data. max_set_duration can keep
the latest data.
Marcin Jurkowski [Tue, 11 Jul 2017 13:00:25 +0000 (15:00 +0200)]
uptime plugin: don't cache boot time and simplify Linux code
Caching boottime on startup yields incorrect uptime values if system
date changes after the daemon is started.
This is almost certain to happen on embedded systems without RTC, where
clock is set from NTP server at some point after boot process.
On Linux, we can retrieve uptime directly by either reading /proc/uptime
(it's sufficient to read a few bytes) or calling sysinfo() function.
Use the latter since it's the most efficient way in speed, memory
requirements and code simplicity terms.
Florian Forster [Mon, 25 Sep 2017 07:36:23 +0000 (09:36 +0200)]
Merge remote-tracking branch 'github/pr/2442'
Florian Forster [Mon, 25 Sep 2017 07:28:34 +0000 (09:28 +0200)]
zfs_arc plugin: Avoid resetting global variables from init().
Fixes: #973
Richard Kojedzinszky [Sat, 14 Jan 2017 08:41:12 +0000 (09:41 +0100)]
zfs_arc: derive hit/miss stats for ratio calculations
Pavel Rochnyack [Sun, 24 Sep 2017 14:00:53 +0000 (21:00 +0700)]
tail plugin: Allow to set "bucket" metrics type
When several distributions needs to be calculated in one 'tail' instance,
all their metrics will be reported as single 'bucket' type with the same plugin instance value.
That is confusing and this patch allows to split these metrics to their own types.
Florian Forster [Sat, 23 Sep 2017 20:14:18 +0000 (22:14 +0200)]
Merge remote-tracking branch 'github/pr/2439'
Xavier G [Sat, 23 Sep 2017 19:57:13 +0000 (21:57 +0200)]
cpu plugin: add new options to the default configuration file.
Xavier G [Sat, 23 Sep 2017 19:27:20 +0000 (21:27 +0200)]
cpu plugin: adjust numfields conditions in cpu_read().
Xavier G [Sat, 23 Sep 2017 17:38:30 +0000 (19:38 +0200)]
cpu plugin: adjust coding style (variable declaration).
Xavier G [Sat, 23 Sep 2017 16:58:51 +0000 (18:58 +0200)]
cpu plugin: update documentation.
Xavier G [Sat, 23 Sep 2017 16:34:11 +0000 (18:34 +0200)]
cpu plugin: subtract guest states from user/nice.
Florian Forster [Sat, 23 Sep 2017 06:03:03 +0000 (08:03 +0200)]
Merge pull request #2441 from zerkms/ISSUE-2433
Added `ReportIO` option to the `swap` plugin
Ivan Kurnosov [Sat, 23 Sep 2017 05:32:14 +0000 (17:32 +1200)]
swap plugin: Added `ReportIO` option
lxc/lxd containers at the moment cannot properly report the swap io (the corresponding /proc/vmstat are not virtualized), so added an option to disable that reporting.
Enabled by default.
Closes: #2433
Florian Forster [Fri, 22 Sep 2017 06:55:18 +0000 (08:55 +0200)]
Merge remote-tracking branch 'github/pr/2377'
Pavel Rochnyack [Fri, 22 Sep 2017 06:40:28 +0000 (13:40 +0700)]
Filecount plugin: Code style changes, clang-format
Pavel Rochnyack [Sun, 9 Oct 2016 14:28:52 +0000 (20:28 +0600)]
Filecount plugin: Custom values for reported plugin, type and type instance
* Allow to set plugin name;
* Allow to set empty plugin instance;
* Allow to set metric types: Added 'FilesSizeType' and 'FilesCountType' options;
* Allow to disable metric reporting;
* Allow to set metrics type instance
Florian Forster [Thu, 21 Sep 2017 20:00:14 +0000 (22:00 +0200)]
Merge remote-tracking branch 'github/pr/2434'
Florian Forster [Thu, 21 Sep 2017 17:59:46 +0000 (19:59 +0200)]
Merge remote-tracking branch 'github/pr/2435'
Florian Forster [Thu, 21 Sep 2017 15:26:23 +0000 (17:26 +0200)]
Merge branch 'collectd-5.7'
Florian Forster [Thu, 21 Sep 2017 15:22:39 +0000 (17:22 +0200)]
Merge branch 'collectd-5.6' into collectd-5.7
Florian Forster [Thu, 21 Sep 2017 15:18:05 +0000 (17:18 +0200)]
src/daemon/collectd.c: Fix implementation of the -B option.
Also add a manual page entry.
Issue: #2421
Pull-Request: #2422
Florian Forster [Thu, 21 Sep 2017 15:10:46 +0000 (17:10 +0200)]
Merge remote-tracking branch 'github/pr/2422'
Fixes: #2421
Pavel Rochnyack [Thu, 21 Sep 2017 06:24:14 +0000 (13:24 +0700)]
table: Allow custom plugin name to be reported
Nathaniel Wesley Filardo [Wed, 6 Sep 2017 17:56:40 +0000 (13:56 -0400)]
Add daemon option to avoid making BaseDir
One possible implementation of collectd/collectd#2421
Pavel Rochnyack [Thu, 21 Sep 2017 04:17:32 +0000 (11:17 +0700)]
openvpn: Changes after review, clang-formatting
Pavel Rochnyack [Sat, 8 Jul 2017 18:04:05 +0000 (01:04 +0700)]
openvpn: reworked status file parser
* Added detection of status fields index by parsing 'HEADER' lines.
This allows to support status files from latest OpenVPN-2.4 and possible from future versions;
* Fixed a bug with OpenVPN status file version 3 where delimiter is 'tab' (not space or comma);
* Status file version detection was moved from configuration callback to read callback;
* Now 'plugin_register_complex_read()' is used for registering read callback.
Closes: #2128
Xavier G [Wed, 20 Sep 2017 21:28:35 +0000 (23:28 +0200)]
cpu plugin: add linux-specific "guest" states.
Florian Forster [Wed, 20 Sep 2017 20:26:08 +0000 (22:26 +0200)]
collectd.conf(5): Document dependencies between mqtt's TLS options better.
Florian Forster [Wed, 20 Sep 2017 20:20:51 +0000 (22:20 +0200)]
mqtt plugin: Add support for TLS in Subscriber blocks.
Fixes: #2419
Florian Forster [Wed, 20 Sep 2017 17:38:10 +0000 (19:38 +0200)]
perl plugin: Improve error message.
Florian Forster [Wed, 20 Sep 2017 17:34:56 +0000 (19:34 +0200)]
Merge remote-tracking branch 'github/pr/2391' into collectd-5.6
Christian Bartolomäus [Tue, 19 Sep 2017 07:09:39 +0000 (09:09 +0200)]
nfs plugin: Fix typo
Florian Forster [Tue, 19 Sep 2017 06:20:19 +0000 (08:20 +0200)]
Merge remote-tracking branch 'github/pr/2430'
Florian Forster [Tue, 19 Sep 2017 06:16:53 +0000 (08:16 +0200)]
Merge branch 'pr/2431'
Florian Forster [Tue, 19 Sep 2017 06:16:42 +0000 (08:16 +0200)]
uptime plugin: Coding style update.
This is only touching the Linux code, though.
usev6 [Mon, 18 Sep 2017 18:50:18 +0000 (20:50 +0200)]
nfs plugin: Changes after review
* Avoid negated config options (s/IgnoreV/ReportV/)
* Use _Bool instead of int
* Handle multiple occurences of config option correctly
Florian Forster [Mon, 18 Sep 2017 14:15:23 +0000 (16:15 +0200)]
Merge branch 'collectd-5.7'
Ivan Kurnosov [Mon, 18 Sep 2017 08:17:05 +0000 (20:17 +1200)]
Reimplemented `uptime` plugin to read from `/proc/uptime`
Florian Forster [Mon, 18 Sep 2017 08:04:47 +0000 (10:04 +0200)]
synproxy plugin: Re-run clang-format.
Florian Forster [Mon, 18 Sep 2017 08:02:45 +0000 (10:02 +0200)]
Merge remote-tracking branch 'github/pr/2381'
Florian Forster [Mon, 18 Sep 2017 06:58:44 +0000 (08:58 +0200)]
Merge pull request #2417 from bluca/dpdk_pkgconfig_backport
configure.ac: dpdk: use pkg-config - 5.7
Florian Forster [Mon, 18 Sep 2017 06:53:01 +0000 (08:53 +0200)]
Merge remote-tracking branch 'github/pr/2412'
Marek Becka [Mon, 31 Jul 2017 11:41:25 +0000 (07:41 -0400)]
use generic types in synproxy plugin and code refactoring
Marek Becka [Wed, 26 Jul 2017 11:25:16 +0000 (07:25 -0400)]
Fix source path in automake
Marek Becka [Wed, 26 Jul 2017 10:12:12 +0000 (06:12 -0400)]
New plugin: synproxy
usev6 [Fri, 15 Sep 2017 21:05:14 +0000 (23:05 +0200)]
nfs: Add config options to ignore versions
usev6 [Fri, 15 Sep 2017 21:02:19 +0000 (23:02 +0200)]
README: NFSv4 is supported nowadays
(implemented with commit
64446a66fe)
Marc Fournier [Mon, 4 Sep 2017 09:51:04 +0000 (11:51 +0200)]
collectd.spec: avoid accidentally picking an ancient/unsupported java version
Neil Wilson [Thu, 23 Feb 2017 17:03:34 +0000 (17:03 +0000)]
ntpd: Correct loop offset and error calculation
Stop the scaling calculation dropping the sign of the underlying value
Fixes: #2188
Florian Forster [Wed, 30 Aug 2017 11:34:28 +0000 (13:34 +0200)]
Merge remote-tracking branch 'github/pr/2258'
Florian Forster [Wed, 30 Aug 2017 11:32:54 +0000 (13:32 +0200)]
Treewide: Don't set value_list_t.host to hostname_g.
plugin_dispatch_values() will automatically fill that value in.
Florian Forster [Wed, 30 Aug 2017 09:16:54 +0000 (11:16 +0200)]
libcollectdclient: Guard gcrypt code with preprocessor conditionals.
Florian Forster [Wed, 30 Aug 2017 09:14:50 +0000 (11:14 +0200)]
libcollectdclient: Include <stdlib.h> and <string.h>.
For free(3) and memmove(3) respectively.
Ruben Kerkhof [Fri, 18 Aug 2017 11:00:36 +0000 (13:00 +0200)]
collectd.spec: add new intel_pmu plugin
Ruben Kerkhof [Fri, 18 Aug 2017 10:53:52 +0000 (12:53 +0200)]
configure.ac: fix indentation
Ruben Kerkhof [Fri, 18 Aug 2017 10:51:54 +0000 (12:51 +0200)]
Merge pull request #2405 from cpaelzer/fix-dpdk-pkg-config-if-not-available
configure.ac: dpdk: tolerate no pkg-config
Christian Ehrhardt [Fri, 18 Aug 2017 10:50:22 +0000 (12:50 +0200)]
configure.ac: follow the 2 space indent style
The rest of configure.ac indents not to the context, but by 2 spaces.
Follow that rule to stay in style.
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Christian Ehrhardt [Fri, 18 Aug 2017 10:46:17 +0000 (12:46 +0200)]
configure.ac: fix indent
Fix tab indents to be space based as they should, but keep the
effective indent at the level of the context it belongs to in
PKG_CHECK_MODULES.
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Christian Ehrhardt [Thu, 17 Aug 2017 19:11:30 +0000 (20:11 +0100)]
configure.ac: dpdk: use pkg-config
To detect cflags and libs use the sometimes provided pkg-config for
libdpdk. That avoids build errors on systems where special flags are
needed and provided by dpdk via pkg-config, but not yet considered by
the collectd build system.
root [Thu, 17 Aug 2017 14:18:02 +0000 (14:18 +0000)]
configure.ac: dpdk: tolerate no pkg-config
Since pull request #2400 pkg-config works great for dpdk, but not if
there is no pkg-config around at all.
To fix that the PKG_CHECK_MODULES macro needs to define a valid fourth
argument, otherwise it will error out.
This closes 2404
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Ruben Kerkhof [Thu, 17 Aug 2017 13:09:56 +0000 (15:09 +0200)]
Merge pull request #2400 from cpaelzer/fix-dpdk-multiarch-pkg-config
configure.ac: dpdk: use pkg-config
Christian Ehrhardt [Thu, 17 Aug 2017 13:01:27 +0000 (15:01 +0200)]
configure.ac: dpdk: append DPDK_CFLAGS to LIBDPDK_CPPFLAGS
In some way it is bad naming in pkg-config - it is always some sort of
conflated ldflags + libs and cppflags + cxxflags + cflags.
Due to that to work correctly we append DPDK_CFLAGS (if defined by
pkg-config) to LIBDPDK_CPPFLAGS as well.
This intentionally does not add those CFLAGS specified by a user to
allow full override and fully separated CLFAGS/CPPFLAGS if needed.
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Christian Ehrhardt [Thu, 17 Aug 2017 11:34:12 +0000 (13:34 +0200)]
configure.ac: dpdk: introduce LIBDPDK_CFLAGS
This restores the former behavior of LIBDPDK_CPPFLAGS and now
correctly carries CFLAGS read from pkg-config in its own variable.
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Christian Ehrhardt [Wed, 16 Aug 2017 12:31:48 +0000 (14:31 +0200)]
configure.ac: dpdk: use pkg-config
To detect cflags and libs use the sometimes provided pkg-config for
libdpdk. That avoids build errors on systems where special flags are
needed and provided by dpdk via pkg-config, but not yet considered by
the collectd build system.
This closes #2399
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Pavel Rochnyack [Wed, 2 Aug 2017 05:15:50 +0000 (12:15 +0700)]
perl plugin: Added check of proper interpreter initialization.
Closes: #927
Pavel Rochnyack [Mon, 31 Jul 2017 04:57:30 +0000 (11:57 +0700)]
memcached: Persistent connections with IO timeouts
Florian Forster [Thu, 27 Jul 2017 10:58:11 +0000 (12:58 +0200)]
Merge pull request #2378 from cramertj/grpc-meta
Add metadata support to GRPC plugin
Florian Forster [Wed, 26 Jul 2017 20:15:13 +0000 (22:15 +0200)]
Merge pull request #2380 from maryamtahhan/feat_mcelog_bugfixes
mcelog: fix compilation error caused by migration to snprintf().
Taylor Cramer [Wed, 26 Jul 2017 17:25:02 +0000 (10:25 -0700)]
GRPC metadata review cleanup
Pavel Rochnyack [Mon, 24 Jul 2017 08:07:16 +0000 (15:07 +0700)]
openldap: Fix plugin shutdown with connection failed
When plugin failes to connect to LDAP server, the `ldap_unbind_ext_s(st->ld)` is called.
According to `man 3 ldap_unbind_ext_s`, that call is used to free the resources contained in the ld structure.
When plugin shutdown, the `ldap_unbind_ext_s` called again, which causes coredump.
The plugin code was changed to set st->ld to NULL after `ldap_unbind_ext_s()` call.
Korynkevych, RomanX [Tue, 25 Jul 2017 09:30:59 +0000 (10:30 +0100)]
mcelog: fix compilation error caused by migration to snprintf().
Change-Id: I625254fa60efbb94580ed2eb69d7c7bf7027a6eb
Signed-off-by: Korynkevych, RomanX <romanx.korynkevych@intel.com>
Taylor Cramer [Mon, 24 Jul 2017 17:36:27 +0000 (10:36 -0700)]
Add metadata support to GRPC plugin
Florian Forster [Mon, 24 Jul 2017 13:37:45 +0000 (15:37 +0200)]
Merge pull request #2246 from maryamtahhan/feat_mcelog_notification_bugfixes
Feat mcelog notification bugfixes
Korynkevych, RomanX [Fri, 21 Jul 2017 13:42:46 +0000 (14:42 +0100)]
mcelog: updates based on review comments
* modified code to use return without parenthesis
* fixed logic that parses config options
Change-Id: I2c5c5f42f8395306622dee8cdf4f94b46e3e3570
Signed-off-by: Korynkevych, RomanX <romanx.korynkevych@intel.com>
Florian Forster [Mon, 24 Jul 2017 07:31:05 +0000 (09:31 +0200)]
Merge pull request #2349 from rpv-tomsk/fix-register-complex-read
Free `userdata` if plugin_register_complex_read() has failed.
Pavel Rochnyack [Mon, 24 Jul 2017 07:05:16 +0000 (14:05 +0700)]
openldap: Fixed possible dereference of NULL pointer
If `plugin_register_complex_read()` has failed, then `cldap_free` is called which set pointer to NULL.
That pointer is accessed by `cldap_shutdown()` callback later.
Pavel Rochnyack [Thu, 6 Jul 2017 19:07:43 +0000 (02:07 +0700)]
Change error message when read callback name is duplicated while registering it.
The message `Check for duplicate "LoadPlugin" lines` is obsolete, as there is a special check in `plugin_load()` for this case.
Pavel Rochnyack [Thu, 6 Jul 2017 18:48:21 +0000 (01:48 +0700)]
Free `userdata` if plugin_register_complex_read() has failed.
Ruben Kerkhof [Fri, 21 Jul 2017 19:09:58 +0000 (21:09 +0200)]
Merge pull request #2375 from rpv-tomsk/small-fix
network: Fix free() before use
Pavel Rochnyack [Fri, 21 Jul 2017 18:06:58 +0000 (01:06 +0700)]
network: Fix free() before use
Florian Forster [Thu, 20 Jul 2017 19:53:04 +0000 (21:53 +0200)]
Merge pull request #2374 from maryamtahhan/feat_intel_pmu_bugfixes
intel_pmu: fix compilation error caused by migration to snprintf().
Korynkevych, RomanX [Thu, 20 Jul 2017 13:09:36 +0000 (14:09 +0100)]
intel_pmu: fix compilation error caused by migration to snprintf().
Change-Id: I4e461cd11aa03ca588649ca86892c23c9f38fc54
Signed-off-by: Korynkevych, RomanX <romanx.korynkevych@intel.com>
Florian Forster [Thu, 20 Jul 2017 07:12:14 +0000 (09:12 +0200)]
Merge branch 'collectd-5.7'
Conflicts:
src/rrdtool.c
Florian Forster [Thu, 20 Jul 2017 07:11:09 +0000 (09:11 +0200)]
Merge branch 'collectd-5.6' into collectd-5.7
Conflicts:
src/rrdtool.c
Florian Forster [Thu, 20 Jul 2017 06:14:17 +0000 (08:14 +0200)]
Merge pull request #2232 from rpv-tomsk/processes
processes: Show real disk IO in addition to process IO (Linux only)
Pavel Rochnyack [Wed, 19 Jul 2017 12:28:15 +0000 (19:28 +0700)]
rrdtool plugin: Changes after review
* Handle "CacheFlush" as a double
* Updated documentation spelling