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
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'
Merge branch 'collectd-5.4' into collectd-5.5
Conflicts:
ChangeLog
contrib/redhat/collectd.spec
version-gen.sh
Conflicts:
ChangeLog
contrib/redhat/collectd.spec
version-gen.sh
Merge pull request #1804 from rubenk/madwifi-fix-buffer-overflow
madwifi plugin: fix buffer overflows
madwifi plugin: fix buffer overflows
metadata: add comment about metadata functions use and threads safety
Signed-off-by: Florian Forster <octo@collectd.org>
Signed-off-by: Florian Forster <octo@collectd.org>
Bump spec file to 5.4.3
Update spec file to 5.5.2
Merge pull request #1807 from matteocontrini/master
Added 'operations_per_second' (redis) type
Added 'operations_per_second' (redis) type
Bump version to 5.4.3; Update ChangeLog.
network plugin: Fix error message for GCRYCTL_INIT_SECMEM failure.
Merge branch 'collectd-5.5'
ChangeLog: Add note about #1665.
Added 'operations_per_second' (redis) type
Bump version to 5.5.2; Update ChangeLog.
Merge branch 'collectd-5.4' into collectd-5.5
network plugin, libcollectdclient: Check return value of gcry_control().
Fixes: #1665
Fixes: #1665
libcollectdclient: fix compiler warning on Solaris
CC libcollectdclient_la-client.lo
"client.c", line 1104: argument #4 is incompatible with prototype:
prototype: pointer to function(pointer to const void, pointer to const void) returning int : "/usr/include/iso/stdlib_iso.h", line 134
argument : pointer to void
CC libcollectdclient_la-client.lo
"client.c", line 1104: argument #4 is incompatible with prototype:
prototype: pointer to function(pointer to const void, pointer to const void) returning int : "/usr/include/iso/stdlib_iso.h", line 134
argument : pointer to void
utils_cache_mock: fix annotations
It's __attribute__, not __attribute
Found with Solaris lint.
It's __attribute__, not __attribute
Found with Solaris lint.
configure.ac: fix empty else on RHEL5
Ancient autoconf versions don't like empty
strings in m4 arguments.
Ancient autoconf versions don't like empty
strings in m4 arguments.
Fix build when hal is not installed
treewide: fix invocation of c_avl_create
Fixes the following warning on Solaris:
|c_avl_tree_t *c_avl_create (int (*compare) (const void *, const
void *));
| ^ line 54, utils_avltree.h
| included in line 34, utils_vl_lookup.c
|
| obj->by_type_tree = c_avl_create ((void *) strcmp);
| ^ line 567,
utils_vl_lookup.c
E_ARG_INCOMPATIBLE_WITH_ARG_L, argument #1 is incompatible with
prototype:
prototype: pointer to function(pointer to const void, pointer to
const void) returning int : "src/daemon/utils_avltree.h", line 54
argument : pointer to void
I'll look into writing a generic function to compare avl keys so
we don't need to do all the casting.
Fixes the following warning on Solaris:
|c_avl_tree_t *c_avl_create (int (*compare) (const void *, const
void *));
| ^ line 54, utils_avltree.h
| included in line 34, utils_vl_lookup.c
|
| obj->by_type_tree = c_avl_create ((void *) strcmp);
| ^ line 567,
utils_vl_lookup.c
E_ARG_INCOMPATIBLE_WITH_ARG_L, argument #1 is incompatible with
prototype:
prototype: pointer to function(pointer to const void, pointer to
const void) returning int : "src/daemon/utils_avltree.h", line 54
argument : pointer to void
I'll look into writing a generic function to compare avl keys so
we don't need to do all the casting.
email plugin: fix lint warnings
set but not used in function
(468) err in open_connection
(574) err in email_init
set but not used in function
(468) err in open_connection
(574) err in email_init
utils_llist.c: remove unneccesary include
write_kafka plugin: remove unneccesary includes
threshold plugin: remove unneccesary include
mqtt plugin: remove unused include
battery plugin: remove unused include
memcachec plugin: correct error message
curl plugin: correct error message
modbus plugin: unsigned value can't be negative
collectd-tg: remove dead code
fscache plugin: unsigned value can't be negative
configure.ac: always use pkg-config to detect hal
Hal needs dbus, but we need pkg-config to tell us that.
Now that pkg-config is not optional anymore, rewrite the
check to always use it. Also add a check for the header.
Fixes building the uuid plugin on Solaris 11.3
Hal needs dbus, but we need pkg-config to tell us that.
Now that pkg-config is not optional anymore, rewrite the
check to always use it. Also add a check for the header.
Fixes building the uuid plugin on Solaris 11.3
ganglia plugin: unsigned value can't be negative
treewide: remove unused includes
network plugin: use size_t for length and offsets
Ignore lint files
apache plugin: fix compiler warning on Solaris
memcached plugin: fix compiler warning on Solaris
| ud.free_func = (void *) memcached_free;
| ^ line 559, memcached.c
assignment type mismatch:
pointer to function(pointer to void) returning void "=" pointer to void
Casting a function pointer to a void pointer is undefined behaviour
in C (it is defined in POSIX however)
| ud.free_func = (void *) memcached_free;
| ^ line 559, memcached.c
assignment type mismatch:
pointer to function(pointer to void) returning void "=" pointer to void
Casting a function pointer to a void pointer is undefined behaviour
in C (it is defined in POSIX however)
mysql plugin: remove unneccesary cast