[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'
Florian Forster
octo at verplant.org
Mon Sep 18 16:18:25 CEST 2017
Makefile.am | 58 ++-
configure.ac | 26 +-
contrib/redhat/collectd.spec | 29 +-
proto/types.proto | 13 +-
src/apache.c | 32 +-
src/collectd-nagios.c | 2 +-
src/collectd-tg.c | 4 +-
src/collectd.conf.in | 7 +-
src/collectd.conf.pod | 25 +-
src/collectdctl.c | 2 +-
src/curl.c | 2 +-
src/daemon/plugin.c | 29 +-
src/daemon/utils_cache.c | 9 +
src/daemon/utils_cache.h | 2 +
src/dpdkevents.c | 1 -
src/dpdkstat.c | 1 -
src/grpc.cc | 145 +++++-
src/intel_pmu.c | 4 +-
src/libcollectdclient/client.c | 2 -
src/libcollectdclient/collectd/client.h | 55 +-
src/libcollectdclient/collectd/network.h | 4 +-
src/libcollectdclient/collectd/network_buffer.h | 5 +-
src/libcollectdclient/collectd/network_parse.h | 56 ++
src/libcollectdclient/collectd/server.h | 88 ++++
src/libcollectdclient/collectd/types.h | 97 ++++
src/libcollectdclient/network_parse.c | 623 +++++++++++++++++++++++
src/libcollectdclient/network_parse_test.c | 511 +++++++++++++++++++
src/libcollectdclient/server.c | 213 ++++++++
src/mcelog.c | 301 ++++++++---
src/memcached.c | 40 +-
src/mic.c | 3 -
src/nut.c | 24 +-
src/openldap.c | 2 +-
src/perl.c | 28 +-
src/routeros.c | 19 +-
src/snmp.c | 1 -
src/synproxy.c | 112 ++++
src/tail_csv.c | 1 -
src/types.db | 1 +
src/utils_curl_stats.c | 10 +-
src/utils_tail_match.c | 1 -
41 files changed, 2310 insertions(+), 278 deletions(-)
New commits:
commit 1ecde57a53fc7c50e6b0139ad745b868413d420c
Merge: 746faef 8339b50
Author: Florian Forster <octo at collectd.org>
Date: Mon Sep 18 16:15:23 2017 +0200
Merge branch 'collectd-5.7'
commit 746faef9ffc8c263382356ada9a008564f5288b4
Author: Florian Forster <octo at collectd.org>
Date: Mon Sep 18 10:04:47 2017 +0200
synproxy plugin: Re-run clang-format.
commit b4c17cc31997759c0b0811cdc805910c6cb57424
Merge: fea2563 ad2ad9f
Author: Florian Forster <octo at collectd.org>
Date: Mon Sep 18 10:02:45 2017 +0200
Merge remote-tracking branch 'github/pr/2381'
commit 8339b50c3c2c4ca61e87a43a62c23bd53271a4ad
Merge: 96b920e 013bbe1
Author: Florian Forster <ff at octo.it>
Date: Mon Sep 18 08:58:44 2017 +0200
Merge pull request #2417 from bluca/dpdk_pkgconfig_backport
configure.ac: dpdk: use pkg-config - 5.7
commit fea2563830dc71df90422959f742b52b9972548f
Merge: 4380983 affa67a
Author: Florian Forster <octo at collectd.org>
Date: Mon Sep 18 08:53:01 2017 +0200
Merge remote-tracking branch 'github/pr/2412'
commit ad2ad9fc2f87f07e74f019edb6c92a17a34ec5b5
Author: Marek Becka <marek.becka at superhosting.cz>
Date: Mon Jul 31 07:41:25 2017 -0400
use generic types in synproxy plugin and code refactoring
commit be78373fc36cf79622f54f70416b86393a1c9677
Author: Marek Becka <marek.becka at superhosting.cz>
Date: Wed Jul 26 07:25:16 2017 -0400
Fix source path in automake
commit 813cfffe619513b3136d8980c022728cde81c3e3
Author: Marek Becka <marek.becka at superhosting.cz>
Date: Wed Jul 26 06:12:12 2017 -0400
New plugin: synproxy
commit 4380983e0a45e2d1c1207dbea95863d1dcc844c6
Merge: a35895c 4a32628
Author: Florian Forster <octo at collectd.org>
Date: Wed Aug 30 13:34:28 2017 +0200
Merge remote-tracking branch 'github/pr/2258'
commit affa67ac016775fbc685ca5fe547064991444f33
Author: Florian Forster <octo at collectd.org>
Date: Wed Aug 30 13:32:54 2017 +0200
Treewide: Don't set value_list_t.host to hostname_g.
plugin_dispatch_values() will automatically fill that value in.
commit 4a3262890ccdf889feeae9b48d612818ec571c67
Author: Florian Forster <octo at collectd.org>
Date: Wed Aug 30 11:16:54 2017 +0200
libcollectdclient: Guard gcrypt code with preprocessor conditionals.
commit 1d429f78567323c11f00e9f6e5ea1765e7c5c8c7
Author: Florian Forster <octo at collectd.org>
Date: Wed Aug 30 11:14:50 2017 +0200
libcollectdclient: Include <stdlib.h> and <string.h>.
For free(3) and memmove(3) respectively.
commit a35895c171ea67c7c707f98f49134236f9143c53
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Fri Aug 18 13:00:36 2017 +0200
collectd.spec: add new intel_pmu plugin
commit 61193e3791af533b9fc8fe9e93a237559d38ef55
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Fri Aug 18 12:53:52 2017 +0200
configure.ac: fix indentation
commit 9e6bf7d6cd8c54f9239745644c3598fd026e293b
Merge: 929a7f2 3dcc903
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Fri Aug 18 12:51:54 2017 +0200
Merge pull request #2405 from cpaelzer/fix-dpdk-pkg-config-if-not-available
configure.ac: dpdk: tolerate no pkg-config
commit 3dcc903cb07c01f6aa9da9b922e928e74cdd8ffb
Author: Christian Ehrhardt <christian.ehrhardt at canonical.com>
Date: Fri Aug 18 12:50:22 2017 +0200
configure.ac: follow the 2 space indent style
The rest of configure.ac indents not to the context, but by 2 spaces.
Follow that rule to stay in style.
Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
commit d5f09da34b227d87b7fe411365a97b9aa658af52
Author: Christian Ehrhardt <christian.ehrhardt at canonical.com>
Date: Fri Aug 18 12:46:17 2017 +0200
configure.ac: fix indent
Fix tab indents to be space based as they should, but keep the
effective indent at the level of the context it belongs to in
PKG_CHECK_MODULES.
Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
commit 013bbe150f72265dd13a7c9af4478f70389fc3ad
Author: Christian Ehrhardt <christian.ehrhardt at canonical.com>
Date: Thu Aug 17 20:11:30 2017 +0100
configure.ac: dpdk: use pkg-config
To detect cflags and libs use the sometimes provided pkg-config for
libdpdk. That avoids build errors on systems where special flags are
needed and provided by dpdk via pkg-config, but not yet considered by
the collectd build system.
commit af406d0146bc22afcc4453ed3aaeae45f502c639
Author: root <root at zesty-test.lxd>
Date: Thu Aug 17 14:18:02 2017 +0000
configure.ac: dpdk: tolerate no pkg-config
Since pull request #2400 pkg-config works great for dpdk, but not if
there is no pkg-config around at all.
To fix that the PKG_CHECK_MODULES macro needs to define a valid fourth
argument, otherwise it will error out.
This closes 2404
Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
commit 929a7f21e8f6709b7acc7491ffc71e8d95135cc2
Merge: 6d79874 5668f55
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Thu Aug 17 15:09:56 2017 +0200
Merge pull request #2400 from cpaelzer/fix-dpdk-multiarch-pkg-config
configure.ac: dpdk: use pkg-config
commit 5668f55e9eab2cb6cde91ba8a620d5d7a816fc71
Author: Christian Ehrhardt <christian.ehrhardt at canonical.com>
Date: Thu Aug 17 15:01:27 2017 +0200
configure.ac: dpdk: append DPDK_CFLAGS to LIBDPDK_CPPFLAGS
In some way it is bad naming in pkg-config - it is always some sort of
conflated ldflags + libs and cppflags + cxxflags + cflags.
Due to that to work correctly we append DPDK_CFLAGS (if defined by
pkg-config) to LIBDPDK_CPPFLAGS as well.
This intentionally does not add those CFLAGS specified by a user to
allow full override and fully separated CLFAGS/CPPFLAGS if needed.
Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
commit 6ca79b67b41c4055acf3ae953773d0bb0150f3a4
Author: Christian Ehrhardt <christian.ehrhardt at canonical.com>
Date: Thu Aug 17 13:34:12 2017 +0200
configure.ac: dpdk: introduce LIBDPDK_CFLAGS
This restores the former behavior of LIBDPDK_CPPFLAGS and now
correctly carries CFLAGS read from pkg-config in its own variable.
Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
commit 7968c0ddec342632ecff40be022f3cca730a8648
Author: Christian Ehrhardt <christian.ehrhardt at canonical.com>
Date: Wed Aug 16 14:31:48 2017 +0200
configure.ac: dpdk: use pkg-config
To detect cflags and libs use the sometimes provided pkg-config for
libdpdk. That avoids build errors on systems where special flags are
needed and provided by dpdk via pkg-config, but not yet considered by
the collectd build system.
This closes #2399
Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
commit 6d79874b8afa65cbb4a8e348caf37b8e60fbeded
Merge: 7d462fc fdee620
Author: Florian Forster <ff at octo.it>
Date: Thu Jul 27 12:58:11 2017 +0200
Merge pull request #2378 from cramertj/grpc-meta
Add metadata support to GRPC plugin
commit 7d462fc1428372a39eb1fdfc5f997fbb62154192
Merge: 68c08bd 2a86e83
Author: Florian Forster <ff at octo.it>
Date: Wed Jul 26 22:15:13 2017 +0200
Merge pull request #2380 from maryamtahhan/feat_mcelog_bugfixes
mcelog: fix compilation error caused by migration to snprintf().
commit fdee620e0146253956adf795cfccac9f516ca347
Author: Taylor Cramer <cramertj at google.com>
Date: Wed Jul 26 10:25:02 2017 -0700
GRPC metadata review cleanup
commit 2a86e83d54f000f113026c2575c934786c6716ad
Author: Korynkevych, RomanX <romanx.korynkevych at intel.com>
Date: Tue Jul 25 10:30:59 2017 +0100
mcelog: fix compilation error caused by migration to snprintf().
Change-Id: I625254fa60efbb94580ed2eb69d7c7bf7027a6eb
Signed-off-by: Korynkevych, RomanX <romanx.korynkevych at intel.com>
commit 9dad090759fe0f7137262f26498b6c1c3dfb8c29
Author: Taylor Cramer <cramertj at google.com>
Date: Mon Jul 24 10:36:27 2017 -0700
Add metadata support to GRPC plugin
commit 68c08bd380d63281f5707e893c27f952c5fde1d8
Merge: d1d1a79 5323289
Author: Florian Forster <ff at octo.it>
Date: Mon Jul 24 15:37:45 2017 +0200
Merge pull request #2246 from maryamtahhan/feat_mcelog_notification_bugfixes
Feat mcelog notification bugfixes
commit 532328916d6a3037b67a6c3916079931c3429050
Author: Korynkevych, RomanX <romanx.korynkevych at intel.com>
Date: Fri Jul 21 14:42:46 2017 +0100
mcelog: updates based on review comments
* modified code to use return without parenthesis
* fixed logic that parses config options
Change-Id: I2c5c5f42f8395306622dee8cdf4f94b46e3e3570
Signed-off-by: Korynkevych, RomanX <romanx.korynkevych at intel.com>
commit d1d1a799a4dd0818877d6d5c1e6c2884c84373ce
Merge: 2c1c0bd ff0d8b0
Author: Florian Forster <ff at octo.it>
Date: Mon Jul 24 09:31:05 2017 +0200
Merge pull request #2349 from rpv-tomsk/fix-register-complex-read
Free `userdata` if plugin_register_complex_read() has failed.
commit ff0d8b0879c81f4743f38637063c0e26194f3e00
Author: Pavel Rochnyack <pavel2000 at ngs.ru>
Date: Mon Jul 24 14:05:16 2017 +0700
openldap: Fixed possible dereference of NULL pointer
If `plugin_register_complex_read()` has failed, then `cldap_free` is called which set pointer to NULL.
That pointer is accessed by `cldap_shutdown()` callback later.
commit f519b4b222ab9253e70b6cda7605d7c58ff771b4
Author: Pavel Rochnyack <pavel2000 at ngs.ru>
Date: Fri Jul 7 02:07:43 2017 +0700
Change error message when read callback name is duplicated while registering it.
The message `Check for duplicate "LoadPlugin" lines` is obsolete, as there is a special check in `plugin_load()` for this case.
commit 5ea1f5a36f99f6c828936d1f993c9ba790b953ec
Author: Pavel Rochnyack <pavel2000 at ngs.ru>
Date: Fri Jul 7 01:48:21 2017 +0700
Free `userdata` if plugin_register_complex_read() has failed.
commit 2c1c0bdf777d1a7efeefff23ed23fe84d55d5db7
Merge: c99e3a4 edb91e1
Author: Florian Forster <ff at octo.it>
Date: Thu Jul 20 21:53:04 2017 +0200
Merge pull request #2374 from maryamtahhan/feat_intel_pmu_bugfixes
intel_pmu: fix compilation error caused by migration to snprintf().
commit edb91e1a233489cd7a3cf615e7b5070d03f50408
Author: Korynkevych, RomanX <romanx.korynkevych at intel.com>
Date: Thu Jul 20 14:09:36 2017 +0100
intel_pmu: fix compilation error caused by migration to snprintf().
Change-Id: I4e461cd11aa03ca588649ca86892c23c9f38fc54
Signed-off-by: Korynkevych, RomanX <romanx.korynkevych at intel.com>
commit 217ec252adf547f2dd048489e2498bc31e8f70db
Merge: cf500b6 b9fd6b6
Author: Roman Korynkevych <romanx.korynkevych at intel.com>
Date: Fri Jul 14 17:26:44 2017 +0300
Merge branch 'master' into feat_mcelog_notification_bugfixes
commit cf500b62343bf8d0c56220c95091a7def6e09f95
Author: Tahhan, Maryam <maryam.tahhan at intel.com>
Date: Thu Jul 6 15:04:50 2017 +0100
mcelog: updates based on github review
* Reduces complex level of indentation in conditional blocks
* Uses #defines for corrected and uncorrected strings for notifications
* Fixes memory leaks
* clang was run on the mcelog.c
Change-Id: Ia4c08debc129e2fc9327922299a68304b101d09f
Signed-off-by: Tahhan, Maryam <maryam.tahhan at intel.com>
commit d6b30b974af0fddb4bddde410cd7b00a9b877496
Author: Korynkevych, RomanX <romanx.korynkevych at intel.com>
Date: Tue Jun 20 16:02:29 2017 +0100
mcelog: set n.meta to NULL after meta data is cleared.
mcelog plugin got stuck after corrected and uncorrected memory errors injection.
This is caused due to pointing n.meta to unknown place in memory as n.meta
was not set to NULL after meta data has been cleared.
Change-Id: I81bdbeb43a9858f0071e1798e4d7a15423832a35
Signed-off-by: Korynkevych, RomanX <romanx.korynkevych at intel.com>
commit 13d7a317bc5c677092b9e9ba1109afe47c952512
Author: Tahhan, Maryam <maryam.tahhan at intel.com>
Date: Mon May 29 14:04:39 2017 +0100
mcelog: make options mutually exclusive
Make the logfile and socket options mutually exclusive as the collection
requirements for the 2 are different and the memory errors from the
socket overlap with the logfile. Set the default to memory errors until
the logfile changes are merged.
Change-Id: If1eef9d37f1ffe404cf679df4dca9ae3c92ab9ea
Signed-off-by: Tahhan, Maryam <maryam.tahhan at intel.com>
commit 21234c8ef4fd418af7ab5477416dadf8e5ffc78a
Author: Tahhan, Maryam <maryam.tahhan at intel.com>
Date: Mon Feb 27 13:33:31 2017 +0000
mcelog: notification persist option
Implement notification persist option and separate out memory block from the
rest of the configuration.
Change-Id: I48d946bb381d3cfc61fee91a31f3865802389eef
Signed-off-by: Tahhan, Maryam <maryam.tahhan at intel.com>
commit c6350b3e442d2e1b5175bde3b16696c43f25c46f
Author: Tahhan, Maryam <maryam.tahhan at intel.com>
Date: Tue May 23 11:02:01 2017 +0100
mcelog: code review fix
Get rid of verbose mcelog_get_dimm() function and use llist_search() instead.
Change-Id: Iccc5c083cf254b82c74f6f77df4a0659ba14282c
Signed-off-by: Tahhan, Maryam <maryam.tahhan at intel.com>
commit 0aa5b32fd9246ad82686616eada68ee50f26bff7
Author: Florian Forster <octo at collectd.org>
Date: Tue Jul 4 23:36:24 2017 +0200
libcollectdclient: Include "config.h" unconditionally.
commit 44b95a1ad0180955694ff3678bb7faa02828dae7
Author: Florian Forster <octo at collectd.org>
Date: Fri May 5 15:34:58 2017 +0200
libcollectdclient: Include "collectd/types.h" instead of "collectd/client.h".
commit 6a070667d39927f5448c4a25c34e9fb3862e6fcd
Author: Florian Forster <octo at collectd.org>
Date: Fri May 5 15:17:16 2017 +0200
libcollectdclient: Use IPV6_JOIN_GROUP instead of IPV6_ADD_MEMBERSHIP.
IPV6_JOIN_GROUP appears to be more portable.
commit 4f6ec37baafc3d9f13ec726974cdc840071d4e10
Author: Florian Forster <octo at collectd.org>
Date: Fri May 5 14:11:44 2017 +0200
libcollectdclient: Include <netinet/in.h>.
We need to include this for a variety of symbols on FreeBSD.
commit 6e006e93c5c34d0022c2a46e111eeb843a793677
Author: Florian Forster <octo at collectd.org>
Date: Thu May 4 09:30:25 2017 +0200
libcollectdclient: Fix BSD support.
FreeBSD needs <sys/endian.h> instead of <endian.h>.
commit 193294c2cc727296b9fb859daf2eacb906fc1735
Author: Tahhan, Maryam <maryam.tahhan at intel.com>
Date: Fri Apr 14 12:41:00 2017 +0100
mcelog: code review updates
* Comparing variables with NULL explicilty instead of !var
* Removed unnecessary casts
Change-Id: I50a1691c42842c81ff71c2e91a8fb292524dc945
Signed-off-by: Tahhan, Maryam <maryam.tahhan at intel.com>
commit 49d05d53d4c88895a1ff454000d65b6acabdbb99
Author: Tahhan, Maryam <maryam.tahhan at intel.com>
Date: Sun Feb 26 13:48:56 2017 +0000
mcelog: only send notifications for new errors
Update the mcelog plugin to only distpatch notifications for memory corrected
and uncorrected errors when the value changes for each dimm.
Change-Id: I29ee6b8519e273bd0ef47eed1a0084d3b6d7cef0
Signed-off-by: Tahhan, Maryam <maryam.tahhan at intel.com>
commit d255167bb214dd770349912a7f65698913972f52
Author: Tahhan, Maryam <maryam.tahhan at intel.com>
Date: Wed Feb 22 18:43:56 2017 +0000
mcelog: different notifications for memory errors
For mcelog's unix socked data source (default /var/run/mcelog-client), mcelog
plugin generates collectd notifications that merge both corrected and
uncorrected memory error info. This is incorrect behaviour. Separate
notifications should be created for each category and also severity should be
differentiated. This patch fixes this.
Change-Id: Ie9eb1dd6bbc7bbbdd9fc72f1f2e7c395031b3d51
Signed-off-by: Tahhan, Maryam <maryam.tahhan at intel.com>
commit 96289bfdb8519c7bfbb5e1dffe6ac22da7496d66
Author: Florian Forster <octo at collectd.org>
Date: Wed May 3 11:45:42 2017 +0200
libcollectdclient: Use GCRY_THREAD_OPTION_PTHREAD_IMPL with older gcrypt versions only.
Copied from src/network.c
commit decb31fc353114e2198dfcdafbfdbb0132a6bcee
Author: Florian Forster <octo at collectd.org>
Date: Tue May 2 13:14:36 2017 +0200
libcollectdclient: Remove TODO.
No, we should not, because memory allocation is more annoying in C.
commit 0c593a0f20e5b149645dfdc53e235e8805431021
Author: Florian Forster <octo at collectd.org>
Date: Tue May 2 11:23:05 2017 +0200
libcollectdclient: Improve documentation of lcc_listener_t.conn.
commit f4b19ab92c4a053d0e39930d42e0a8bdde7e5d9b
Author: Florian Forster <octo at collectd.org>
Date: Tue May 2 11:22:23 2017 +0200
libcollectdclient: Replace TODOs with (hopefully) useful comments.
commit a81a7365e671cf02d88448e6c536c678a5a9d67c
Author: Florian Forster <octo at collectd.org>
Date: Tue May 2 11:21:48 2017 +0200
libcollectdclient: Write only metrics with the requested security level.
commit 98d25510a339e789c27ee234558476b04185bd51
Author: Florian Forster <octo at collectd.org>
Date: Tue May 2 11:08:37 2017 +0200
libcollectdclient: Add LCC_NETWORK_BUFFER_SIZE.
commit 1cee13d802444f4062a373192e83ba92608d7f3b
Author: Florian Forster <octo at collectd.org>
Date: Tue May 2 10:52:58 2017 +0200
libcollectdclient: Add lcc_network_parse_options_t to lcc_listener_t.
This avoids listing the same fields twice.
commit 8059545db364a1aa722535da2c1939529ea28a68
Author: Florian Forster <octo at collectd.org>
Date: Tue May 2 10:49:12 2017 +0200
libcollectdclient: Introduce a "parser" callback.
This will allow the network plugin to enqueue received network packets and
parse them using a thread pool.
commit 35c5322df0de5bbc5f40cddf7f6ff5f7578aeca1
Author: Florian Forster <octo at collectd.org>
Date: Tue May 2 10:27:49 2017 +0200
libcollectdclient: Install the "collectd/types.h" header.
commit 59353d13d73f3a351c5dada73896344b9e2a3818
Author: Florian Forster <octo at collectd.org>
Date: Tue May 2 10:26:40 2017 +0200
libcollectdclient: Fix off-by-one error when reading the username.
The allocated buffer includes a null byte, but the network packet doesn't.
That means we were reading one byte too many from the buffer, overwriting
the terminating null byte in the buffer.
commit a21477bc160169035f250724d7fa027fe3da1106
Author: Florian Forster <octo at collectd.org>
Date: Thu Apr 13 14:19:14 2017 +0200
libcollectdclient: Separate module for lcc_network_parse().
commit c3eb1f9dd670b0d112820ed2894e6d5ecb09c286
Author: Florian Forster <octo at collectd.org>
Date: Thu Apr 13 09:12:49 2017 +0200
libcollectdclient: Implement parsing of signed and encrypted network data.
commit 10d95b0cf8d2ffe1472cc65a4d403c9c1ca4118d
Author: Florian Forster <octo at collectd.org>
Date: Mon Apr 10 09:18:48 2017 +0200
libcollectdclient: Implement server code.
The implementation is intentionally similar to the Golang implementation.
Security features (signing, encryption) are still missing.
commit 5fd514bde768c7de76e38349d17e581e8b949764
Author: Florian Forster <octo at collectd.org>
Date: Thu Apr 13 12:06:20 2017 +0200
libcollectdclient: Include headers with the "collectd/" path prefix.
commit beb469770de2f252b16bb63779067302115a2d6f
Author: Florian Forster <octo at collectd.org>
Date: Mon Apr 10 09:28:37 2017 +0200
libcollectdclient: Move type definitions into their own header.
The "types.h" header is included by "client.h", so existing code does not
need to be updated.
More information about the collectd-changes
mailing list