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
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 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
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
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
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
Add a config file for clang-format
To use it, use `clang-format --style=file`
To use it, use `clang-format --style=file`
Try if this fixes the build on RHEL{5,6}
ceph plugin: no need to zero the whole array
also use '\0' not 0 while we're here
also use '\0' not 0 while we're here
ipmi: use C99 designated initializer
apache: no need to zero-initialize
amqp: use C99 designated initializers
amqp: no need to zero-initialize buffer
all messages written into it are null-terminated
all messages written into it are null-terminated
aggregration: no need to zero-initialize
treewide: replace memset to 0 with initializers
Merge pull request #1822 from rubenk/write_riemann-indent
write_riemann plugin: reindent
write_riemann plugin: reindent
Merge pull request #1824 from rubenk/protobuf-autoconf
Protobuf autoconf adjustments
Protobuf autoconf adjustments
Use pkg-config to configure grpc plugin
- Check for libgrpc++ instead of libgrpc
- Add check for libprotobuf
- Add configure options --with-libgrpc++, --with-libprotobuf and --with-libprotobuf-c
- Add precious variable PROTOC for path to the protoc compiler
- Add precious variable PROTOC_C for path to the protoc-c compiler
- Add precious variable GRPC_CPP_PLUGIN for path to the grpc_cpp_plugin binary
Fixes #1817
- Check for libgrpc++ instead of libgrpc
- Add check for libprotobuf
- Add configure options --with-libgrpc++, --with-libprotobuf and --with-libprotobuf-c
- Add precious variable PROTOC for path to the protoc compiler
- Add precious variable PROTOC_C for path to the protoc-c compiler
- Add precious variable GRPC_CPP_PLUGIN for path to the grpc_cpp_plugin binary
Fixes #1817
write-riemann plugin: reindent with clang-format
clang-format -i --style=llvm src/write_riemann.c
clang-format -i --style=llvm src/write_riemann.c
Merge branch 'pr/1791'
interface plugin: Remove NULL config key.
remove mode lines from interface plugin
interface plugin: following active/inactive interfaces via ReportInactive
Stop using `which` for finding python interpreter
Which is not available in minimal build environments (see #1825 for an
example) so replace it with AC_PATH_PROG.
Which is not available in minimal build environments (see #1825 for an
example) so replace it with AC_PATH_PROG.
inteface plugin: add formatting string
Merge pull request #1825 from ripienaar/missing_which
collectd.spec: el7 fails to find python without which
collectd.spec: el7 fails to find python without which
collectd.spec: el7 fails to find python without which
On very minimal build centos machines the yum-builddep should install
all it needs to succesfully build on centos, but this misses which and
so python cant be found.
On very minimal build centos machines the yum-builddep should install
all it needs to succesfully build on centos, but this misses which and
so python cant be found.
grpc plugin: Simplify error handling a bit.
Make control flow more straight forward and handle all cleanup in one place.
Make control flow more straight forward and handle all cleanup in one place.
proto/collectd.proto: Remove unused import "google/protobuf/timestamp".
This causes problems when generating Go code from the .proto.
This causes problems when generating Go code from the .proto.
Merge pull request #1816 from octo/grpc-free-iter
grpc plugin: Free the cache iterator when returning due to an error.
grpc plugin: Free the cache iterator when returning due to an error.
grpc plugin: Free the cache iterator when returning due to an error.
Merge remote-tracking branch 'github/pr/1814'
empty_counter match: Code cleanup.
empty_counter match: Add support for the DERIVE data source type.
Fixes: #1813
Fixes: #1813
varnish plugin: Add informative warnings to the config handling.
Not all config options are valid for all versions of Varnish. Rather
than removing the if-clause altogether, which results in a "Ignoring
unknown configuration option" warning, print a user-friendly warning
instead.
Fixes: #1790
Not all config options are valid for all versions of Varnish. Rather
than removing the if-clause altogether, which results in a "Ignoring
unknown configuration option" warning, print a user-friendly warning
instead.
Fixes: #1790
Merge pull request #1806 from rubenk/network-plugin-size_t
network plugin: use size_t for length and offsets
network plugin: use size_t for length and offsets
network plugin: Don't abort() if gcrypt initialization failed.
Instead, report an error and let plugin initialization fail.
Instead, report an error and let plugin initialization fail.
write_http: fix warning in new kairos support
Found by LLVM:
comparison of integers of different signs: 'int' and 'const size_t' (aka 'const unsigned long')
Found by LLVM:
comparison of integers of different signs: 'int' and 'const size_t' (aka 'const unsigned long')
write_http: remove superfluous braces
Merge pull request #1809 from beorn-/write_http_kairosdb_format_master
Add KAIROSDB format to write_http plugin
Add KAIROSDB format to write_http plugin
Add KAIROSDB format to write_http plugin
Merge branch 'collectd-5.5'