Bump python requirement to 2.6
Fixes #1863
Fixes #1863
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
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
Merge pull request #1856 from rubenk/snmp-dont-dispatch-values-with-empty-type-instance
snmp : don't send values for empty type_instance
snmp : don't send values for empty type_instance
Merge pull request #1490 from rubenk/uuid
Uuid plugin fixes / updates
Uuid plugin fixes / updates
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
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
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 *);
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 *);
Merge pull request #1853 from rubenk/python-plugin-fix-building-on-osx
python plugin: fix building on OSX
python plugin: fix building on OSX
Merge pull request #1844 from rubenk/sigrok
sigrok: use pkg-config to find library
sigrok: use pkg-config to find library
Merge branch 'pr/1826'
cpusleep plugin: Reformat with `clang-format -style=LLVM`.
network plugin: Minimized number of proposed changes
8 years agonetwork plugin: Improved error logging on decrypt error (wrong/missing username/password)
network plugin: Improved error logging on decrypt error (wrong/missing username/password)
Merge remote-tracking branch 'github/master'
configure.ac: don't break Vim syntax highlighting
Merge remote-tracking branches 'github/pr/1857', 'github/pr/1859' and 'github/pr/1860'
Merge remote-tracking branch 'github/pr/1396'
python plugin: Fix double declaration of variable.
This fixes a regression from 92498b8a0e1d50c7e06d435395ac0ac307cc190c.
This fixes a regression from 92498b8a0e1d50c7e06d435395ac0ac307cc190c.
src/utils_format_json_test.c: Fix @rubenk's review comments.
src/utils_format_json.c: Add support for libyajl < 2.
write_http plugin: Implement writing of notifications.
src/utils_format_json.[ch]: Implement format_json_notification().
Merge branch 'collectd-5.5'
Merge branch 'collectd-5.4' into collectd-5.5
src/utils_db_query.c: Check return status of strjoin().
Fixes: #4
Fixes: #4
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
Even with --enable-debug. This behavior is now controlled by the
"COLLECTD_TRACE" environment variable.
Fixes: #105
python plugin: Fix SIGINT handling.
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
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
collectd.conf(5): s/collectd/collected/
Merge pull request #1855 from coreykosak/master
Spelling: it's -> its
Spelling: it's -> its
Spelling: it's -> its
configure.ac: remove checks for pkg-config
pkg-config is not optional anymore.
pkg-config is not optional anymore.
utils_dns.c: update rr types
Fixes #859
Fixes #859
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
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
collectd.conf(5): fix typo in Ethstat section
Merge pull request #1854 from brd/remove-stolen
Remove watching stolen, since the counter has been removed upstream.
Remove watching stolen, since the counter has been removed upstream.
Remove watching stolen, since the counter has been removed upstream.
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
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
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
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
Merge pull request #1850 from rubenk/python-return-error-when-config-callback-fails
python plugin: return error on config failure
python plugin: return error on config failure
python plugin: review fixes
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.
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.
python plugins: return error on more failures
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
Return an error when something goes wrong during config.
We still loop through all specified modules so all errors are logged.
Fixes #926
Merge pull request #1847 from rubenk/man-collectd-python-remove-notes-section
collectd-python(5): remove NOTES section
collectd-python(5): remove NOTES section
Merge pull request #1843 from xinity/mysql-galera-stats
mysql plugin: add support for Galera statistics
mysql plugin: add support for Galera statistics
mysql plugin: add support for Galera statistics
cpusleep plugin: calculating in integers
collectd-python(5): remove NOTES section
This man page just describes the python plugin so it shouldn't contain
generic information for developers.
This man page just describes the python plugin so it shouldn't contain
generic information for developers.
collectd-python(5): make example work out of the box
collectd-python(5): remove semicolons from example
Merge branch 'collectd-5.5'
Conflicts:
src/pyvalues.c
Conflicts:
src/pyvalues.c
Merge branch 'collectd-5.4' into collectd-5.5
Merge pull request #1846 from tokkee/collectd-5.4
python plugin: Fix conversion of value-lists from Python to C.
python plugin: Fix conversion of value-lists from Python to C.
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.
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.
Merge pull request #1840 from rubenk/write-sensu-readd-asprintf
write_sensu: Re-add substitute for asprintf
write_sensu: Re-add substitute for asprintf
write_sensu: Re-add substitute for asprintf
asprint is only available from Solaris 10 update 11.
Fixes #1798
asprint is only available from Solaris 10 update 11.
Fixes #1798
AUTHORS: change my email adress to match the rest
AUTHORS: Fix typo
AUTHORS: I take care of EPEL too
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)
While we're doing that, look for a version less than 0.4, since we don't support that yet (#1574)
Merge pull request #1842 from rubenk/declare-loop-variable-in-for-loop-controlling-expression
treewide: declare loop variable in loop expression
treewide: declare loop variable in loop expression
treewide: declare loop variable in loop expression
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
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
uuid plugin: make it work on OpenBSD
uuid plugin: make it work on NetBSD
uuid plugin: make it work on FreeBSD
uuid plugin: make it work on OSX
uuid plugin: also look in /sys/class/dmi for uuid
Recent Linux kernels store the uuid in /sys/class/dmi/id/product_uuid.
Recent Linux kernels store the uuid in /sys/class/dmi/id/product_uuid.
uuid plugin: only look in /sys on Linux
uuid plugin: look in smbios system table for uuid
This saves a lot of parsing when dmidecode output is large.
This saves a lot of parsing when dmidecode output is large.
uuid plugin: some coding style cleanups
cpusleep plugin: adding comment regarding units
cpusleep plugin: changing reported type to total_time_in_ms; other small changes
src/plugin.c: Stop write threads before calling shutdown callbacks.
Issue: #1110
Issue: #1110
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
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
Merge pull request #1690 from fr0stbyte/max_size
make DATA_MAX_NAME_LEN a compile time tunable
make DATA_MAX_NAME_LEN a compile time tunable
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.
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.
make DATA_MAX_NAME_LEN configurable at compile time
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.)
[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.)
grep -q is not portable
Solaris grep doesn't have -q
Use the grep we detected with AC_PROG_EGREP and just redirect stdout.
Solaris grep doesn't have -q
Use the grep we detected with AC_PROG_EGREP and just redirect stdout.
Merge pull request #1832 from rubenk/check-for-c99-compiler
Require a compiler that understands C99
Require a compiler that understands C99
src/daemon/plugin.h: Enlarge the DATA_MAX_NAME_LEN.
Fixes: #966, #1238
Fixes: #966, #1238
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.
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.
Merge pull request #1830 from rubenk/move-collectd-header
treewide: add blank line below collectd.h
treewide: add blank line below collectd.h
Merge pull request #1831 from rubenk/ai_hints-cleanup
Ai hints cleanup
Ai hints cleanup
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.
.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.
no need to initialize result ptr of getaddrinfo
treewide: use designated initializers for ai_hints
xencpu plugin: Remove unnecessary semicolons.
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.
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.
treewide: stop checking for AI_ADDRCONFIG
It has been in RFC 3494 since 2003 and all the platforms
we care about have it.
It has been in RFC 3494 since 2003 and all the platforms
we care about have it.
treewide: add blank line below collectd.h
Fix build on Solaris 10
Fix result if no protoc 3 found
Merge pull request #1829 from rubenk/clang-format
Add a config file for clang-format
Add a config file for clang-format
Merge pull request #1821 from rubenk/memset
treewide: replace memset to 0 with initializers
treewide: replace memset to 0 with initializers
pf: no need to zero-initialize status
The kernel bcopies properly sized data into this struct
The kernel bcopies properly sized data into this struct
Fix double declaration
ipmi: fix building with older gcc's