Marc Fournier [Fri, 18 Mar 2016 22:46:27 +0000 (23:46 +0100)]
Merge branch 'collectd-5.5'
Marc Fournier [Fri, 18 Mar 2016 22:44:17 +0000 (23:44 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Fri, 18 Mar 2016 22:07:02 +0000 (23:07 +0100)]
RPM specfile: update changelog
Marc Fournier [Fri, 18 Mar 2016 21:53:59 +0000 (22:53 +0100)]
RPM specfile: enable xmms plugin on EL7
Ruben Kerkhof [Fri, 18 Mar 2016 12:38:04 +0000 (13:38 +0100)]
statgrab: Save LDFLAGS before changing them.
We did restore them after the test but forget to save them before it.
Ruben Kerkhof [Fri, 18 Mar 2016 12:22:58 +0000 (13:22 +0100)]
Fix build on Solaris 10 i386 part 2
utils_latency.c needs the same fix as applied in
a41f312
Ruben Kerkhof [Fri, 18 Mar 2016 12:07:13 +0000 (13:07 +0100)]
Remove warning when we don't have clock_gettime
Ruben Kerkhof [Fri, 18 Mar 2016 12:04:19 +0000 (13:04 +0100)]
Merge branch 'collectd-5.5'
Ruben Kerkhof [Fri, 18 Mar 2016 12:03:37 +0000 (13:03 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Fri, 18 Mar 2016 11:59:03 +0000 (12:59 +0100)]
Fix build on Solaris 10 i386
AC_SYS_LARGEFILE defines _FILE_OFFSET_BITS in src/config.h,
so we need this header first before including system headers.
Thanks to @dago for the report.
Fixes:
CC collectd-utils_random.o
In file included from collectd.h:31:0,
from utils_random.c:29:
../../src/config.h:1646:0: error: "_FILE_OFFSET_BITS" redefined
[-Werror]
#define _FILE_OFFSET_BITS 64
^
In file included from
/opt/csw/lib/gcc/i386-pc-solaris2.10/5.2.0/include-fixed/pthread.h:20:0,
from utils_random.c:27:
/opt/csw/lib/gcc/i386-pc-solaris2.10/5.2.0/include-fixed/sys/feature_tests.h:196:0:
note: this is the location of the previous definition
#define _FILE_OFFSET_BITS 32
^
cc1: all warnings being treated as errors
Marc Fournier [Fri, 18 Mar 2016 09:16:34 +0000 (10:16 +0100)]
RPM specfile: re-enable memcachec plugin on EL7
cf https://bugzilla.redhat.com/show_bug.cgi?id=
1116949
Marc Fournier [Fri, 18 Mar 2016 09:13:48 +0000 (10:13 +0100)]
RPM specfile: enable modbus plugin on EL7
Ruben Kerkhof [Thu, 17 Mar 2016 19:22:15 +0000 (20:22 +0100)]
Merge pull request #1617 from michaelsalmon/putval-time-exec-pod
added definition of N to collectd-exec
Michael Salmon [Thu, 17 Mar 2016 13:18:04 +0000 (14:18 +0100)]
added definition of N to collectd-exec
Ruben Kerkhof [Sun, 13 Mar 2016 11:46:31 +0000 (12:46 +0100)]
onewire plugin: fix one more compiler warning
comparison of integers of different signs: 'int' and 'unsigned long'
Ruben Kerkhof [Sat, 12 Mar 2016 21:50:09 +0000 (22:50 +0100)]
IPC: hopefully fix compiling under AIX
This code couldn't possibly have compiled.
Found by cppcheck:
[src/ipc.c:285]: (error) Invalid number of character '{' when these
macros are defined: 'KERNEL_AIX'.
Ruben Kerkhof [Sat, 12 Mar 2016 16:30:58 +0000 (17:30 +0100)]
onewire plugin: fix two compiler warnings
onewire.c:418:31: warning: comparison of integers of different signs:
'int' and 'unsigned long' [-Wsign-compare]
if ((status > 0) && (status < sizeof (subpath)))
~~~~~~ ^ ~~~~~~~~~~~~~~~~
onewire.c:422:31: warning: comparison of integers of different signs:
'int' and 'unsigned long' [-Wsign-compare]
if ((status > 0) && (status < sizeof (subpath)))
~~~~~~ ^ ~~~~~~~~~~~~~~~~
Ruben Kerkhof [Sat, 12 Mar 2016 14:38:01 +0000 (15:38 +0100)]
utils_subst_test.c: constify
Ruben Kerkhof [Sat, 12 Mar 2016 13:38:41 +0000 (14:38 +0100)]
ceph_test.c: constify
Ruben Kerkhof [Fri, 11 Mar 2016 18:50:04 +0000 (19:50 +0100)]
battery plugin: constify
Ruben Kerkhof [Fri, 11 Mar 2016 16:54:11 +0000 (17:54 +0100)]
Fix some typos in the collectd.conf manpage
Ruben Kerkhof [Fri, 11 Mar 2016 16:12:34 +0000 (17:12 +0100)]
Fix some typos in collectd.conf
Ruben Kerkhof [Wed, 9 Mar 2016 22:44:42 +0000 (23:44 +0100)]
Revert "Fix building with older versions of libtool"
While this fixed building from git on EL5, it broke
building from tarballs. Since the latter is more important,
revert this until I can get to the bottom of it.
This reverts commit
5a911ceb65165a4293830503afd257a9bd474bc7.
Ruben Kerkhof [Sun, 6 Mar 2016 17:08:38 +0000 (18:08 +0100)]
Revert "Turbostat: add missing types in configure.ac"
These autoconf tests were introduced in autoconf 2.60.
We still support older versions.
We've assumed for a while now that any platform we build
on has the types and functionality tested here available, and supports
a reasonable subset of the C99 and Posix standards.
This fixes building from git on RHEL5.
This reverts commit
45687863426b21f854711248258a13c345371843.
Ruben Kerkhof [Sun, 6 Mar 2016 17:06:38 +0000 (18:06 +0100)]
Fix building with older versions of libtool
The libtool on RHEL5 doesn't set LTDEPS, therefore
we failed to compile the builtin ltdl lib.
It does however set LIBLTDL to the path of the if it is
going to build an internal one. Use that.
Fixes building from git on RHEL5
Ruben Kerkhof [Sun, 6 Mar 2016 17:02:35 +0000 (18:02 +0100)]
build.sh: explicitly check for bison
We don't work with other yaccs.
Ruben Kerkhof [Sun, 6 Mar 2016 13:11:11 +0000 (14:11 +0100)]
python plugin: fix some typos in doc strings
Ruben Kerkhof [Sun, 6 Mar 2016 12:44:59 +0000 (13:44 +0100)]
curl_json plugin: zero-initialize struct correctly
Seen on FreeBSD:
curl_json.c: In function 'cj_sock_perform':
curl_json.c:864:10: warning: missing initializer for field 'sun_len' of 'struct sockaddr_un' [-Wmissing-field-initializers]
struct sockaddr_un sa_unix = {};
^
In file included from curl_json.c:32:0:
/usr/include/sys/un.h:48:16: note: 'sun_len' declared here
unsigned char sun_len; /* sockaddr len including null */
^
Ruben Kerkhof [Sun, 6 Mar 2016 12:30:10 +0000 (13:30 +0100)]
virt plugin: missed one old-style definition
Ruben Kerkhof [Sun, 6 Mar 2016 11:46:15 +0000 (12:46 +0100)]
Travis: build python plugin
The Travis image has various python versions installed in /opt,
none of which have development headers, and they are first in
the PATH. Explicitly use the python in /usr/bin instead.
Ruben Kerkhof [Sun, 6 Mar 2016 11:45:47 +0000 (12:45 +0100)]
Travis: build iptables plugin
Ruben Kerkhof [Sun, 6 Mar 2016 11:09:29 +0000 (12:09 +0100)]
Merge branch 'collectd-5.5'
Ruben Kerkhof [Sun, 6 Mar 2016 11:08:59 +0000 (12:08 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Sun, 6 Mar 2016 11:00:24 +0000 (12:00 +0100)]
virt plugin: fix old-style function definitions
Ruben Kerkhof [Sun, 6 Mar 2016 10:49:07 +0000 (11:49 +0100)]
Merge pull request #1575 from rubenk/dragonflybsd-utils-mount
Fix build on DragonFlyBSD
Ruben Kerkhof [Sun, 6 Mar 2016 10:20:42 +0000 (11:20 +0100)]
Merge pull request #1580 from rubenk/freebsd-zfs-arc
zfs_arc: 'stolen' was removed after FreeBSD 10.2
Ruben Kerkhof [Sat, 5 Mar 2016 22:55:20 +0000 (23:55 +0100)]
Revert "perl plugin: mark file variable as const"
It breaks the build on RHEL5
This reverts commit
43d7245c20930161284e5784fbf115d1221a5951.
Ruben Kerkhof [Sat, 5 Mar 2016 21:55:21 +0000 (22:55 +0100)]
cu_mount_getoptionvalue: mark keyword as const
Ruben Kerkhof [Sat, 5 Mar 2016 21:54:48 +0000 (22:54 +0100)]
tests: fix old-style function definition
Ruben Kerkhof [Sat, 5 Mar 2016 21:32:40 +0000 (22:32 +0100)]
sigrok plugin: constify
Ruben Kerkhof [Sat, 5 Mar 2016 18:09:13 +0000 (19:09 +0100)]
processes plugin: fix one more old-style prototype
Ruben Kerkhof [Sat, 5 Mar 2016 17:40:46 +0000 (18:40 +0100)]
swap plugin: fix building on OpenBSD
Ruben Kerkhof [Sat, 5 Mar 2016 17:09:01 +0000 (18:09 +0100)]
configure.ac: fix comment
Ruben Kerkhof [Sat, 5 Mar 2016 17:08:24 +0000 (18:08 +0100)]
perl plugin: mark file variable as const
Ruben Kerkhof [Sat, 5 Mar 2016 16:57:26 +0000 (17:57 +0100)]
collectdmon: mark pidfile as const
Ruben Kerkhof [Sat, 5 Mar 2016 16:39:47 +0000 (17:39 +0100)]
collectdctl: mark as exit_usage as noreturn
Ruben Kerkhof [Sat, 5 Mar 2016 16:36:05 +0000 (17:36 +0100)]
zfs_arc plugin: constify
Ruben Kerkhof [Sat, 5 Mar 2016 16:21:49 +0000 (17:21 +0100)]
tokyotyrant plugin: constify
Ruben Kerkhof [Sat, 5 Mar 2016 16:05:47 +0000 (17:05 +0100)]
smart plugin: constify
Ruben Kerkhof [Sat, 5 Mar 2016 15:55:24 +0000 (16:55 +0100)]
utils_rrdcreate.c: constify
Ruben Kerkhof [Sat, 5 Mar 2016 15:42:24 +0000 (16:42 +0100)]
vserver plugin: constify
Ruben Kerkhof [Sat, 5 Mar 2016 15:25:38 +0000 (16:25 +0100)]
Mark functions that exit as noreturn
Ruben Kerkhof [Sat, 5 Mar 2016 14:17:10 +0000 (15:17 +0100)]
configfile.c: constify
Ruben Kerkhof [Sat, 5 Mar 2016 13:50:35 +0000 (14:50 +0100)]
postgresql plugin: constify
Ruben Kerkhof [Sat, 5 Mar 2016 13:37:40 +0000 (14:37 +0100)]
parser.y: mark text as const
Ruben Kerkhof [Sat, 5 Mar 2016 13:10:53 +0000 (14:10 +0100)]
cu_mount_checkoption: mark keyword as const
Ruben Kerkhof [Sat, 5 Mar 2016 13:03:03 +0000 (14:03 +0100)]
nfs plugin: constify
Ruben Kerkhof [Sat, 5 Mar 2016 12:56:17 +0000 (13:56 +0100)]
netlink plugin: constify
Ruben Kerkhof [Sat, 5 Mar 2016 12:49:49 +0000 (13:49 +0100)]
ipvs plugin: constify
Ruben Kerkhof [Sat, 5 Mar 2016 12:36:50 +0000 (13:36 +0100)]
memory plugin: constify
Ruben Kerkhof [Sat, 5 Mar 2016 12:31:29 +0000 (13:31 +0100)]
mysql plugin: fix indentation
Ruben Kerkhof [Sat, 5 Mar 2016 12:19:06 +0000 (13:19 +0100)]
mysql plugin: constify
Ruben Kerkhof [Sat, 5 Mar 2016 12:09:54 +0000 (13:09 +0100)]
nginx plugin: constify
Ruben Kerkhof [Sat, 5 Mar 2016 12:04:59 +0000 (13:04 +0100)]
ntpd plugin: constify
Ruben Kerkhof [Sat, 5 Mar 2016 11:54:26 +0000 (12:54 +0100)]
write_tsdb plugin: constify
Ruben Kerkhof [Sat, 5 Mar 2016 11:45:57 +0000 (12:45 +0100)]
openvpn plugin: constify
Ruben Kerkhof [Fri, 4 Mar 2016 22:56:12 +0000 (23:56 +0100)]
unixsock plugin: constify
Ruben Kerkhof [Fri, 4 Mar 2016 22:22:55 +0000 (23:22 +0100)]
plugin.c: constify
Ruben Kerkhof [Fri, 4 Mar 2016 22:15:47 +0000 (23:15 +0100)]
syslog plugin: constify
Ruben Kerkhof [Fri, 4 Mar 2016 22:05:05 +0000 (23:05 +0100)]
email plugin: constify
Ruben Kerkhof [Fri, 4 Mar 2016 20:11:21 +0000 (21:11 +0100)]
ted plugin: constify
Ruben Kerkhof [Fri, 4 Mar 2016 20:08:30 +0000 (21:08 +0100)]
zookeeper plugin: constify
Ruben Kerkhof [Fri, 4 Mar 2016 20:06:15 +0000 (21:06 +0100)]
memcached plugin: constify
Ruben Kerkhof [Fri, 4 Mar 2016 20:02:43 +0000 (21:02 +0100)]
mbmon plugin: constify
Ruben Kerkhof [Fri, 4 Mar 2016 19:57:04 +0000 (20:57 +0100)]
ascent plugin: constify
Ruben Kerkhof [Fri, 4 Mar 2016 19:48:26 +0000 (20:48 +0100)]
apcups plugin: constify
Ruben Kerkhof [Fri, 4 Mar 2016 19:16:19 +0000 (20:16 +0100)]
Merge pull request #1602 from rubenk/powerdns-constify
powerdns: constify some stuff
Ruben Kerkhof [Fri, 4 Mar 2016 18:13:15 +0000 (19:13 +0100)]
Merge pull request #1600 from rubenk/ceph-make-some-variables-static
ceph plugin: mark variable as static and const
Ruben Kerkhof [Fri, 4 Mar 2016 18:13:00 +0000 (19:13 +0100)]
Merge pull request #1579 from rubenk/fix-typo-in-comment
Fix a typo in a comment
Ruben Kerkhof [Fri, 4 Mar 2016 18:12:40 +0000 (19:12 +0100)]
Merge pull request #1601 from rubenk/thermal-make-some-variables-static
thermal plugin: mark some variables as static
Ruben Kerkhof [Fri, 4 Mar 2016 18:12:25 +0000 (19:12 +0100)]
Merge pull request #1603 from rubenk/tcpconns-make-variable-static
tcpconns plugin: mark variable as static
Ruben Kerkhof [Fri, 4 Mar 2016 18:12:08 +0000 (19:12 +0100)]
Merge pull request #1604 from rubenk/sensors-make-variable-static
sensors plugin: mark variable as static
Ruben Kerkhof [Fri, 4 Mar 2016 18:11:51 +0000 (19:11 +0100)]
Merge pull request #1605 from rubenk/tail-mark-variables-as-static
tail plugin: mark a few variables as static
Ruben Kerkhof [Fri, 4 Mar 2016 18:11:32 +0000 (19:11 +0100)]
Merge pull request #1606 from rubenk/utils-dns-remove-unused-code
utils-dns: remove unused code
Ruben Kerkhof [Fri, 4 Mar 2016 17:06:23 +0000 (18:06 +0100)]
utils-dns: remove unused code
Ruben Kerkhof [Fri, 4 Mar 2016 17:03:19 +0000 (18:03 +0100)]
tail plugin: mark a few variables as static
Ruben Kerkhof [Fri, 4 Mar 2016 17:00:40 +0000 (18:00 +0100)]
sensors plugin: mark variable as static
Ruben Kerkhof [Fri, 4 Mar 2016 16:59:43 +0000 (17:59 +0100)]
tcpconns plugin: mark variable as static
Ruben Kerkhof [Fri, 4 Mar 2016 16:53:50 +0000 (17:53 +0100)]
ceph plugin: mark variable as static and const
Ruben Kerkhof [Fri, 4 Mar 2016 16:53:13 +0000 (17:53 +0100)]
thermal plugin: mark some variables as static
Ruben Kerkhof [Fri, 4 Mar 2016 13:40:06 +0000 (14:40 +0100)]
powerdns: constify some stuff
make some variables static while we're at it
Ruben Kerkhof [Fri, 4 Mar 2016 12:10:56 +0000 (13:10 +0100)]
Fix the remainging -Wshadow issues on master
Ruben Kerkhof [Fri, 4 Mar 2016 11:19:47 +0000 (12:19 +0100)]
Merge branch 'collectd-5.5'
Ruben Kerkhof [Fri, 4 Mar 2016 11:19:15 +0000 (12:19 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Fri, 4 Mar 2016 11:15:49 +0000 (12:15 +0100)]
Merge pull request #1597 from rubenk/turbostat-fix-prototypes
Turbostat: fix a few old-style prototypes
Ruben Kerkhof [Fri, 4 Mar 2016 11:15:31 +0000 (12:15 +0100)]
Merge pull request #1595 from rubenk/turbostat-fix-shadowing-issue
Turbostat: fix shadowing issue
Ruben Kerkhof [Fri, 4 Mar 2016 11:15:13 +0000 (12:15 +0100)]
Merge pull request #1594 from rubenk/ceph-fix-shadowing-issue
Ceph: fix shadowing issue
Ruben Kerkhof [Fri, 4 Mar 2016 11:14:55 +0000 (12:14 +0100)]
Merge pull request #1596 from rubenk/fix-a-few-more-prototypes
Fix a few more prototypes
Ruben Kerkhof [Thu, 3 Mar 2016 22:02:03 +0000 (23:02 +0100)]
Turbostat: fix a few old-style prototypes
Ruben Kerkhof [Thu, 3 Mar 2016 21:35:43 +0000 (22:35 +0100)]
Fix a few more prototypes
Found with -Wstrict-prototypes and -Wold-style-definition