Kim Jones [Thu, 9 Jun 2016 01:56:05 +0000 (02:56 +0100)]
Interface name and number of ports enabled can now be customised
Using the .conf files
They are optional arguments
Change-Id: Icc8dd0933f98c3ba05cc6bc3f338070d38b06a05
Signed-off-by: Kim Jones <kim-marie.jones@intel.com>
Maryam Tahhan [Tue, 7 Jun 2016 11:46:52 +0000 (12:46 +0100)]
dpdkstat: refactored pipe error checking
This commit cleans up and fixes the pipe creation, and improves the
error checking.
Change-Id: I53de4a7ff450aea349971f58fe5cce8904da1e89
Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
Maryam Tahhan [Tue, 7 Jun 2016 11:31:44 +0000 (12:31 +0100)]
configure: check AVX support
Check AVX support before adding -mavx flag.
Change-Id: I2de2a12704126590ef991de89880ad5bd5c3805e
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
Maryam Tahhan [Fri, 13 May 2016 10:10:18 +0000 (11:10 +0100)]
dpdkstat: configuration improvements
Cleanup detection and configuration for dpdkstat to include:
* -mavx flag which is need for compilation on Ubuntu 14.04.
* Simplification of code to detect DPDK library.
* Support for DPDK not being installed in /usr/lib.
Change-Id: I2767797f1928934a8545a602b8af92c9decf24d3
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
Maryam Tahhan [Fri, 13 May 2016 10:02:34 +0000 (11:02 +0100)]
dpdkstat: cleanup of code
Cleaned up code to ensure appropriate spacing and moved integer declarations
out of loops as it's not supported out of box on C99 compilers.
Change-Id: Ia420fcb5e0a5ce9110fcdc7cc09aaa01c2b86771
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
Maryam Tahhan [Tue, 3 May 2016 10:31:01 +0000 (11:31 +0100)]
dpdkstat: fix missed rework
Update README to refer to libdpdk instead of dpdk. Update the
declaration of dpdk_init to remove whitespace.
Change-Id: Ib2b02929bf7ab164fc97a84da1dbb0c7d77a2080
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
Maryam Tahhan [Tue, 3 May 2016 09:15:37 +0000 (10:15 +0100)]
dpdkstat: rebase against latest master
Change-Id: I2528cd3cae66a0d2ded0950fec9a529545b75c81
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
Maryam Tahhan [Mon, 2 May 2016 19:04:11 +0000 (20:04 +0100)]
dpdkstat: fix configure.ac and src/Makefile
Fix configuration.ac and src/Makefile based on comments from pull
request review.
* Removed unnecessary libs.
* Removed unnecessary compilation flags.
* Fixed indentation in configure.ac
* Remove duplicate AC_CHECK_LIB check.
* Compare FOUND_DPDK with xtrue explicitly.
* Change standalone instances of dpdk to libdpdk.
* Add BUILD_WITH_DPDK_LIBS to dpdkstat_la_LIBADD.
Change-Id: I27b0c888f81cac3219fdc97174e31770dbd5e746
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
Maryam Tahhan [Mon, 2 May 2016 19:03:09 +0000 (20:03 +0100)]
dpdkstat: fix typo in collectd.conf.pod
Fix typo in collectd.conf.pod.
Change-Id: I0de9582c0a3f2731194b73c85aa83a1e6bdc9aec
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
Maryam Tahhan [Mon, 2 May 2016 18:53:00 +0000 (19:53 +0100)]
dpdkstat: fix compilation errors
Fix compilation errors for dpdkstat.
Change-Id: I5f20219344f36a12d4a60f2bad6ce8228e3e992e
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
Maryam Tahhan [Thu, 28 Apr 2016 15:11:05 +0000 (16:11 +0100)]
README: update to include min version of DPDK
Update the readme to include the minimum version of DPDK required for
the dpdkstat plugin.
Change-Id: I51ca20284d90586e24bb9711de0b40d4027ca367
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
Maryam Tahhan [Thu, 28 Apr 2016 15:07:08 +0000 (16:07 +0100)]
types.db: fix alignment for dpdkstats
Change-Id: I00173c9a07a288a4aca5912687627b8f62d64f65
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
Harry van Haaren [Tue, 19 Apr 2016 14:43:45 +0000 (15:43 +0100)]
v2: dpdkstat: fixed issues from github review
v2: fixed indentation of part
This commit fixes all code issues in dpdkstat.c
Mostly error handling, and some minor nit-picks.
Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
Maryam Tahhan [Mon, 11 Apr 2016 10:09:33 +0000 (11:09 +0100)]
dpdkstat: rebased + fixed alignment in types.db
Rebased against the latest master and cleaned up alignment in types.db.
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
Maryam Tahhan [Tue, 5 Apr 2016 09:52:16 +0000 (10:52 +0100)]
readme: update to include DPDK.
Include DPDK as part of the README features.
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
Maryam Tahhan [Tue, 5 Apr 2016 09:48:04 +0000 (10:48 +0100)]
dpdkstat: bugfix missed enabled_port_count
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
Reviewed-by: Harry Van Haaren <harry.van.haaren@intel.com>
Maryam Tahhan [Sun, 3 Apr 2016 09:42:44 +0000 (10:42 +0100)]
dpdkstat: convert snprintf uses to ssnprintf
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
Maryam Tahhan [Sun, 3 Apr 2016 09:35:23 +0000 (10:35 +0100)]
dpdkstat: bugfix enable_port_count
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
Maryam Tahhan [Sun, 3 Apr 2016 09:29:13 +0000 (10:29 +0100)]
dpdkstat: fix configuration without DPDK
Modify the configuration in the situation where DPDK is not selected as
an option.
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
Maryam Tahhan [Mon, 28 Mar 2016 11:26:03 +0000 (12:26 +0100)]
dpdkstat: enable a plugin for DPDK stats
This patch enables support to retrieve statistics for DPDK
interfaces. An overview of the threading is as follows:
1. collectd init() or read() calls dpdk_helper_spawn() to retrieve
the required size of xstats to allocate.
1.1. DPDK counts ports, stats and length, writing them to
shared-memory (SHM).
1.2. DPDK helper (secondary) process quits, allowing cleanup of
the shared memory.
2. collectd resizes shared-memory to size of stats as provided by
DPDK.
3. collectd respawns the DPDK helper.
3.1. Helper blocks on a semaphore until told to read the stats
from DPDK and write them to SHM.
4. collectd dispatches statistics
4.1. Thread blocks on semaphore until stats are available.
This threading model is required to allow the plugin to detect when
the DPDK primary process/application has been killed/reset, and to avoid
the plugin from stopping another DPDK primary process from starting.
Some extra housekeeping is in place to ensure collectd is never
stalled by using sem_timedwait() with a timeout. If collectd dies, the
helper process will automatically quit after a timeout, as it detects
its ppid has changed.
Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
Florian Forster [Thu, 28 Jul 2016 10:25:16 +0000 (12:25 +0200)]
Merge remote-tracking branch 'github/pr/1814'
Florian Forster [Thu, 28 Jul 2016 10:10:07 +0000 (12:10 +0200)]
empty_counter match: Code cleanup.
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
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
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
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')
Ruben Kerkhof [Tue, 26 Jul 2016 12:37:45 +0000 (14:37 +0200)]
write_http: remove superfluous braces
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
Aurelien ROUGEMONT [Wed, 27 Jan 2016 16:06:45 +0000 (17:06 +0100)]
Add KAIROSDB format to write_http plugin
Ruben Kerkhof [Tue, 26 Jul 2016 10:50:36 +0000 (12:50 +0200)]
Merge branch '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
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
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>
Ruben Kerkhof [Tue, 26 Jul 2016 10:26:24 +0000 (12:26 +0200)]
Bump spec file to 5.4.3
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)
Ruben Kerkhof [Tue, 26 Jul 2016 10:20:40 +0000 (12:20 +0200)]
Update spec file to 5.5.2
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
Florian Forster [Tue, 26 Jul 2016 07:21:19 +0000 (09:21 +0200)]
Bump version to 5.4.3; Update ChangeLog.
Florian Forster [Tue, 26 Jul 2016 06:54:42 +0000 (08:54 +0200)]
network plugin: Fix error message for GCRYCTL_INIT_SECMEM failure.
Florian Forster [Tue, 26 Jul 2016 05:56:09 +0000 (07:56 +0200)]
Merge branch 'collectd-5.5'
Florian Forster [Tue, 26 Jul 2016 05:50:55 +0000 (07:50 +0200)]
ChangeLog: Add note about #1665.
Matteo Contrini [Mon, 25 Jul 2016 22:35:13 +0000 (00:35 +0200)]
Added 'operations_per_second' (redis) type
Florian Forster [Mon, 25 Jul 2016 11:13:56 +0000 (13:13 +0200)]
Bump version to 5.5.2; Update ChangeLog.
Florian Forster [Mon, 25 Jul 2016 11:52:16 +0000 (13:52 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Mon, 25 Jul 2016 11:39:37 +0000 (13:39 +0200)]
network plugin, libcollectdclient: Check return value of gcry_control().
Fixes: #1665
Ruben Kerkhof [Sun, 24 Jul 2016 19:23:59 +0000 (21:23 +0200)]
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
Ruben Kerkhof [Sun, 24 Jul 2016 18:27:48 +0000 (20:27 +0200)]
utils_cache_mock: fix annotations
It's __attribute__, not __attribute
Found with Solaris lint.
Ruben Kerkhof [Sun, 24 Jul 2016 18:07:18 +0000 (20:07 +0200)]
configure.ac: fix empty else on RHEL5
Ancient autoconf versions don't like empty
strings in m4 arguments.
Ruben Kerkhof [Sun, 24 Jul 2016 17:03:29 +0000 (19:03 +0200)]
Fix build when hal is not installed
Ruben Kerkhof [Sun, 24 Jul 2016 16:43:38 +0000 (18:43 +0200)]
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.
Ruben Kerkhof [Sun, 24 Jul 2016 16:22:32 +0000 (18:22 +0200)]
email plugin: fix lint warnings
set but not used in function
(468) err in open_connection
(574) err in email_init
Ruben Kerkhof [Sun, 24 Jul 2016 16:11:07 +0000 (18:11 +0200)]
utils_llist.c: remove unneccesary include
Ruben Kerkhof [Sun, 24 Jul 2016 16:05:22 +0000 (18:05 +0200)]
write_kafka plugin: remove unneccesary includes
Ruben Kerkhof [Sun, 24 Jul 2016 16:03:36 +0000 (18:03 +0200)]
threshold plugin: remove unneccesary include
Ruben Kerkhof [Sun, 24 Jul 2016 16:02:01 +0000 (18:02 +0200)]
mqtt plugin: remove unused include
Ruben Kerkhof [Sun, 24 Jul 2016 15:58:58 +0000 (17:58 +0200)]
battery plugin: remove unused include
Ruben Kerkhof [Sun, 24 Jul 2016 15:56:46 +0000 (17:56 +0200)]
memcachec plugin: correct error message
Ruben Kerkhof [Sun, 24 Jul 2016 15:56:04 +0000 (17:56 +0200)]
curl plugin: correct error message
Ruben Kerkhof [Sun, 24 Jul 2016 15:21:56 +0000 (17:21 +0200)]
modbus plugin: unsigned value can't be negative
Ruben Kerkhof [Sun, 24 Jul 2016 15:15:11 +0000 (17:15 +0200)]
collectd-tg: remove dead code
Ruben Kerkhof [Sun, 24 Jul 2016 15:11:46 +0000 (17:11 +0200)]
fscache plugin: unsigned value can't be negative
Ruben Kerkhof [Sun, 24 Jul 2016 14:47:40 +0000 (16:47 +0200)]
uuid plugin: fix inclusion of libhal.h
Follow up of
34db18b
Ruben Kerkhof [Sun, 24 Jul 2016 14:43:30 +0000 (16:43 +0200)]
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
Ruben Kerkhof [Sun, 24 Jul 2016 13:31:56 +0000 (15:31 +0200)]
ganglia plugin: unsigned value can't be negative
Ruben Kerkhof [Sun, 24 Jul 2016 11:56:32 +0000 (13:56 +0200)]
treewide: remove unused includes
Ruben Kerkhof [Sun, 24 Jul 2016 11:56:32 +0000 (13:56 +0200)]
network plugin: use size_t for length and offsets
Ruben Kerkhof [Sun, 24 Jul 2016 11:55:22 +0000 (13:55 +0200)]
Ignore lint files
Ruben Kerkhof [Sun, 24 Jul 2016 11:43:48 +0000 (13:43 +0200)]
apache plugin: fix compiler warning on Solaris
Ruben Kerkhof [Sun, 24 Jul 2016 11:41:00 +0000 (13:41 +0200)]
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)
Ruben Kerkhof [Sun, 24 Jul 2016 11:37:14 +0000 (13:37 +0200)]
mysql plugin: remove unneccesary cast
Ruben Kerkhof [Sun, 24 Jul 2016 11:29:25 +0000 (13:29 +0200)]
network plugin: unsigned variables can't be negative
Ruben Kerkhof [Sun, 24 Jul 2016 11:28:01 +0000 (13:28 +0200)]
utils_dns.c: unsigned variable can't be negative
Ruben Kerkhof [Sun, 24 Jul 2016 11:27:18 +0000 (13:27 +0200)]
utils_dns.c: fix strange linebreak
Ruben Kerkhof [Sun, 24 Jul 2016 11:26:19 +0000 (13:26 +0200)]
rrdtool plugin: unsigned value can't be negative
Ruben Kerkhof [Sun, 24 Jul 2016 11:24:54 +0000 (13:24 +0200)]
ted plugin: 0xAA doesn't fit in a signed char
Ruben Kerkhof [Sun, 24 Jul 2016 11:23:58 +0000 (13:23 +0200)]
openldap plugin: rc is only used once
Ruben Kerkhof [Sun, 24 Jul 2016 11:21:45 +0000 (13:21 +0200)]
interface plugin: val is only used once
Ruben Kerkhof [Sun, 24 Jul 2016 11:19:08 +0000 (13:19 +0200)]
Make chrony compile with Solaris Studio compiler
Ideally we'll have autoconf checks for supported attributes,
will look into that later.
Ruben Kerkhof [Sat, 23 Jul 2016 21:26:14 +0000 (23:26 +0200)]
utils_dns.c: remove dead code
Ruben Kerkhof [Sat, 23 Jul 2016 21:24:46 +0000 (23:24 +0200)]
zone plugin: remove unused code
Ruben Kerkhof [Sat, 23 Jul 2016 21:22:33 +0000 (23:22 +0200)]
collectctl: remove dead code
Ruben Kerkhof [Sat, 23 Jul 2016 13:54:20 +0000 (15:54 +0200)]
teamspeak plugin: fix indentation
Ruben Kerkhof [Sat, 23 Jul 2016 13:30:44 +0000 (15:30 +0200)]
madwifi plugin: fix buffer overflows
Ruben Kerkhof [Sat, 23 Jul 2016 13:24:47 +0000 (15:24 +0200)]
curl_xml plugin: fix indentation
Ruben Kerkhof [Sat, 23 Jul 2016 13:23:03 +0000 (15:23 +0200)]
utils_curl_stats.c: fix order of calloc arguments
Ruben Kerkhof [Sat, 23 Jul 2016 13:16:41 +0000 (15:16 +0200)]
libcollectdclient: remove unneccesary cast
Ruben Kerkhof [Sat, 23 Jul 2016 13:07:25 +0000 (15:07 +0200)]
processes plugin: fix indentation
Ruben Kerkhof [Sat, 23 Jul 2016 12:59:38 +0000 (14:59 +0200)]
log_logstash plugin: fix indentation
Ruben Kerkhof [Sat, 23 Jul 2016 12:57:04 +0000 (14:57 +0200)]
curl_json plugin: fix indentation
Ruben Kerkhof [Sat, 23 Jul 2016 12:56:21 +0000 (14:56 +0200)]
conntrack plugin: fix indentation
Ruben Kerkhof [Sat, 23 Jul 2016 12:54:32 +0000 (14:54 +0200)]
utils_cmd_putval.c: fix indentation
Ruben Kerkhof [Sat, 23 Jul 2016 12:50:17 +0000 (14:50 +0200)]
utils_threshold.c: fix indentation
Ruben Kerkhof [Sat, 23 Jul 2016 11:35:27 +0000 (13:35 +0200)]
collectd.h: guard define of __attribute__
It might have already been defined to a no-op in <sys/cdefs.h>
Ruben Kerkhof [Sat, 23 Jul 2016 11:34:00 +0000 (13:34 +0200)]
collectd.h: remove unused defines
Ruben Kerkhof [Sat, 23 Jul 2016 11:27:39 +0000 (13:27 +0200)]
collectd.h: fix indentation
Florian Forster [Thu, 21 Jul 2016 05:49:50 +0000 (07:49 +0200)]
Merge branch 'collectd-5.5'
Florian Forster [Thu, 21 Jul 2016 05:49:25 +0000 (07:49 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Tue, 19 Jul 2016 08:00:37 +0000 (10:00 +0200)]
network plugin: Fix heap overflow in parse_packet().
Emilien Gaspar has identified a heap overflow in parse_packet(), the
function used by the network plugin to parse incoming network packets.
This is a vulnerability in collectd, though the scope is not clear at
this point. At the very least specially crafted network packets can be
used to crash the daemon. We can't rule out a potential remote code
execution though.
Fixes: CVE-2016-6254
Ruben Kerkhof [Mon, 18 Jul 2016 18:36:06 +0000 (20:36 +0200)]
Merge pull request #1765 from vincentbernat/fix/kafka-partition-selection
write_kafka: ensure key is properly hashed to select partition
Ruben Kerkhof [Mon, 18 Jul 2016 18:20:40 +0000 (20:20 +0200)]
Merge pull request #1785 from rinigus/master_issue1781
disk plugin: release udev-based name. Fixes #1781