[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'
Florian Forster
octo at verplant.org
Tue Aug 19 09:48:26 CEST 2008
AUTHORS | 3 +
configure.in | 48 +++++-
contrib/collection3/etc/collection.conf | 56 ++++++
contrib/collection3/lib/Collectd/Graph/Config.pm | 144 +++++++++++++++
src/Makefile.am | 10 +-
src/processes.c | 20 ++-
src/snmp.c | 19 +--
src/swap.c | 12 +-
src/tcpconns.c | 210 ++++++++++++++++++++--
9 files changed, 479 insertions(+), 43 deletions(-)
New commits:
commit d4a4b86e962952fa32297e955ea1b168f1d70740
Author: Florian Forster <octo at huhu.verplant.org>
Date: Tue Aug 19 09:47:46 2008 +0200
build system: Automatically enable the processes and tcpconns plugins.
commit efbeffe4cc730d6e14ba45dddfee9ab5229f07dc
Merge: 043a6f45dbab10267d0bb81ec5ad9a313669ec35 903ebad4e6fe24e6b04097f18048b63ebb3bcb29
Author: Florian Forster <octo at huhu.verplant.org>
Date: Tue Aug 19 09:46:34 2008 +0200
Merge branch 'collectd-4.4'
Conflicts:
configure.in
commit 903ebad4e6fe24e6b04097f18048b63ebb3bcb29
Merge: 61011a9d336d85890eac845c5af23a8046e74c10 540e2d3c242dd39bb304fc3548dad5437ed6eddc
Author: Florian Forster <octo at huhu.verplant.org>
Date: Tue Aug 19 09:45:35 2008 +0200
Merge branch 'collectd-4.3' into collectd-4.4
commit 540e2d3c242dd39bb304fc3548dad5437ed6eddc
Author: Florian Forster <octo at huhu.verplant.org>
Date: Tue Aug 19 09:44:56 2008 +0200
build system: Automatically enable the swap plugin if the kvm library is found.
This fixes a bug introduced with the previous commit.
commit 043a6f45dbab10267d0bb81ec5ad9a313669ec35
Author: Florian Forster <octo at huhu.verplant.org>
Date: Tue Aug 19 09:42:15 2008 +0200
build system: Check for `kvm_nlist'.
Build the tcpconns plugin if it exists.
commit 5db1547c947a42577709f74fe3324bf2d00ea87c
Merge: 31604b175ea62f9af1b0e36a1f32a77ba0712808 6065fb667bcdb2409af5509f1af9904047a401be
Author: Florian Forster <octo at huhu.verplant.org>
Date: Tue Aug 19 09:35:07 2008 +0200
Merge branch 'ms/tcpconns'
commit 31604b175ea62f9af1b0e36a1f32a77ba0712808
Author: Florian Forster <octo at huhu.verplant.org>
Date: Tue Aug 19 09:34:08 2008 +0200
build system: Check for `kvm_getprocs'.
Link the processes plugin with the `kvm' library if it provides this symbol.
commit abfe65ffb5239060c0c9558d916bbeddee0bc86c
Merge: 5e700757575fa6606cf201947cb0efb57ce12e6d 61011a9d336d85890eac845c5af23a8046e74c10
Author: Florian Forster <octo at huhu.verplant.org>
Date: Tue Aug 19 09:27:14 2008 +0200
Merge branch 'collectd-4.4'
Conflicts:
src/tcpconns.c
commit 61011a9d336d85890eac845c5af23a8046e74c10
Merge: 7881caca3cf7ee5253b5a3e3b7e2efe1e351dc2c c146aa8a58c370ced66a869a49028232b6bd9bdf
Author: Florian Forster <octo at huhu.verplant.org>
Date: Tue Aug 19 09:26:13 2008 +0200
Merge branch 'collectd-4.3' into collectd-4.4
commit c146aa8a58c370ced66a869a49028232b6bd9bdf
Merge: aac435a16a547dd0a7621d0cda75b2918b24b515 e2004cdfb5c19647c3fc35f1322a5990cf04a8c8
Author: Florian Forster <octo at huhu.verplant.org>
Date: Tue Aug 19 09:25:46 2008 +0200
Merge branch 'collectd-4.3' of /var/lib/git/collectd into collectd-4.3
commit aac435a16a547dd0a7621d0cda75b2918b24b515
Author: Florian Forster <octo at huhu.verplant.org>
Date: Tue Aug 19 09:24:33 2008 +0200
build system: Define which version of libkvm has been checked for.
The used `kvm_getswapinfo' is apparently an extension not all versions of the
kvm library support.
commit 6065fb667bcdb2409af5509f1af9904047a401be
Author: Florian Forster <octo at huhu.verplant.org>
Date: Tue Aug 19 07:42:07 2008 +0200
tcpconns plugin: Removed legacy variables.
`off' was forgotten and the global `nl' was already commented out.
commit e2004cdfb5c19647c3fc35f1322a5990cf04a8c8
Author: Florian Forster <octo at noris.net>
Date: Mon Aug 18 18:19:26 2008 +0200
tcpconns plugin: Fix another format string.
commit a4dd6274577a8213ea0c23e4379a32b04406ebf1
Author: Florian Forster <octo at huhu.verplant.org>
Date: Mon Aug 18 17:44:16 2008 +0200
tcpconns plugin: Various fixes for OpenBSD.
- Renamed the TCP states to be the same as used with other operating systems.
- Improved and added error messages.
- Stripped down the `struct nlist'.
- Cleaned up `conn_read'.
- Support for IPv6 sockets has been improved: Not connected IPv6 sockets are
now ignored, too. No idea what the remote-port previously would have been.
commit 3a52ff10fbf2a05a80f699cae8184b6ae972353f
Author: Florian Forster <octo at huhu.verplant.org>
Date: Mon Aug 18 16:24:22 2008 +0200
AUTHORS: Added Michael Stapelberg.
commit 7132090f6bfe5556558975a2b3507ace80388491
Author: Florian Forster <octo at huhu.verplant.org>
Date: Mon Aug 18 16:16:28 2008 +0200
build system: Added OpenBSD specific behavior for the tcpconns plugin.
commit cac681c56b06231b18fc02ffd71d4afd13973050
Author: Michael Stapelberg <michael+git at stapelberg.de>
Date: Sat Aug 9 14:42:07 2008 +0200
tcpconns plugin: Add compatibility for OpenBSD.
Hi there,
I've just integrated OpenBSD-support into the tcpconns module. Please test this
thouroughly, it's not running for so long on my box (but works fine).
Also, please add -lkvm to the right place in the autoconf-stuff so that when
using tcpconns on OpenBSD, libkvm is linked.
Also, I'm not sure about how much of the license we need to embed. I'll
therefore post the full license information so you can put it in if you feel
like:
/* $collectd: parts of tcpconns.c, 2008/08/08 03:48:30 Michael Stapelberg $ */
/* $OpenBSD: inet.c,v 1.100 2007/06/19 05:28:30 ray Exp $ */
/* $NetBSD: inet.c,v 1.14 1995/10/03 21:42:37 thorpej Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
Best regards,
Michael
commit e0fdc19f6e9f61323a2d61e00e6226070e35668b
Author: Florian Forster <octo at huhu.verplant.org>
Date: Mon Aug 18 16:18:41 2008 +0200
tcpconns plugin: Fix formatstrings.
commit 0109e3c1f3a515ed716ddbdc261e0ed2e3f8e640
Author: Florian Forster <octo at noris.net>
Date: Mon Aug 18 10:48:21 2008 +0200
snmp plugin: Fix a possible memory leak.
The result was not freed when `csnmp_instance_list_add' failed. This
rarely happens in 4.3, but later versions will be more strict in the
function, so this became a problem.
commit 7881caca3cf7ee5253b5a3e3b7e2efe1e351dc2c
Author: Florian Forster <octo at noris.net>
Date: Wed Aug 13 11:45:45 2008 +0200
contrib/collection3: Added a couple more graph definitions.
commit e7db41673ef77bb980d3192ae59bea07e2e65507
Author: Florian Forster <octo at huhu.verplant.org>
Date: Wed Aug 13 09:48:50 2008 +0200
contrib/collection3: Added the forgotten Collectd::Graph::Config module.
More information about the collectd-changes
mailing list