trenkel [Sun, 7 Aug 2016 16:26:02 +0000 (18:26 +0200)]
Merge pull request #1864 from rubenk/python-2.6
Bump minimum required Python version to 2.6
Ruben Kerkhof [Sun, 7 Aug 2016 16:03:21 +0000 (18:03 +0200)]
Remove Python 2.4 compatibily macros
Ruben Kerkhof [Sun, 7 Aug 2016 15:10:12 +0000 (17:10 +0200)]
Bump python requirement to 2.6
Fixes #1863
Ruben Kerkhof [Sun, 7 Aug 2016 13:49:02 +0000 (15:49 +0200)]
Merge pull request #1851 from rubenk/use-python-config-for-libpython-detection
Switch to python-config for libpython detection
Ruben Kerkhof [Sun, 7 Aug 2016 11:10:14 +0000 (13:10 +0200)]
python: use LIBPYTHON_LIBS too
python-config --ldflags returns -lpython (yeah I know)
autoconf prepends ldflags in its configuration tests
so conftest.c will never look for symbols in -lpython.
python-config --libs also returns -lpython, but this is appended.
Ruben Kerkhof [Fri, 5 Aug 2016 18:55:37 +0000 (20:55 +0200)]
Switch to python-config for libpython detection
The old way of detecting libpython was unreliable and did not work on
OS X.
Instead use python-config which was introduced in python 2.6.
For older versions of python you can still set PYTHON_CPPFLAGS and
PYTHON_LDFLAGS on the ./configure command line.
By default we look for python3-config, python2-config and last
python-config. The path to python-config can be overriden by setting
PYTHON_CONFIG.
Fixes #888 and #27
Ruben Kerkhof [Sun, 7 Aug 2016 12:13:11 +0000 (14:13 +0200)]
perl plugin: fix build on RHEL5
perl.c: In function 'init_pi':
perl.c:2304: warning: implicit declaration of function
'pthread_mutexattr_settype'
perl.c:2304: error: 'PTHREAD_MUTEX_RECURSIVE' undeclared (first use in
this function)
perl.c:2304: error: (Each undeclared identifier is reported only once
perl.c:2304: error: for each function it appears in.)
make[3]: *** [perl_la-perl.lo] Error 1
Ruben Kerkhof [Sun, 7 Aug 2016 11:35:53 +0000 (13:35 +0200)]
utils_dns.c: fix build on OSX
utils_dns.c:759:11: error: use of undeclared identifier 'ns_t_apl'
case ns_t_apl: return ("APL");
Apparently Apple forgot to add some record types
when they bumped the version number of /usr/include/arpa/nameser.h
Ruben Kerkhof [Sun, 7 Aug 2016 10:45:22 +0000 (12:45 +0200)]
Merge pull request #1856 from rubenk/snmp-dont-dispatch-values-with-empty-type-instance
snmp : don't send values for empty type_instance
Ruben Kerkhof [Sun, 7 Aug 2016 10:12:08 +0000 (12:12 +0200)]
Merge pull request #1490 from rubenk/uuid
Uuid plugin fixes / updates
Ruben Kerkhof [Sat, 6 Aug 2016 06:31:04 +0000 (08:31 +0200)]
snmp : don't send values for empty type_instance
If you have multiple Instance values that are empty string,
they all end up in the same rrd file, resulting in:
rrdc_update (/collectd/rrd/vc3/snmp/if_errors.rrd, [
1352632188:0:0], 1) failed with status -1
Fixes #176
Ruben Kerkhof [Sun, 7 Aug 2016 09:59:31 +0000 (11:59 +0200)]
perl plugin: needs _LARGEFILE64_SOURCE
libperl compiled with LARGE_FILES support defines its own Off_t
as off64_t, even if off_t is 64-bit wide on 64bit platforms.
off64_t is only exposed in the libc headers if _LARGEFILE64_SOURCE
is defined.
In file included from perl.c:47:0:
/usr/lib/x86_64-linux-gnu/perl/5.20/CORE/perl.h:2398:22: error: unknown
type name 'off64_t'
# define Off_t off64_t
^
/usr/lib/x86_64-linux-gnu/perl/5.20/CORE/perlio.h:277:15: note: in
expansion of macro 'Off_t'
PERL_EXPORT_C Off_t PerlIO_tell(PerlIO *);
Ruben Kerkhof [Sun, 7 Aug 2016 09:50:25 +0000 (11:50 +0200)]
Merge pull request #1853 from rubenk/python-plugin-fix-building-on-osx
python plugin: fix building on OSX
Ruben Kerkhof [Sun, 7 Aug 2016 09:45:05 +0000 (11:45 +0200)]
Merge pull request #1844 from rubenk/sigrok
sigrok: use pkg-config to find library
Florian Forster [Sun, 7 Aug 2016 08:32:28 +0000 (10:32 +0200)]
Merge branch 'pr/1826'
Florian Forster [Sun, 7 Aug 2016 08:30:22 +0000 (10:30 +0200)]
cpusleep plugin: Reformat with `clang-format -style=LLVM`.
Pavel Rochnyack [Wed, 8 Jun 2016 07:15:54 +0000 (13:15 +0600)]
network plugin: Minimized number of proposed changes
Pavel Rochnyack [Tue, 31 May 2016 08:21:53 +0000 (14:21 +0600)]
network plugin: Improved error logging on decrypt error (wrong/missing username/password)
Florian Forster [Sat, 6 Aug 2016 19:15:18 +0000 (21:15 +0200)]
Merge remote-tracking branch 'github/master'
Ruben Kerkhof [Sat, 6 Aug 2016 19:13:41 +0000 (21:13 +0200)]
configure.ac: don't break Vim syntax highlighting
Florian Forster [Sat, 6 Aug 2016 19:13:22 +0000 (21:13 +0200)]
Merge remote-tracking branches 'github/pr/1857', 'github/pr/1859' and 'github/pr/1860'
Florian Forster [Sat, 6 Aug 2016 18:51:01 +0000 (20:51 +0200)]
Merge remote-tracking branch 'github/pr/1396'
Florian Forster [Sat, 6 Aug 2016 18:44:09 +0000 (20:44 +0200)]
python plugin: Fix double declaration of variable.
This fixes a regression from
92498b8a0e1d50c7e06d435395ac0ac307cc190c.
Florian Forster [Sat, 6 Aug 2016 11:59:11 +0000 (13:59 +0200)]
src/utils_format_json_test.c: Fix @rubenk's review comments.
Florian Forster [Wed, 2 Dec 2015 11:42:54 +0000 (12:42 +0100)]
src/utils_format_json.c: Add support for libyajl < 2.
Florian Forster [Fri, 20 Nov 2015 09:55:09 +0000 (10:55 +0100)]
write_http plugin: Implement writing of notifications.
Florian Forster [Fri, 20 Nov 2015 09:47:57 +0000 (10:47 +0100)]
src/utils_format_json.[ch]: Implement format_json_notification().
Florian Forster [Sat, 6 Aug 2016 18:36:21 +0000 (20:36 +0200)]
Merge branch 'collectd-5.5'
Florian Forster [Sat, 6 Aug 2016 18:33:54 +0000 (20:33 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Sat, 6 Aug 2016 18:15:51 +0000 (20:15 +0200)]
src/utils_db_query.c: Check return status of strjoin().
Fixes: #4
Florian Forster [Sat, 6 Aug 2016 18:00:34 +0000 (20:00 +0200)]
libcollectdclient: Don't print anything to STDOUT by default.
Even with --enable-debug. This behavior is now controlled by the
"COLLECTD_TRACE" environment variable.
Fixes: #105
Sven Trenkel [Sat, 6 Aug 2016 15:42:58 +0000 (15:42 +0000)]
python plugin: Fix SIGINT handling.
Florian Forster [Sat, 6 Aug 2016 16:22:56 +0000 (18:22 +0200)]
ping plugin: Let start_thread() return gracefully when thread is already running.
Signaling an error caused the init function to signal an error, causing
the read callback to be unregistered on systems where init is called
more than once.
Fixes: #869
Ruben Kerkhof [Sat, 6 Aug 2016 15:56:49 +0000 (17:56 +0200)]
collectd.conf(5): s/collectd/collected/
Ruben Kerkhof [Sat, 6 Aug 2016 14:10:04 +0000 (16:10 +0200)]
Merge pull request #1855 from coreykosak/master
Spelling: it's -> its
Corey Kosak [Sat, 6 Aug 2016 00:48:27 +0000 (20:48 -0400)]
Spelling: it's -> its
Ruben Kerkhof [Sat, 6 Aug 2016 11:33:36 +0000 (13:33 +0200)]
configure.ac: remove checks for pkg-config
pkg-config is not optional anymore.
Ruben Kerkhof [Sat, 6 Aug 2016 08:27:29 +0000 (10:27 +0200)]
utils_dns.c: update rr types
Fixes #859
Ruben Kerkhof [Sat, 6 Aug 2016 11:09:15 +0000 (13:09 +0200)]
perl : fix build without compiler optimization
CC perl_la-perl.lo
In file included from /usr/include/stdio.h:27:0,
from ./daemon/collectd.h:34,
from perl.c:36:
/usr/include/features.h:331:4: error: #warning _FORTIFY_SOURCE requires
compiling with optimization (-O) [-Werror=cpp]
# warning _FORTIFY_SOURCE requires compiling with optimization (-O)
^~~~~~~
cc1: all warnings being treated as errors
Makefile:4439: recipe for target 'perl_la-perl.lo' failed
make[3]: *** [perl_la-perl.lo] Error 1
ccflags contains the flags used to compile libperl itself, not the ones
needed for compiling code that uses it. Switch to perl_inc which just
returns the neccesary include flags
Fixes #1858
Ruben Kerkhof [Sat, 6 Aug 2016 09:19:37 +0000 (11:19 +0200)]
collectd.conf(5): fix typo in Ethstat section
Ruben Kerkhof [Fri, 5 Aug 2016 21:07:37 +0000 (23:07 +0200)]
Merge pull request #1854 from brd/remove-stolen
Remove watching stolen, since the counter has been removed upstream.
Brad Davis [Fri, 5 Aug 2016 21:05:16 +0000 (15:05 -0600)]
Remove watching stolen, since the counter has been removed upstream.
Ruben Kerkhof [Fri, 5 Aug 2016 20:03:27 +0000 (22:03 +0200)]
python plugin: fix building on OSX
Fixes #1852
duplicate symbol _ValuesType in:
.libs/python_la-python.o
.libs/python_la-pyconfig.o
duplicate symbol _NotificationType in:
.libs/python_la-python.o
.libs/python_la-pyconfig.o
duplicate symbol _ConfigType in:
.libs/python_la-python.o
.libs/python_la-pyconfig.o
duplicate symbol _UnsignedType in:
.libs/python_la-python.o
.libs/python_la-pyconfig.o
duplicate symbol _SignedType in:
.libs/python_la-python.o
.libs/python_la-pyconfig.o
duplicate symbol _PluginDataType in:
.libs/python_la-python.o
.libs/python_la-pyconfig.o
duplicate symbol _ValuesType in:
.libs/python_la-python.o
.libs/python_la-pyvalues.o
duplicate symbol _NotificationType in:
.libs/python_la-python.o
.libs/python_la-pyvalues.o
duplicate symbol _ConfigType in:
.libs/python_la-python.o
.libs/python_la-pyvalues.o
duplicate symbol _UnsignedType in:
.libs/python_la-python.o
.libs/python_la-pyvalues.o
duplicate symbol _SignedType in:
.libs/python_la-python.o
.libs/python_la-pyvalues.o
duplicate symbol _PluginDataType in:
.libs/python_la-python.o
.libs/python_la-pyvalues.o
ld: 12 duplicate symbols for architecture x86_64
clang: error: linker command failed with exit code 1 (use -v to see invocation)
make[3]: *** [python.la] Error 1
make[2]: *** [all-recursive] Error 1
make[1]: *** [all] Error 2
make: *** [all-recursive] Error 1
Ruben Kerkhof [Fri, 5 Aug 2016 17:46:08 +0000 (19:46 +0200)]
python plugin: fix building with python 3
Python 3 doesn't have PyUnicode_SetDefaultEncoding()
CC python_la-python.lo
python.c: In function 'cpy_config':
python.c:1138:4: error: implicit declaration of function 'PyUnicode_SetDefaultEncoding' [-Werror=implicit-function-declaration]
if (PyUnicode_SetDefaultEncoding(encoding)) {
^
cc1: all warnings being treated as errors
*** Error code 1
trenkel [Fri, 5 Aug 2016 16:45:52 +0000 (18:45 +0200)]
Merge pull request #1850 from rubenk/python-return-error-when-config-callback-fails
python plugin: return error on config failure
Ruben Kerkhof [Fri, 5 Aug 2016 16:37:25 +0000 (18:37 +0200)]
python plugin: review fixes
Ruben Kerkhof [Fri, 5 Aug 2016 16:21:39 +0000 (18:21 +0200)]
Bump autoconf requirement to 2.60
Since
ae63479 we use AC_PROG_CC_C99 which was introduced in autoconf 2.60.
Unfortunately this means you can't build from git anymore on RHEL5, but
so be it. Building from tarball of course still works.
Ruben Kerkhof [Fri, 5 Aug 2016 16:13:02 +0000 (18:13 +0200)]
python plugins: return error on more failures
Ruben Kerkhof [Fri, 5 Aug 2016 15:09:59 +0000 (17:09 +0200)]
python plugin: return error on config failure
Return an error when something goes wrong during config.
We still loop through all specified modules so all errors are logged.
Fixes #926
trenkel [Fri, 5 Aug 2016 13:35:44 +0000 (15:35 +0200)]
Merge pull request #1847 from rubenk/man-collectd-python-remove-notes-section
collectd-python(5): remove NOTES section
Ruben Kerkhof [Fri, 5 Aug 2016 12:41:57 +0000 (14:41 +0200)]
Merge pull request #1843 from xinity/mysql-galera-stats
mysql plugin: add support for Galera statistics
Rachid Zarouali [Thu, 4 Aug 2016 07:10:13 +0000 (09:10 +0200)]
mysql plugin: add support for Galera statistics
Rinigus [Fri, 5 Aug 2016 12:16:18 +0000 (15:16 +0300)]
cpusleep plugin: calculating in integers
Ruben Kerkhof [Fri, 5 Aug 2016 11:52:55 +0000 (13:52 +0200)]
collectd-python(5): remove NOTES section
This man page just describes the python plugin so it shouldn't contain
generic information for developers.
Ruben Kerkhof [Fri, 5 Aug 2016 11:45:58 +0000 (13:45 +0200)]
collectd-python(5): make example work out of the box
Ruben Kerkhof [Fri, 5 Aug 2016 11:42:49 +0000 (13:42 +0200)]
collectd-python(5): remove semicolons from example
Ruben Kerkhof [Fri, 5 Aug 2016 11:17:32 +0000 (13:17 +0200)]
Merge branch 'collectd-5.5'
Conflicts:
src/pyvalues.c
Ruben Kerkhof [Fri, 5 Aug 2016 11:12:03 +0000 (13:12 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
trenkel [Thu, 4 Aug 2016 20:57:55 +0000 (22:57 +0200)]
Merge pull request #1846 from tokkee/collectd-5.4
python plugin: Fix conversion of value-lists from Python to C.
Sebastian Harl [Thu, 4 Aug 2016 20:15:34 +0000 (22:15 +0200)]
python plugin: Fix conversion of value-lists from Python to C.
This affects data-sets with more than one data-source of different types.
Previously, the type of the first data-source would have been used to convert
all values.
Ruben Kerkhof [Thu, 4 Aug 2016 15:28:03 +0000 (17:28 +0200)]
Merge pull request #1840 from rubenk/write-sensu-readd-asprintf
write_sensu: Re-add substitute for asprintf
Ruben Kerkhof [Thu, 4 Aug 2016 11:47:51 +0000 (13:47 +0200)]
write_sensu: Re-add substitute for asprintf
asprint is only available from Solaris 10 update 11.
Fixes #1798
Ruben Kerkhof [Thu, 4 Aug 2016 15:09:27 +0000 (17:09 +0200)]
AUTHORS: change my email adress to match the rest
Ruben Kerkhof [Thu, 4 Aug 2016 15:08:59 +0000 (17:08 +0200)]
AUTHORS: Fix typo
Ruben Kerkhof [Thu, 4 Aug 2016 15:08:03 +0000 (17:08 +0200)]
AUTHORS: I take care of EPEL too
Ruben Kerkhof [Thu, 4 Aug 2016 13:34:43 +0000 (15:34 +0200)]
sigrok: use pkg-config to find library
While we're doing that, look for a version less than 0.4, since we don't support that yet (#1574)
Ruben Kerkhof [Thu, 4 Aug 2016 12:39:28 +0000 (14:39 +0200)]
Merge pull request #1842 from rubenk/declare-loop-variable-in-for-loop-controlling-expression
treewide: declare loop variable in loop expression
Ruben Kerkhof [Tue, 2 Aug 2016 18:19:37 +0000 (20:19 +0200)]
treewide: declare loop variable in loop expression
Florian Forster [Thu, 4 Aug 2016 09:30:18 +0000 (11:30 +0200)]
memcached plugin: Use hostname_g when reading localhost.
Previously, the code would use the value of the "Host" option or
"127.0.0.1" if that option was unset (plus special cases for UNIX
sockets and a legacy mode). Obviously, "127.0.0.1" is a bad default.
This patch emulates the behavior of the MySQL plugin: if the "Host"
option is unset or set to either "localhost" or "127.0.0.1", the global
hostname_g variable is used.
Fixes: #801
Supersedes: #894
Ruben Kerkhof [Fri, 25 Dec 2015 10:46:04 +0000 (11:46 +0100)]
uuid plugin: make it work on OpenBSD
Ruben Kerkhof [Fri, 25 Dec 2015 10:19:29 +0000 (11:19 +0100)]
uuid plugin: make it work on NetBSD
Ruben Kerkhof [Fri, 25 Dec 2015 10:14:01 +0000 (11:14 +0100)]
uuid plugin: make it work on FreeBSD
Ruben Kerkhof [Fri, 25 Dec 2015 10:10:16 +0000 (11:10 +0100)]
uuid plugin: make it work on OSX
Ruben Kerkhof [Fri, 25 Dec 2015 09:54:47 +0000 (10:54 +0100)]
uuid plugin: also look in /sys/class/dmi for uuid
Recent Linux kernels store the uuid in /sys/class/dmi/id/product_uuid.
Ruben Kerkhof [Fri, 25 Dec 2015 09:53:41 +0000 (10:53 +0100)]
uuid plugin: only look in /sys on Linux
Ruben Kerkhof [Fri, 25 Dec 2015 09:51:01 +0000 (10:51 +0100)]
uuid plugin: look in smbios system table for uuid
This saves a lot of parsing when dmidecode output is large.
Ruben Kerkhof [Fri, 25 Dec 2015 09:46:41 +0000 (10:46 +0100)]
uuid plugin: some coding style cleanups
Rinigus [Thu, 4 Aug 2016 06:13:49 +0000 (09:13 +0300)]
cpusleep plugin: adding comment regarding units
Rinigus [Wed, 3 Aug 2016 21:41:25 +0000 (00:41 +0300)]
cpusleep plugin: changing reported type to total_time_in_ms; other small changes
Florian Forster [Wed, 3 Aug 2016 20:27:26 +0000 (22:27 +0200)]
src/plugin.c: Stop write threads before calling shutdown callbacks.
Issue: #1110
Florian Forster [Wed, 3 Aug 2016 19:35:36 +0000 (21:35 +0200)]
write_http plugin: Be extra conservative in wh_reset_buffer().
This function is called from wh_callback_free() which is used to clean up after
?alloc() failures, so the "send_buffer" field may actually be NULL.
Issue: #1835
Ruben Kerkhof [Wed, 3 Aug 2016 18:39:00 +0000 (20:39 +0200)]
Merge pull request #1690 from fr0stbyte/max_size
make DATA_MAX_NAME_LEN a compile time tunable
Ruben Kerkhof [Wed, 3 Aug 2016 17:10:04 +0000 (19:10 +0200)]
madwifi: fix scan-build warning
CC madwifi.lo
madwifi.c:608:2: warning: Function call argument is an uninitialized
value
ssnprintf (buf, bufsize, "%02x:%02x:%02x:%02x:%02x:%02x",
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
Radu Brumariu [Sat, 30 Apr 2016 15:16:28 +0000 (11:16 -0400)]
make DATA_MAX_NAME_LEN configurable at compile time
Ruben Kerkhof [Wed, 3 Aug 2016 15:33:19 +0000 (17:33 +0200)]
pinba plugin: fix warning on Solaris
[libprotobuf WARNING google/protobuf/compiler/parser.cc:547] No syntax
specified for the proto file: pinba.proto. Please use 'syntax =
"proto2";' or 'syntax = "proto3";' to specify a syntax version.
(Defaulted to proto2 syntax.)
Ruben Kerkhof [Wed, 3 Aug 2016 15:31:08 +0000 (17:31 +0200)]
grep -q is not portable
Solaris grep doesn't have -q
Use the grep we detected with AC_PROG_EGREP and just redirect stdout.
Ruben Kerkhof [Wed, 3 Aug 2016 15:01:37 +0000 (17:01 +0200)]
Fix failing tests after
6fd0d25
Fixes #1833
Ruben Kerkhof [Wed, 3 Aug 2016 13:41:54 +0000 (15:41 +0200)]
Merge pull request #1832 from rubenk/check-for-c99-compiler
Require a compiler that understands C99
Amy Lin [Mon, 6 Jul 2015 06:34:31 +0000 (16:34 +1000)]
src/daemon/plugin.h: Enlarge the DATA_MAX_NAME_LEN.
Fixes: #966, #1238
Ruben Kerkhof [Wed, 3 Aug 2016 12:28:29 +0000 (14:28 +0200)]
Require a compiler that understands C99
Upcoming changes will requires C99 support.
For newer compilers this is the default, but older
compilers needs a flag like -std=gnu99 or -std=c99.
Ruben Kerkhof [Wed, 3 Aug 2016 11:41:40 +0000 (13:41 +0200)]
Merge pull request #1830 from rubenk/move-collectd-header
treewide: add blank line below collectd.h
Ruben Kerkhof [Wed, 3 Aug 2016 08:06:55 +0000 (10:06 +0200)]
Merge pull request #1831 from rubenk/ai_hints-cleanup
Ai hints cleanup
Ruben Kerkhof [Tue, 2 Aug 2016 15:16:58 +0000 (17:16 +0200)]
treewide: Use AF_UNSPEC consistently
.ai_family expects an address family, not a protocol family.
Note that on most platforms these constants are the same, so this
is purely cosmetic.
Ruben Kerkhof [Tue, 2 Aug 2016 14:42:23 +0000 (16:42 +0200)]
no need to initialize result ptr of getaddrinfo
Ruben Kerkhof [Tue, 2 Aug 2016 14:27:17 +0000 (16:27 +0200)]
treewide: use designated initializers for ai_hints
Florian Forster [Wed, 3 Aug 2016 05:19:28 +0000 (07:19 +0200)]
xencpu plugin: Remove unnecessary semicolons.
Ruben Kerkhof [Tue, 2 Aug 2016 13:19:49 +0000 (15:19 +0200)]
treewide: stop checking for AI_PASSIVE
I think it's safe to assume that if you have getaddrinfo, you have
AI_PASSIVE. My copy of Stevens from 1998 already describes it.
Ruben Kerkhof [Tue, 2 Aug 2016 13:17:11 +0000 (15:17 +0200)]
treewide: stop checking for AI_ADDRCONFIG
It has been in RFC 3494 since 2003 and all the platforms
we care about have it.
Ruben Kerkhof [Mon, 1 Aug 2016 20:52:30 +0000 (22:52 +0200)]
treewide: add blank line below collectd.h
Ruben Kerkhof [Tue, 2 Aug 2016 11:44:55 +0000 (13:44 +0200)]
Fix build on Solaris 10