[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'
Florian Forster
octo at verplant.org
Wed Sep 21 15:28:45 CEST 2016
AUTHORS | 2 +-
README | 138 +++++++++
configure.ac | 79 +++++
src/Makefile.am | 8 +
src/collectd.conf.in | 11 +
src/collectd.conf.pod | 61 ++++
src/daemon/common.c | 14 +-
src/dpdkstat.c | 783 +++++++++++++++++++++++++++++++++++++++++++++++++
src/hddtemp.c | 112 ++++---
src/lvm.c | 2 +-
src/types.db | 6 +
11 files changed, 1166 insertions(+), 50 deletions(-)
New commits:
commit c4bce475033d055cf5370b33fc6b8675fad5667b
Merge: e1bfa71 b968fcb
Author: Florian Forster <octo at collectd.org>
Date: Wed Sep 21 15:25:07 2016 +0200
Merge remote-tracking branch 'github/pr/631'
commit e1bfa71aca1f37c2f293dc9adb44065c6e7a9ad9
Merge: 4eee46d d0a9767
Author: Florian Forster <octo at collectd.org>
Date: Wed Sep 21 08:48:56 2016 +0200
Merge branch 'pr/1649'
commit d0a97673ed7746184fc2338afa3c200a34310196
Author: Florian Forster <octo at collectd.org>
Date: Wed Sep 21 08:48:12 2016 +0200
dpkgstat plugin: Filter through clang-format.
commit f7b3b6b8921c10b61fd2158e446686ef19315ed2
Author: Taras Chornyi <tarasx.chornyi at intel.com>
Date: Mon Sep 19 17:47:04 2016 +0100
dpdkstat: Fixed issue with incorrect argc calculation
Changed log messages to use PRIuN defines
Change-Id: I1433fbd6443c3d0a956c04670f93615042b40577
Signed-off-by: Taras Chornyi <tarasx.chornyi at intel.com>
commit 4eee46d61a42706a4c9ccc4d4af9c6df30708216
Merge: 603b18e a39ddf9
Author: Florian Forster <octo at collectd.org>
Date: Mon Sep 19 16:14:42 2016 +0200
Merge remote-tracking branch 'github/pr/1942'
commit b968fcbd88a56a2d4d9950ad1e2ea8e144ffed10
Author: Benjamin Gilbert <bgilbert at backtick.net>
Date: Mon Sep 19 01:42:52 2016 -0500
Update email address
commit 442696dca3162676b63735afaf94c2b35d5ad840
Author: Benjamin Gilbert <bgilbert at cs.cmu.edu>
Date: Wed Mar 11 00:28:36 2015 -0400
hddtemp: Improve robustness of test
Don't rely on signedness of buffer_size.
commit 6bd86ee138ba0652f5d0a90b4744a0e34faf2066
Author: Benjamin Gilbert <bgilbert at cs.cmu.edu>
Date: Tue Jun 3 16:15:24 2014 -0400
hddtemp: Lift 1024-byte response limit
Dynamically scale the response buffer, up to a maximum of 1 MB.
commit 00e2b373a02e5070364e244ebbaa9f8ace88c75d
Author: Benjamin Gilbert <bgilbert at cs.cmu.edu>
Date: Tue Jun 3 10:32:41 2014 -0400
hddtemp: Lift 32-device limit
Instead of building an array of fields and then walking it, split into
fields as we go.
commit a656aa08957763edbb36300688393382c7f7056a
Author: Taras Chornyi <tarasx.chornyi at intel.com>
Date: Mon Sep 19 08:35:59 2016 +0300
dpdkstat: Addressed PR comments
1) Added missing option description
2) Replaced strerror with sstrerror
3) Do not return from helper code
4) Use generic collectd Interval implementation
5) Removed "\n" from log messages
Signed-off-by: Taras Chornyi <tarasx.chornyi at intel.com>
commit a39ddf983654047f745c2672999df0ac13adb705
Author: Rinigus <rinigus.git at gmail.com>
Date: Sun Sep 18 21:11:04 2016 +0300
parse_value_file: adding strstripnewline back
commit fcbad61c7f63eb73694a10b47a51f32a7de3847b
Author: Rinigus <rinigus.git at gmail.com>
Date: Sat Sep 17 13:07:26 2016 +0300
use fgets in parse_value_file, fixes #1941
commit acbf4e5d5b848540c6fc0d9bfb235f6441564384
Author: Taras Chornyi <tarasx.chornyi at intel.com>
Date: Mon Sep 12 16:18:40 2016 +0100
dpdkstats: Added errors and filter_result types.
Map flow and mac related counters.
Minor types fixes.
Change-Id: Ib35ce61eb3dd1d602cf901e4bab677f9f65398a3
Signed-off-by: Taras Chornyi <tarasx.chornyi at intel.com>
commit 9a667f4fa02c6a03df58fd6dde9b4b2428a405fb
Author: Maryam Tahhan <maryam.tahhan at intel.com>
Date: Thu Aug 25 15:36:49 2016 +0100
readme: updated with supported dpdk version
Updated the README file with the supported version of DPDK. Updates for DPDK
v16.07 to follow later.
Change-Id: Ic7864f70da860e1a9ee421bb6bcbaa2fd4da4c6d
Signed-off-by: Maryam Tahhan <maryam.tahhan at intel.com>
commit dbc37ea39ffde66b9bf6f389a7a8f65ab6d7f8f5
Author: Kim Jones <kim-marie.jones at intel.com>
Date: Mon Aug 8 13:30:56 2016 +0100
dpdkstat: rework
1) Declaring int i = 0 in for loop
2) Removed -fPIC flag
3) Fixed indentation
4) Changed true and false to yes and no
5) Fixed empty var issue when --with-libdpdk=yes
6) Changed DPDK_LIB to DPDK_EXTRA_LIB (typo)
7) Removed dead code & FOUND_DPDK after AC_MSG_ERROR
8) Changed AC_CHECK_FILE to AC_CHECK_HEADER
9) Restructured DPDK part of configure.ac
10) Add comment explaining no-as-needed flag.
11) Added new if_* types to types.db
12) Updated type & type inst. selection for xstats
Change-Id: I7fb48852d8d0b94b4c67f204f1b1b430681e4509
Signed-off-by: Kim Jones <kim-marie.jones at intel.com>
commit fc4f5dc7512b5fb7413561766ba8b508b248712c
Author: Kim Jones <kim-marie.jones at intel.com>
Date: Thu Aug 4 14:25:11 2016 +0100
dpdkstat: remove redundant types in types.db
We are not using them; we are using counter and
the "types" are, in fact, type instances.
Change-Id: Iaec23f730a3cdb544fe7393c3fb103c9f6258913
Signed-off-by: Kim Jones <kim-marie.jones at intel.com>
commit c290e77c172908fc592b40499e0992e6fcc452f6
Author: Korynkevych, RomanX <romanx.korynkevych at intel.com>
Date: Wed Jul 13 10:30:49 2016 +0100
dpdkstat: README instructions for DPDK static lib
Updated README with instructions on how to build and link to the static
DPDK library for dpdk plugins.
Change-Id: I580cccc8af648c270c5a35689dc536a283f1689a
Signed-off-by: Korynkevych, RomanX <romanx.korynkevych at intel.com>
Signed-off-by: Maryam Tahhan <maryam.tahhan at intel.com>
commit e5867b0f09cedb5710550f20662876683c6e602e
Author: Kim Jones <kim-marie.jones at intel.com>
Date: Tue Jul 5 17:09:33 2016 +0100
Modify DPDK CFLAGS
The failed compile when there are no additional
flags on Ub14.04 is specific to GCC 4.8 and below.
This can be fixed by installing GCC 4.9, or
alternately by adding -mssse3 or newer ISA flag.
The opensource community have requested that we
simply document the GCC version requirement,
rather than adding GCC ISA flags to configure.ac
Change-Id: I8ec7bd3f094b0dd608381068fd6b18a74050d420
Signed-off-by: Kim Jones <kim-marie.jones at intel.com>
commit 19a9d6d149b8600139abf0d39f0a9aa445d36527
Author: Kim Jones <kim-marie.jones at intel.com>
Date: Thu Jul 28 13:58:24 2016 +0100
Fixing configure.ac to reflect changes in collectd
Signed-off-by: Kim Jones <kim-marie.jones at intel.com>
commit f7a72570f9b5c0779c6c41d42aaf0d5f0dc1fb07
Author: Kim Jones <kim-marie.jones at intel.com>
Date: Tue Jun 14 08:21:23 2016 +0100
Added ASLR info to README
Applied an old version the last time; reverted and reapplying new
version.
Signed-off-by: Kim Jones <kim-marie.jones at intel.com>
commit 42bfe325002b0507a04f6e574cbd4022f0f78561
Author: Kim Jones <kim-marie.jones at intel.com>
Date: Thu Jun 9 02:56:05 2016 +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 at intel.com>
commit b9c8aeaa70b15792a10a694fcb8e4304a8330715
Author: Maryam Tahhan <maryam.tahhan at intel.com>
Date: Tue Jun 7 12:46:52 2016 +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 at intel.com>
commit b64c0510b32bb6a03c1b43d8a4718067f08e70aa
Author: Maryam Tahhan <maryam.tahhan at intel.com>
Date: Tue Jun 7 12:31:44 2016 +0100
configure: check AVX support
Check AVX support before adding -mavx flag.
Change-Id: I2de2a12704126590ef991de89880ad5bd5c3805e
Signed-off-by: Maryam Tahhan <maryam.tahhan at intel.com>
commit 3e3e104f560884c79b7751f728b06e0a9438ebc8
Author: Maryam Tahhan <maryam.tahhan at intel.com>
Date: Fri May 13 11:10:18 2016 +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 at intel.com>
commit ba76b1429d2b11935602aaf85174fa6058325d0f
Author: Maryam Tahhan <maryam.tahhan at intel.com>
Date: Fri May 13 11:02:34 2016 +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 at intel.com>
commit 792cd8301fb8ac61f398243ac5b4a91a974177e0
Author: Maryam Tahhan <maryam.tahhan at intel.com>
Date: Tue May 3 11:31:01 2016 +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 at intel.com>
commit 608ea49234f27adcb5e91718bcbee36dee9716ba
Author: Maryam Tahhan <maryam.tahhan at intel.com>
Date: Tue May 3 10:15:37 2016 +0100
dpdkstat: rebase against latest master
Change-Id: I2528cd3cae66a0d2ded0950fec9a529545b75c81
Signed-off-by: Maryam Tahhan <maryam.tahhan at intel.com>
commit ef5a03b12c0c75847a77cacd1f6fabf44c109df4
Author: Maryam Tahhan <maryam.tahhan at intel.com>
Date: Mon May 2 20:04:11 2016 +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 at intel.com>
commit 6e2f4268da0fc4b3d71e2a558e112a367806d975
Author: Maryam Tahhan <maryam.tahhan at intel.com>
Date: Mon May 2 20:03:09 2016 +0100
dpdkstat: fix typo in collectd.conf.pod
Fix typo in collectd.conf.pod.
Change-Id: I0de9582c0a3f2731194b73c85aa83a1e6bdc9aec
Signed-off-by: Maryam Tahhan <maryam.tahhan at intel.com>
commit 213986f665915ec5b4b811f94b56dd305125b7fd
Author: Maryam Tahhan <maryam.tahhan at intel.com>
Date: Mon May 2 19:53:00 2016 +0100
dpdkstat: fix compilation errors
Fix compilation errors for dpdkstat.
Change-Id: I5f20219344f36a12d4a60f2bad6ce8228e3e992e
Signed-off-by: Maryam Tahhan <maryam.tahhan at intel.com>
commit 1133dfb0bb8e00276052402358bacdbaf1914ce0
Author: Maryam Tahhan <maryam.tahhan at intel.com>
Date: Thu Apr 28 16:11:05 2016 +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 at intel.com>
commit d1fbd0c1490553ccba3dd33783009f79ce457561
Author: Maryam Tahhan <maryam.tahhan at intel.com>
Date: Thu Apr 28 16:07:08 2016 +0100
types.db: fix alignment for dpdkstats
Change-Id: I00173c9a07a288a4aca5912687627b8f62d64f65
Signed-off-by: Maryam Tahhan <maryam.tahhan at intel.com>
commit 5c0551e591163d93b7caf41e909d00761079df4c
Author: Harry van Haaren <harry.van.haaren at intel.com>
Date: Tue Apr 19 15:43:45 2016 +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 at intel.com>
commit 930fe01de28ee650d49267b04718df989da65c7a
Author: Maryam Tahhan <maryam.tahhan at intel.com>
Date: Mon Apr 11 11:09:33 2016 +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 at intel.com>
commit c041bc5ebbba910c8a18e728b24f57ae08b7b434
Author: Maryam Tahhan <maryam.tahhan at intel.com>
Date: Tue Apr 5 10:52:16 2016 +0100
readme: update to include DPDK.
Include DPDK as part of the README features.
Signed-off-by: Maryam Tahhan <maryam.tahhan at intel.com>
commit 70cc129cd1916ff8d406e18d59ef1a80eb9d65d0
Author: Maryam Tahhan <maryam.tahhan at intel.com>
Date: Tue Apr 5 10:48:04 2016 +0100
dpdkstat: bugfix missed enabled_port_count
Signed-off-by: Maryam Tahhan <maryam.tahhan at intel.com>
Reviewed-by: Harry Van Haaren <harry.van.haaren at intel.com>
commit 5f170b47ddffe4ce9a9a987ef1e904fbaa385490
Author: Maryam Tahhan <maryam.tahhan at intel.com>
Date: Sun Apr 3 10:42:44 2016 +0100
dpdkstat: convert snprintf uses to ssnprintf
Signed-off-by: Maryam Tahhan <maryam.tahhan at intel.com>
commit 95e06f1062584a64311442d042b13e044e87d175
Author: Maryam Tahhan <maryam.tahhan at intel.com>
Date: Sun Apr 3 10:35:23 2016 +0100
dpdkstat: bugfix enable_port_count
Signed-off-by: Maryam Tahhan <maryam.tahhan at intel.com>
Signed-off-by: Harry van Haaren <harry.van.haaren at intel.com>
commit d6198411d285aa8d7baad403ac3e142e5aeba75f
Author: Maryam Tahhan <maryam.tahhan at intel.com>
Date: Sun Apr 3 10:29:13 2016 +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 at intel.com>
commit 8a7ec0cfb7aaab52e53fbb21cdc887cee4cccd6d
Author: Maryam Tahhan <maryam.tahhan at intel.com>
Date: Mon Mar 28 12:26:03 2016 +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 at intel.com>
Signed-off-by: Maryam Tahhan <maryam.tahhan at intel.com>
More information about the collectd-changes
mailing list