Sebastian Harl [Mon, 30 May 2016 21:23:59 +0000 (23:23 +0200)]
curl stats: Simplified some error checks and removed unused code.
Sebastian Harl [Mon, 30 May 2016 21:10:08 +0000 (23:10 +0200)]
configure / curl stats: Check for CURLINFO_APPCONNECT_TIME.
It's available since cURL 7.19 but RHEL5 ships an older version.
Sebastian Harl [Mon, 30 May 2016 20:46:14 +0000 (22:46 +0200)]
collectd.conf(5): Briefly explain MeasureResponseTime vs TotalTime.
Sebastian Harl [Mon, 30 May 2016 20:39:53 +0000 (22:39 +0200)]
curl stats: Use CamelCase identifiers instead of using underscores.
This is more consistent with the usual collectd style but still close enough
to the names used in cURL.
Sebastian Harl [Sat, 18 Apr 2015 19:44:22 +0000 (21:44 +0200)]
collectd.conf(5): Add documentation for cURL statistics.
Sebastian Harl [Sat, 18 Apr 2015 17:36:08 +0000 (19:36 +0200)]
Add request specific statistics to all CURL-based plugins.
All metrics supported by curl_easy_getinfo can be retrieved and dispatched for
each request done through CURL. All statistics are optional and disabled by
default.
Ruben Kerkhof [Fri, 10 Jun 2016 10:27:55 +0000 (12:27 +0200)]
configure.ac: indent and sort some conditionals
Ruben Kerkhof [Fri, 10 Jun 2016 10:23:09 +0000 (12:23 +0200)]
configure.ac: remove obsolete macro
We don't need it anymore. See
http://gnu-autoconf.7623.n7.nabble.com/Bug-389558-autoconf-AC-PROG-GCC-TRADITIONAL-throws-error-in-comparision-td1885.html
Ruben Kerkhof [Fri, 10 Jun 2016 08:46:28 +0000 (10:46 +0200)]
chrony plugin: use ANSI function definitions
chrony.c:392:1: warning: function declaration isn’t a prototype
[-Wstrict-prototypes]
chrony_set_timeout()
^
chrony.c: In function ‘chrony_set_timeout’:
chrony.c:392:1: warning: old-style function definition
[-Wold-style-definition]
chrony.c: At top level:
Ruben Kerkhof [Fri, 10 Jun 2016 08:11:01 +0000 (10:11 +0200)]
Merge pull request #1758 from rubenk/README
README: use https for collectd.org link
Ruben Kerkhof [Fri, 10 Jun 2016 08:10:54 +0000 (10:10 +0200)]
Merge pull request #1759 from rubenk/ansi-function-declaration
uc_get_iterator: use ansi function declaration
Ruben Kerkhof [Fri, 10 Jun 2016 07:48:23 +0000 (09:48 +0200)]
Merge branch 'collectd-5.5'
Ruben Kerkhof [Fri, 10 Jun 2016 07:47:53 +0000 (09:47 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Thomas Guthmann [Wed, 8 Jun 2016 03:03:47 +0000 (13:03 +1000)]
Bug#1059 : Remove any white spaces in ethstats stat names (affects VMXNet3 interface)
Ruben Kerkhof [Thu, 9 Jun 2016 21:09:18 +0000 (23:09 +0200)]
uc_get_iterator: use ansi function declaration
In file included from common.c:37:0:
utils_cache.h:76:1: warning: function declaration isn’t a prototype
[-Wstrict-prototypes]
uc_iter_t *uc_get_iterator ();
^
Ruben Kerkhof [Thu, 9 Jun 2016 17:56:56 +0000 (19:56 +0200)]
README: use https for collectd.org link
Ruben Kerkhof [Mon, 6 Jun 2016 08:32:59 +0000 (10:32 +0200)]
Merge pull request #1750 from tokkee/sh/cli
daemon: Let all command line options override global options from the config.
Sebastian Harl [Sun, 5 Jun 2016 22:09:58 +0000 (00:09 +0200)]
configfile: Log errors when trying to access unknown global options.
Sebastian Harl [Sun, 5 Jun 2016 22:03:39 +0000 (00:03 +0200)]
daemon: Let all command line options override global options from the config.
This replaces
09fb81e130ad70bf0547cec3d3c349ce8cb092cf which provided a
specific solution for the `PIDFile' option. The new solution is generic and
more nicely abstracted without the need for global variables across multiple
modules.
Fixes #366
Sebastian Harl [Sun, 5 Jun 2016 13:34:28 +0000 (15:34 +0200)]
Merge pull request #1747 from rubenk/write_graphite_check_fd
Write graphite check fd
Ruben Kerkhof [Sun, 5 Jun 2016 12:36:36 +0000 (14:36 +0200)]
wg_send_buffer: return error if fd < 0
CID 116310
Ruben Kerkhof [Sun, 5 Jun 2016 12:35:36 +0000 (14:35 +0200)]
write_graphite: remove dead assignment
status is immediately overwritten in the next line.
Sebastian Harl [Sun, 5 Jun 2016 12:27:11 +0000 (14:27 +0200)]
Merge pull request #1746 from rubenk/swrite-check-for-open-fd
swrite: return error if fd is negative
Ruben Kerkhof [Sun, 5 Jun 2016 11:53:17 +0000 (13:53 +0200)]
swrite: return error if fd is negative
Sebastian Harl [Sun, 5 Jun 2016 11:40:20 +0000 (13:40 +0200)]
Merge pull request #1743 from rubenk/apcups-coverity
apcups: ignore result of swrite in net_shutdown
Ruben Kerkhof [Sun, 5 Jun 2016 11:03:42 +0000 (13:03 +0200)]
apcups: ignore result of swrite in net_shutdown
CID 37945
Ruben Kerkhof [Sun, 5 Jun 2016 10:42:45 +0000 (12:42 +0200)]
Add test logs to .gitignore
Ruben Kerkhof [Sat, 4 Jun 2016 22:24:28 +0000 (00:24 +0200)]
automake: disable gzipped tarballs
We only use bz2.
Fixes make distcheck on FreeBSD-11-CURRENT
test -n "" || find "collectd-5.5.1.1086.g41e7c34" -type d ! -perm -755 -exec chmod u+rwx,go+rx {} \; -o ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o ! -type d ! -perm -400 -exec chmod a+r {} \; -o ! -type d ! -perm -444 -exec /bin/sh /home/ruben/src/collectd/libltdl/config/install-sh -c -m a+r {} {} \; || chmod -R a+r "collectd-5.5.1.1086.g41e7c34"
tardir=collectd-5.5.1.1086.g41e7c34 && tar --format=posix -chf - "$tardir" | BZIP2=${BZIP2--9} bzip2 -c >collectd-5.5.1.1086.g41e7c34.tar.bz2
tardir=collectd-5.5.1.1086.g41e7c34 && tar --format=posix -chf - "$tardir" | GZIP=--best gzip -c >collectd-5.5.1.1086.g41e7c34.tar.gz
if test -d "collectd-5.5.1.1086.g41e7c34"; then find "collectd-5.5.1.1086.g41e7c34" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "collectd-5.5.1.1086.g41e7c34" || { sleep 5 && rm -rf "collectd-5.5.1.1086.g41e7c34"; }; else :; fi
case 'collectd-5.5.1.1086.g41e7c34.tar.gz collectd-5.5.1.1086.g41e7c34.tar.bz2' in *.tar.gz*) GZIP=--best gzip -dc collectd-5.5.1.1086.g41e7c34.tar.gz | tar -xf - ;; *.tar.bz2*) bzip2 -dc collectd-5.5.1.1086.g41e7c34.tar.bz2 | tar -xf - ;; *.tar.lz*) lzip -dc collectd-5.5.1.1086.g41e7c34.tar.lz | tar -xf - ;; *.tar.xz*) xz -dc collectd-5.5.1.1086.g41e7c34.tar.xz | tar -xf - ;; *.tar.Z*) uncompress -c collectd-5.5.1.1086.g41e7c34.tar.Z | tar -xf - ;; *.shar.gz*) GZIP=--best gzip -dc collectd-5.5.1.1086.g41e7c34.shar.gz | unshar ;; *.zip*) unzip collectd-5.5.1.1086.g41e7c34.zip ;; esac
tar: Parse error: SCHILY.acl.default
tar: Parse error: SCHILY.acl.default
tar: Error exit delayed from previous errors.
*** Error code 1
Stop.
make: stopped in /usr/home/ruben/src/collectd
Sebastian Harl [Sat, 4 Jun 2016 22:11:33 +0000 (00:11 +0200)]
src/Makefile: Add valgrind.FreeBSD.suppress to the dist tarball.
Ruben Kerkhof [Sat, 4 Jun 2016 21:05:32 +0000 (23:05 +0200)]
Merge pull request #1742 from tokkee/sh/suppress
Valgrind: Suppress a bogus invalid read on FreeBSD.
Sebastian Harl [Sat, 4 Jun 2016 20:27:09 +0000 (22:27 +0200)]
Merge pull request #1741 from rubenk/fix-leak-in-disk-plugin
Plug a memory leak in disk plugin
Sebastian Harl [Sat, 4 Jun 2016 20:21:48 +0000 (22:21 +0200)]
Valgrind: Suppress a bogus invalid read on FreeBSD.
Valgrind reports an invalid read in common.c:parse_value. The error is
supposed to happen in strlen() on a just previously strdup()ed string.
Possibly, this is some sort of alignment issue. The read size is reported to
be 4 on a buffer of size 3.
https://bugzilla.redhat.com/show_bug.cgi?id=678518 may also be related.
Ruben Kerkhof [Sat, 4 Jun 2016 20:15:15 +0000 (22:15 +0200)]
Plug a memory leak in disk plugin
Introduced by
bdbc066 so no need to backport.
CID 116311
Sebastian Harl [Sat, 4 Jun 2016 18:27:30 +0000 (20:27 +0200)]
Makefile: Add testwrapper.sh to dist tarballs.
Ruben Kerkhof [Sat, 4 Jun 2016 18:16:56 +0000 (20:16 +0200)]
Merge pull request #1740 from rubenk/correct-am_cflags
Append -Werror to the right flags
Ruben Kerkhof [Sat, 4 Jun 2016 18:11:33 +0000 (20:11 +0200)]
chrony plugin: constify 2 function arguments
Fixes a couple of dozen of these warnings:
chrony.c:889:20: warning: passing 'const char [14]' to parameter of type
'char *' discards qualifiers
[-Wincompatible-pointer-types-discards-qualifiers]
chrony_push_data("clock_stratum", "chrony", (__extension__ ({ unsigned
short int __v, __x = (unsigned short int)
(chrony_resp.body.tracking.f_stratum); if (__builtin_constant_p (__x))
__v = ((unsigned short int) ((((__x) >> 8) & 0xff) | (((__x) & 0xff) <<
8))); else __asm__ ("rorw $8, %w0" : "=r" (__v) : "0" (__x) : "cc");
__v; })));
^~~~~~~~~~~~~~~
Ruben Kerkhof [Sat, 4 Jun 2016 18:07:08 +0000 (20:07 +0200)]
chrony plugin: fix clang warning
chrony.c:745:11: warning: declaration shadows a local variable
[-Wshadow]
int fh = open("/dev/random", 00);
^
Ruben Kerkhof [Sat, 4 Jun 2016 17:33:55 +0000 (19:33 +0200)]
collectd.spec: add missing %endif
Ruben Kerkhof [Sat, 4 Jun 2016 17:28:22 +0000 (19:28 +0200)]
configure.ac: fix autoreconf warnings
configure.ac:804: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call
detected in body
../../lib/autoconf/lang.m4:193: AC_LANG_CONFTEST is expanded from...
configure.ac:804: the top level
Ruben Kerkhof [Sat, 4 Jun 2016 17:20:26 +0000 (19:20 +0200)]
Append -Werror to the right flags
Sebastian Harl [Sat, 4 Jun 2016 17:11:57 +0000 (19:11 +0200)]
testwrapper.sh: Use /bin/sh instead of /bin/bash.
We don't use any bashisms.
Ruben Kerkhof [Sat, 4 Jun 2016 16:44:18 +0000 (18:44 +0200)]
Merge pull request #1739 from tokkee/sh/memcheck
unit tests: Run all tests through Valgrind's memcheck, if available.
Sebastian Harl [Sat, 4 Jun 2016 16:39:21 +0000 (18:39 +0200)]
Actually add the testwrapper.sh script.
… it's now used for running all tests.
Sebastian Harl [Sat, 4 Jun 2016 16:37:26 +0000 (18:37 +0200)]
configure: Drop unneeded AC_SUBST() calls for AC_PATH_PROG() results.
AC_PATH_PROG calls AC_SUBST for us.
Sebastian Harl [Sat, 4 Jun 2016 16:27:52 +0000 (18:27 +0200)]
unit tests: Run all tests through Valgrind's memcheck, if available.
Ruben Kerkhof [Sat, 4 Jun 2016 16:31:16 +0000 (18:31 +0200)]
collectd.spec: add new gRPC plugin
Disable it for now as the version of protobuf-compiler
in RHEL and Fedora is too old.
Sebastian Harl [Sat, 4 Jun 2016 16:26:44 +0000 (18:26 +0200)]
ceph_test: Free the yajl handle.
Sebastian Harl [Sat, 4 Jun 2016 16:25:06 +0000 (18:25 +0200)]
utils_mount_test: Free dynamically allocated strings.
Sebastian Harl [Sat, 4 Jun 2016 16:24:23 +0000 (18:24 +0200)]
testing: Evaluate expressions only once in EXPECT_EQ_STR().
Sebastian Harl [Sat, 4 Jun 2016 15:58:23 +0000 (17:58 +0200)]
utils_vl_lookup: Free regexen when destroying class lists.
Else, we'll leak any memory used by the regex.
Ruben Kerkhof [Sat, 4 Jun 2016 16:20:35 +0000 (18:20 +0200)]
Merge pull request #1738 from tokkee/sh/silent
src/Makefile: Support silent build rules for pod2man.
Sebastian Harl [Sat, 4 Jun 2016 15:36:56 +0000 (17:36 +0200)]
src/Makefile: Support silent build rules for pod2man.
Ruben Kerkhof [Sat, 4 Jun 2016 15:25:46 +0000 (17:25 +0200)]
Merge pull request #1699 from tokkee/sh/grpc
gRPC server plugin
Sebastian Harl [Sat, 4 Jun 2016 14:33:41 +0000 (16:33 +0200)]
gRPC doc: Fixed typos and mention C++11 requirement.
Sebastian Harl [Sat, 4 Jun 2016 14:24:17 +0000 (16:24 +0200)]
src/Makefile: Don't unnecessarily set plugin specific CXXFLAGS.
Also, drop unneeded -lphread / -ldl from grpc's libraries.
Sebastian Harl [Sat, 4 Jun 2016 14:23:22 +0000 (16:23 +0200)]
src/Makefile: Don't set subdir-objects.
That's now done globally via configure.
Ruben Kerkhof [Sat, 4 Jun 2016 13:12:37 +0000 (15:12 +0200)]
collectd.spec: fix rpmlint warning
collectd.src: W: summary-not-capitalized C statistics collection and
monitoring daemon
Ruben Kerkhof [Sat, 4 Jun 2016 13:11:43 +0000 (15:11 +0200)]
collectd.spec: make scriptlets work on Fedora
Ruben Kerkhof [Sat, 4 Jun 2016 12:18:57 +0000 (14:18 +0200)]
collectd.spec: only require python26 on RHEL < 6
Otherwise the else clause in the condition matches on Fedora too.
This makes the spec build on Fedora.
Ruben Kerkhof [Sat, 4 Jun 2016 11:26:06 +0000 (13:26 +0200)]
collectd.spec: disable plugins on older distro
Instead of keeping a list per RHEL version of which plugins to enable,
invert the logic and keep a list of plugins to disable when the distro
is too old. This way we only have to specify a plugin once, and this
also opens up the possibility to build on Fedora.
Ruben Kerkhof [Sat, 4 Jun 2016 11:04:55 +0000 (13:04 +0200)]
Merge pull request #1737 from rubenk/pthread-cleanup
Pthread cleanup
Ruben Kerkhof [Sat, 4 Jun 2016 10:57:34 +0000 (12:57 +0200)]
collectd.spec: sort list
Ruben Kerkhof [Sat, 4 Jun 2016 10:54:43 +0000 (12:54 +0200)]
collectd.spec: EPEL7 has a recent ganglia-devel
Ruben Kerkhof [Sat, 4 Jun 2016 10:51:47 +0000 (12:51 +0200)]
collectd.spec: sort plugin lists
Ruben Kerkhof [Sat, 4 Jun 2016 10:43:07 +0000 (12:43 +0200)]
collectd.spec: turn TODO into changelog entry
Ruben Kerkhof [Sat, 4 Jun 2016 10:25:54 +0000 (12:25 +0200)]
Add new Chrony plugin to rpm spec file
Ruben Kerkhof [Sat, 4 Jun 2016 09:50:59 +0000 (11:50 +0200)]
Remove HAVE_PTHREAD_H include guard
We can't build without pthread.h so guarding it is not necessary
anymore.
Ruben Kerkhof [Sat, 4 Jun 2016 09:48:56 +0000 (11:48 +0200)]
configure.ac: move AC_SUBST down to after define
Ruben Kerkhof [Sat, 4 Jun 2016 09:22:09 +0000 (11:22 +0200)]
Sort types.db
Ruben Kerkhof [Sat, 4 Jun 2016 09:19:14 +0000 (11:19 +0200)]
Merge pull request #1548 from bbczeuz/zseng_dev_chrony
[plugin] Chrony NTP service check
Ruben Kerkhof [Fri, 3 Jun 2016 20:36:04 +0000 (22:36 +0200)]
src/Makefile.am: merge EXTRA_DIST variables
Ruben Kerkhof [Fri, 3 Jun 2016 20:34:28 +0000 (22:34 +0200)]
src/Makefile.am: remove commented out line
Ruben Kerkhof [Fri, 3 Jun 2016 20:33:23 +0000 (22:33 +0200)]
src/Makefile.am: remove useless assigment
Ruben Kerkhof [Fri, 3 Jun 2016 20:29:03 +0000 (22:29 +0200)]
zfs_arc: simplify build logic
Use BUILD_SOLARIS instead of assuming that any OS not FreeBSD or Linux is Solaris.
Ruben Kerkhof [Fri, 3 Jun 2016 20:22:06 +0000 (22:22 +0200)]
src/Makefile.am: remove useless assignment
Ruben Kerkhof [Fri, 3 Jun 2016 20:20:43 +0000 (22:20 +0200)]
xencpu: add missing cppflags and ldflags
Ruben Kerkhof [Fri, 3 Jun 2016 18:49:48 +0000 (20:49 +0200)]
write_redis: append to CPPFLAGS, not CFLAGS
Ruben Kerkhof [Fri, 3 Jun 2016 18:45:20 +0000 (20:45 +0200)]
openvpn plugin: remove useless assignment
Ruben Kerkhof [Fri, 3 Jun 2016 18:44:58 +0000 (20:44 +0200)]
oracle plugin: use CPPFLAGS instead of CFLAGS
Ruben Kerkhof [Fri, 3 Jun 2016 18:42:36 +0000 (20:42 +0200)]
openldap plugin: use CPPFLAGS instead of CFLAGS
Ruben Kerkhof [Fri, 3 Jun 2016 18:41:50 +0000 (20:41 +0200)]
openldap plugin: use $PLUGIN_LDFLAGS
Just like the other plugins.
Ruben Kerkhof [Fri, 3 Jun 2016 18:40:25 +0000 (20:40 +0200)]
src/Makefile.am: remove useless assignment
Ruben Kerkhof [Fri, 3 Jun 2016 18:38:10 +0000 (20:38 +0200)]
mysql plugin: simplify build logic
The MySQL plugin can't be build without libmysql support.
./configure already takes care of that.
Ruben Kerkhof [Fri, 3 Jun 2016 18:34:29 +0000 (20:34 +0200)]
lvm: add missing cppflags and ldflags to Makefile
Ruben Kerkhof [Fri, 3 Jun 2016 18:32:53 +0000 (20:32 +0200)]
src/Makefile.am: remove useless assignment
Ruben Kerkhof [Fri, 3 Jun 2016 18:30:59 +0000 (20:30 +0200)]
ipvs: simplify logic a bit
Ruben Kerkhof [Fri, 3 Jun 2016 18:26:10 +0000 (20:26 +0200)]
src/Makefile.am: remove useless assignment
Ruben Kerkhof [Fri, 3 Jun 2016 17:23:09 +0000 (19:23 +0200)]
simplify Makefile.am for nginx and write_http
They can't be build without libcurl support,
./configure will take care of that.
Remove the now unused BUILD_WITH_LIBCURL conditional
Ruben Kerkhof [Fri, 3 Jun 2016 17:20:50 +0000 (19:20 +0200)]
Simplify Makefile.am for curl plugins
They can't be build without libcurl support,
./configure will take care of that.
Ruben Kerkhof [Fri, 3 Jun 2016 17:10:39 +0000 (19:10 +0200)]
aquaero: add flags to the right variable
Ruben Kerkhof [Fri, 3 Jun 2016 17:07:29 +0000 (19:07 +0200)]
src/Makefile.am: merge 2 lines
Ruben Kerkhof [Fri, 3 Jun 2016 17:05:44 +0000 (19:05 +0200)]
src/Makefile.am: simplify Apache plugin
It can't be build without libcurl support and
configure will take care of that.
Ruben Kerkhof [Fri, 3 Jun 2016 16:50:53 +0000 (18:50 +0200)]
configure.ac: break a few long lines up
Ruben Kerkhof [Fri, 3 Jun 2016 16:30:00 +0000 (18:30 +0200)]
Always build with pthread support
Until now you could run ./configure --with-libpthread=no.
This didn't actually compile though.
The daemon has assumed for a while now that pthread support
is available. Bail out in ./configure if this is not the case.
Ruben Kerkhof [Fri, 3 Jun 2016 16:05:11 +0000 (18:05 +0200)]
configure.ac: remove unused HAVE_LIBPTHREAD define
Ruben Kerkhof [Fri, 3 Jun 2016 16:01:14 +0000 (18:01 +0200)]
unixsock plugin: stop linking with libpthread
The collectd daemon already links with it.
Ruben Kerkhof [Fri, 3 Jun 2016 15:58:13 +0000 (17:58 +0200)]
statsd plugin: stop linking with libpthread
The collectd daemon already links with it.
Ruben Kerkhof [Fri, 3 Jun 2016 15:51:48 +0000 (17:51 +0200)]
snmp plugin: stop linking with libpthread
The collectd daemon already links with it.
Ruben Kerkhof [Fri, 3 Jun 2016 15:50:57 +0000 (17:50 +0200)]
nut plugin: stop linking with libpthread
The collectd daemon already links with it.
Ruben Kerkhof [Fri, 3 Jun 2016 15:50:35 +0000 (17:50 +0200)]
notify_email plugin: stop linking with libpthread
The collectd daemon already links with it.