]>
git.ipfire.org Git - thirdparty/collectd.git/log
Marc Fournier [Fri, 11 Sep 2015 20:41:55 +0000 (22:41 +0200)]
Merge remote-tracking branch 'origin/pr/1135'
Marc Fournier [Fri, 11 Sep 2015 20:34:18 +0000 (22:34 +0200)]
Merge remote-tracking branch 'origin/pr/1260'
Marc Fournier [Fri, 11 Sep 2015 20:30:28 +0000 (22:30 +0200)]
Merge remote-tracking branch 'origin/pr/1205'
Ruben Kerkhof [Sat, 1 Aug 2015 17:03:34 +0000 (19:03 +0200)]
mysql: use mysql_config --include for include path
According to the mysql_config manpage, --cflags shows the
compiler flags the library was compiled with. We certainly don't
want to use those.
Ruben Kerkhof [Sat, 1 Aug 2015 17:02:15 +0000 (19:02 +0200)]
mysql: just search for mysql_get_server_version
If we found that symbol, assume we also found mysql_init.
Ruben Kerkhof [Sat, 1 Aug 2015 16:59:53 +0000 (18:59 +0200)]
mysql: respect mysql_libs when searching for symbol
We always looked in libmysqlclient, but this doesn't
work for compatible databases such as Percona.
Respect the list return by mysql_config --libs_r instead.
Fixes #1098
Brian ONeill [Thu, 6 Aug 2015 20:11:23 +0000 (16:11 -0400)]
added ZFS ARC cache to memory, treating it like Linux cached memory
Marc Fournier [Fri, 11 Sep 2015 20:17:44 +0000 (22:17 +0200)]
Merge remote-tracking branch 'origin/pr/1229'
Marc Fournier [Fri, 11 Sep 2015 20:17:20 +0000 (22:17 +0200)]
Merge remote-tracking branch 'origin/pr/1254'
vzubko [Fri, 28 Aug 2015 18:23:21 +0000 (11:23 -0700)]
Log http error codes other than 200. New config option LogHttpError [true/false].
Denys Berkovskyy [Tue, 8 Sep 2015 10:38:18 +0000 (11:38 +0100)]
Fix copy-paste error in debug message in snmp plugin
Florian Forster [Fri, 11 Sep 2015 05:23:56 +0000 (07:23 +0200)]
mqtt plugin: Initialize locks on startup.
D'oh!
Issue: #1262
Marc Fournier [Tue, 8 Sep 2015 07:06:11 +0000 (09:06 +0200)]
configure: print out build flags and options in summary
Marc Fournier [Tue, 8 Sep 2015 07:03:24 +0000 (09:03 +0200)]
configure: move werror flag to features
Ruben Kerkhof [Fri, 14 Aug 2015 22:15:59 +0000 (00:15 +0200)]
Make building with -Werror optional.
I noticed various downstream distros patch out -Werror
for one reason or another. This adds an option to make that
easier. It is still on by default.
bbczeuz [Sun, 6 Sep 2015 12:58:44 +0000 (14:58 +0200)]
Merge pull request #3 from collectd/master
merging upstream
Marc Fournier [Thu, 3 Sep 2015 17:24:19 +0000 (19:24 +0200)]
plugin.c: emit log message when plugin loading succeeds
Marc Fournier [Thu, 3 Sep 2015 17:06:24 +0000 (19:06 +0200)]
Merge pull request #1253 from rubenk/fix-osx-build
gettimeofday() needs <sys/time.h>
Michal Bebjak [Thu, 3 Sep 2015 10:21:21 +0000 (12:21 +0200)]
dbi plugin interval documentation
Michal Bebjak [Thu, 3 Sep 2015 10:21:05 +0000 (12:21 +0200)]
Fix compilation for master
Ruben Kerkhof [Thu, 3 Sep 2015 09:49:11 +0000 (11:49 +0200)]
gettimeofday() needs <sys/time.h>
Fixes #1247
Christian Fetzer [Mon, 24 Aug 2015 07:49:21 +0000 (09:49 +0200)]
sensors: Report sensor readings by descriptive labels
Adds an option UseLabels to configure how sensor readings are
reported. The default reports readings using the sensor name (e.g.
"in0"). With this option set to true, the readings are reported using
the label (e.g. "VCore").
Florian Forster [Tue, 1 Sep 2015 20:16:11 +0000 (22:16 +0200)]
collectd-tg: Fall back to gettimeofday(3) if clock_gettime(3) is not available.
Sometimes Mac OS/X is stupid. clock_gettime() was introduced in 1997, just
sayin'.
Fixes: #1247
Marc Fournier [Wed, 26 Aug 2015 22:44:23 +0000 (00:44 +0200)]
Merge branch 'collectd-5.5'
Marc Fournier [Wed, 26 Aug 2015 22:20:12 +0000 (00:20 +0200)]
src/daemon/utils_time_test.c: add ULL suffix to large literals
This should prevent some 32bit compilers from complaining about:
`integer constant is too large for 'long' type`
Marc Fournier [Wed, 26 Aug 2015 21:40:18 +0000 (23:40 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Fri, 14 Aug 2015 20:25:20 +0000 (22:25 +0200)]
Fix harmless build warnings with newer binutils
I see a lot of those on Rawhide:
ar: `u' modifier ignored since `D' is the default (see `U')
It's going to take a while to get this fixed upstream.
Meanwhile, silence the warnings.
Macro copied from libvirt.
Ruben Kerkhof [Sun, 16 Aug 2015 10:28:43 +0000 (12:28 +0200)]
liboconfig: Fix implicit declaration warning
strlen declaration is in string.h
Ruben Kerkhof [Sun, 16 Aug 2015 11:47:24 +0000 (13:47 +0200)]
Don't unlock lock twice
Fixes make check on OpenBSD
Ruben Kerkhof [Sun, 16 Aug 2015 12:39:23 +0000 (14:39 +0200)]
pf: fix compilation on OpenBSD
Ruben Kerkhof [Sun, 16 Aug 2015 13:07:03 +0000 (15:07 +0200)]
dns: fix compilation on OpenBSD
OpenBSD doesn't have pcap-bpf.h
pcap.h has been including pcap/bpf.h since 2006.
Since we require a pcap which has PCAP_ERROR_IFACE_NOT_UP, introduced in 2008
this shouldn't break anything.
Marc Fournier [Wed, 26 Aug 2015 21:28:50 +0000 (23:28 +0200)]
coding style fixes over
94e5622
Gautam BT [Mon, 9 Feb 2015 11:01:24 +0000 (16:31 +0530)]
Fix pipe leak in exec plugin
Fixes #762
Florian Forster [Fri, 21 Aug 2015 11:55:42 +0000 (13:55 +0200)]
src/testing.h: Rename the EXPECT_EQ_{DOUBLE,INT,STR} macros.
Let all equality macros follow a common naming and logging schema.
Florian Forster [Fri, 21 Aug 2015 11:37:30 +0000 (13:37 +0200)]
src/testing.h: Rewrite the EXPECT_EQ_UINT64() macro.
Cast the input to uint64_t, so we don't need to do this when calling the
macro. This results in cleaner log messages and prevents macros to be
expanded in the log output.
Florian Forster [Fri, 21 Aug 2015 11:34:49 +0000 (13:34 +0200)]
src/daemon/utils_time_test.c: Test ms conversion.
The CDTIME_T_TO_MS() macro is used by all plugins using the cURL library,
so we should properly test this macro, too.
Florian Forster [Fri, 21 Aug 2015 10:49:04 +0000 (12:49 +0200)]
src/daemon/utils_time.h: Don't cast input to time_t.
The CDTIME_T_TO_TIME_T() macro used to cast its input to time_t, which is
a 32bit type on (some?) 32bit architectures.
This is a regression introduced in
db1391aaa66b8b8fad82219494f61f3452441f62
and not found in any released version of collectd. Phew!
Florian Forster [Fri, 21 Aug 2015 09:56:57 +0000 (11:56 +0200)]
src/daemon/utils_time.h: Treat nanoseconds as 64bit integer.
The assumed type was "long", because that is what struct timespec is
using. However, struct timespec only stores the fraction of a second in
the approrpiate field and therefore only cares about values up to 10^9.
We, on the other hand, assume a UNIX epoch in ns precision, so we
require the entire 64bits.
This patch changes the [MUN]S_TO_CDTIME_T() macros to assume a uint64_t
input and moves the casting to the appropriate data type for struct
time{val,spec} to the CDTIME_T_TO_TIME{VAL,SPEC}() macros. Appropriate
casts are added to the cURL based plugins which need to pass a "long" to
cURL when specifying timeouts.
It also fixes the unit test, which assigned large (> 32 bit) literals to
a "long" field, which breaks on 32 bit architectures.
Florian Forster [Wed, 19 Aug 2015 12:26:24 +0000 (14:26 +0200)]
src/daemon/utils_time.h: Improve precision of conversion macros.
This patch also adds test cases for most conversions. It is inspired by
collectd/go-collectd#5 and uses some of the same test cases.
Michal Bebjak [Mon, 17 Aug 2015 11:07:23 +0000 (13:07 +0200)]
Allow to specify per database interval for fetching stats
Ruben Kerkhof [Fri, 14 Aug 2015 19:21:52 +0000 (21:21 +0200)]
Set bugreport url and homepage url
./configure --help now shows:
Report bugs to <https://github.com/collectd/collectd/issues>.
collectd home page: <https://collectd.org>.
Ruben Kerkhof [Fri, 14 Aug 2015 18:51:15 +0000 (20:51 +0200)]
Use a single sed invocation
Ruben Kerkhof [Fri, 14 Aug 2015 18:44:51 +0000 (20:44 +0200)]
Always use 7 hex characters when describing
Some users (like me) override this in their .gitconfig
Ruben Kerkhof [Fri, 14 Aug 2015 18:41:49 +0000 (20:41 +0200)]
when building from dirty working dir, show it.
This adds a + when the working dir is dirty, i.e.:
5.5.0.355.gfba3b8da7b64+
Ruben Kerkhof [Sun, 9 Aug 2015 17:46:08 +0000 (19:46 +0200)]
ltdl: only compile included libltdl when needed
If configure finds an external libltdl, it's going to
use it, so there's no use in compiling the shipped libltdl.
Marc Fournier [Thu, 13 Aug 2015 21:36:19 +0000 (23:36 +0200)]
Merge remote-tracking branch 'origin/pr/1216'
Marc Fournier [Thu, 13 Aug 2015 21:35:57 +0000 (23:35 +0200)]
Merge remote-tracking branch 'origin/pr/1188'
Brad Davis [Tue, 11 Aug 2015 13:49:04 +0000 (07:49 -0600)]
Use the devstat struct directly instead of using devstat_compute_statistics().
Ruben Kerkhof [Mon, 10 Aug 2015 20:29:07 +0000 (22:29 +0200)]
powerdns: update recursor stats to 3.7.3
Fixes #555
Marc Fournier [Fri, 7 Aug 2015 08:14:59 +0000 (10:14 +0200)]
Merge branch 'collectd-5.5'
Marc Fournier [Fri, 7 Aug 2015 08:14:17 +0000 (10:14 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Brian ONeill [Thu, 6 Aug 2015 20:15:50 +0000 (16:15 -0400)]
Changed the max value of cache_size in types.db to handle boxes with large amounts of memory
Brian ONeill [Thu, 6 Aug 2015 20:12:33 +0000 (16:12 -0400)]
Added more data to ZFS stats, c, c_min, and c_max for bettering monitoring arc usage
Jenny Wong [Thu, 6 Aug 2015 17:02:35 +0000 (10:02 -0700)]
Fix void* arithmetic warning (-Wpointer-arith)
https://gcc.gnu.org/onlinedocs/gcc/Pointer-Arith.html
gcc will assume sizeof(void) == 1 when doing pointer arithmetic on
void*s, but other compilers may not.
Marc Fournier [Wed, 5 Aug 2015 16:05:02 +0000 (18:05 +0200)]
routeros: fix a small build error pointed out by clang
routeros.c:334:35: error: 'memset' call operates on objects of type 'cr_data_t' (aka 'struct cr_data_s') while the size is based on a different type 'cr_data_t *' (aka 'struct cr_data_s *') [-Werror,-Wsizeof-pointer-memaccess]
memset (router_data, 0, sizeof (router_data));
~~~~~~~~~~~ ^~~~~~~~~~~
routeros.c:334:35: note: did you mean to dereference the argument to 'sizeof' (and multiply it by the number of elements)?
memset (router_data, 0, sizeof (router_data));
^~~~~~~~~~~
Pierre-Yves Ritschard [Wed, 5 Aug 2015 09:08:22 +0000 (11:08 +0200)]
Merge pull request #1153 from mbethke/fix-unixsock
Fix Unixsock.pm
Pierre-Yves Ritschard [Wed, 5 Aug 2015 09:07:27 +0000 (11:07 +0200)]
Merge pull request #1178 from rubenk/fix-libmodbus-compilation-on-freebsd
core: include <sys/socket.h> in collectd.h
Natanael Copa [Wed, 5 Aug 2015 06:48:08 +0000 (08:48 +0200)]
ipc: enable _GNU_SOURCE to fix build with musl libc
This fixes compile the compile error:
> ipc.c:154:49: error: 'struct shm_info' has no member named 'used_ids'
> ipc_submit_g("shm", "segments", NULL, shm_info.used_ids);
> ^
Fixes #1147
Marc Fournier [Tue, 4 Aug 2015 16:39:33 +0000 (18:39 +0200)]
Revert "amqp: look for librabbitmq in /usr/local as well"
This reverts commit
c1c5087fd5d9e66427cee8c98c523519d578bee6 .
... as a follow-up to the discussion which took place in #1201
Ruben Kerkhof [Tue, 4 Aug 2015 09:21:19 +0000 (11:21 +0200)]
fhcount: this plugin only works on Linux
Ruben Kerkhof [Tue, 4 Aug 2015 13:40:34 +0000 (15:40 +0200)]
gcrypt: take search path into account
Ruben Kerkhof [Tue, 4 Aug 2015 13:28:03 +0000 (15:28 +0200)]
gcrypt: remove exec-prefix check
libgcrypt-config --libs already includes the correct library include path.
Also, we hardcoded it to $exec-prefix/lib, which is just plain wrong on
64bit architectures.
Pierre-Yves Ritschard [Tue, 4 Aug 2015 10:39:45 +0000 (12:39 +0200)]
Merge pull request #1196 from rubenk/travis
Travis
Ruben Kerkhof [Tue, 4 Aug 2015 08:33:39 +0000 (10:33 +0200)]
Travis: add some whitelisted packages
The list is at https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise
Ruben Kerkhof [Tue, 4 Aug 2015 08:20:50 +0000 (10:20 +0200)]
Travis: test with both gcc and clang
Travis does this in parallel so the build doesn't become
twice as long.
Ruben Kerkhof [Tue, 4 Aug 2015 08:18:36 +0000 (10:18 +0200)]
Travis: run make distcheck
This way we test if we can successfully build from tarball,
and we didn't leave out any files or forgot to clean something up.
Ruben Kerkhof [Sun, 2 Aug 2015 12:05:17 +0000 (14:05 +0200)]
disk: no need to link with kvm, bsdxml, sbuf
Ruben Kerkhof [Sun, 2 Aug 2015 11:57:05 +0000 (13:57 +0200)]
disk: rename snap_present to snap
There's only one of them now
Ruben Kerkhof [Sun, 2 Aug 2015 11:47:18 +0000 (13:47 +0200)]
disk: gather statistics since boot on FreeBSD
disk_octets and disk_ops are derives, so we don't want rates
but absolute values.
I tested this with fio with a constant IO rate and confirmed
that the values are correct for disk_octets and disk_ops.
disk_time is a different matter and I need some help with that.
devstat_compute_statistics returns a long double and it didn't
seem to increase much on my system, but that might be because I
tested this with a fast SSD.
Xin Li [Tue, 4 Jun 2013 21:44:34 +0000 (14:44 -0700)]
Make disk plugin compatible with FreeBSD.
Marc Fournier [Mon, 3 Aug 2015 21:29:16 +0000 (23:29 +0200)]
Merge branch 'collectd-5.5'
Marc Fournier [Mon, 3 Aug 2015 21:28:39 +0000 (23:28 +0200)]
systemd.collectd.service: take debian/ubuntu's env file in account too
Marc Fournier [Mon, 3 Aug 2015 21:27:10 +0000 (23:27 +0200)]
Merge remote-tracking branch 'origin/pr/1191'
Marc Fournier [Mon, 3 Aug 2015 21:26:55 +0000 (23:26 +0200)]
Merge remote-tracking branch 'origin/pr/1181'
Marc Fournier [Mon, 3 Aug 2015 21:26:21 +0000 (23:26 +0200)]
Merge remote-tracking branch 'origin/pr/1175'
Marc Fournier [Mon, 3 Aug 2015 21:26:05 +0000 (23:26 +0200)]
Merge remote-tracking branch 'origin/pr/1164'
Marc Fournier [Mon, 3 Aug 2015 21:23:37 +0000 (23:23 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Vincent Bernat [Mon, 3 Aug 2015 08:06:30 +0000 (10:06 +0200)]
logstash: initialize conf struct to 0
With YAJL 1 (at least on Ubuntu Precise), if `conf.indentString` is not
initialized correctly, we would get a segfault even when `conf.beautify`
is set to 0. We avoid this case by initializing the whole structure to
0. `conf.beautify = 0` is kept for explicitness.
Ruben Kerkhof [Sat, 1 Aug 2015 09:46:45 +0000 (11:46 +0200)]
Fix libmodbus detection on FreeBSD
We look for modbus/modbus.h in /usr/local/include/modbus
but we should look for modbus.h
This is only an issue on FreeBSD since /usr/local/include is not
in the default search path.
Ruben Kerkhof [Sat, 1 Aug 2015 11:01:30 +0000 (13:01 +0200)]
amqp: look for librabbitmq in /usr/local as well
This detects it automatically on FreeBSD.
Ideally we should just use pkg-config but that is
left as an exercise for the reader ;)
Ruben Kerkhof [Sat, 1 Aug 2015 11:22:07 +0000 (13:22 +0200)]
Fix varnish detection on FreeBSD
We look for varnish/vapi/vsc.h in /usr/include/varnish
but we should look for vapi/vsc.h
This is only an issue on FreeBSD since /usr/local/include is not
in the default search path.
Ruben Kerkhof [Sun, 2 Aug 2015 18:54:51 +0000 (20:54 +0200)]
irq: skip FIQ line in /proc/interrupts
/proc/interrupts on my Raspberry PI contains:
FIQ: usb_fiq
This line doesn't contain any per cpu counters
but we try to parse it anyway, resulting in:
parse_value: Failed to parse string as derive: usb_fiq.
Fixes #971
Ruben Kerkhof [Sat, 1 Aug 2015 18:18:51 +0000 (20:18 +0200)]
configure.ac: remove some redundant x'es
Ruben Kerkhof [Sat, 1 Aug 2015 18:21:41 +0000 (20:21 +0200)]
configure.ac: fix indentation
Ruben Kerkhof [Sat, 25 Jul 2015 10:32:06 +0000 (12:32 +0200)]
Fix a memory leak on shutdown
Fabien Wernli [Mon, 3 Aug 2015 08:15:56 +0000 (10:15 +0200)]
Use environmental variables from /etc/sysconfig/collectd
Change-Id: I948ce3d7a3071cc1ac26a24b059a5ee4aacba0d9
Pierre-Yves Ritschard [Sun, 2 Aug 2015 08:40:07 +0000 (10:40 +0200)]
travis: make check as well
Ruben Kerkhof [Sat, 1 Aug 2015 11:13:40 +0000 (13:13 +0200)]
Add more test stuff to .gitignore
Ruben Kerkhof [Sat, 1 Aug 2015 10:19:58 +0000 (12:19 +0200)]
core: include <sys/socket.h> in collectd.h
Fixes #1127
Marc Fournier [Sat, 1 Aug 2015 07:34:28 +0000 (09:34 +0200)]
Merge branch 'collectd-5.5'
Marc Fournier [Sat, 1 Aug 2015 07:30:22 +0000 (09:30 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Shahul Hameed [Mon, 20 Jul 2015 17:06:23 +0000 (13:06 -0400)]
Add utils_parse_option.c/h to amqp plugin source files list
Ruben Kerkhof [Sat, 25 Jul 2015 09:57:12 +0000 (11:57 +0200)]
collectd -T: fix memory leak
Ruben Kerkhof [Sat, 25 Jul 2015 17:17:07 +0000 (19:17 +0200)]
Fix some small leaks on error paths
Ruben Kerkhof [Sat, 25 Jul 2015 19:29:50 +0000 (21:29 +0200)]
liboconfig: really fix lex warnings
Flex has two options to disable input and unput.
Turn them on.
Wojtek Bocer [Mon, 27 Jul 2015 08:16:46 +0000 (09:16 +0100)]
Add remark about length of HostnameFormat string in virt plugin
Marc Fournier [Sat, 1 Aug 2015 07:09:03 +0000 (09:09 +0200)]
Merge remote-tracking branch 'origin/pr/1168'
Shahul Hameed [Wed, 29 Jul 2015 15:06:50 +0000 (11:06 -0400)]
Use standard ints in write_kafka plugin for portability
Pierre-Yves Ritschard [Fri, 31 Jul 2015 15:02:03 +0000 (17:02 +0200)]
travis: move to new infra
Pierre-Yves Ritschard [Fri, 31 Jul 2015 15:01:19 +0000 (17:01 +0200)]
travis: update script