]> git.ipfire.org Git - thirdparty/collectd.git/log
thirdparty/collectd.git
7 years agodaemon/types_list.c: fix minor style issue
Ruben Kerkhof [Sat, 15 Dec 2018 17:23:55 +0000 (18:23 +0100)] 
daemon/types_list.c: fix minor style issue

7 years agodaemon/plugin.c: fix two more stylistic issues
Ruben Kerkhof [Sat, 15 Dec 2018 17:22:30 +0000 (18:22 +0100)] 
daemon/plugin.c: fix two more stylistic issues

7 years agodaemon/plugin.c: remove unneccesary casts
Ruben Kerkhof [Sat, 15 Dec 2018 17:21:18 +0000 (18:21 +0100)] 
daemon/plugin.c: remove unneccesary casts

7 years agodaemon/plugin.c: fix minor style issue
Ruben Kerkhof [Sat, 15 Dec 2018 17:18:26 +0000 (18:18 +0100)] 
daemon/plugin.c: fix minor style issue

7 years agocpufreq plugin: fix minor style issue
Ruben Kerkhof [Sat, 15 Dec 2018 17:13:42 +0000 (18:13 +0100)] 
cpufreq plugin: fix minor style issue

7 years agobarometer plugin: remove unneccesary cast
Ruben Kerkhof [Sat, 15 Dec 2018 17:08:36 +0000 (18:08 +0100)] 
barometer plugin: remove unneccesary cast

7 years agocollectd-nagios: remove unneccesary casts
Ruben Kerkhof [Fri, 14 Dec 2018 18:15:07 +0000 (19:15 +0100)] 
collectd-nagios: remove unneccesary casts

7 years agoceph plugin: use recommended style for calloc
Ruben Kerkhof [Fri, 14 Dec 2018 18:13:15 +0000 (19:13 +0100)] 
ceph plugin: use recommended style for calloc

7 years agoMerge pull request #3017 from rpv-tomsk/collectd-collectd-5.8
Pavel Rochnyak [Thu, 6 Dec 2018 17:14:04 +0000 (00:14 +0700)] 
Merge pull request #3017 from rpv-tomsk/collectd-collectd-5.8

configure.ac: run dpdk build tests only if pkgconfig fails

7 years agoconfigure.ac: run dpdk build tests only if pkgconfig fails 3017/head
Luca Boccassi [Mon, 3 Dec 2018 15:56:13 +0000 (15:56 +0000)] 
configure.ac: run dpdk build tests only if pkgconfig fails

The AC_CHECK_LIB test runs unconditionally, and fails with DPDK 18.11
when built with Meson as there is no longer a libdpdk.so linker script,
but only a pkg-config file, so -ldpdk (which is what AC_CHECK_LIB runs)
fails.

Use AC_LINK_IFELSE instead, with compiler and linker flags set
appropriately.

Signed-off-by: Luca Boccassi <bluca@debian.org>
7 years agoMerge pull request #3015 from bluca/dpdk_pkgconfig
Pavel Rochnyak [Thu, 6 Dec 2018 16:59:36 +0000 (23:59 +0700)] 
Merge pull request #3015 from bluca/dpdk_pkgconfig

configure.ac: run dpdk build tests only if pkgconfig fails

7 years agoconfigure.ac: run dpdk build tests only if pkgconfig fails 3015/head
Luca Boccassi [Mon, 3 Dec 2018 15:56:13 +0000 (15:56 +0000)] 
configure.ac: run dpdk build tests only if pkgconfig fails

The AC_CHECK_LIB test runs unconditionally, and fails with DPDK 18.11
when built with Meson as there is no longer a libdpdk.so linker script,
but only a pkg-config file, so -ldpdk (which is what AC_CHECK_LIB runs)
fails.

Use AC_LINK_IFELSE instead, with compiler and linker flags set
appropriately.

Signed-off-by: Luca Boccassi <bluca@debian.org>
7 years agovirt plugin: Add missing config_keys
Pavel Rochnyack [Wed, 5 Dec 2018 09:19:53 +0000 (16:19 +0700)] 
virt plugin: Add missing config_keys

7 years agovirt plugin: New options: ReportBlockDevices and ReportNetworkInterfaces
Pavel Rochnyack [Wed, 5 Dec 2018 07:29:31 +0000 (14:29 +0700)] 
virt plugin: New options: ReportBlockDevices and ReportNetworkInterfaces

This allows to disable unneeded reports if stats are gathered by another plugin.

7 years agovirt plugin: Move adding of devices into own functions
Pavel Rochnyack [Wed, 5 Dec 2018 06:52:47 +0000 (13:52 +0700)] 
virt plugin: Move adding of devices into own functions

This also covers case when error while adding block device
refuse adding of domain network devices.

7 years agovirt plugin: Fixed mistake in variable rename
Pavel Rochnyack [Wed, 5 Dec 2018 06:28:30 +0000 (13:28 +0700)] 
virt plugin: Fixed mistake in variable rename

7 years agovirt plugin: Handle ignorelists properly
Pavel Rochnyack [Wed, 5 Dec 2018 06:11:12 +0000 (13:11 +0700)] 
virt plugin: Handle ignorelists properly

Added check for ignorelist_create() success.
Removed unnecessary "not null" checks in rest of code.

7 years agovirt plugin: Updated InterfaceFormat documentation
Pavel Rochnyack [Tue, 4 Dec 2018 17:20:36 +0000 (00:20 +0700)] 
virt plugin: Updated InterfaceFormat documentation

7 years agoMerge pull request #3014 from rpv-tomsk/collectd-master
Pavel Rochnyak [Tue, 4 Dec 2018 08:54:44 +0000 (15:54 +0700)] 
Merge pull request #3014 from rpv-tomsk/collectd-master

sensors plugin: Drop support for libsensors older than 3.0.0

7 years agoMerge pull request #3000 from teknoraver/master
Pavel Rochnyak [Mon, 3 Dec 2018 18:13:12 +0000 (01:13 +0700)] 
Merge pull request #3000 from teknoraver/master

Add ovs-dpdk extended metrics

7 years agoindent with contrib/format.sh 3000/head
Matteo Croce [Mon, 3 Dec 2018 17:21:03 +0000 (18:21 +0100)] 
indent with contrib/format.sh

7 years agoAdd ovs-dpdk extended metrics
Matteo Croce [Mon, 3 Dec 2018 17:17:01 +0000 (18:17 +0100)] 
Add ovs-dpdk extended metrics

Signed-off-by: Matteo Croce <mcroce@redhat.com>
Signed-off-by: Ryan McCabe <rmccabe@redhat.com>
7 years agoMerge pull request #3013 from rpv-tomsk/collectd-collectd-5.8
Pavel Rochnyak [Mon, 3 Dec 2018 11:57:29 +0000 (18:57 +0700)] 
Merge pull request #3013 from rpv-tomsk/collectd-collectd-5.8

sensors: Removed checks for upper limit of SENSORS_API_VERSION

7 years agosensors plugin: Drop support for libsensors older than 3.0.0 3014/head
Pavel Rochnyack [Mon, 3 Dec 2018 11:56:39 +0000 (18:56 +0700)] 
sensors plugin: Drop support for libsensors older than 3.0.0

The lm_sensors-3.0.0, which introduces 'modern' API, released 2007-11-24.
The time came to drop older version support.

7 years agosensors: Removed checks for upper limit of SENSORS_API_VERSION
Pavel Rochnyack [Mon, 3 Dec 2018 11:34:14 +0000 (18:34 +0700)] 
sensors: Removed checks for upper limit of SENSORS_API_VERSION

That makes no more sense after lm-sensors got new maintainers.

Issue: #3006

7 years agosensors: Removed checks for upper limit of SENSORS_API_VERSION 3013/head
Pavel Rochnyack [Mon, 3 Dec 2018 11:34:14 +0000 (18:34 +0700)] 
sensors: Removed checks for upper limit of SENSORS_API_VERSION

That makes no more sense after lm-sensors got new maintainers.

Closes: #3006
7 years agoMerge pull request #3012 from rpv-tomsk/collectd-master
Pavel Rochnyak [Mon, 3 Dec 2018 11:27:18 +0000 (18:27 +0700)] 
Merge pull request #3012 from rpv-tomsk/collectd-master

ovs_stats: Cleanup and improve

7 years agoovs_stats: Optimize read callback 3012/head
Pavel Rochnyack [Mon, 3 Dec 2018 10:38:17 +0000 (17:38 +0700)] 
ovs_stats: Optimize read callback

7 years agoovs_stats: Do not create bridge if it has not be monitored.
Pavel Rochnyack [Mon, 3 Dec 2018 10:29:27 +0000 (17:29 +0700)] 
ovs_stats: Do not create bridge if it has not be monitored.

7 years agoovs_stats: Fix indent
Pavel Rochnyack [Mon, 3 Dec 2018 10:16:17 +0000 (17:16 +0700)] 
ovs_stats: Fix indent

7 years agoovs_stats: Locking reworked
Pavel Rochnyack [Mon, 3 Dec 2018 10:10:23 +0000 (17:10 +0700)] 
ovs_stats: Locking reworked

Locking now done in unified way, on top-level.
That removes usage of global variables in unprotected way.

7 years agoovs_stats: Do not create ports if there is no bridge name
Pavel Rochnyack [Mon, 3 Dec 2018 09:32:29 +0000 (16:32 +0700)] 
ovs_stats: Do not create ports if there is no bridge name

That has no sence, as it will not pass condition in ovs_stats_plugin_read()

7 years agoMerge pull request #3011 from rpv-tomsk/collectd-master
Pavel Rochnyak [Mon, 3 Dec 2018 06:52:44 +0000 (13:52 +0700)] 
Merge pull request #3011 from rpv-tomsk/collectd-master

ovs_stats: Code style and cleanup

7 years agoovs_stats: Removed unused variable 3011/head
Pavel Rochnyack [Mon, 3 Dec 2018 06:45:16 +0000 (13:45 +0700)] 
ovs_stats: Removed unused variable

7 years agoovs_stats: Fix indents
Pavel Rochnyack [Mon, 3 Dec 2018 06:44:36 +0000 (13:44 +0700)] 
ovs_stats: Fix indents

7 years agoMerge pull request #2880 from abays/add_ovs_stats_bonds_3
Pavel Rochnyak [Mon, 3 Dec 2018 05:49:18 +0000 (12:49 +0700)] 
Merge pull request #2880 from abays/add_ovs_stats_bonds_3

ovs_stats bonds support with separate interface stats

7 years agoMerge pull request #3010 from rpv-tomsk/collectd-5.8
Pavel Rochnyak [Sun, 2 Dec 2018 20:03:17 +0000 (03:03 +0700)] 
Merge pull request #3010 from rpv-tomsk/collectd-5.8

write_mongodb: Fix plugin dependencies

7 years agowrite_mongodb: Fix plugin dependencies 3010/head
Pavel Rochnyack [Sun, 2 Dec 2018 19:48:08 +0000 (02:48 +0700)] 
write_mongodb: Fix plugin dependencies

Issue: #2900

7 years agowrite_mongodb: Fix plugin dependencies
Pavel Rochnyack [Sun, 2 Dec 2018 19:48:08 +0000 (02:48 +0700)] 
write_mongodb: Fix plugin dependencies

Issue: #2900

7 years agoFix merge issue
Pavel Rochnyack [Sun, 2 Dec 2018 18:45:11 +0000 (01:45 +0700)] 
Fix merge issue

7 years agoMerge pull request #2807 from sileht/master
Pavel Rochnyak [Sun, 2 Dec 2018 18:42:32 +0000 (01:42 +0700)] 
Merge pull request #2807 from sileht/master

virt: allow read Hostname from libvirt metadata

7 years agovirt: Fix indent 2807/head
Pavel Rochnyack [Sun, 2 Dec 2018 18:34:16 +0000 (01:34 +0700)] 
virt: Fix indent

7 years agovirt: Merge changes from master to resolve conflict
Pavel Rochnyack [Sun, 2 Dec 2018 18:24:36 +0000 (01:24 +0700)] 
virt: Merge changes from master to resolve conflict

7 years agoMerge pull request #2990 from rpv-tomsk/collectd-master
Pavel Rochnyak [Sun, 2 Dec 2018 17:59:08 +0000 (00:59 +0700)] 
Merge pull request #2990 from rpv-tomsk/collectd-master

virt plugin: Document Instances option

7 years agovirt: allow read Hostname from libvirt metadata
Mehdi Abaakouk [Tue, 5 Jun 2018 14:09:30 +0000 (16:09 +0200)] 
virt: allow read Hostname from libvirt metadata

This change allows to read Hostname from Libvirt metadata API.

Applications like OVirt or Openstack Nova uses this metadata API to
store additional informations like the 'user facing' Guest name.

To do so, a new choice 'metadata' is added for 'HostnameFormat' and
'PluginInstanceFormat'. And two new options are also added to localize
the hostname into the Guest metadata: HostnameMetadataNS and
HostnameMetadataXPath.

Closes: #2805
7 years agowrite_graphite plugin: Add option to reverse host
usev6 [Fri, 23 Nov 2018 23:35:39 +0000 (00:35 +0100)] 
write_graphite plugin: Add option to reverse host

7 years agoAdded a comma to the list of prohibited characters
Marat Salimzianov [Wed, 21 Nov 2018 21:07:21 +0000 (22:07 +0100)] 
Added a comma to the list of prohibited characters

7 years agoFix stop_threads call
Andrew Bays [Mon, 19 Nov 2018 18:16:41 +0000 (13:16 -0500)] 
Fix stop_threads call

7 years agoMore styling + optimizations
Andrew Bays [Mon, 19 Nov 2018 18:05:04 +0000 (13:05 -0500)] 
More styling + optimizations

7 years agoSmall snprintf optimization 2880/head
Andrew Bays [Mon, 19 Nov 2018 14:31:51 +0000 (09:31 -0500)] 
Small snprintf optimization

7 years agoMerge branch 'master' into add_ovs_stats_bonds_3
Andrew Bays [Mon, 19 Nov 2018 13:50:59 +0000 (08:50 -0500)] 
Merge branch 'master' into add_ovs_stats_bonds_3

7 years agoDocument InterfaceStats option for ovs_stats plugin
Andrew Bays [Mon, 19 Nov 2018 13:29:56 +0000 (08:29 -0500)] 
Document InterfaceStats option for ovs_stats plugin

7 years agoMerge pull request #2994 from octo/tail-doc
Florian Forster [Thu, 15 Nov 2018 16:59:49 +0000 (17:59 +0100)] 
Merge pull request #2994 from octo/tail-doc

collectd.conf(5): Improve the tail plugin's documentation.

7 years agocollectd.conf(5): Improve the tail plugin's documentation. 2994/head
Florian Forster [Thu, 15 Nov 2018 10:46:27 +0000 (11:46 +0100)] 
collectd.conf(5): Improve the tail plugin's documentation.

7 years agoStyling + optimizations
Andrew Bays [Tue, 13 Nov 2018 15:04:19 +0000 (10:04 -0500)] 
Styling + optimizations

7 years agoSimplified ZooKeeper quorum reporting and fixed the query-error case. 2991/head
Chris Brown [Fri, 9 Nov 2018 20:01:29 +0000 (12:01 -0800)] 
Simplified ZooKeeper quorum reporting and fixed the query-error case.

7 years agoMerge branch 'master' into connectivity
Andrew Bays [Fri, 9 Nov 2018 12:25:46 +0000 (07:25 -0500)] 
Merge branch 'master' into connectivity

7 years agoStyling/optimization cleanup + proper use of cdtime
Andrew Bays [Fri, 9 Nov 2018 12:19:00 +0000 (07:19 -0500)] 
Styling/optimization cleanup + proper use of cdtime

7 years agoFix formatting.
Chris Brown [Fri, 9 Nov 2018 01:19:49 +0000 (17:19 -0800)] 
Fix formatting.

7 years agoAdd 'quorum' stat to ZooKeeper plugin so that alerts are able to tell the difference...
Chris Brown [Fri, 9 Nov 2018 00:58:43 +0000 (16:58 -0800)] 
Add 'quorum' stat to ZooKeeper plugin so that alerts are able to tell the difference between data lag and loss of quorum.

7 years agovirt plugin: Document Instances option 2990/head
Pavel Rochnyack [Thu, 8 Nov 2018 08:14:02 +0000 (15:14 +0700)] 
virt plugin: Document Instances option

Documented implementation from 452324c4a5b6ec07575cfc5d5d339852b040509b

7 years agouse cdtime + snprintf cleanup + other styling/cleanup
Andrew Bays [Tue, 6 Nov 2018 18:15:52 +0000 (13:15 -0500)] 
use cdtime + snprintf cleanup + other styling/cleanup

7 years agoMerge branch 'master' into sysevent
Andrew Bays [Tue, 6 Nov 2018 17:55:23 +0000 (12:55 -0500)] 
Merge branch 'master' into sysevent

7 years agoMerge pull request #2988 from octo/ff/struct-init-syntax
Florian Forster [Tue, 6 Nov 2018 15:39:11 +0000 (16:39 +0100)] 
Merge pull request #2988 from octo/ff/struct-init-syntax

log_logstash plugin: Fix non-portable struct initialization with "{}".

7 years agolog_logstash plugin: Fix non-portable struct initialization with "{}". 2988/head
Florian Forster [Tue, 6 Nov 2018 14:13:01 +0000 (15:13 +0100)] 
log_logstash plugin: Fix non-portable struct initialization with "{}".

7 years agocurl plugin: re-format
Jakub Jankowski [Mon, 5 Nov 2018 23:33:26 +0000 (00:33 +0100)] 
curl plugin: re-format

7 years agocurl plugin: address code review comments
Jakub Jankowski [Mon, 5 Nov 2018 23:30:26 +0000 (00:30 +0100)] 
curl plugin: address code review comments

7 years agoMerge pull request #2976 from luisfdez/feat/set-ok
Florian Forster [Mon, 5 Nov 2018 21:42:49 +0000 (22:42 +0100)] 
Merge pull request #2976 from luisfdez/feat/set-ok

Add a new UNKNOWN state as the initial state of metrics

7 years agoMore styling + ignorelist create check
Andrew Bays [Mon, 5 Nov 2018 15:17:20 +0000 (10:17 -0500)] 
More styling + ignorelist create check

7 years agocurl plugin: add AddressFamily
Jakub Jankowski [Sat, 3 Nov 2018 01:51:29 +0000 (02:51 +0100)] 
curl plugin: add AddressFamily

In situations when hostnames in URLs resolve to both IPv4 and IPv6
addresses, sometimes it's useful to have separate statistics for both
of these separately.

With this commit, within <Page> block you can set
  AddressFamily "ipv6"
or
  AddressFamily "ipv4"
to specifically use one or the other.

Signed-off-by: Jakub Jankowski <shasta@toxcorp.com>
7 years agoRedfish plugin: Fix race condition
Mozejko, MarcinX [Fri, 21 Sep 2018 10:00:22 +0000 (11:00 +0100)] 
Redfish plugin: Fix race condition
Fix segmentation fault
Fix memory leaks

Change-Id: I8691c292af323145536528f16525206acbfb03f7
Signed-off-by: Mozejko, MarcinX <marcinx.mozejko@intel.com>
Signed-off-by: Adrian Boczkowski <adrianx.boczkowski@intel.com>
7 years agoMerge pull request #2985 from tylerharper/master
trenkel [Thu, 1 Nov 2018 12:35:31 +0000 (13:35 +0100)] 
Merge pull request #2985 from tylerharper/master

add Import configuration option to collectd-python documentation

7 years agoadd Import configuration option to collectd-python documentation 2985/head
Tyler Harper [Thu, 1 Nov 2018 12:01:22 +0000 (08:01 -0400)] 
add Import configuration option to collectd-python documentation

7 years agoMerge pull request #2551 from klnikita/reset_disk_linux
Florian Forster [Wed, 31 Oct 2018 10:18:18 +0000 (11:18 +0100)] 
Merge pull request #2551 from klnikita/reset_disk_linux

disk plugin: reset the disk when it disappear from /proc/diskstats (Linux only)

7 years agodisk plugin: Updated after review 2551/head
Pavel Rochnyack [Wed, 31 Oct 2018 03:14:03 +0000 (10:14 +0700)] 
disk plugin: Updated after review

7 years agodisk plugin: Review #2551
Pavel Rochnyack [Tue, 30 Oct 2018 17:56:53 +0000 (00:56 +0700)] 
disk plugin: Review #2551

7 years agodisk: in linux, reset the disk when it disappear from diskstats
Nikita Kozlov [Tue, 14 Nov 2017 20:48:53 +0000 (21:48 +0100)] 
disk: in linux, reset the disk when it disappear from diskstats

If you don't reset the diskstats_t for a given diskname when it
disappear and the disk name is reused later (for exemple an iSCSI disk)
The "disk" plugin detect an int overflow because linux /proc/diskstats are
reseted to 0 for that diskname and the plugin send incorrect stats for
the new disk.

7 years agocontrib/docker: Install all recommended packages
Pavel Rochnyack [Tue, 30 Oct 2018 16:14:30 +0000 (23:14 +0700)] 
contrib/docker: Install all recommended packages

Closes: #2974
Closes: #2973
7 years agodisk plugin: Fix regression after #2955 (Drop support for Linux 2.4)
Pavel Rochnyack [Tue, 30 Oct 2018 14:53:11 +0000 (21:53 +0700)] 
disk plugin: Fix regression after #2955 (Drop support for Linux 2.4)

Issue: #2955

7 years agoAdd a new UNKNOWN state as the initial state of metrics 2976/head
Luis Fernández Álvarez [Wed, 24 Oct 2018 13:49:35 +0000 (15:49 +0200)] 
Add a new UNKNOWN state as the initial state of metrics

* UNKNOWN becomes the default state of the metrics.
* States are renumbered so UNKNOWN is lower than OKAY and the threshold
evaluation logic is consistent.
* If an invalid datasource is set in a threshold it will resolve to
UNKNOWN.

7 years agocpufreq plugin: Limit reported value of percent to 100.1
Pavel Rochnyack [Sat, 27 Oct 2018 17:02:22 +0000 (00:02 +0700)] 
cpufreq plugin: Limit reported value of percent to 100.1

cat /sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state \
; sleep 10 ; cat /sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state
2664000 463368
1998000 59724070
2664000 463385
1998000 59725054

The sum of counters change is 1001, which produces reported value near
to 100.1%. I got calculated ds[0] = 100.100053 and such value produces gap on
charts.

Added limit to avoid such.

7 years agoMerge pull request #2627 from pllopis/turbostat_fixes
Pavel Rochnyak [Sat, 27 Oct 2018 14:23:52 +0000 (21:23 +0700)] 
Merge pull request #2627 from pllopis/turbostat_fixes

turbostat plugin: add RestoreAffinityPolicy parameter

7 years agoturbostat plugin: Polished RestoreAffinityPolicy option 2627/head
Pavel Rochnyack [Sat, 27 Oct 2018 13:16:38 +0000 (20:16 +0700)] 
turbostat plugin: Polished RestoreAffinityPolicy option

7 years agoturbostat plugin: add new setting `RestoreAffinityPolicy`
Pablo Llopis [Tue, 13 Mar 2018 10:55:06 +0000 (11:55 +0100)] 
turbostat plugin: add new setting `RestoreAffinityPolicy`

This new setting controls how the affinity is restored during
turbostat_read(). Two policies are implemented: AffinityRestore, and
AffinityAllCPUs. The default policy, AffinityRestore, behaves exactly
the same as before, which is to save affinity and to later restore it.
The second policy, RestoreAllCPUs, skips saving the affinity and
sets the affinity to all CPUs after each read. This second policy is
useful for systems where sched_getaffinity() fails and prevents data
collection.

7 years agoformatting fixes
Pablo Llopis [Fri, 15 Dec 2017 14:58:22 +0000 (15:58 +0100)] 
formatting fixes

7 years agoIncrease turbostat_read() resiliency when sched_getaffinity() fails
Pablo Llopis [Fri, 15 Dec 2017 13:57:33 +0000 (14:57 +0100)] 
Increase turbostat_read() resiliency when sched_getaffinity() fails

7 years agoRequest kernel version in reported issues
Pavel Rochnyack [Sat, 27 Oct 2018 10:02:57 +0000 (17:02 +0700)] 
Request kernel version in reported issues

7 years agoMerge pull request #2979 from rpv-tomsk/collectd-master
Florian Forster [Sat, 27 Oct 2018 08:53:12 +0000 (10:53 +0200)] 
Merge pull request #2979 from rpv-tomsk/collectd-master

swap plugin: Drop support for Linux 2.4.

7 years agoswap plugin: Drop support for Linux 2.4. 2979/head
Pavel Rochnyack [Sat, 27 Oct 2018 07:57:11 +0000 (14:57 +0700)] 
swap plugin: Drop support for Linux 2.4.

Related: #2955

7 years agoMerge pull request #2978 from rpv-tomsk/collectd-master
Pavel Rochnyak [Sat, 27 Oct 2018 07:56:47 +0000 (14:56 +0700)] 
Merge pull request #2978 from rpv-tomsk/collectd-master

virt plugin: Cleanup

7 years agovirt plugin: Cleanup 2978/head
Pavel Rochnyack [Sat, 27 Oct 2018 07:36:55 +0000 (14:36 +0700)] 
virt plugin: Cleanup

7 years agoMerge pull request #2923 from qdbp/gpu_nvml_plugin
Florian Forster [Sat, 27 Oct 2018 07:14:25 +0000 (09:14 +0200)] 
Merge pull request #2923 from qdbp/gpu_nvml_plugin

New plugin: gpu_nvidia collects NVIDIA GPU stats.

7 years agorename plugin to "gpu_nvidia" 2923/head
Evgeny Naumov [Fri, 26 Oct 2018 22:13:27 +0000 (18:13 -0400)] 
rename plugin to "gpu_nvidia"

7 years agoMerge branch 'collectd-5.8' into master
Pavel Rochnyack [Fri, 26 Oct 2018 17:29:52 +0000 (00:29 +0700)] 
Merge branch 'collectd-5.8' into master

Conflicts:
src/disk.c
src/virt.c

7 years agoMerge branch 'collectd-5.7' into collectd-5.8
Pavel Rochnyack [Fri, 26 Oct 2018 15:06:35 +0000 (22:06 +0700)] 
Merge branch 'collectd-5.7' into collectd-5.8

Conflicts:
src/utils_mount.c

7 years agoMerge pull request #2975 from octo/issue/2954
Florian Forster [Fri, 26 Oct 2018 06:21:45 +0000 (08:21 +0200)] 
Merge pull request #2975 from octo/issue/2954

zfs_arc: Ignore the first two lines of the statistics file on Linux (5.7 cherry-pick)

7 years agocontrib/format.sh src/zfs_arc.c 2975/head
Florian Forster [Fri, 26 Oct 2018 06:05:41 +0000 (08:05 +0200)] 
contrib/format.sh src/zfs_arc.c

7 years agozfs_arc: Ignore the first two lines of the statistics file on Linux.
YmrDtnJu [Sat, 10 Dec 2016 00:30:59 +0000 (01:30 +0100)] 
zfs_arc: Ignore the first two lines of the statistics file on Linux.

The first two lines of the statistics file on Linux contain information about
the rest of the file. They do not contain any usable statistics.
See module/spl/spl-kstat.c of the spl module of ZFS on Linux for more
information.

7 years agoMerge pull request #2972 from rpv-tomsk/collectd-collectd-5.8
Florian Forster [Thu, 25 Oct 2018 18:20:46 +0000 (20:20 +0200)] 
Merge pull request #2972 from rpv-tomsk/collectd-collectd-5.8

virt plugin: Remove optional virDomainGetCPUStats() from main flow

7 years agovirt plugin: Move `get_pcpu_stats()' down to avoid forward declaration of `submit_der... 2972/head
Pavel Rochnyack [Thu, 25 Oct 2018 08:44:38 +0000 (15:44 +0700)] 
virt plugin: Move `get_pcpu_stats()' down to avoid forward declaration of `submit_derive2()'