Sean Campbell [Fri, 6 Oct 2017 20:55:37 +0000 (16:55 -0400)]
Fixed issues with initializing hostname.
campbellsean@google.com [Fri, 6 Oct 2017 18:23:18 +0000 (14:23 -0400)]
Fix kstat_ctl_t definition in globals.
campbellsean@google.com [Fri, 6 Oct 2017 17:47:45 +0000 (13:47 -0400)]
Cleanup some defines and includes.
campbellsean@google.com [Fri, 6 Oct 2017 17:44:38 +0000 (13:44 -0400)]
Adds setter for hostname_g and eliminates hostname_g_size variable.
campbellsean@google.com [Fri, 6 Oct 2017 17:40:43 +0000 (13:40 -0400)]
Add MIT license to new globals files.
Damian Bogel [Wed, 9 Sep 2015 19:03:25 +0000 (15:03 -0400)]
Reading configuration file is now done outside main().
Damian Bogel [Wed, 9 Sep 2015 15:37:05 +0000 (11:37 -0400)]
Common stuff now builds as a library.
Florian Forster [Wed, 4 Oct 2017 20:29:28 +0000 (22:29 +0200)]
ceph plugin: Fix comment typo.
Florian Forster [Wed, 4 Oct 2017 18:25:20 +0000 (20:25 +0200)]
Merge remote-tracking branch 'github/pr/1558'
Pavel Rochnyack [Wed, 4 Oct 2017 16:59:46 +0000 (23:59 +0700)]
curl_xml: Use of xmlFree() for values returned by xmlNodeGetContent()
Pavel Rochnyack [Wed, 4 Oct 2017 16:35:58 +0000 (23:35 +0700)]
curl_xml: Fixed issues found by review
Denes Matetelki [Mon, 2 Oct 2017 08:37:20 +0000 (10:37 +0200)]
varnish plugin: Metrics with invalid data source type. #2462
Pavel Rochnyack [Sat, 30 Sep 2017 13:00:20 +0000 (20:00 +0700)]
curl_xml: Updated documentation and default configuration
Pavel Rochnyack [Sat, 30 Sep 2017 12:38:15 +0000 (19:38 +0700)]
curl_xml: Code cleanup and fixes
* XPath list creation moved from cx_config_add_xpath() to cx_config_add_url()
* Added missing check for ValuesFrom option presence
* Added missing check for strdup() result
* Removed excessive check for option name in cx_config_add_url()
Ruben Kerkhof [Sat, 30 Sep 2017 12:02:15 +0000 (14:02 +0200)]
collectd.spec: bzip2 is the default
Pavel Rochnyack [Sat, 30 Sep 2017 11:10:39 +0000 (18:10 +0700)]
curl_xml: Removed excessive operation
Pavel Rochnyack [Sat, 30 Sep 2017 09:37:44 +0000 (16:37 +0700)]
curl_xml: Refactored via cx_get_text_node_value()
Pavel Rochnyack [Sat, 30 Sep 2017 07:02:22 +0000 (14:02 +0700)]
curl_xml: Code cleanup, clang-format
Pavel Rochnyack [Mon, 19 Sep 2016 09:22:36 +0000 (15:22 +0600)]
curl_xml: Renamed 'PluginName' option to unified 'Plugin'.
Pavel Rochnyack [Wed, 24 Feb 2016 15:38:30 +0000 (22:38 +0700)]
curl_xml: Changed documentation to match proposed changes.
Pavel Rochnyack [Wed, 24 Feb 2016 13:20:42 +0000 (20:20 +0700)]
curl_xml: Add ability to set plugin instance from XML data.
Pavel Rochnyack [Wed, 24 Feb 2016 13:20:27 +0000 (20:20 +0700)]
curl_xml: Add ability to set custom plugin name in collected data.
Florian Forster [Fri, 29 Sep 2017 14:24:47 +0000 (16:24 +0200)]
Merge branch 'pr/2454'
Florian Forster [Fri, 29 Sep 2017 14:24:31 +0000 (16:24 +0200)]
processes plugin: Format with clang-format.
Also a small manpage formatting tweak.
Florian Forster [Fri, 29 Sep 2017 11:08:25 +0000 (13:08 +0200)]
Merge branch 'collectd-5.7'
Florian Forster [Fri, 29 Sep 2017 11:05:26 +0000 (13:05 +0200)]
Merge branch 'collectd-5.6' into collectd-5.7
Wilfried Goesgens [Fri, 29 Sep 2017 10:47:27 +0000 (12:47 +0200)]
use existing type to publish the data
Default [Fri, 29 Sep 2017 09:32:47 +0000 (12:32 +0300)]
there no such command in make make-dist-bz2
Florian Forster [Fri, 29 Sep 2017 06:50:19 +0000 (08:50 +0200)]
collectd.conf(5): Move towards unifying "string literals".
Florian Forster [Fri, 29 Sep 2017 06:49:29 +0000 (08:49 +0200)]
Merge remote-tracking branch 'github/pr/1707'
Florian Forster [Fri, 29 Sep 2017 06:44:22 +0000 (08:44 +0200)]
dbi plugin: Fix additional memory leaks.
Pavel Rochnyack [Thu, 12 May 2016 10:24:00 +0000 (16:24 +0600)]
dbi plugin: Fix memory leak.
Some memory was leaked when shutting down.
This is a partial back-port of
5ee365a.
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Fri, 29 Sep 2017 06:31:11 +0000 (08:31 +0200)]
collectd.conf(5): Move towards unifying "string literals".
Florian Forster [Fri, 29 Sep 2017 06:29:24 +0000 (08:29 +0200)]
Merge remote-tracking branch 'github/pr/1681'
Pavel Rochnyack [Thu, 25 Feb 2016 14:44:02 +0000 (21:44 +0700)]
curl_json: Added example configuration for PHP-FPM.
Pavel Rochnyack [Thu, 25 Feb 2016 14:31:46 +0000 (21:31 +0700)]
curl_json: Add ability to set custom plugin name in collected data.
Wilfried Goesgens [Thu, 28 Sep 2017 09:34:42 +0000 (11:34 +0200)]
fix indention, revert merge failures
Wilfried Goesgens [Thu, 28 Sep 2017 09:34:26 +0000 (11:34 +0200)]
add documentation
Tomofumi Hayashi [Thu, 28 Sep 2017 03:57:46 +0000 (12:57 +0900)]
write_redis_plugin: Add document for MaxSetDuration
This change adds description for MaxSetDuration, which is
introduced at #2440.
Florian Forster [Wed, 27 Sep 2017 20:24:21 +0000 (22:24 +0200)]
Merge remote-tracking branch 'github/pr/2449'
Pavel Rochnyack [Wed, 27 Sep 2017 12:15:13 +0000 (19:15 +0700)]
snmp plugin: Use array instead of cycle in res->errstat check
Wilfried Goesgens [Wed, 27 Sep 2017 14:52:12 +0000 (16:52 +0200)]
add option to collect the count of active memory maps for linux processes
Florian Forster [Wed, 27 Sep 2017 14:37:16 +0000 (16:37 +0200)]
Merge remote-tracking branch 'github/pr/2452'
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 09:08:50 +0000 (11:08 +0200)]
src/utils_match.c: Reset UTILS_MATCH_CF_GAUGE_INC matches to zero (was: NaN)
Fixes: #2448
Florian Forster [Wed, 27 Sep 2017 08:23:40 +0000 (10:23 +0200)]
Merge remote-tracking branch 'github/pr/2451' into collectd-5.6
Florian Forster [Wed, 27 Sep 2017 06:23:51 +0000 (08:23 +0200)]
Merge remote-tracking branch 'github/pr/2388'
Pavel Rochnyack [Tue, 26 Sep 2017 15:30:52 +0000 (22:30 +0700)]
snmp plugin: Style fix
Issue: #2291
Signed-off-by: Florian Forster <octo@collectd.org>
Pavel Rochnyack [Wed, 31 May 2017 16:27:13 +0000 (23:27 +0700)]
snmp plugin: Fix double free of request PDU
snmp_sess_synch_response() always frees request PDU, in both case of request
error and success. If error condition occurs inside of `while (status == 0)`
loop, double free of `req` happens.
Issue: #2291
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Wed, 27 Sep 2017 06:07:10 +0000 (08:07 +0200)]
email, exec and unixsock plugins: Use _SC_GETPW_R_SIZE_MAX.
Fixes: #2208
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
Pavel Rochnyack [Tue, 26 Sep 2017 19:01:14 +0000 (02:01 +0700)]
snmp plugin: Reworked/fixed res->errstat check
Pavel Rochnyack [Thu, 1 Jun 2017 07:39:24 +0000 (14:39 +0700)]
snmp plugin: Added res->errstat check
Collectd does not check for `res->errstat` value after
`snmp_sess_synch_response()` call. In case of error, there is no any data in
`res->variables` actually, but variables are tried to be processed as usual.
Suffix calculation will fail, so all subtrees will be marked as failed, not
only one subtree which caused an error.
The csnmp_instance_list_add() call will fail too, and, as result,
`csnmp_read_table` will finish it's work without any data submission.
The log message like
"snmp plugin: host HOSTNAME: csnmp_instance_list_add failed",
which is put into logs in this case, also has no enough diagnostic data.
Added code to proper check for `res->errstat` and to try to get available data.
Issue: #2291
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