From d70f53287e065d0560c3fcd3ef2e1c89beb1f9b5 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sun, 2 Sep 2007 01:33:57 +0200 Subject: [PATCH] Updated to collectd-4.1.0-1. * Updated copyright file. * Updated collectd.conf. * Added iproute-dev, libsnmp-dev | libsnmp9-dev, xmms-dev build dependencies. --- debian/changelog | 12 ++++++++++ debian/collectd.conf | 53 ++++++++++++++++++++++++++++++++++++++++++++ debian/control | 4 ++-- debian/copyright | 24 +++++++++++--------- 4 files changed, 80 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 005dc71..83245c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +collectd (4.1.0-1) experimental; urgency=low + + * New upstream release. + - Added options to collectd2html.pl to specify host and data directory + (Closes: #438499). + New plugins: + - Detailed Linux network interface and routing statistics: netlink + - Values from SNMP enabled network devices: snmp + - Bitrate and frequency of music played with XMMS: xmms + + -- Sebastian Harl Sun, 2 Sep 2007 00:56:10 +0200 + collectd (4.0.7-1) experimental; urgency=low * New upstream release. diff --git a/debian/collectd.conf b/debian/collectd.conf index 049f63f..8796189 100644 --- a/debian/collectd.conf +++ b/debian/collectd.conf @@ -34,6 +34,7 @@ LoadPlugin load LoadPlugin memory #LoadPlugin multimeter #LoadPlugin mysql +#LoadPlugin netlink #LoadPlugin network #LoadPlugin nfs #LoadPlugin ntpd @@ -44,6 +45,7 @@ LoadPlugin processes LoadPlugin rrdtool #LoadPlugin sensors #LoadPlugin serial +#LoadPlugin snmp LoadPlugin swap LoadPlugin syslog #LoadPlugin tape @@ -51,6 +53,7 @@ LoadPlugin syslog LoadPlugin users #LoadPlugin vserver #LoadPlugin wireless +#LoadPlugin xmms # # URL "http://localhost/status?auto" @@ -129,6 +132,14 @@ LoadPlugin users # Database "db_name" # +# +# Interface "All" +# VerboseInterface "All" +# QDisc "eth0" "pfifo_fast-1:0" +# Class "ppp0" "htb-1:10" +# Filter "ppp0" "u32-1:0" +# + # # Server "ff18::efc0:4a42" "25826" # Server "239.192.74.66" "25826" @@ -181,6 +192,48 @@ LoadPlugin users # IgnoreSelected false # +# +# +# Type "voltage" +# Table false +# Instance "input_line1" +# Values "SNMPv2-SMI::enterprises.6050.5.4.1.1.2.1" +# +# +# Type "users" +# Table false +# Instance "" +# Values "HOST-RESOURCES-MIB::hrSystemNumUsers.0" +# +# +# Type "if_octets" +# Table true +# Instance "IF-MIB::ifDescr" +# Values "IF-MIB::ifInOctets" "IF-MIB::ifOutOctets" +# +# +# +# Address "192.168.0.2" +# Version 1 +# Community "community_string" +# Collect "std_traffic" +# Inverval 120 +# +# +# Address "192.168.0.42" +# Version 2 +# Community "another_string" +# Collect "std_traffic" "hr_users" +# +# +# Address "192.168.0.3" +# Version 1 +# Community "more_communities" +# Collect "powerplus_voltge_input" +# Interval 300 +# +# + LogLevel info diff --git a/debian/control b/debian/control index 9a90ee5..d5ae919 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: collectd Section: utils Priority: optional Maintainer: Sebastian Harl -Build-Depends: debhelper (>= 5), po-debconf, dpatch, bison | byacc, flex, autotools-dev, libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, iptables-dev [!alpha !amd64 !hppa !ia64 !ppc64], nut-dev [!alpha !amd64 !hppa !ia64 !ppc64], libperl-dev +Build-Depends: debhelper (>= 5), po-debconf, dpatch, bison | byacc, flex, autotools-dev, libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, iptables-dev [!alpha !amd64 !hppa !ia64 !ppc64], nut-dev [!alpha !amd64 !hppa !ia64 !ppc64], libperl-dev, iproute-dev, libsnmp-dev | libsnmp9-dev, xmms-dev Build-Conflicts: libpthread-dev Standards-Version: 3.7.2 XS-Vcs-Git: git://git.tokkee.org/pkg-collectd.git @@ -171,7 +171,7 @@ Description: statistics collection daemon (sensors plugin) Package: collectd-dev Architecture: all -Depends: collectd (>= ${source:Version}), collectd (<< 4.1~) +Depends: collectd (>= ${source:Version}), collectd (<< 4.2~) Description: statistics collection daemon (development files) collectd is a small daemon which collects system information periodically and provides mechanismns to store the values in a variety of ways. It is written diff --git a/debian/copyright b/debian/copyright index dbc8eb8..f19cd6d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -33,15 +33,25 @@ Licenses: Files contrib/collectd2html.pl src/hddtemp.c - Copyright 2006 Vincent Stehlé + Copyright (C) 2006 Vincent Stehlé + License: GNU General Public License + + Files contrib/cussh.pl + src/email.c + src/logfile.c + src/perl.c + src/users.c + src/vserver.c + Copyright (C) 2006-2007 Sebastian Harl License: GNU General Public License File src/apache.c - Copyright (C) 2006 Florian Forster + Copyright (C) 2006-2007 Florian Forster Copyright (C) 2007 Florent Monbillard License: GNU General Public License File src/apcups.c + Copyright (C) 2007 Florian Forster Copyright (C) 2006 Anthony Gialluca Copyright (C) 2000-2004 Kern Sibbald Copyright (C) 1996-99 Andre M. Hedrick @@ -53,14 +63,6 @@ Licenses: Copyright (C) 2005-2007 Peter Holik License: GNU General Public License - Files src/email.c - src/logfile.c - src/perl.c - src/users.c - src/vserver.c - Copyright (C) 2006-2007 Sebastian Harl - License: GNU General Public License - File src/iptables.c Copyright (C) 2007 Sjoerd van der Berg License: GNU General Public License @@ -196,6 +198,6 @@ can be found in `/usr/share/common-licenses/LGPL'. Use whatever you like more. -The Debian packaging is (C) 2006, Sebastian Harl and +The Debian packaging is (C) 2006-2007, Sebastian Harl and is licensed under the GPL, see above. -- 2.30.2