Marc Fournier [Tue, 27 Oct 2015 22:39:38 +0000 (23:39 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Tue, 27 Oct 2015 22:32:20 +0000 (23:32 +0100)]
write_redis: remove unused variable from wr_write()
Brian Kelly [Wed, 15 Jul 2015 15:40:18 +0000 (11:40 -0400)]
write_redis plugin: Remove old zadd command formatting code that should not be there to fix sorted set key names
Marc Fournier [Fri, 23 Oct 2015 13:56:58 +0000 (15:56 +0200)]
collectd.conf.pod: correct a small typo
Douglas Thrift [Tue, 20 Oct 2015 23:19:02 +0000 (16:19 -0700)]
Fix a few typos in collectd-exec(5)
Pierre-Yves Ritschard [Mon, 19 Oct 2015 09:53:26 +0000 (11:53 +0200)]
statsd: provide a gauge for counters, holding the absolute count.
When not using StoreRates false, this allows statsd aggregators
to hold on to the absolute count, if needed.
Jan Andres [Sat, 17 Oct 2015 18:07:10 +0000 (20:07 +0200)]
Fix TIMESPEC_TO_CDTIME_T() on 32-bit arch.
Add ULL prefix to constant to ensure we get a 64-bit unsigned multiply.
Marc Fournier [Fri, 16 Oct 2015 09:29:37 +0000 (11:29 +0200)]
openldap: copyright update + minor cleanup
Marc Fournier [Fri, 16 Oct 2015 09:07:31 +0000 (11:07 +0200)]
openldap: properly UNBIND from server on shutdown
The idea is to call ldap_unbind_ext_s(), which notifies the ldap server
we're disconnecting.
We need to keep a reference to each configured databases in a global
variable so that the shutdown function can reach them in due time.
code & logic stolen from dbi.c/postgresql.c
Marc Fournier [Fri, 16 Oct 2015 07:34:14 +0000 (09:34 +0200)]
openldap: tell libldap to automatically restart reconnections
Marc Fournier [Wed, 14 Oct 2015 16:13:31 +0000 (18:13 +0200)]
openldap: set the default timeout to the plugin read `Interval`
Marc Fournier [Wed, 14 Oct 2015 15:44:04 +0000 (17:44 +0200)]
openldap: make connection to server persistent
Removes the overhead of connection setup/teardown at each read interval.
Marc Fournier [Wed, 14 Oct 2015 07:10:50 +0000 (09:10 +0200)]
Merge branch 'collectd-5.5'
Marc Fournier [Wed, 14 Oct 2015 07:10:38 +0000 (09:10 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Herve COMMOWICK [Wed, 14 Oct 2015 06:57:05 +0000 (08:57 +0200)]
processes: correctly count processes on FreeBSD
because actually we count threads instead of processes
(partial backport of
85c31a6d66 for collectd-5.4 /mf)
Ciaran Mac An Iomaire [Wed, 7 Oct 2015 15:20:20 +0000 (08:20 -0700)]
Fix 'Modification of a read-only value attempted' error
Herve COMMOWICK [Thu, 8 Oct 2015 09:41:45 +0000 (11:41 +0200)]
processes: correctly count processes on {free,open}BSD
because actually we count threads instead of processes
Marc Fournier [Wed, 14 Oct 2015 06:50:28 +0000 (08:50 +0200)]
systemd.collectd.service: backport changes from master branch
Marc Fournier [Wed, 14 Oct 2015 06:47:39 +0000 (08:47 +0200)]
Merge remote-tracking branch 'origin/pr/1264'
Marc Fournier [Tue, 15 Sep 2015 16:29:34 +0000 (18:29 +0200)]
snmp: remove warning now redundant with plugin.c
Marc Fournier [Tue, 15 Sep 2015 16:26:01 +0000 (18:26 +0200)]
plugin.c: add quotes to debug messages, for the sake of consistency
Marc Fournier [Tue, 15 Sep 2015 16:16:07 +0000 (18:16 +0200)]
plugin.c: add timer on plugins read functions
Print out the value in a debug message. Also emit a warning when it
exceeds the configured Interval.
Sven Trenkel [Sun, 4 Oct 2015 00:05:24 +0000 (00:05 +0000)]
python: Fix double-free bug.
trenkel [Wed, 7 Oct 2015 14:51:29 +0000 (16:51 +0200)]
Merge pull request #1289 from trenkel/master
python: Fix double-free bug.
Sven Trenkel [Sun, 4 Oct 2015 00:05:24 +0000 (00:05 +0000)]
python: Fix double-free bug.
Ruben Kerkhof [Wed, 9 Sep 2015 16:52:26 +0000 (18:52 +0200)]
systemd: drop all capabilities by default
dns and ping need CAP_NET_RAW, iptables needs CAP_NET_ADMIN
so leave those commented out in the .service file.
Ruben Kerkhof [Wed, 9 Sep 2015 15:52:53 +0000 (17:52 +0200)]
Make /home, /root and /run/user inaccessible
Ruben Kerkhof [Wed, 9 Sep 2015 15:51:17 +0000 (17:51 +0200)]
Mount /usr, /boot and /etc readonly
Ruben Kerkhof [Wed, 9 Sep 2015 15:49:49 +0000 (17:49 +0200)]
No need to wait 10 seconds before restarting
Systemd makes sure the process is gone before starting a new one
Ruben Kerkhof [Wed, 9 Sep 2015 15:49:10 +0000 (17:49 +0200)]
Only restart collectd on failure
Do what the comment says ;)
Ruben Kerkhof [Wed, 9 Sep 2015 15:47:01 +0000 (17:47 +0200)]
NotifyAccess is the default
Ruben Kerkhof [Wed, 9 Sep 2015 15:46:32 +0000 (17:46 +0200)]
Let systemd handle logging
Ruben Kerkhof [Tue, 8 Sep 2015 14:46:27 +0000 (16:46 +0200)]
notify_systemd: unset NOTIFY_SOCKET later
getenv returns a pointer, possibly to a static buffer.
If I understand the specs correctly, unsetenv is basically free
to do what it wants with this, so don't keep using the pointer
after we do unsetenv.
Ruben Kerkhof [Tue, 8 Sep 2015 14:13:47 +0000 (16:13 +0200)]
notify_systemd: remove dead code
The whole function is already wrapped in #ifdef KERNEL_LINUX
Ruben Kerkhof [Tue, 8 Sep 2015 14:11:56 +0000 (16:11 +0200)]
notify_systemd: use close-on-exit on socket
Marc Fournier [Mon, 14 Sep 2015 08:58:22 +0000 (10:58 +0200)]
Merge branch 'collectd-5.5'
Marc Fournier [Mon, 14 Sep 2015 08:57:37 +0000 (10:57 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
bbczeuz [Sun, 13 Sep 2015 22:10:44 +0000 (00:10 +0200)]
Merge pull request #4 from collectd/master
sync with upstream
Marc Fournier [Sun, 13 Sep 2015 22:03:44 +0000 (00:03 +0200)]
gmond: fix linking against libganglia at build time
Current versions of libganglia don't ship the ganglia-config utility
anymore. Change the configure script to not expect it to be in $PATH and
provide sensible defaults instead.
Fix #1129
Marc Fournier [Fri, 11 Sep 2015 21:59:10 +0000 (23:59 +0200)]
log_logstash: fix timestamp field to respect ISO 8601 format
Fixes #1132
Ruben Kerkhof [Tue, 30 Jun 2015 13:04:11 +0000 (15:04 +0200)]
virt: Add PluginInstanceFormat none, as default
Fixes #1100
Marc Fournier [Fri, 11 Sep 2015 21:29:08 +0000 (23:29 +0200)]
Merge branch 'collectd-5.5'
Marc Fournier [Fri, 11 Sep 2015 21:21:49 +0000 (23:21 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Tue, 30 Jun 2015 12:41:41 +0000 (14:41 +0200)]
PluginInterfaceFormat supports multiple fields
Document this.
Ruben Kerkhof [Tue, 30 Jun 2015 12:13:24 +0000 (14:13 +0200)]
Don't access freed memory
The fields array contains pointers into the value_copy string.
Ruben Kerkhof [Tue, 30 Jun 2015 11:03:13 +0000 (13:03 +0200)]
Fix error message
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.