Code

collectd.git
8 years agocollectd.conf(5): s/collectd/collected/
Ruben Kerkhof [Sat, 6 Aug 2016 15:56:49 +0000 (17:56 +0200)]
collectd.conf(5): s/collectd/collected/

8 years agoMerge pull request #1855 from coreykosak/master
Ruben Kerkhof [Sat, 6 Aug 2016 14:10:04 +0000 (16:10 +0200)]
Merge pull request #1855 from coreykosak/master

Spelling: it's -> its

8 years agoSpelling: it's -> its
Corey Kosak [Sat, 6 Aug 2016 00:48:27 +0000 (20:48 -0400)]
Spelling: it's -> its

8 years agocollectd.conf(5): fix typo in Ethstat section
Ruben Kerkhof [Sat, 6 Aug 2016 09:19:37 +0000 (11:19 +0200)]
collectd.conf(5): fix typo in Ethstat section

8 years agoMerge pull request #1854 from brd/remove-stolen
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.

8 years agoRemove 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.

8 years agopython plugin: fix building with python 3
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

8 years agoMerge pull request #1850 from rubenk/python-return-error-when-config-callback-fails
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

8 years agopython plugin: review fixes
Ruben Kerkhof [Fri, 5 Aug 2016 16:37:25 +0000 (18:37 +0200)]
python plugin: review fixes

8 years agoBump autoconf requirement to 2.60
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.

8 years agopython plugins: return error on more failures
Ruben Kerkhof [Fri, 5 Aug 2016 16:13:02 +0000 (18:13 +0200)]
python plugins: return error on more failures

8 years agopython plugin: return error on config failure
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

8 years agoMerge pull request #1847 from rubenk/man-collectd-python-remove-notes-section
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

8 years agoMerge pull request #1843 from xinity/mysql-galera-stats
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

8 years agomysql 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

8 years agocollectd-python(5): remove NOTES section
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.

8 years agocollectd-python(5): make example work out of the box
Ruben Kerkhof [Fri, 5 Aug 2016 11:45:58 +0000 (13:45 +0200)]
collectd-python(5): make example work out of the box

8 years agocollectd-python(5): remove semicolons from example
Ruben Kerkhof [Fri, 5 Aug 2016 11:42:49 +0000 (13:42 +0200)]
collectd-python(5): remove semicolons from example

8 years agoMerge branch 'collectd-5.5'
Ruben Kerkhof [Fri, 5 Aug 2016 11:17:32 +0000 (13:17 +0200)]
Merge branch 'collectd-5.5'

Conflicts:
src/pyvalues.c

8 years agoMerge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Fri, 5 Aug 2016 11:12:03 +0000 (13:12 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

8 years agoMerge pull request #1846 from tokkee/collectd-5.4
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.

8 years agopython 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.

8 years agoMerge pull request #1840 from rubenk/write-sensu-readd-asprintf
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

8 years agowrite_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

8 years agoAUTHORS: change my email adress to match the rest
Ruben Kerkhof [Thu, 4 Aug 2016 15:09:27 +0000 (17:09 +0200)]
AUTHORS: change my email adress to match the rest

8 years agoAUTHORS: Fix typo
Ruben Kerkhof [Thu, 4 Aug 2016 15:08:59 +0000 (17:08 +0200)]
AUTHORS: Fix typo

8 years agoAUTHORS: I take care of EPEL too
Ruben Kerkhof [Thu, 4 Aug 2016 15:08:03 +0000 (17:08 +0200)]
AUTHORS: I take care of EPEL too

8 years agoMerge pull request #1842 from rubenk/declare-loop-variable-in-for-loop-controlling...
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

8 years agotreewide: 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

8 years agomemcached plugin: Use hostname_g when reading localhost.
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

8 years agosrc/plugin.c: Stop write threads before calling shutdown callbacks.
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

8 years agowrite_http plugin: Be extra conservative in wh_reset_buffer().
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

8 years agoMerge pull request #1690 from fr0stbyte/max_size
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

8 years agomadwifi: fix scan-build warning
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.

8 years agomake DATA_MAX_NAME_LEN configurable at compile time
Radu Brumariu [Sat, 30 Apr 2016 15:16:28 +0000 (11:16 -0400)]
make DATA_MAX_NAME_LEN configurable at compile time

8 years agopinba plugin: fix warning on Solaris
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.)

8 years agogrep -q is not portable
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.

8 years agoFix failing tests after 6fd0d25
Ruben Kerkhof [Wed, 3 Aug 2016 15:01:37 +0000 (17:01 +0200)]
Fix failing tests after 6fd0d25

Fixes #1833

8 years agoMerge pull request #1832 from rubenk/check-for-c99-compiler
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

8 years agosrc/daemon/plugin.h: Enlarge the DATA_MAX_NAME_LEN.
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
8 years agoRequire a compiler that understands C99
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.

8 years agoMerge pull request #1830 from rubenk/move-collectd-header
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

8 years agoMerge pull request #1831 from rubenk/ai_hints-cleanup
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

8 years agotreewide: Use AF_UNSPEC consistently
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.

8 years agono need to initialize result ptr of getaddrinfo
Ruben Kerkhof [Tue, 2 Aug 2016 14:42:23 +0000 (16:42 +0200)]
no need to initialize result ptr of getaddrinfo

8 years agotreewide: use designated initializers for ai_hints
Ruben Kerkhof [Tue, 2 Aug 2016 14:27:17 +0000 (16:27 +0200)]
treewide: use designated initializers for ai_hints

8 years agoxencpu plugin: Remove unnecessary semicolons.
Florian Forster [Wed, 3 Aug 2016 05:19:28 +0000 (07:19 +0200)]
xencpu plugin: Remove unnecessary semicolons.

8 years agotreewide: stop checking for AI_PASSIVE
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.

8 years agotreewide: stop checking for AI_ADDRCONFIG
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.

8 years agotreewide: add blank line below collectd.h
Ruben Kerkhof [Mon, 1 Aug 2016 20:52:30 +0000 (22:52 +0200)]
treewide: add blank line below collectd.h

8 years agoFix build on Solaris 10
Ruben Kerkhof [Tue, 2 Aug 2016 11:44:55 +0000 (13:44 +0200)]
Fix build on Solaris 10

8 years agoFix result if no protoc 3 found
Ruben Kerkhof [Tue, 2 Aug 2016 11:43:31 +0000 (13:43 +0200)]
Fix result if no protoc 3 found

8 years agoMerge pull request #1829 from rubenk/clang-format
Ruben Kerkhof [Tue, 2 Aug 2016 11:16:17 +0000 (13:16 +0200)]
Merge pull request #1829 from rubenk/clang-format

Add a config file for clang-format

8 years agoMerge pull request #1821 from rubenk/memset
Ruben Kerkhof [Tue, 2 Aug 2016 11:15:52 +0000 (13:15 +0200)]
Merge pull request #1821 from rubenk/memset

treewide: replace memset to 0 with initializers

8 years agopf: no need to zero-initialize status
Ruben Kerkhof [Tue, 2 Aug 2016 10:04:09 +0000 (12:04 +0200)]
pf: no need to zero-initialize status

The kernel bcopies properly sized data into this struct

8 years agoFix double declaration
Ruben Kerkhof [Tue, 2 Aug 2016 08:27:01 +0000 (10:27 +0200)]
Fix double declaration

8 years agoipmi: fix building with older gcc's
Ruben Kerkhof [Tue, 2 Aug 2016 07:52:43 +0000 (09:52 +0200)]
ipmi: fix building with older gcc's

8 years agoAdd a config file for clang-format
Ruben Kerkhof [Mon, 1 Aug 2016 15:48:59 +0000 (17:48 +0200)]
Add a config file for clang-format

To use it, use `clang-format --style=file`

8 years agoTry if this fixes the build on RHEL{5,6}
Ruben Kerkhof [Mon, 1 Aug 2016 21:19:10 +0000 (23:19 +0200)]
Try if this fixes the build on RHEL{5,6}

8 years agoceph plugin: no need to zero the whole array
Ruben Kerkhof [Mon, 1 Aug 2016 20:31:31 +0000 (22:31 +0200)]
ceph plugin: no need to zero the whole array

also use '\0' not 0 while we're here

8 years agoipmi: use C99 designated initializer
Ruben Kerkhof [Mon, 1 Aug 2016 20:22:35 +0000 (22:22 +0200)]
ipmi: use C99 designated initializer

8 years agoapache: no need to zero-initialize
Ruben Kerkhof [Mon, 1 Aug 2016 20:15:25 +0000 (22:15 +0200)]
apache: no need to zero-initialize

8 years agoamqp: use C99 designated initializers
Ruben Kerkhof [Mon, 1 Aug 2016 20:05:11 +0000 (22:05 +0200)]
amqp: use C99 designated initializers

8 years agoamqp: no need to zero-initialize buffer
Ruben Kerkhof [Mon, 1 Aug 2016 19:55:13 +0000 (21:55 +0200)]
amqp: no need to zero-initialize buffer

all messages written into it are null-terminated

8 years agoaggregration: no need to zero-initialize
Ruben Kerkhof [Mon, 1 Aug 2016 19:48:07 +0000 (21:48 +0200)]
aggregration: no need to zero-initialize

8 years agotreewide: replace memset to 0 with initializers
Ruben Kerkhof [Sat, 30 Jul 2016 10:23:11 +0000 (12:23 +0200)]
treewide: replace memset to 0 with initializers

8 years agoMerge pull request #1822 from rubenk/write_riemann-indent
Ruben Kerkhof [Mon, 1 Aug 2016 15:51:15 +0000 (17:51 +0200)]
Merge pull request #1822 from rubenk/write_riemann-indent

write_riemann plugin: reindent

8 years agoMerge pull request #1824 from rubenk/protobuf-autoconf
Ruben Kerkhof [Mon, 1 Aug 2016 11:21:30 +0000 (13:21 +0200)]
Merge pull request #1824 from rubenk/protobuf-autoconf

Protobuf autoconf adjustments

8 years agoUse pkg-config to configure grpc plugin
Ruben Kerkhof [Sat, 30 Jul 2016 11:52:14 +0000 (13:52 +0200)]
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

8 years agowrite-riemann plugin: reindent with clang-format
Ruben Kerkhof [Mon, 1 Aug 2016 09:33:02 +0000 (11:33 +0200)]
write-riemann plugin: reindent with clang-format

clang-format -i --style=llvm src/write_riemann.c

8 years agoMerge branch 'pr/1791'
Florian Forster [Mon, 1 Aug 2016 09:12:48 +0000 (11:12 +0200)]
Merge branch 'pr/1791'

8 years agointerface plugin: Remove NULL config key.
Florian Forster [Mon, 1 Aug 2016 09:12:35 +0000 (11:12 +0200)]
interface plugin: Remove NULL config key.

8 years agoremove mode lines from interface plugin
Rinigus [Sun, 31 Jul 2016 08:37:55 +0000 (11:37 +0300)]
remove mode lines from interface plugin

8 years agointerface plugin: following active/inactive interfaces via ReportInactive
Rinigus [Sat, 30 Jul 2016 21:11:30 +0000 (00:11 +0300)]
interface plugin: following active/inactive interfaces via ReportInactive

8 years agoStop using `which` for finding python interpreter
Ruben Kerkhof [Sat, 30 Jul 2016 20:30:20 +0000 (22:30 +0200)]
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.

8 years agointeface plugin: add formatting string
Rinigus [Sat, 30 Jul 2016 17:06:26 +0000 (20:06 +0300)]
inteface plugin: add formatting string

8 years agoMerge pull request #1825 from ripienaar/missing_which
Ruben Kerkhof [Sat, 30 Jul 2016 16:39:57 +0000 (18:39 +0200)]
Merge pull request #1825 from ripienaar/missing_which

collectd.spec: el7 fails to find python without which

8 years agocollectd.spec: el7 fails to find python without which
R.I.Pienaar [Sat, 30 Jul 2016 16:23:25 +0000 (18:23 +0200)]
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.

8 years agogrpc plugin: Simplify error handling a bit.
Sebastian Harl [Thu, 28 Jul 2016 19:30:25 +0000 (21:30 +0200)]
grpc plugin: Simplify error handling a bit.

Make control flow more straight forward and handle all cleanup in one place.

8 years agoproto/collectd.proto: Remove unused import "google/protobuf/timestamp".
Florian Forster [Thu, 28 Jul 2016 14:10:29 +0000 (16:10 +0200)]
proto/collectd.proto: Remove unused import "google/protobuf/timestamp".

This causes problems when generating Go code from the .proto.

8 years agoMerge pull request #1816 from octo/grpc-free-iter
Sebastian Harl [Thu, 28 Jul 2016 13:30:58 +0000 (15:30 +0200)]
Merge pull request #1816 from octo/grpc-free-iter

grpc plugin: Free the cache iterator when returning due to an error.

8 years agogrpc plugin: Free the cache iterator when returning due to an error.
Florian Forster [Thu, 28 Jul 2016 13:20:37 +0000 (15:20 +0200)]
grpc plugin: Free the cache iterator when returning due to an error.

8 years agoMerge remote-tracking branch 'github/pr/1814'
Florian Forster [Thu, 28 Jul 2016 10:25:16 +0000 (12:25 +0200)]
Merge remote-tracking branch 'github/pr/1814'

8 years agoempty_counter match: Code cleanup.
Florian Forster [Thu, 28 Jul 2016 10:10:07 +0000 (12:10 +0200)]
empty_counter match: Code cleanup.

8 years agoempty_counter match: Add support for the DERIVE data source type.
Florian Forster [Thu, 28 Jul 2016 10:03:43 +0000 (12:03 +0200)]
empty_counter match: Add support for the DERIVE data source type.

Fixes: #1813
8 years agovarnish plugin: Add informative warnings to the config handling.
Florian Forster [Thu, 28 Jul 2016 08:53:50 +0000 (10:53 +0200)]
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
8 years agoMerge pull request #1806 from rubenk/network-plugin-size_t
Ruben Kerkhof [Wed, 27 Jul 2016 12:42:46 +0000 (14:42 +0200)]
Merge pull request #1806 from rubenk/network-plugin-size_t

network plugin: use size_t for length and offsets

8 years agonetwork plugin: Don't abort() if gcrypt initialization failed.
Sebastian Harl [Wed, 27 Jul 2016 07:45:48 +0000 (09:45 +0200)]
network plugin: Don't abort() if gcrypt initialization failed.

Instead, report an error and let plugin initialization fail.

8 years agowrite_http: fix warning in new kairos support
Ruben Kerkhof [Tue, 26 Jul 2016 14:14:02 +0000 (16:14 +0200)]
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')

8 years agowrite_http: remove superfluous braces
Ruben Kerkhof [Tue, 26 Jul 2016 12:37:45 +0000 (14:37 +0200)]
write_http: remove superfluous braces

8 years agoMerge pull request #1809 from beorn-/write_http_kairosdb_format_master
Ruben Kerkhof [Tue, 26 Jul 2016 12:36:44 +0000 (14:36 +0200)]
Merge pull request #1809 from beorn-/write_http_kairosdb_format_master

Add KAIROSDB format to write_http plugin

8 years agoAdd KAIROSDB format to write_http plugin
Aurelien ROUGEMONT [Wed, 27 Jan 2016 16:06:45 +0000 (17:06 +0100)]
Add KAIROSDB format to write_http plugin

8 years agoMerge branch 'collectd-5.5'
Ruben Kerkhof [Tue, 26 Jul 2016 10:50:36 +0000 (12:50 +0200)]
Merge branch 'collectd-5.5'

8 years agoMerge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Tue, 26 Jul 2016 10:50:07 +0000 (12:50 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

Conflicts:
ChangeLog
contrib/redhat/collectd.spec
version-gen.sh

8 years agoMerge pull request #1804 from rubenk/madwifi-fix-buffer-overflow
Ruben Kerkhof [Tue, 26 Jul 2016 10:45:53 +0000 (12:45 +0200)]
Merge pull request #1804 from rubenk/madwifi-fix-buffer-overflow

madwifi plugin: fix buffer overflows

8 years agometadata: add comment about metadata functions use and threads safety
Aurelien ROUGEMONT [Tue, 26 Jul 2016 10:29:49 +0000 (12:29 +0200)]
metadata: add comment about metadata functions use and threads safety

Signed-off-by: Florian Forster <octo@collectd.org>
8 years agoBump spec file to 5.4.3
Ruben Kerkhof [Tue, 26 Jul 2016 10:26:24 +0000 (12:26 +0200)]
Bump spec file to 5.4.3

8 years agoUpdate spec file to 5.5.2
Ruben Kerkhof [Tue, 26 Jul 2016 10:20:40 +0000 (12:20 +0200)]
Update spec file to 5.5.2

(cherry picked from commit 34add34b27c6d85ed992efc951fc08994e5f86d6)

8 years agoUpdate spec file to 5.5.2
Ruben Kerkhof [Tue, 26 Jul 2016 10:20:40 +0000 (12:20 +0200)]
Update spec file to 5.5.2

8 years agoMerge pull request #1807 from matteocontrini/master
Ruben Kerkhof [Tue, 26 Jul 2016 10:13:46 +0000 (12:13 +0200)]
Merge pull request #1807 from matteocontrini/master

Added 'operations_per_second' (redis) type