Pierre-Yves Ritschard [Wed, 12 Nov 2014 11:35:00 +0000 (12:35 +0100)]
Merge pull request #803 from bnordbo/aggregation-libm
Link aggregation.so to libm.so
Bjørn Nordbø [Wed, 12 Nov 2014 11:27:43 +0000 (12:27 +0100)]
Link aggregation.so to libm.so
Pierre-Yves Ritschard [Tue, 11 Nov 2014 11:13:30 +0000 (12:13 +0100)]
Merge pull request #793 from vincentbernat/fix/gcrypt-deprecated
network: don't enable gcrypt thread callbacks when gcrypt recent enough
Pierre-Yves Ritschard [Tue, 11 Nov 2014 10:27:35 +0000 (11:27 +0100)]
Merge pull request #792 from vincentbernat/fix/out-of-tree-build
build: fix out-of-tree build
Pierre-Yves Ritschard [Fri, 7 Nov 2014 16:37:09 +0000 (17:37 +0100)]
ignore new dirs
Pierre-Yves Ritschard [Fri, 7 Nov 2014 16:34:32 +0000 (17:34 +0100)]
Define _DEFAULT_SOURCE in addition to _BSD_SOURCE
This enables forward compatibility with the ongoing
deprecation of _BSD_SOURCE.
Pierre-Yves Ritschard [Fri, 7 Nov 2014 15:27:08 +0000 (16:27 +0100)]
Merge pull request #794 from vincentbernat/fix/kafka-warning
kafka: fix compilation for older versions of librdkafka
Vincent Bernat [Fri, 7 Nov 2014 14:51:58 +0000 (15:51 +0100)]
kafka: fix compilation for older versions of librdkafka
Since commit
f505691270f2317291c372fd5f004a4ffbce9f9a, kafka module was
broken. Enable definition of `kafka_log()` when using kafka logger
callback as well.
Vincent Bernat [Fri, 7 Nov 2014 14:20:22 +0000 (15:20 +0100)]
network: don't enable gcrypt thread callbacks when gcrypt recent enough
From `gcrypt.h`:
> NOTE: Since Libgcrypt 1.6 the thread callbacks are not anymore used.
> However we keep it to allow for some source code compatibility if used
> in the standard way.
Otherwise, we get a deprecation warning which is turned into an error:
```
CC libcollectdclient_la-network_buffer.lo
../../../src/libcollectdclient/network_buffer.c:58:15: error: 'gcry_thread_cbs' is deprecated (declared at /usr/include/gcrypt.h:213) [-Werror=deprecated-declarations]
GCRY_THREAD_OPTION_PTHREAD_IMPL;
```
Fixes: #632
Vincent Bernat [Fri, 7 Nov 2014 14:40:37 +0000 (15:40 +0100)]
build: fix out-of-tree build
When building collectd out of tree, `srcdir` and `builddir` are
different. We ask to search path in `$(top_srcdir)/src` since this is
needed to find `liboconfig/config.h`. Also fix search path for
libcollectdclient where only one header is in `builddir` while the
remaining are in `srcdir`.
Marc Fournier [Thu, 6 Nov 2014 20:08:37 +0000 (21:08 +0100)]
Merge pull request #791 from mfournier/fix-lvm-merge-conflict-mistake
lvm: remove duplicate call to lvm_submit()
Marc Fournier [Wed, 5 Nov 2014 15:18:03 +0000 (16:18 +0100)]
lvm: remove duplicate call to lvm_submit()
This got added by accident when solving the merge conflict in
103f05e0.
It led to the plugin triggering the classical "uc_update: Value too old"
error message.
Marc Fournier [Mon, 3 Nov 2014 10:24:38 +0000 (11:24 +0100)]
s/libvirt/virt/ in doc & rpm specfile
... as this plugin was renamed in
62f94860.
Marc Fournier [Mon, 3 Nov 2014 09:23:32 +0000 (10:23 +0100)]
build: update reference to files moved in
216c6246
Fixes #785
Marc Fournier [Fri, 31 Oct 2014 14:21:25 +0000 (15:21 +0100)]
Merge pull request #772 from mschenck/write_tsdb-type-type_instance-differentiate
Including vl->type, even when vl->type_instance is available to avoid ov...
Pierre-Yves Ritschard [Thu, 30 Oct 2014 13:03:31 +0000 (14:03 +0100)]
Merge pull request #778 from landryb/openbsd_fix_processes_plugin
Fix the processes plugin on OpenBSD (#776)
Pierre-Yves Ritschard [Thu, 30 Oct 2014 13:03:10 +0000 (14:03 +0100)]
Merge pull request #779 from landryb/openbsd_build_fixes
Openbsd build fixes
Landry Breuil [Mon, 27 Oct 2014 09:13:42 +0000 (10:13 +0100)]
Recent NetBSD versions also use a TAILQ.
Landry Breuil [Mon, 27 Oct 2014 08:38:31 +0000 (09:38 +0100)]
Use cpu_stage() where expected in the CAN_USE_SYSCTL, HAVE_LIBSTATGRAB and HAVE_SYSCTLBYNAME codepaths.
cpu_state() isnt a function.
Landry Breuil [Mon, 27 Oct 2014 08:37:58 +0000 (09:37 +0100)]
inpt_queue is a TAILQ on OpenBSD
Landry Breuil [Mon, 27 Oct 2014 08:36:28 +0000 (09:36 +0100)]
Link collectd-tg with -lpthread if available
otherwise linking fails with undefined refs to pthread_mutex_* functions
Landry Breuil [Mon, 27 Oct 2014 08:12:26 +0000 (09:12 +0100)]
Fix swapctl() argument count detection on OpenBSD.
on OpenBSD swapctl() takes three arguments, but is defined in unistd.h
and also needs sys/param.h.
http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man2/swapctl.2
we need to add those headers to both detections to make sure the test
on 'swapctl takes two arguments' correctly fails.
Landry Breuil [Mon, 27 Oct 2014 07:38:53 +0000 (08:38 +0100)]
Include pthread.h in plugin.h to get pthread_t definition.
Landry Breuil [Mon, 27 Oct 2014 07:37:14 +0000 (08:37 +0100)]
Fix the processes plugin on OpenBSD (#776)
Properly check for struct kinfo_proc members in configure.ac
Use kvm_getprocs() like it was done on FreeBSD
Marc Fournier [Sun, 26 Oct 2014 18:45:02 +0000 (19:45 +0100)]
Merge remote-tracking branch 'origin/pr/488'
Sebastian Harl [Sat, 23 Nov 2013 12:55:32 +0000 (13:55 +0100)]
Let the config parser accept unquoted IPv6 addresses.
The parser supports raw IPv6 addresses, optional address and port (as
[<addr>]:<port>), and embedded IPv4 addresses.
Based on "Common Patterns" found in the flex manual.
Sebastian Harl [Sat, 25 Oct 2014 07:17:37 +0000 (09:17 +0200)]
Merge pull request #774 from trenkel/master
Adding get_dataset() to python
Sven Trenkel [Thu, 23 Oct 2014 19:01:13 +0000 (19:01 +0000)]
python: Add get_dataset() to the man page.
Sven Trenkel [Thu, 23 Oct 2014 16:58:50 +0000 (16:58 +0000)]
Add get_dataset() as a way to get the definition of a dataset from python.
https://github.com/collectd/collectd/issues/771
Michael Schenck [Tue, 21 Oct 2014 17:31:40 +0000 (13:31 -0400)]
Including vl->type, even when vl->type_instance is available to avoid over-writing values (i.e. with the 'df' plugin)
Marc Fournier [Mon, 20 Oct 2014 14:49:04 +0000 (16:49 +0200)]
mysql: correct 2 data types in innodb counters
Thanks to @ekilby for spotting this mistake ! Fixes #757
trenkel [Wed, 1 Oct 2014 14:10:10 +0000 (16:10 +0200)]
Merge pull request #751 from ptbrowne/prepend-sys-path
feat(python-plugin): prepend instead of append ModulePath to sys.path
Patrick Browne [Wed, 1 Oct 2014 09:18:40 +0000 (11:18 +0200)]
doc(collectd-python): update
Patrick Browne [Tue, 30 Sep 2014 08:31:05 +0000 (10:31 +0200)]
feat(python-plugin): prepend instead of append ModulePath to sys.path
When importing a module, you expect the plugin repertory to have higher priority
than your site-packages. It will prevent hard to debug clashing module names problems.
At least, if there is a problem, it will fail more loudly than "module did not register
any config callback"
Florian Forster [Fri, 26 Sep 2014 02:10:32 +0000 (19:10 -0700)]
cpu plugin: Don't report empty cpu states.
Florian Forster [Tue, 23 Sep 2014 14:52:04 +0000 (07:52 -0700)]
src/Makefile.am: Make sure plugins only export "module_register".
While there, put the LDFLAGS shared between all plugins into a separate
variable.
Florian Forster [Tue, 23 Sep 2014 14:13:52 +0000 (07:13 -0700)]
Merge remote-tracking branch 'github/pr/697'
Florian Forster [Tue, 23 Sep 2014 14:09:47 +0000 (07:09 -0700)]
Merge remote-tracking branch 'github/pr/734'
Victor Berger [Mon, 22 Sep 2014 14:51:36 +0000 (16:51 +0200)]
bind plugin: split bind_xml_stats to v3 and v1_v2.
And minor change to bind_parse_generic_name_attr_value_list.
Victor Berger [Sat, 20 Sep 2014 13:15:51 +0000 (15:15 +0200)]
bind plugin: add support for the new XML v3 API.
Unfortunately, this new API does not provide per-zone data
any more, thus 'Zone' options like
Zone "example.com/IN"
are ignored if API version is 3.
Florian Forster [Sat, 20 Sep 2014 05:31:23 +0000 (07:31 +0200)]
COPYING: Add the MIT License and add a note about plugins being licensed individually.
Florian Forster [Sat, 20 Sep 2014 05:18:03 +0000 (07:18 +0200)]
Move utils_parse_option.[ch] out of the daemon/ directory.
Florian Forster [Sat, 20 Sep 2014 05:11:17 +0000 (07:11 +0200)]
common.[ch]: Move escape_string() to here.
Florian Forster [Sat, 20 Sep 2014 04:49:01 +0000 (06:49 +0200)]
Move collectd daemon files to the src/daemon/ directory.
Marc Fournier [Fri, 8 Aug 2014 09:34:20 +0000 (11:34 +0200)]
memory: make linux slab reporting work with older kernels
Marc Fournier [Fri, 8 Aug 2014 09:05:33 +0000 (11:05 +0200)]
memory: adjust safeguard to changes from previous commit
Florian Forster [Wed, 17 Sep 2014 08:52:36 +0000 (10:52 +0200)]
src/collectd.c: Set the LC_NUMERIC locale to "C".
When using ASCII protocols, such as the Graphite protocol, doubles are
converted to strings using sprintf(3) and parsed with strtod(3). If the
effective locale uses something different from a dot (".") as the
decimal separator (e.g. Portuguese, German), this breaks.
This patch sets the LC_NUMERIC locale to "C" on start-up, so that
strings are produced and parsed in a well-defined manner.
Fixes: #512
Florian Forster [Tue, 16 Sep 2014 14:05:52 +0000 (16:05 +0200)]
write_graphite plugin: Limit number of reconnection attempts per time.
Fixes: #625
Manuel CISSÉ [Thu, 20 Feb 2014 15:06:56 +0000 (16:06 +0100)]
memory plugin: Add slab memory stats (linux)
Pull-Request: #560
Florian Forster [Tue, 16 Sep 2014 09:17:55 +0000 (11:17 +0200)]
virt plugin: Rename the "libvirt" plugin to "virt".
"libvirt" confused libtool and caused problems when re-building from source.
Florian Forster [Tue, 16 Sep 2014 07:52:10 +0000 (09:52 +0200)]
cpu plugin: Various, random fixes and improvements:
* Add Pierre-Yves to the list of copyright holders.
* Make sure the entire file is consistently indented.
* Renamed the "ReportActive" config option to "ReportByState"
(with negated logic).
* Renamed internal functions to better reflect their use.
* Let cpu_stage() (née submit()) work on individual counters / derives
rather than an array, removing logic from the cpu_read() function.
* Rename CPU_SUBMIT_* to CPU_STATE_*.
* Move legacy behavior it its own function, cpu_commit_without_aggregation().
Florian Forster [Tue, 16 Sep 2014 05:19:09 +0000 (07:19 +0200)]
swap plugin: Make SwapCached optional under Linux.
OpenVZ doesn't provide the line, which caused swap collection to be
skipped entirely on these systems. Instead, "cached" should simply be
ignored, as it is on other systems. Thanks to @zerkms for reporting this
problem!
Fixes: #733
Florian Forster [Mon, 15 Sep 2014 17:21:22 +0000 (19:21 +0200)]
cpu plugin: Fix parsing of SoftIRQ under Linux.
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
John Ferlito [Sat, 13 Sep 2014 01:24:14 +0000 (11:24 +1000)]
Add ReconnectInterval option to Network plugin
The Network plugin only performs DNS resolution at initialization. This
can be problematic when trying to performs migrations of collectd
infrastructure or when trying to create HA solutions which are dependant
on DNS.
The ReconnectInterval options forces a reconnect of all the sockets at
the defined number of seconds. By default no re-connections are attempted
if this option is not set.
John Ferlito [Sat, 13 Sep 2014 01:15:30 +0000 (11:15 +1000)]
Move sockent_client_disconnect above sockent_client_disconnect so we can use it there
Florian Forster [Sat, 13 Sep 2014 08:25:31 +0000 (10:25 +0200)]
collectd.conf(5): Document the ReportDegraded" option.
Florian Forster [Fri, 12 Sep 2014 15:06:53 +0000 (17:06 +0200)]
battery plugin: Implement the "ReportDegraded" option.
Florian Forster [Thu, 11 Sep 2014 05:16:19 +0000 (07:16 +0200)]
battery plugin: Implement the ValuesPercentage option.
Florian Forster [Wed, 10 Sep 2014 15:26:16 +0000 (17:26 +0200)]
battery plugin: Only report "current" when actually supplied by the battery.
I think the commend in the file sums it up pretty good, read that ;)
Florian Forster [Wed, 10 Sep 2014 15:04:41 +0000 (17:04 +0200)]
AUTHORS: Add Andy Parkins.
Vladimir Smirnov [Wed, 10 Sep 2014 19:08:50 +0000 (21:08 +0200)]
Fix typo in if caluse
Fixes #729
Florian Forster [Wed, 10 Sep 2014 14:53:51 +0000 (16:53 +0200)]
battery plugin: Import code to read metrics from sysfs.
This started as a simple import of Andy Parkins' sysfsbattery plugin into
the battery plugin. Since the battery plugin is ancient and hasn't been
touched in a while, this quickly escalated to a much bigger refactoring.
Sorry!
On the other hand, this fixes a couple of bugs. For example, all metrics
were always dispatched with plugin_instance "0". This is correct for the
majority of laptops, of course, but in theory this could be wrong.
Also ACPI charging / discharging rate is reported as "current", when
modern batteries actually report "power". The sysfs code does this
correctly, ACPI still needs to be patched.
Fixes: #725
Florian Forster [Wed, 10 Sep 2014 14:15:40 +0000 (16:15 +0200)]
src/common.[ch]: Implement strtogauge().
Florian Forster [Tue, 9 Sep 2014 21:43:11 +0000 (23:43 +0200)]
src/configfile.c: Fix the default interval setting.
Also fixes a bug in global_option_get_time(): Values smaller than or
equal to zero are illegal and the default value should be returned.
Thanks to @anandkarthik for spotting this!
Fixes: #727
Marc Fournier [Mon, 8 Sep 2014 13:10:18 +0000 (15:10 +0200)]
RPM specfile: take all new plugins and dependencies in account
Marc Fournier [Mon, 8 Sep 2014 15:32:54 +0000 (17:32 +0200)]
Merge branch 'collectd-5.4'
Marc Fournier [Mon, 8 Sep 2014 15:29:14 +0000 (17:29 +0200)]
RPM specfile: enable lvm plugin on RHEL7
Marc Fournier [Mon, 8 Sep 2014 15:21:38 +0000 (17:21 +0200)]
Merge branch 'collectd-5.3' into collectd-5.4
Conflicts:
contrib/redhat/collectd.spec
Florian Forster [Mon, 8 Sep 2014 15:11:56 +0000 (17:11 +0200)]
Merge remote-tracking branch 'github/master'
Florian Forster [Mon, 8 Sep 2014 15:07:39 +0000 (17:07 +0200)]
processes plugin: Limit the buffer size used for command line matching.
ARG_MAX is quite big on many systems, for example >100 kByte on
GNU/Linux. This is a problem for systems with tight memory constraints,
for example embedded devices.
This patch uses at most 4 kByte for this, which out to be enough for the
vast majority of users. Users with specific requirements can compile
with "CMDLINE_BUFFER_SIZE=${LOTS}" in their CPPFLAGS to override this
default.
Fixes: #652
Marc Fournier [Mon, 8 Sep 2014 14:59:30 +0000 (16:59 +0200)]
RPM specfile: enable netlink plugin on RHEL > 5
Marc Fournier [Mon, 8 Sep 2014 14:42:14 +0000 (16:42 +0200)]
RPM specfile: fix bogus dates
modern rpmbuild versions appear to be more strict on this point.
Marc Fournier [Mon, 8 Sep 2014 14:41:21 +0000 (16:41 +0200)]
RPM specfile: support for RHEL7
Marc Fournier [Mon, 8 Sep 2014 12:12:51 +0000 (14:12 +0200)]
RPM specfile: add missing %files section for modbus plugin
complement to
a781eb2c5
Marc Fournier [Mon, 8 Sep 2014 10:49:49 +0000 (12:49 +0200)]
RPM specfile: remove define accidentally re-added when handling merge conflict
Marc Fournier [Mon, 8 Sep 2014 10:38:53 +0000 (12:38 +0200)]
RPM specfile: remove macro accidentally re-added when handling merge conflict
Marc Fournier [Mon, 8 Sep 2014 10:26:55 +0000 (12:26 +0200)]
RPM specfile: remove duplicate modbus block
Marc Fournier [Fri, 29 Aug 2014 15:07:18 +0000 (17:07 +0200)]
improve CollectInternalStats's documentation
Marc Fournier [Mon, 8 Sep 2014 09:41:25 +0000 (11:41 +0200)]
Merge remote-tracking branch 'origin/pr/691'
Florian Forster [Mon, 8 Sep 2014 09:21:50 +0000 (11:21 +0200)]
Merge branch 'pr-713'
Florian Forster [Mon, 8 Sep 2014 09:19:26 +0000 (11:19 +0200)]
src/plugin.c: Parse "MaxReadInterval" with global_option_get_time().
Florian Forster [Mon, 8 Sep 2014 09:16:39 +0000 (11:16 +0200)]
src/configfile.[ch]: Implement global_option_get_time().
Florian Forster [Mon, 8 Sep 2014 09:16:18 +0000 (11:16 +0200)]
src/configfile.c: Use cf_util_get_cdtime() to parse the "Interval" settings.
Florian Forster [Sun, 7 Sep 2014 06:13:19 +0000 (08:13 +0200)]
set target: Simplify config parsing.
Florian Forster [Sat, 6 Sep 2014 09:47:37 +0000 (11:47 +0200)]
disk plugin: Add metric for pending I/O operations.
This is only supported on Linux right now.
Fixes: #705
Florian Forster [Sat, 6 Sep 2014 09:30:20 +0000 (11:30 +0200)]
Merge branch 'collectd-5.4'
Florian Forster [Sat, 6 Sep 2014 09:27:56 +0000 (11:27 +0200)]
Merge branch 'collectd-5.3' into collectd-5.4
Conflicts:
src/curl.c
Florian Forster [Sat, 6 Sep 2014 08:58:45 +0000 (10:58 +0200)]
network plugin: Improve client connecting behavior.
This moves the socket creation logic so it's called from
networt_send_buffer_plain(). This allows us to recover after network
failures or when collectd was started before the network was available.
Fixes: #627
Florian Forster [Fri, 5 Sep 2014 13:54:48 +0000 (15:54 +0200)]
network plugin: Improve "Buffer too small" error message.
References: #724
Florian Forster [Fri, 5 Sep 2014 05:16:20 +0000 (07:16 +0200)]
write_http plugin: Don't compare pointer with numeric literal.
Not even zero. Not even once.
References: #722
Florian Forster [Thu, 4 Sep 2014 08:54:35 +0000 (10:54 +0200)]
collectd.conf(5): s/metircs/metrics/
Florian Forster [Thu, 4 Sep 2014 05:20:14 +0000 (07:20 +0200)]
collectd.conf(5): Improve markup of the write_kafka documentation.
Florian Forster [Thu, 4 Sep 2014 05:18:51 +0000 (07:18 +0200)]
write_http plugin: Implement the "BufferSize" option.
Fixes: #722
Florian Forster [Wed, 3 Sep 2014 07:10:00 +0000 (09:10 +0200)]
src/utils_match.[ch]: Implement match_value_reset().
This is called from the curl and memcachec plugins. Previously, gauge
average, minimum and maximum values were calculated since the start of
the daemon, rather than per-interval. This is not the documented
functionality.
Fixes: #663
Florian Forster [Wed, 3 Sep 2014 05:39:27 +0000 (07:39 +0200)]
curl plugin: Use the utility functions for config handling.
Florian Forster [Tue, 2 Sep 2014 17:51:37 +0000 (19:51 +0200)]
Merge remote-tracking branch 'github/collectd-5.3' into collectd-5.3
Florian Forster [Tue, 2 Sep 2014 17:50:47 +0000 (19:50 +0200)]
src/meta_data.c: If the meta_data_t is empty, avoid calling malloc(0).
Florian Forster [Tue, 2 Sep 2014 17:49:11 +0000 (19:49 +0200)]
src/utils_format_json.c: Handle empty meta_data_t gracefully.
Previously, `meta != NULL` and `keys_num == 0` was possible and would
result in "{}", which is not valid JSON.
Fixes: 716
Florian Forster [Tue, 2 Sep 2014 17:48:10 +0000 (19:48 +0200)]
python plugin: Don't create empty meta_data_t objects.
Fixes: #716