Korynkevych, RomanX [Thu, 16 Mar 2017 17:21:31 +0000 (17:21 +0000)]
snmp_agent: generate table OID based on instance as a key in case index is not specfified.
Based on the SNMP rules when table column is represented as a key
of string type, key should be used while generating OID for each row.
When index is not specified, then it's assumed that instance value is
the key for the specified table.
Change-Id: I9f3fbd9aa018bc9037bd3202e2ed107a302fe1b3
Signed-off-by: Korynkevych, RomanX <romanx.korynkevych@intel.com>
Korynkevych, RomanX [Thu, 12 Jan 2017 11:24:27 +0000 (11:24 +0000)]
snmp_agent: fix c_avl_pick() segmentation fault.
Segmentation fault caused by c_avl_pick() occurs when NULL
iterator is passed.
Change-Id: I3dc960f80b556e18616717ca53fd992c8cf9d78b
Signed-off-by: Korynkevych, RomanX <romanx.korynkevych@intel.com>
Roman Korynkevych [Tue, 3 Jan 2017 15:02:20 +0000 (15:02 +0000)]
snmp_agent: fix root Makefile.am
The location of SNMP Agent sources in Makefile.am is `src/*` folder now.
Signed-off-by: Roman Korynkevych <romanx.korynkevych@intel.com>
Korynkevych, RomanX [Fri, 30 Dec 2016 16:45:06 +0000 (16:45 +0000)]
snmp_agent: addressing PR comments.
Additional validation and variable names changes.
Change-Id: Ic6c3c3226e2ee6586c03b64d063822b99c242af3
Signed-off-by: Korynkevych, RomanX <romanx.korynkevych@intel.com>
Korynkevych, RomanX [Mon, 26 Dec 2016 15:01:57 +0000 (15:01 +0000)]
snmp_agent: Addressing PR comments.
Performed code cleanup and optimizations:
- Reformat file using clang-format.
- Removed duplicate code.
Change-Id: Ia6d7cde0e44cb5d3639df11e712fe655becd9712
Signed-off-by: Korynkevych, RomanX <romanx.korynkevych@intel.com>
Korynkevych, RomanX [Wed, 14 Dec 2016 17:05:10 +0000 (17:05 +0000)]
snmp_agent: removed references to snmp_agent.h file from Makefile.
Change-Id: I697d80d39d8f37d9bd36280bad874a1f4d600518
Signed-off-by: Korynkevych, RomanX <romanx.korynkevych@intel.com>
Korynkevych, RomanX [Wed, 14 Dec 2016 11:11:28 +0000 (11:11 +0000)]
snmp_agent: define MIN macro if not defined.
Change-Id: Ic57c14abb8b6b31547e97e6c394b8c3147b1e6b2
Signed-off-by: Korynkevych, RomanX <romanx.korynkevych@intel.com>
Korynkevych, RomanX [Wed, 14 Dec 2016 10:37:05 +0000 (10:37 +0000)]
snmp_agent: Implement SNMP Agent plugin.
The SNMP Agent plugin is an AgentX subagent that receives and handles
queries from SNMP master agent and returns the data collected by read
plugins. The SNMP Agent plugin handles requests only for OIDs specified
in configuration file. To handle SNMP queries the plugin gets data from
collectd and translates requested values from collectd's internal
format to SNMP format. This plugin is a generic plugin and cannot work
without configuration. For more details on AgentX subagent see
<http://www.net-snmp.org/tutorial/tutorial-5/toolkit/demon/>
Change-Id: I0e82131685f2138e1af0a9283b06f85dd2028878
Signed-off-by: Korynkevych, RomanX <romanx.korynkevych@intel.com>
Ruben Kerkhof [Tue, 3 Jan 2017 14:17:10 +0000 (15:17 +0100)]
Merge pull request #2130 from maryamtahhan/issue_ovs_events_2127
ovs_events: fix #2127
Mytnyk, VolodymyrX [Tue, 3 Jan 2017 13:17:20 +0000 (13:17 +0000)]
ovs_events: fix #2127
- Fixed FreeBSD compilation issue
- Fixed CLANG warnings:
"-Wsign-compare, -Wtautological-compare"
Change-Id: I7a58271c34120e2782e43d4245abefebae2601ca
Signed-off-by: Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com>
Ruben Kerkhof [Sun, 1 Jan 2017 14:00:22 +0000 (15:00 +0100)]
Merge pull request #2095 from maryamtahhan/dpdkstat_utils_rework
dpdkstat plugin rework
Krzysztof Matczak [Thu, 22 Dec 2016 12:29:32 +0000 (12:29 +0000)]
Addressing PR comments related with dpdk_utils
Change-Id: I4d6e132e0b5aa940a9c444c141967c8b79d90f0e
Signed-off-by: Krzysztof Matczak <krzysztofx.matczak@intel.com>
Krzysztof Matczak [Thu, 15 Dec 2016 12:23:31 +0000 (12:23 +0000)]
PR review comments addressed
Adressed comments raised during PR review. Removed documentation
chapter related with static linking since it was outdated and
there's no single universal solution for all supported DPDK
releases. Static linking of external libraries into plugins
is not supported in collectd.
Change-Id: I35f7decb0fdacaaaad50fa2bf35f7ba6aa96c3f0
Signed-off-by: Krzysztof Matczak <krzysztofx.matczak@intel.com>
Krzysztof Matczak [Thu, 24 Nov 2016 10:19:05 +0000 (10:19 +0000)]
dpdkstat plugin rework
This patch contains rework of existing dpdkstat plugin. Changes are focused on
extracting common dpdk related features into utils file that could be reused by
other DPDK plugins. Also some related structural changes are introduced.
List of changes:
- introduction of new utils_dpdk.c that handles child process spawning,
and terminating, messaging between parent and child, DPDK configuration
and initialization and DPDK commands execution
- DPDK EAL specific options put into separate subsection of
dpdkstat configuration
- documentation update
Those changes are preparatory steps for upstreaming dpdkevent plugin
that is going to collect DPDK ports and logical cores status info.
Signed-off-by: Krzysztof Matczak <krzysztofx.matczak@intel.com>
Ruben Kerkhof [Sat, 31 Dec 2016 14:11:18 +0000 (15:11 +0100)]
ovs_events: fix build failures on Jessie
src/utils_ovs.c: In function ‘ovs_db_table_update_cb’:
src/utils_ovs.c:464:15: error: unused variable ‘table_name’ [-Werror=unused-variable]
const char *table_name = NULL;
^~~~~~~~~~
src/utils_ovs.c:463:10: error: unused variable ‘obj_len’ [-Werror=unused-variable]
size_t obj_len = 0;
^~~~~~~
src/utils_ovs.c:462:12: error: unused variable ‘jtable_update’ [-Werror=unused-variable]
yajl_val jtable_update;
^~~~~~~~~~~~~
src/utils_ovs.c: In function ‘ovs_db_reconnect’:
src/utils_ovs.c:713:22: error: unused variable ‘saunix’ [-Werror=unused-variable]
struct sockaddr_un saunix;
^~~~~~
src/utils_ovs.c:710:14: error: unused variable ‘unix_prefix’ [-Werror=unused-variable]
const char unix_prefix[] = "unix:";
^~~~~~~~~~~
src/utils_ovs.c: In function ‘ovs_yajl_gen_val’:
src/utils_ovs.c:373:10: error: ‘yajl_gen_ret’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
return yajl_gen_ret;
^~~~~~~~~~~~
cc1: all warnings being treated as errors
Ruben Kerkhof [Sat, 31 Dec 2016 14:02:32 +0000 (15:02 +0100)]
Makefile.am: keep plugins sorted
Ruben Kerkhof [Sat, 31 Dec 2016 13:35:09 +0000 (14:35 +0100)]
ovs_events plugin: fix build
Ruben Kerkhof [Sat, 31 Dec 2016 13:01:11 +0000 (14:01 +0100)]
collectd.spec: add new ovs_events plugin
Ruben Kerkhof [Sat, 31 Dec 2016 12:54:42 +0000 (13:54 +0100)]
Makefile.am: fix indentation
Ruben Kerkhof [Sat, 31 Dec 2016 12:47:04 +0000 (13:47 +0100)]
Merge pull request #2097 from YmrDtnJu/zfs_arc
zfs_arc updates for linux
Ruben Kerkhof [Sat, 31 Dec 2016 12:45:23 +0000 (13:45 +0100)]
Makefile.am: sort some stuff
Ruben Kerkhof [Sat, 31 Dec 2016 12:25:06 +0000 (13:25 +0100)]
ceph plugin: remove unused assignment
Ruben Kerkhof [Sat, 31 Dec 2016 12:23:41 +0000 (13:23 +0100)]
ovs_events: append flags to _CPPFLAGS, not _CFLAGS
YmrDtnJu [Sun, 25 Dec 2016 18:28:07 +0000 (19:28 +0100)]
zfs_arc: Do not log an error if a value cannot be found.
Ruben Kerkhof [Sat, 31 Dec 2016 12:21:39 +0000 (13:21 +0100)]
configure.ac: keep plugins sorted
Ruben Kerkhof [Sat, 31 Dec 2016 12:00:33 +0000 (13:00 +0100)]
collectd.spec: add new mcelog plugin
Ruben Kerkhof [Sat, 31 Dec 2016 11:46:52 +0000 (12:46 +0100)]
Merge pull request #1971 from maryamtahhan/feat_ovs_link
OVS events plugin
Mytnyk, VolodymyrX [Mon, 26 Dec 2016 13:37:45 +0000 (13:37 +0000)]
ovs_events: Fix root Makefile.am
The location of OVS sources in Malefile.am is `src/*` folder now.
Change-Id: Iffe8a439faf531e74e0a752c3fb544369928cfb6
Signed-off-by: Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com>
Mytnyk, VolodymyrX [Tue, 6 Dec 2016 23:25:45 +0000 (23:25 +0000)]
ovs_events: fix using of plugin_thread_create ()
- the prototype of plugin_thread_create () has been changed in
latest master.
Change-Id: I492942442717c43cd6e6e73478248164b5083894
Signed-off-by: Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com>
Mytnyk, VolodymyrX [Mon, 28 Nov 2016 23:23:04 +0000 (23:23 +0000)]
ovs_events: Fix PR code clean-up comments
- Fix OVS documentation
- Code clean-up
Change-Id: I84fb003aea19f73381192f31935c79b51eaba1c9
Signed-off-by: Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com>
Mytnyk, VolodymyrX [Mon, 21 Nov 2016 19:15:15 +0000 (19:15 +0000)]
ovs_events: Fix OvS documentation URL address
Change-Id: I5bd4d7aabaf0ff66edd9c1cd75caf7f37448e00d
Signed-off-by: Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com>
Mytnyk, VolodymyrX [Mon, 21 Nov 2016 17:21:56 +0000 (17:21 +0000)]
ovs_events: PR clean-up
Clean-up OVS events plugin based on PR comments.
Change-Id: Ibd18924dd2a6f936d0ea83ed4eeb3b34ff8416b5
Signed-off-by: Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com>
Mytnyk, VolodymyrX [Tue, 8 Nov 2016 16:19:56 +0000 (16:19 +0000)]
ovs_events: Fix notification metadata garbage.
If some of interface data is not available, the garbage
information may be returned by ovs_events_get_iface_info() function.
Add clean-up interface information structure into the function.
Change-Id: Ia3d2bdfe31d0b3db81ad7ad773eca1df5d5f6f6a
Signed-off-by: Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com>
Mytnyk, VolodymyrX [Fri, 28 Oct 2016 10:18:17 +0000 (11:18 +0100)]
ovs_events: Address PR comments
- Change configuration format to suggested one;
- Fix init/destroy API;
- Fix memory leaks;
- Code-clean-up.
Change-Id: I1ff94271b777c69f3d07a66f43dc10d034e71101
Signed-off-by: Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com>
Mytnyk, VolodymyrX [Tue, 11 Oct 2016 10:46:24 +0000 (11:46 +0100)]
OVS events: Fix multiple interface config issue
If multiple interfaces are configured, only last one will
be monitored (notifications aren't sent for all others).
Change-Id: Ica918ef0557747d84677db739a64698d3756a675
Signed-off-by: Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com>
Mytnyk, VolodymyrX [Tue, 4 Oct 2016 14:20:37 +0000 (15:20 +0100)]
OVS events: Address all PR comments
- Change OVS implementation to use suggested configuration:
OvsDbAddress "127.0.0.1" "6640"
OvsDbAddress "2001:DB8::c011:ec7d" "6640"
OvsDbAddress "2001:DB8::c011:ec7d" "service-name"
OvsDbAddress "unix:/path/to/socket"
- Update documentation;
- Change OVS utils to use getaddrinfo();
- Clean-up compilation warnings on FreeBSD system.
- Add IPv6 support;
Change-Id: I60ca700c15406c783b62ee52135266d67b60393a
Signed-off-by: Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com>
Mytnyk, VolodymyrX [Mon, 3 Oct 2016 14:45:23 +0000 (15:45 +0100)]
OVS events: Fix configure script to detect YAJL tree API
If old YAJL version is installed on a system (ver < 2.0), the OVS plugin
compilation will fail as it requires tree API to be supported in YAJL
library. For this reason, it was decided to change 'configure' script
to detect YAJL tree API also.
Clean-up according updated collectd style:
https://github.com/collectd/collectd/pull/1931
https://github.com/collectd/collectd/issues/1951
Change-Id: I90c82cdc9780ee8c0c9b794986662a39a5ab0011
Signed-off-by: Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com>
Mytnyk, VolodymyrX [Fri, 30 Sep 2016 16:12:32 +0000 (17:12 +0100)]
OVS events: Fix 'make distcheck'
Change-Id: I731b633b5f78ed63b643574a336c59717e408a78
Signed-off-by: Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com>
Mytnyk, VolodymyrX [Wed, 28 Sep 2016 09:43:08 +0000 (10:43 +0100)]
ovs_events plugin: Filter through clang-format.
Disable clang-format for diagram in utils_ovs.c.
Change-Id: Idfb1510c996f5ebbdadc96663eb032537837502a
Signed-off-by: Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com>
Mytnyk, VolodymyrX [Tue, 27 Sep 2016 13:36:26 +0000 (14:36 +0100)]
ovs_events: Fix plugin collectd config file
- Fix Ubuntu compilation warnings.
Change-Id: I7bb72ec0ca732b00c4169e0174d64407d99a2751
Signed-off-by: Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com>
Mytnyk, VolodymyrX [Fri, 23 Sep 2016 14:59:38 +0000 (15:59 +0100)]
ovs_events: Add external ids as metadata
- Interface meta data are added to dispatched
values & notification.
interface metadata:
- UUID (always);
- iface-id (if exists)
- vm-uuid (if exists)
- Fix read callback to poll actual data instead of
reading cache;
- Code clean up;
Change-Id: I291cb190d31ae091c1d47ce0f5e9d439f6958d61
Signed-off-by: Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com>
Mytnyk, VolodymyrX [Fri, 23 Sep 2016 13:11:04 +0000 (14:11 +0100)]
OVS link: rename "ovs_link" -> "ovs_events"
- Rename files
Change-Id: Ic662d5d673c1c66b2057e4b35fa3cf664e92825e
Signed-off-by: Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com>
Mytnyk, VolodymyrX [Fri, 23 Sep 2016 07:42:37 +0000 (08:42 +0100)]
OVS link: rename plugin to "ovs_events"
Change-Id: Ic50891722074aec017b1329601a3bcbafb030ce0
Signed-off-by: Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com>
Mytnyk, VolodymyrX [Tue, 20 Sep 2016 12:36:08 +0000 (13:36 +0100)]
OVS link plugin: Add connection terminate callback
Extend OVS utils to notify OVS plugin about OVS DB
connection lost. If the connection is lost, OVS link plugin
will dispatch notification and print error message. OVS plugin
treats status of all interfaces as UNKNOWN.
Change-Id: I22fe3cb0740e0f4779a5c4f6b92e78f1ad9777a3
Signed-off-by: Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com>
Mytnyk, VolodymyrX [Fri, 16 Sep 2016 11:01:30 +0000 (12:01 +0100)]
OVS link plugin: Add read callback
- Implement read callback;
- Add SendNotification option;
- Update plugin documentation;
- Clean-up.
Change-Id: Ie645192498d234d47e1fe0272ec30e7c3d9c1774
Signed-off-by: Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com>
Mytnyk, VolodymyrX [Wed, 31 Aug 2016 16:55:10 +0000 (17:55 +0100)]
OVS link: Implement OVS link plugin
This plugin consists of two parts:
- OVS link
The implementation of the plugin itself, which uses
OVS utils API to be able to monitor a link status of
OVS connected interfaces and dispatch the values
through collectd notification mechanism whenever
the link state change occurs.
- OVS utils
This module implements the OVS DB communication routine
specified by RFC7047. It includes:
- Connecting/disconnecting to/from OVS DB (via TCP/UNIX);
- Mechanism to subscribe to OVS DB table events like
init/insert/modify/delete table rows;
- API to send custom request and receive result;
- Recovery connection mechanism with OVS DB;
- Handling of ECHO request to verify the liveness
of a database connection;
- Helpers functions.
Change-Id: Icac392bd1bd40f7dd156bfd2fc4ff08d9725a22f
Signed-off-by: Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com>
Ruben Kerkhof [Mon, 26 Dec 2016 11:41:03 +0000 (12:41 +0100)]
Merge pull request #2003 from maryamtahhan/feat_ras
mcelog plugin
Krzysztof Matczak [Sun, 25 Dec 2016 20:57:59 +0000 (20:57 +0000)]
post rebase issues fixed
Change-Id: I42b4b392da942808d29b73a13cd5e0bbcef9b6b8
Signed-off-by: Krzysztof Matczak <krzysztofx.matczak@intel.com>
Krzysztof Matczak [Sun, 25 Dec 2016 14:50:19 +0000 (14:50 +0000)]
workaround for zero initializer false warning
Change-Id: I77a8ca1d5854ebda8533483cdd5ea08c3c07a059
Signed-off-by: Krzysztof Matczak <krzysztofx.matczak@intel.com>
Krzysztof Matczak [Fri, 23 Dec 2016 00:21:53 +0000 (00:21 +0000)]
PR comments addressed
Change-Id: I0ddfd6dcd911ab46fcbc032081a2980b1f1f549b
Signed-off-by: Krzysztof Matczak <krzysztofx.matczak@intel.com>
Maryam Tahhan [Fri, 30 Sep 2016 10:58:03 +0000 (11:58 +0100)]
fixed rebase conflicts
Signed-off-by: Krzysztof Matczak <krzysztofx.matczak@intel.com>
Ruben Kerkhof [Fri, 23 Dec 2016 17:47:59 +0000 (18:47 +0100)]
dpdkstat plugin: jump to the right label
Ruben Kerkhof [Fri, 23 Dec 2016 17:47:10 +0000 (18:47 +0100)]
virt plugin: fix a few build warnings
src/virt.c:939:13: warning: initializing 'char *' with an expression of type 'const char [34]' discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]
char *bd_xmlpath = "/domain/devices/disk/target[@dev]";
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/virt.c:941:20: warning: assigning to 'char *' from 'const char [34]' discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]
bd_xmlpath = "/domain/devices/disk/source[@dev]";
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Ruben Kerkhof [Fri, 23 Dec 2016 17:07:21 +0000 (18:07 +0100)]
Fix rpm building
Fallout from
c5cfdb0
Florian Forster [Thu, 22 Dec 2016 09:57:57 +0000 (10:57 +0100)]
Merge branch 'collectd-5.7'
Florian Forster [Thu, 22 Dec 2016 09:57:43 +0000 (10:57 +0100)]
Merge branch 'collectd-5.6' into collectd-5.7
Florian Forster [Thu, 22 Dec 2016 09:52:44 +0000 (10:52 +0100)]
src/daemon/common.c: Change swrite() to return errno if possible.
Florian Forster [Thu, 22 Dec 2016 08:13:52 +0000 (09:13 +0100)]
Merge pull request #2121 from octo/netapp
netapp plugin: Fix complation problems.
Florian Forster [Thu, 22 Dec 2016 05:52:43 +0000 (06:52 +0100)]
Merge remote-tracking branch 'github/pr/2059'
Ruben Kerkhof [Wed, 21 Dec 2016 17:56:48 +0000 (18:56 +0100)]
Merge pull request #2085 from rubenk/non-recursive-make
Switch to non-recursive make
Ruben Kerkhof [Mon, 5 Dec 2016 21:20:15 +0000 (22:20 +0100)]
Switch to non-recursive make
Recursive make caused various dependency issues, mainly with linked
libraries or objects from other directories. Switch to a single Makefile
to solve this. An addded benefit is that this should speed up the build.
It also opens up the possibility to improve on our directory layout.
Florian Forster [Wed, 21 Dec 2016 14:02:05 +0000 (15:02 +0100)]
netapp plugin: Fix compilation problems.
Fixes: #2120
Florian Forster [Mon, 19 Dec 2016 08:09:05 +0000 (09:09 +0100)]
Auto-Merge pull request #2113 from rubenk/dpdk-double-close
Automatically merged due to "Automerge" label
Ruben Kerkhof [Sun, 18 Dec 2016 12:05:59 +0000 (13:05 +0100)]
Merge pull request #2114 from mfournier/dpdkstat-formatstring
dpdkstat: use portable format strings
Marc Fournier [Sun, 18 Dec 2016 10:17:59 +0000 (11:17 +0100)]
dpdkstat: use portable format strings
Florian Forster [Sat, 17 Dec 2016 19:04:15 +0000 (20:04 +0100)]
Merge pull request #2112 from rubenk/battery-plugin-nul-terminate-buffer
Battery plugin: nul-terminate buffer
Ruben Kerkhof [Sat, 17 Dec 2016 17:56:47 +0000 (18:56 +0100)]
Merge branch 'collectd-5.7'
Ruben Kerkhof [Sat, 17 Dec 2016 17:50:58 +0000 (18:50 +0100)]
dpdkstat: don't close already closed fd on failure
CID #158525
Ruben Kerkhof [Sat, 17 Dec 2016 17:39:39 +0000 (18:39 +0100)]
battery plugin: null-terminate buffer
We call strstripnewline on it, which expects a null-terminated string.
CID #158524
Ruben Kerkhof [Sat, 17 Dec 2016 16:44:47 +0000 (17:44 +0100)]
Fix parallel build
Fixes #2110
Florian Forster [Sat, 17 Dec 2016 10:39:08 +0000 (11:39 +0100)]
Auto-Merge pull request #2053 from nuclearcat/master
Automatically merged due to "Automerge" label
Denys Fedoryshchenko [Wed, 30 Nov 2016 04:07:40 +0000 (04:07 +0000)]
Suggestions
Denys Fedoryshchenko [Tue, 29 Nov 2016 00:28:30 +0000 (00:28 +0000)]
More appropriate metric
Denys Fedoryshchenko [Tue, 29 Nov 2016 00:24:56 +0000 (00:24 +0000)]
Removing double reference
Denys Fedoryshchenko [Thu, 24 Nov 2016 01:20:25 +0000 (01:20 +0000)]
Adding support of drops value monitoring
Florian Forster [Fri, 16 Dec 2016 18:39:06 +0000 (19:39 +0100)]
Auto-Merge pull request #2111 from octo/cid/157643
Automatically merged due to "Automerge" label
Florian Forster [Fri, 16 Dec 2016 17:42:13 +0000 (18:42 +0100)]
src/utils_cmd_getthreshold.c: Fix formatting.
Florian Forster [Fri, 16 Dec 2016 17:38:34 +0000 (18:38 +0100)]
set target: Avoid casting negative int to size_t.
CID: 157643
Florian Forster [Fri, 16 Dec 2016 13:39:07 +0000 (14:39 +0100)]
Auto-Merge pull request #2099 from tokkee/sh/booleans
Automatically merged due to "Automerge" label
Marc Fournier [Thu, 15 Dec 2016 22:22:59 +0000 (23:22 +0100)]
update README to mention write_prometheus & support lib
Florian Forster [Thu, 15 Dec 2016 10:44:10 +0000 (11:44 +0100)]
Auto-Merge pull request #2096 from rubenk/target-set-plug-leak
Automatically merged due to "Automerge" label
Florian Forster [Thu, 15 Dec 2016 10:27:40 +0000 (11:27 +0100)]
Auto-Merge pull request #2092 from rubenk/prometheus-plug-leak
Automatically merged due to "Automerge" label
Ruben Kerkhof [Tue, 13 Dec 2016 15:36:26 +0000 (16:36 +0100)]
Merge pull request #2100 from mojaves/pr-virt-disconnect-on-inst0
virt plugin: handle disconnect on inst#0
Francesco Romani [Tue, 13 Dec 2016 15:34:24 +0000 (16:34 +0100)]
virt plugin: Use lv_disconnect on shutdown
Avoiding duplication of the code and let's use
the new lv_disconnect() helper in the lv_shutdown() callback.
Signed-off-by: Francesco Romani <fromani@redhat.com>
Francesco Romani [Mon, 12 Dec 2016 11:05:11 +0000 (12:05 +0100)]
virt plugin: handle disconnect on inst#0
Only one virt reader instance should take care of connection
handling (connection/disconnection) to avoid races and plugin
data corruption, potentially crashing collectd.
This bug cannot be triggered with instances=1 (default settings).
Signed-off-by: Francesco Romani <fromani@redhat.com>
Ruben Kerkhof [Tue, 13 Dec 2016 15:18:42 +0000 (16:18 +0100)]
Merge pull request #2101 from mojaves/pr-virt-open-on-init
virt plugin: Open connection on init()
Francesco Romani [Mon, 12 Dec 2016 15:07:25 +0000 (16:07 +0100)]
virt plugin: fail init with no libvirt connection
Even though we handle disconnection and reconnection
in the read() callback, we expect the libvirt connection
to be available most of the time, including the init()
stage.
Thus, let's fail init() if the connection is not available.
Signed-off-by: Francesco Romani <fromani@redhat.com>
Francesco Romani [Mon, 12 Dec 2016 11:03:43 +0000 (12:03 +0100)]
virt plugin: Open connection on init()
If we use more than one reader instance, we can spot errors like
this in the system logs:
Dec 12 09:59:24 $HOST collectd[19338]: reading number of
domains: invalid connection pointer in virConnectNumOfDomains
Dec 12 09:59:24 benji.rokugan.lan collectd[19338]: read-function of
plugin `virt-2' failed. Will suspend it for 20.000 seconds.
This causes unnecessary delay in the sampling of libvirt.
The reason for this is just one instance (always #0) takes care
of establishing the libvirt connection.
But this could be done safely in the plugin init callback: according
to doc, this function is called at least once before all the read
instances.
Signed-off-by: Francesco Romani <fromani@redhat.com>
Ruben Kerkhof [Mon, 12 Dec 2016 11:34:25 +0000 (12:34 +0100)]
Align dots in ./configure output
Florian Forster [Mon, 12 Dec 2016 07:57:37 +0000 (08:57 +0100)]
Bump version to 5.7.0; Update ChangeLog.
Ruben Kerkhof [Sun, 11 Dec 2016 15:15:01 +0000 (16:15 +0100)]
utils_random.{c,h}: fix build warning
utils_random.c:53:8: warning: no previous prototype for function 'cdrand_d' [-Wmissing-prototypes]
double cdrand_d() {
^
./utils_random.h:32:8: note: this declaration is not a prototype; add 'void' to make it a prototype for a zero-parameter function
double cdrand_d();
^
void
utils_random.c:64:10: warning: no previous prototype for function 'cdrand_u' [-Wmissing-prototypes]
uint32_t cdrand_u() {
^
./utils_random.h:40:10: note: this declaration is not a prototype; add 'void' to make it a prototype for a zero-parameter function
uint32_t cdrand_u();
^
void
2 warnings generated.
Ruben Kerkhof [Sun, 11 Dec 2016 14:04:15 +0000 (15:04 +0100)]
configure.ac: fixup some style issues
I missed these in
865f2eb3
Ruben Kerkhof [Sun, 11 Dec 2016 13:34:26 +0000 (14:34 +0100)]
configure.ac: fix indentation
Sebastian Harl [Sun, 11 Dec 2016 11:06:58 +0000 (12:06 +0100)]
configfile: Reintroduce support for boolean string config values.
For the network plugin, this was changed in
ac73c75aed7 (which landed in 5.6)
which was a backward incompatible change breaking user configuration. Adding
support back in a central location ensures a more consistent behavior across
plugins. At the same time, we issue a warning message that this behavior is
deprecated.
GH #2083, #2098
YmrDtnJu [Sat, 10 Dec 2016 00:30:59 +0000 (01:30 +0100)]
zfs_arc: Ignore the first two lines of the statistics file on Linux.
The first two lines of the statistics file on Linux contain information about
the rest of the file. They do not contain any usable statistics.
See module/spl/spl-kstat.c of the spl module of ZFS on Linux for more
information.
Ruben Kerkhof [Fri, 9 Dec 2016 18:38:11 +0000 (19:38 +0100)]
Travis: install libmicrohttpd
For the write_prometheus plugin
Ruben Kerkhof [Fri, 9 Dec 2016 18:31:58 +0000 (19:31 +0100)]
Travis: install libgps
Ruben Kerkhof [Fri, 9 Dec 2016 17:52:20 +0000 (18:52 +0100)]
Travis: install lua libs
Ruben Kerkhof [Fri, 9 Dec 2016 17:34:42 +0000 (18:34 +0100)]
travis.yml: remove unrecognized option
configure: WARNING: unrecognized options: --with-python
Ruben Kerkhof [Fri, 9 Dec 2016 17:15:29 +0000 (18:15 +0100)]
target_set: plug leak on error
CID 157645