collectd.git
7 years agoMerge pull request #1743 from rubenk/apcups-coverity
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

7 years agoapcups: 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

7 years agoAdd test logs to .gitignore
Ruben Kerkhof [Sun, 5 Jun 2016 10:42:45 +0000 (12:42 +0200)]
Add test logs to .gitignore

7 years agoautomake: disable gzipped tarballs
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

7 years agosrc/Makefile: Add valgrind.FreeBSD.suppress to the dist tarball.
Sebastian Harl [Sat, 4 Jun 2016 22:11:33 +0000 (00:11 +0200)]
src/Makefile: Add valgrind.FreeBSD.suppress to the dist tarball.

7 years agoMerge pull request #1742 from tokkee/sh/suppress
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.

7 years agoMerge pull request #1741 from rubenk/fix-leak-in-disk-plugin
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

7 years agoValgrind: Suppress a bogus invalid read on FreeBSD.
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.

7 years agoPlug a memory leak in disk plugin
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

7 years agoMakefile: Add testwrapper.sh to dist tarballs.
Sebastian Harl [Sat, 4 Jun 2016 18:27:30 +0000 (20:27 +0200)]
Makefile: Add testwrapper.sh to dist tarballs.

7 years agoMerge pull request #1740 from rubenk/correct-am_cflags
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

7 years agochrony plugin: constify 2 function arguments
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; })));
                   ^~~~~~~~~~~~~~~

7 years agochrony plugin: fix clang warning
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);
          ^

7 years agocollectd.spec: add missing %endif
Ruben Kerkhof [Sat, 4 Jun 2016 17:33:55 +0000 (19:33 +0200)]
collectd.spec: add missing %endif

7 years agoconfigure.ac: fix autoreconf warnings
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

7 years agoAppend -Werror to the right flags
Ruben Kerkhof [Sat, 4 Jun 2016 17:20:26 +0000 (19:20 +0200)]
Append -Werror to the right flags

7 years agotestwrapper.sh: Use /bin/sh instead of /bin/bash.
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.

7 years agoMerge pull request #1739 from tokkee/sh/memcheck
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.

7 years agoActually add the testwrapper.sh script.
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.

7 years agoconfigure: Drop unneeded AC_SUBST() calls for AC_PATH_PROG() results.
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.

7 years agounit tests: Run all tests through Valgrind's memcheck, if available.
Sebastian Harl [Sat, 4 Jun 2016 16:27:52 +0000 (18:27 +0200)]
unit tests: Run all tests through Valgrind's memcheck, if available.

7 years agocollectd.spec: add new gRPC plugin
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.

7 years agoceph_test: Free the yajl handle.
Sebastian Harl [Sat, 4 Jun 2016 16:26:44 +0000 (18:26 +0200)]
ceph_test: Free the yajl handle.

7 years agoutils_mount_test: Free dynamically allocated strings.
Sebastian Harl [Sat, 4 Jun 2016 16:25:06 +0000 (18:25 +0200)]
utils_mount_test: Free dynamically allocated strings.

7 years agotesting: Evaluate expressions only once in EXPECT_EQ_STR().
Sebastian Harl [Sat, 4 Jun 2016 16:24:23 +0000 (18:24 +0200)]
testing: Evaluate expressions only once in EXPECT_EQ_STR().

7 years agoutils_vl_lookup: Free regexen when destroying class lists.
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.

7 years agoMerge pull request #1738 from tokkee/sh/silent
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.

7 years agosrc/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.

7 years agoMerge pull request #1699 from tokkee/sh/grpc
Ruben Kerkhof [Sat, 4 Jun 2016 15:25:46 +0000 (17:25 +0200)]
Merge pull request #1699 from tokkee/sh/grpc

gRPC server plugin

7 years agogRPC doc: Fixed typos and mention C++11 requirement.
Sebastian Harl [Sat, 4 Jun 2016 14:33:41 +0000 (16:33 +0200)]
gRPC doc: Fixed typos and mention C++11 requirement.

7 years agosrc/Makefile: Don't unnecessarily set plugin specific CXXFLAGS.
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.

7 years agosrc/Makefile: Don't set subdir-objects.
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.

7 years agocollectd.spec: fix rpmlint warning
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

7 years agocollectd.spec: make scriptlets work on Fedora
Ruben Kerkhof [Sat, 4 Jun 2016 13:11:43 +0000 (15:11 +0200)]
collectd.spec: make scriptlets work on Fedora

7 years agocollectd.spec: only require python26 on RHEL < 6
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.

7 years agocollectd.spec: disable plugins on older distro
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.

7 years agoMerge pull request #1737 from rubenk/pthread-cleanup
Ruben Kerkhof [Sat, 4 Jun 2016 11:04:55 +0000 (13:04 +0200)]
Merge pull request #1737 from rubenk/pthread-cleanup

Pthread cleanup

7 years agocollectd.spec: sort list
Ruben Kerkhof [Sat, 4 Jun 2016 10:57:34 +0000 (12:57 +0200)]
collectd.spec: sort list

7 years agocollectd.spec: EPEL7 has a recent ganglia-devel
Ruben Kerkhof [Sat, 4 Jun 2016 10:54:43 +0000 (12:54 +0200)]
collectd.spec: EPEL7 has a recent ganglia-devel

7 years agocollectd.spec: sort plugin lists
Ruben Kerkhof [Sat, 4 Jun 2016 10:51:47 +0000 (12:51 +0200)]
collectd.spec: sort plugin lists

7 years agocollectd.spec: turn TODO into changelog entry
Ruben Kerkhof [Sat, 4 Jun 2016 10:43:07 +0000 (12:43 +0200)]
collectd.spec: turn TODO into changelog entry

7 years agoAdd new Chrony plugin to rpm spec file
Ruben Kerkhof [Sat, 4 Jun 2016 10:25:54 +0000 (12:25 +0200)]
Add new Chrony plugin to rpm spec file

7 years agoRemove HAVE_PTHREAD_H include guard
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.

7 years agoconfigure.ac: move AC_SUBST down to after define
Ruben Kerkhof [Sat, 4 Jun 2016 09:48:56 +0000 (11:48 +0200)]
configure.ac: move AC_SUBST down to after define

7 years agoSort types.db
Ruben Kerkhof [Sat, 4 Jun 2016 09:22:09 +0000 (11:22 +0200)]
Sort types.db

7 years agoMerge pull request #1548 from bbczeuz/zseng_dev_chrony
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

7 years agosrc/Makefile.am: merge EXTRA_DIST variables
Ruben Kerkhof [Fri, 3 Jun 2016 20:36:04 +0000 (22:36 +0200)]
src/Makefile.am: merge EXTRA_DIST variables

7 years agosrc/Makefile.am: remove commented out line
Ruben Kerkhof [Fri, 3 Jun 2016 20:34:28 +0000 (22:34 +0200)]
src/Makefile.am: remove commented out line

7 years agosrc/Makefile.am: remove useless assigment
Ruben Kerkhof [Fri, 3 Jun 2016 20:33:23 +0000 (22:33 +0200)]
src/Makefile.am: remove useless assigment

7 years agozfs_arc: simplify build logic
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.

7 years agosrc/Makefile.am: remove useless assignment
Ruben Kerkhof [Fri, 3 Jun 2016 20:22:06 +0000 (22:22 +0200)]
src/Makefile.am: remove useless assignment

7 years agoxencpu: add missing cppflags and ldflags
Ruben Kerkhof [Fri, 3 Jun 2016 20:20:43 +0000 (22:20 +0200)]
xencpu: add missing cppflags and ldflags

7 years agowrite_redis: append to CPPFLAGS, not CFLAGS
Ruben Kerkhof [Fri, 3 Jun 2016 18:49:48 +0000 (20:49 +0200)]
write_redis: append to CPPFLAGS, not CFLAGS

7 years agoopenvpn plugin: remove useless assignment
Ruben Kerkhof [Fri, 3 Jun 2016 18:45:20 +0000 (20:45 +0200)]
openvpn plugin: remove useless assignment

7 years agooracle plugin: use CPPFLAGS instead of CFLAGS
Ruben Kerkhof [Fri, 3 Jun 2016 18:44:58 +0000 (20:44 +0200)]
oracle plugin: use CPPFLAGS instead of CFLAGS

7 years agoopenldap 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

7 years agoopenldap plugin: use $PLUGIN_LDFLAGS
Ruben Kerkhof [Fri, 3 Jun 2016 18:41:50 +0000 (20:41 +0200)]
openldap plugin: use $PLUGIN_LDFLAGS

Just like the other plugins.

7 years agosrc/Makefile.am: remove useless assignment
Ruben Kerkhof [Fri, 3 Jun 2016 18:40:25 +0000 (20:40 +0200)]
src/Makefile.am: remove useless assignment

7 years agomysql plugin: simplify build logic
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.

7 years agolvm: add missing cppflags and ldflags to Makefile
Ruben Kerkhof [Fri, 3 Jun 2016 18:34:29 +0000 (20:34 +0200)]
lvm: add missing cppflags and ldflags to Makefile

7 years agosrc/Makefile.am: remove useless assignment
Ruben Kerkhof [Fri, 3 Jun 2016 18:32:53 +0000 (20:32 +0200)]
src/Makefile.am: remove useless assignment

7 years agoipvs: simplify logic a bit
Ruben Kerkhof [Fri, 3 Jun 2016 18:30:59 +0000 (20:30 +0200)]
ipvs: simplify logic a bit

7 years agosrc/Makefile.am: remove useless assignment
Ruben Kerkhof [Fri, 3 Jun 2016 18:26:10 +0000 (20:26 +0200)]
src/Makefile.am: remove useless assignment

7 years agosimplify Makefile.am for nginx and write_http
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

7 years agoSimplify Makefile.am for curl plugins
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.

7 years agoaquaero: add flags to the right variable
Ruben Kerkhof [Fri, 3 Jun 2016 17:10:39 +0000 (19:10 +0200)]
aquaero: add flags to the right variable

7 years agosrc/Makefile.am: merge 2 lines
Ruben Kerkhof [Fri, 3 Jun 2016 17:07:29 +0000 (19:07 +0200)]
src/Makefile.am: merge 2 lines

7 years agosrc/Makefile.am: simplify Apache plugin
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.

7 years agoconfigure.ac: break a few long lines up
Ruben Kerkhof [Fri, 3 Jun 2016 16:50:53 +0000 (18:50 +0200)]
configure.ac: break a few long lines up

7 years agoAlways build with pthread support
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.

7 years agoconfigure.ac: remove unused HAVE_LIBPTHREAD define
Ruben Kerkhof [Fri, 3 Jun 2016 16:05:11 +0000 (18:05 +0200)]
configure.ac: remove unused HAVE_LIBPTHREAD define

7 years agounixsock plugin: stop linking with libpthread
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.

7 years agostatsd plugin: stop linking with libpthread
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.

7 years agosnmp plugin: stop linking with libpthread
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.

7 years agonut plugin: stop linking with libpthread
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.

7 years agonotify_email plugin: stop linking with libpthread
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.

7 years agonetwork plugin: stop linking with libpthread
Ruben Kerkhof [Fri, 3 Jun 2016 15:50:08 +0000 (17:50 +0200)]
network plugin: stop linking with libpthread

The collectd daemon already links with it.

7 years agojava plugin: stop linking with libpthread
Ruben Kerkhof [Fri, 3 Jun 2016 15:49:24 +0000 (17:49 +0200)]
java plugin: stop linking with libpthread

The collectd daemon already links with it.

7 years agoexec plugin: stop linking with libpthread
Ruben Kerkhof [Fri, 3 Jun 2016 15:48:47 +0000 (17:48 +0200)]
exec plugin: stop linking with libpthread

The collectd daemon already links with it.

7 years agoemail plugin: stop linking with libpthread
Ruben Kerkhof [Fri, 3 Jun 2016 15:48:19 +0000 (17:48 +0200)]
email plugin: stop linking with libpthread

The collectd daemon already links with it.

7 years agodns plugin: stop linking with libpthread
Ruben Kerkhof [Fri, 3 Jun 2016 15:47:35 +0000 (17:47 +0200)]
dns plugin: stop linking with libpthread

The collectd daemon already links with it.

7 years agoall plugins: remove pthread.h include
Ruben Kerkhof [Fri, 3 Jun 2016 15:44:58 +0000 (17:44 +0200)]
all plugins: remove pthread.h include

plugin.h already includes pthread.h

7 years agoDon't hardcode libpthread
Ruben Kerkhof [Fri, 3 Jun 2016 15:30:57 +0000 (17:30 +0200)]
Don't hardcode libpthread

7 years agocollectd_tg: let automake compute dependencies
Ruben Kerkhof [Fri, 3 Jun 2016 15:08:33 +0000 (17:08 +0200)]
collectd_tg: let automake compute dependencies

Automake already does the right thing based on the library added with _LDADD.
This also restores a missing dependency on libheap.la.

7 years agocollectd_tg: simplify logic a bit
Ruben Kerkhof [Fri, 3 Jun 2016 15:04:06 +0000 (17:04 +0200)]
collectd_tg: simplify logic a bit

We always link collectdctl with libcollectdclient/libcollectdclient.la.
Make this more obvious.

7 years agocollectdctl: let automake compute dependencies
Ruben Kerkhof [Fri, 3 Jun 2016 15:01:32 +0000 (17:01 +0200)]
collectdctl: let automake compute dependencies

Automake already does the right thing based on the library added with _LDADD

7 years agocollectdctl: simplify logic a bit
Ruben Kerkhof [Fri, 3 Jun 2016 15:00:33 +0000 (17:00 +0200)]
collectdctl: simplify logic a bit

We always link collectdctl with libcollectdclient/libcollectdclient.la.
Make this more obvious.

7 years agosrc/Makefile.am: let automake compute dependencies
Ruben Kerkhof [Fri, 3 Jun 2016 14:58:01 +0000 (16:58 +0200)]
src/Makefile.am: let automake compute dependencies

Automake already does the right thing based on the library
added with _LDADD

7 years agosrc/Makefile.am: simplify logic a bit
Ruben Kerkhof [Fri, 3 Jun 2016 14:52:47 +0000 (16:52 +0200)]
src/Makefile.am: simplify logic a bit

We always link collectd_nagios with libcollectdclient/libcollectdclient.la.
Make this more obvious.

7 years agoRemoved braces on single line 'if'. Always using inet_ntop.
Claudius Zingerli [Fri, 3 Jun 2016 14:38:23 +0000 (16:38 +0200)]
Removed braces on single line 'if'. Always using inet_ntop.

7 years agoMacro fixes, Implemented comments from code review (style, defines)
Claudius Zingerli [Fri, 3 Jun 2016 13:14:43 +0000 (15:14 +0200)]
Macro fixes, Implemented comments from code review (style, defines)

7 years agosrc/Makefile.am: remove CPPFLAGS assignment
Ruben Kerkhof [Fri, 3 Jun 2016 12:23:16 +0000 (14:23 +0200)]
src/Makefile.am: remove CPPFLAGS assignment

AM_CPPFLAGS are added by default, unless you override _CPPFLAGS

7 years agoMerge branch 'collectd-5.5'
Ruben Kerkhof [Fri, 3 Jun 2016 10:56:53 +0000 (12:56 +0200)]
Merge branch 'collectd-5.5'

Conflicts:
src/perl.c

7 years agoMerge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Fri, 3 Jun 2016 10:51:59 +0000 (12:51 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

7 years agosrc/Makefile.am: remove unused variable
Ruben Kerkhof [Fri, 3 Jun 2016 10:51:13 +0000 (12:51 +0200)]
src/Makefile.am: remove unused variable

7 years agoconfigure: Add some more information about protoc/gRPC in the summary.
Sebastian Harl [Sat, 7 May 2016 11:35:17 +0000 (13:35 +0200)]
configure: Add some more information about protoc/gRPC in the summary.

7 years agosrc/Makefile: Move proto-generated sources to nodist_*_SOURCES.
Sebastian Harl [Sat, 7 May 2016 11:26:22 +0000 (13:26 +0200)]
src/Makefile: Move proto-generated sources to nodist_*_SOURCES.

7 years agocollectd.conf(5): Briefly document grpc's SSL options.
Sebastian Harl [Sat, 7 May 2016 00:34:25 +0000 (02:34 +0200)]
collectd.conf(5): Briefly document grpc's SSL options.

7 years agocollectd.conf: Update grpc sample configuration.
Sebastian Harl [Sat, 7 May 2016 00:26:39 +0000 (02:26 +0200)]
collectd.conf: Update grpc sample configuration.

7 years agogrpc plugin: Add options to enable SSL protected connections.
Sebastian Harl [Sat, 7 May 2016 00:17:12 +0000 (02:17 +0200)]
grpc plugin: Add options to enable SSL protected connections.