Ruben Kerkhof [Wed, 26 Oct 2016 17:31:01 +0000 (19:31 +0200)]
Merge pull request #2005 from rpv-tomsk/issue-1996
write_http: Fixed DS type check
Pavel Rochnyack [Wed, 26 Oct 2016 17:27:36 +0000 (23:27 +0600)]
write_http: Fixed DS type check
Closes: #1996
Thomas Deutschmann [Tue, 11 Oct 2016 14:16:23 +0000 (16:16 +0200)]
common.c: Use _LINUX_CAPABILITY_VERSION_3 in cap_header
While check_capability() function already requires
_LINUX_CAPABILITY_VERSION_3 via "#ifdef" since commit
448627953c we still
set the cap_header's version to deprecated _LINUX_CAPABILITY_VERSION. This
results in a warning like
> capability: warning: `collectd' uses 32-bit capabilities (legacy support in use)
from the kernel when a plugin (like iptables) calls our check_capability()
function.
With this commit we will set cap_header to kernel's current capability
version (_LINUX_CAPABILITY_VERSION_3), which is default since
kernel 2.6.26.
Signed-off-by: Florian Forster <octo@collectd.org>
Marc Fournier [Mon, 10 Oct 2016 18:58:19 +0000 (20:58 +0200)]
Merge branch 'collectd-5.5' into collectd-5.6
Marc Fournier [Mon, 10 Oct 2016 18:50:00 +0000 (20:50 +0200)]
fix one typo spotted by Debian's lintian tool
Marc Fournier [Mon, 10 Oct 2016 18:55:56 +0000 (20:55 +0200)]
fix a couple of typos spotted by Debian's lintian tool
Marc Fournier [Mon, 10 Oct 2016 18:47:30 +0000 (20:47 +0200)]
collectd.spec: increment changelog to mention 5.6.1
Victor Demonchy [Mon, 10 Oct 2016 13:28:22 +0000 (15:28 +0200)]
Bump version number in redhat spec
Florian Forster [Sat, 8 Oct 2016 05:48:15 +0000 (07:48 +0200)]
Merge remote-tracking branch 'github/pr/1958' into collectd-5.5
Florian Forster [Fri, 7 Oct 2016 13:52:00 +0000 (15:52 +0200)]
Bump version to 5.6.1; Update ChangeLog.
Florian Forster [Fri, 7 Oct 2016 06:51:29 +0000 (08:51 +0200)]
Merge branch 'collectd-5.5' into collectd-5.6
Florian Forster [Fri, 7 Oct 2016 06:44:53 +0000 (08:44 +0200)]
Merge remote-tracking branch 'github/pr/1961' into collectd-5.5
Marc Fournier [Tue, 4 Oct 2016 21:46:45 +0000 (23:46 +0200)]
write_graphite: remove linking against libyajl (#1976)
write_graphite doesn't have anything to do with json. This seems to have
been accidentally added in
30c1111.
Fixes https://bugs.debian.org/839771
Florian Forster [Wed, 28 Sep 2016 19:27:54 +0000 (21:27 +0200)]
src/daemon/plugin.[ch]: Make the user_data_t* const.
That is, user_data_t* passed to register_* functions. The actual callbacks
are still getting a user_data_t* since they, in theory, would be able to
modify the pointer stored in .data.
Issue: #1954
Florian Forster [Wed, 28 Sep 2016 19:23:49 +0000 (21:23 +0200)]
src/daemons/plugin.c: Don't modify user_data_t* in plugin_register_flush().
Fixes: #1954
Florian Forster [Wed, 28 Sep 2016 18:58:04 +0000 (20:58 +0200)]
Revert "write_graphite: remove #ifndefs"
This reverts commit
de80d27fe7023c2e377674b4cc341e539388b98e.
Fixes: #1953
Florian Forster [Wed, 28 Sep 2016 15:53:34 +0000 (17:53 +0200)]
write_http plugin: Don't register a flush callback unconditionally.
Fixes: #1955
Sebastian Harl [Sun, 25 Sep 2016 11:40:57 +0000 (13:40 +0200)]
Use readdir() instead of the deprecated readdir_r().
Cf. https://sourceware.org/ml/libc-alpha/2016-02/msg00093.html
Sebastian Harl [Sat, 24 Sep 2016 11:05:06 +0000 (13:05 +0200)]
RRDCacheD plugin: Improve various RRD-related error messages.
Sebastian Harl [Sat, 24 Sep 2016 10:55:40 +0000 (12:55 +0200)]
RRDCacheD plugin: Try to reconnect upon failed operations.
The RRD client library does not provide means to check the status of a
connection and there's no way to detect that the connection is broken after,
for example, the daemon restarted. To work around that, try to reconnect if
any client operation fails.
Reported via https://bugs.debian.org/657877
Chao Yang [Fri, 23 Sep 2016 14:48:53 +0000 (10:48 -0400)]
commom: Fixed AIX doesn't have MSG_DONTWAIT
Marc Fournier [Tue, 20 Sep 2016 19:23:09 +0000 (21:23 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Wed, 14 Sep 2016 07:00:00 +0000 (09:00 +0200)]
contrib/examples/myplugin.c: Fix copy and paste error.
Florian Forster [Tue, 13 Sep 2016 20:26:31 +0000 (22:26 +0200)]
Merge branch 'collectd-5.5' into collectd-5.6
Florian Forster [Tue, 13 Sep 2016 08:44:46 +0000 (10:44 +0200)]
curl_json plugin: Skip unexpected non-map values.
Assume, for example, the config `Key "*/foo"`. This config expects JSON
in the form:
{
"bar": {
"foo": 1337
}
}
If the available JSON is instead:
{
"error_code": 0,
"bar": {
"foo": 1337
}
}
the code will take a look at the zero associated with "error_code" and
determine that a map (with key "foo") is expected instead. Previously
the code would continue, eventually calling `cj_get_type()` which
expects that `key->type` is a valid pointer, resulting in a segmentation
fault.
This patch does three things to ensure that this segmentation fault does
not happen again:
1. `cj_get_type()` checks its argument to make sure it is valid before
dereferencing any pointers.
2. In case a non-map is found when a map is expected, the code will
return instead of limping on.
3. After calling `cj_cb_inc_array_index()`, which may update the key,
make sure that it actually did and that key is valid now.
Fixes: #1896
Florian Forster [Mon, 12 Sep 2016 12:16:00 +0000 (14:16 +0200)]
collectd.conf(5): Document the semantics of the "TypesDB" option in more detail.
Fixed: #1241
Florian Forster [Mon, 12 Sep 2016 09:49:52 +0000 (11:49 +0200)]
contrib/migrate-4-5.px: Don't convert "ps_code" and "ps_data" to derive.
Fixes: #1687
Michael Leinartas [Thu, 8 Sep 2016 19:00:35 +0000 (14:00 -0500)]
Add missing option to write_graphite example
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Sun, 11 Sep 2016 18:31:31 +0000 (20:31 +0200)]
apache plugin: End statements with semi-colons.
If only I knew why this wasn't considered a syntax error …
Florian Forster [Sun, 11 Sep 2016 08:01:10 +0000 (10:01 +0200)]
Bump version to 5.6.0; Update ChangeLog.
Florian Forster [Thu, 8 Sep 2016 06:10:54 +0000 (08:10 +0200)]
Merge branch 'collectd-5.5' into collectd-5.6
Florian Forster [Wed, 7 Sep 2016 07:38:23 +0000 (09:38 +0200)]
src/types.db: Remove minimum value from "power".
The battery plugin reports negative power when the battery is discharging.
Florian Forster [Tue, 6 Sep 2016 06:42:26 +0000 (08:42 +0200)]
Merge branch 'collectd-5.5' into collectd-5.6
Florian Forster [Tue, 6 Sep 2016 06:40:35 +0000 (08:40 +0200)]
Merge remote-tracking branch 'github/pr/1909' into collectd-5.5
Florian Forster [Tue, 6 Sep 2016 06:08:01 +0000 (08:08 +0200)]
Merge branch 'collectd-5.5' into collectd-5.6
Marc Fournier [Mon, 5 Sep 2016 19:25:40 +0000 (21:25 +0200)]
target_set.c: rename 'MetaDataSet' option
Fixes #1910
Florian Forster [Mon, 5 Sep 2016 13:45:19 +0000 (15:45 +0200)]
plugin_dispatch_multivalue: Submit NAN when computing percantage of an empty set.
Bernd Zeimetz [Fri, 2 Sep 2016 12:05:58 +0000 (14:05 +0200)]
Also fix query_plans_by_table
#1905 happens here obviously, too.
Bernd Zeimetz [Fri, 2 Sep 2016 11:23:40 +0000 (13:23 +0200)]
pgsql plugin: avoid parsing error from query_plans
idx_scan/idx_tup_fetch can be NULL, avoid trying to parse that into a number.
This should fix #1905.
Thomas Deutschmann [Fri, 2 Sep 2016 12:59:46 +0000 (14:59 +0200)]
Fix compilation against >=xfsprogs-4.7.0
[backport of commit
225ee7bb45152c51c1c9508b2e776cef36d2682d]
Suggested-by: Ruben Kerkhof <ruben@rubenkerkhof.com>
Gentoo-Bug: https://bugs.gentoo.org/590998
Fixes: https://github.com/collectd/collectd/issues/1877
Florian Forster [Fri, 2 Sep 2016 08:48:08 +0000 (10:48 +0200)]
src/common.c: parse_value: Quote string that failed to parse.
Issue: #1905
Florian Forster [Fri, 2 Sep 2016 07:00:58 +0000 (09:00 +0200)]
network plugin: Initialize libgcrypt only when needed.
Previously, libgcrypt was initialized unconditionally in network_init(),
which may cause trouble on some systems. With this patch, gcrypt is
initialized if:
* A client socket as signing or encryption enabled, or
* a server socket has an auth_file configured.
Fixes: #1902
trenkel [Tue, 23 Aug 2016 15:18:57 +0000 (17:18 +0200)]
Merge pull request #1899 from rubenk/python-fixes-for-interactive-sessions
python plugin: Fixing possible problems with the GIL in interactive sessions.
Ruben Kerkhof [Tue, 23 Aug 2016 14:15:30 +0000 (16:15 +0200)]
Try a different way to silence GCC.
On some distro's some versions of GCC warn about the unchecked result,
even though it is casted to void.
See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66425 for the
discussion.
Sven Trenkel [Tue, 16 Aug 2016 21:52:38 +0000 (21:52 +0000)]
python plugin: Fixing possible problems with the GIL.
If AfterFork is called after threads have been initialized.
Also handle SIGTERM while reading from an interactive session slightly more gracefully.
Ruben Kerkhof [Mon, 22 Aug 2016 19:43:15 +0000 (21:43 +0200)]
Really fix tests on Solaris
3b264ee checked for KERNEL_SOLARIS, but this is only defined if config.h is included.
Marc Fournier [Thu, 18 Aug 2016 20:58:39 +0000 (22:58 +0200)]
Merge branch 'collectd-5.5' into collectd-5.6
Marc Fournier [Thu, 18 Aug 2016 20:53:43 +0000 (22:53 +0200)]
Changelog: fix unresolved merge conflict introduced in
dc2eb04
Removed the conflict markers left over, and copy-pasted the changes
added in
c0f5748.
Marc Fournier [Thu, 18 Aug 2016 20:21:47 +0000 (22:21 +0200)]
collectd.spec: mention new cpusleep plugin in changelog
Marc Fournier [Tue, 16 Aug 2016 13:00:59 +0000 (15:00 +0200)]
Merge branch 'collectd-5.5' into collectd-5.6
Marc Fournier [Tue, 16 Aug 2016 12:58:38 +0000 (14:58 +0200)]
collectd.spec: increment version number in changelog
Marc Fournier [Tue, 16 Aug 2016 12:50:50 +0000 (14:50 +0200)]
collectd.spec: remove misleading items from changelog
Sven Trenkel [Mon, 15 Aug 2016 21:47:34 +0000 (21:47 +0000)]
python plugin: Don't shut down the Python interpreter as long as there might be callback methods around.
Florian Forster [Tue, 16 Aug 2016 05:19:31 +0000 (07:19 +0200)]
Merge remote-tracking branch 'github/pr/1890' into collectd-5.6
Florian Forster [Tue, 16 Aug 2016 05:09:45 +0000 (07:09 +0200)]
ceph plugin: Assert that the strings on the stack are non-NULL.
The static analyzer is whining about passing NULLs to strcmp().
Florian Forster [Tue, 16 Aug 2016 04:57:24 +0000 (06:57 +0200)]
ceph plugin: Guard against g_num_daemons being zero.
clang scan-build flags this, because this variable is used to declare VLAs.
Sebastian Harl [Mon, 15 Aug 2016 18:59:05 +0000 (20:59 +0200)]
write_kafka: Fix misleading indentation
Reported by GCC-6 with the `-Werror=misleading-indentation` option.
Thanks for Lucas Nussbaum for reporting this issue!
Fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=831194
Sven Trenkel [Mon, 15 Aug 2016 18:55:44 +0000 (18:55 +0000)]
python plugin: Unregister all internal callback lists before Python interpreter shutdown.
Sven Trenkel [Mon, 15 Aug 2016 18:53:28 +0000 (18:53 +0000)]
python plugin: Properly deal with identifier being NULL in a log callback.
Sven Trenkel [Mon, 15 Aug 2016 18:51:25 +0000 (18:51 +0000)]
python plugin: Grab GIL before freeing callbacks. If their refcount reaches 0 Python code will be executed.
Florian Forster [Mon, 15 Aug 2016 17:57:30 +0000 (19:57 +0200)]
Merge remote-tracking branch 'github/pr/1879'
Florian Forster [Mon, 15 Aug 2016 17:55:49 +0000 (19:55 +0200)]
Merge remote-tracking branch 'github/pr/1883'
Florian Forster [Mon, 15 Aug 2016 17:54:08 +0000 (19:54 +0200)]
CONTRIBUTING.md: Address review comments.
Florian Forster [Mon, 15 Aug 2016 17:51:35 +0000 (19:51 +0200)]
README: Point to CONTRIBUTING.md for bugs and PRs.
Florian Forster [Mon, 15 Aug 2016 17:47:37 +0000 (19:47 +0200)]
CONTRIBUTING.md: Address review comments.
Ruben Kerkhof [Mon, 15 Aug 2016 13:55:22 +0000 (15:55 +0200)]
configure.ac: rewrite liblua detection
Not all distro's have a lua.pc file.
This looks for the most common ones, newest versions first.
Ruben Kerkhof [Thu, 11 Aug 2016 17:38:17 +0000 (19:38 +0200)]
support older versions of riemann-c-client
riemann_client_set_timeout() was added in 1.8.0, but this
version hasn't landed in all distro's yet.
Fixes #986
Ruben Kerkhof [Mon, 15 Aug 2016 07:52:31 +0000 (09:52 +0200)]
scanner.l: remove GCC pragma
GCC on RHEL5 doesn't recognize it and warns about it
scanner.l:36: warning: ignoring #pragma GCC diagnostic
make[4]: *** [scanner.lo] Error 1
CC parser.lo
Florian Forster [Mon, 15 Aug 2016 06:16:51 +0000 (08:16 +0200)]
CONTRIBUTING.md: Add operating system / distribution.
Florian Forster [Mon, 15 Aug 2016 06:16:29 +0000 (08:16 +0200)]
Add a GitHub issue template.
Florian Forster [Mon, 15 Aug 2016 05:41:24 +0000 (07:41 +0200)]
GenericJMX plugin: Suppress "unchecked conversion" warning.
The internet tells me there is no elegant way around this.
Ruben Kerkhof [Sun, 14 Aug 2016 20:53:21 +0000 (22:53 +0200)]
scanner.l: really fix pragma
Ruben Kerkhof [Sun, 14 Aug 2016 20:25:53 +0000 (22:25 +0200)]
Fix build with older GCCs
They warn for unknown pragmas
Ruben Kerkhof [Sun, 14 Aug 2016 19:41:00 +0000 (21:41 +0200)]
Merge pull request #1874 from rubenk/utils-dns-fix-compiler-warning
utils_dns.c: fix compiler warning
Florian Forster [Sun, 14 Aug 2016 19:36:27 +0000 (21:36 +0200)]
ceph plugin: Rewrite the BUFFER_ADD() macro.
I'm hoping that this fixes a potential integer underrun that may occur
when unconditionally subtracting strlen(dest) from sizeof(dest).
Issue: #1835
Ruben Kerkhof [Sun, 14 Aug 2016 19:32:00 +0000 (21:32 +0200)]
liboconfig: silence warnings in generated code
Lex generates these, nothing we can do about them
Ruben Kerkhof [Sun, 14 Aug 2016 19:10:49 +0000 (21:10 +0200)]
processes plugin: fix 3 compiler warnings on OS X
processes.c:1569:26: warning: comparison of integers of different signs: 'int' and 'mach_msg_type_number_t' (aka 'unsigned int') [-Wsign-compare]
for (int pset = 0; pset < pset_list_len; pset++)
~~~~ ^ ~~~~~~~~~~~~~
processes.c:1590:27: warning: comparison of integers of different signs: 'int' and 'mach_msg_type_number_t' (aka 'unsigned int') [-Wsign-compare]
for (int task = 0; task < task_list_len; task++)
~~~~ ^ ~~~~~~~~~~~~~
processes.c:1688:32: warning: comparison of integers of different signs: 'int' and 'mach_msg_type_number_t' (aka 'unsigned int') [-Wsign-compare]
for (int thread = 0; thread < thread_list_len; thread++)
~~~~~~ ^ ~~~~~~~~~~~~~~~
Florian Forster [Sun, 14 Aug 2016 19:03:23 +0000 (21:03 +0200)]
Merge remote-tracking branch 'github/master'
Florian Forster [Sun, 14 Aug 2016 19:02:31 +0000 (21:02 +0200)]
ceph plugin: Change g_num_daemons to size_t.
The variable is used as size for variable length arrays (VLAs), which
cannot have negative size.
Issue: #1835
Ruben Kerkhof [Sun, 14 Aug 2016 18:53:33 +0000 (20:53 +0200)]
cpu plugin: fix compiler warning on OS X
cpu.c:593:24: warning: comparison of integers of different signs: 'int' and 'mach_msg_type_number_t' (aka 'unsigned int') [-Wsign-compare]
for (int cpu = 0; cpu < cpu_list_len; cpu++)
~~~ ^ ~~~~~~~~~~~~
Florian Forster [Sun, 14 Aug 2016 18:47:15 +0000 (20:47 +0200)]
write_http plugin: Sanity check arguments to wh_write_command().
Issue: #1835
Ruben Kerkhof [Sun, 14 Aug 2016 18:28:43 +0000 (20:28 +0200)]
annotate vfprintf-like 'vcomplain' function
utils_complain.c:56:40: warning: format string is not a string literal
[-Wformat-nonliteral]
vsnprintf (message, sizeof (message), format, ap);
^~~~~~
Ruben Kerkhof [Sun, 14 Aug 2016 18:18:47 +0000 (20:18 +0200)]
libcollectdclient: annotate vprintf-like function
client.c:126:21: warning: format string is not a string literal [-Wformat-nonliteral]
status = vprintf (format, ap);
^~~~~~
Ruben Kerkhof [Sun, 14 Aug 2016 17:51:34 +0000 (19:51 +0200)]
Python plugin: fix compiler warning
python.c:397:25: warning: comparison of integers of different signs:
'size_t' (aka 'unsigned long') and 'int' [-Wsign-compare]
for (size_t i = 0; i < num; ++i) {
~ ^ ~~~
Ruben Kerkhof [Sun, 14 Aug 2016 17:32:37 +0000 (19:32 +0200)]
Lua plugin: fix old style definition
lua.c: In function ‘module_register’:
lua.c:588:6: warning: old-style function definition
[-Wold-style-definition]
void module_register() {
^~~~~~~~~~~~~~~
Ruben Kerkhof [Sun, 14 Aug 2016 15:14:25 +0000 (17:14 +0200)]
Merge pull request #1885 from rubenk/lua-plugin
Add a Lua plugin for Collectd
Ruben Kerkhof [Sun, 14 Aug 2016 13:55:17 +0000 (15:55 +0200)]
README: bump Python requirement to 2.6
Ruben Kerkhof [Sun, 14 Aug 2016 13:54:24 +0000 (15:54 +0200)]
Lua plugin: add to rpm specfile
Ruben Kerkhof [Sun, 14 Aug 2016 13:48:55 +0000 (15:48 +0200)]
Lua plugin: add to README
Ruben Kerkhof [Sun, 14 Aug 2016 13:10:04 +0000 (15:10 +0200)]
Lua plugin: make function array const
Ruben Kerkhof [Sun, 14 Aug 2016 13:08:40 +0000 (15:08 +0200)]
Lua plugin: Terminate array with sentinel
From the API docs:
Any array of luaL_Reg must end with a sentinel entry in which both name
and func are NULL.
Ruben Kerkhof [Sun, 14 Aug 2016 12:43:07 +0000 (14:43 +0200)]
collectd-lua(5) fix syntax error in pod
Ruben Kerkhof [Sun, 14 Aug 2016 12:14:40 +0000 (14:14 +0200)]
Lua plugin: add section to collectd.conf(5)
Ruben Kerkhof [Sun, 14 Aug 2016 11:58:14 +0000 (13:58 +0200)]
Lua plugin: s/Collectd/collectd/g in manpage
Ruben Kerkhof [Sun, 14 Aug 2016 11:56:16 +0000 (13:56 +0200)]
Lua plugin: fix build with Lua 5.1
Ruben Kerkhof [Sun, 14 Aug 2016 11:42:41 +0000 (13:42 +0200)]
Lua plugin: add a manpage
Ruben Kerkhof [Sun, 14 Aug 2016 10:07:59 +0000 (12:07 +0200)]
Lua plugin: turn the collectd functions into a lib
Now the module shows up in 'package.loaded':
for name, func in pairs(package.loaded['collectd']) do
print(name, func)
end
returns:
dispatch_values function: 0x7f38b8a472c0
log_debug function: 0x7f38b8a47130
register_write function: 0x7f38b8a47520
log_info function: 0x7f38b8a470d0
register_read function: 0x7f38b8a47360
log_warning function: 0x7f38b8a47070
log_error function: 0x7f38b8a47100
log_notice function: 0x7f38b8a470a0
Ruben Kerkhof [Sun, 14 Aug 2016 09:59:03 +0000 (11:59 +0200)]
Lua plugin: use existing type for functions array
Florian Forster [Sun, 14 Aug 2016 07:33:32 +0000 (09:33 +0200)]
Merge remote-tracking branch 'github/pr/1882'
Ruben Kerkhof [Sat, 13 Aug 2016 17:21:21 +0000 (19:21 +0200)]
Merge pull request #1887 from rubenk/make-xfs-optional
Add an option to disable building with XFS support