From: Sebastian Harl Date: Fri, 10 Sep 2010 20:22:21 +0000 (+0200) Subject: Merged commit 'collectd-4.10.1-1' into lenny-backports. X-Git-Tag: collectd-4.10.1-1--bpo50+1~3 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=cbbff4878edd7b93b70c3b3a2e030d5716af7faf;p=pkg-collectd.git Merged commit 'collectd-4.10.1-1' into lenny-backports. --- cbbff4878edd7b93b70c3b3a2e030d5716af7faf diff --cc debian/changelog index f39cd81,d5c81dd..7c3a1c0 --- a/debian/changelog +++ b/debian/changelog @@@ -1,39 -1,49 +1,85 @@@ + collectd (4.10.1-1) unstable; urgency=low + + * New upstream release. + * debian/patches: + - Removed bts561577_collectd2html_recursive_fix -- applied upstream. + - Removed bts575029-collectd2html-xhtml -- applied upstream. + - Removed bts557599_powerdns_fix -- applied upstream. + * debian/control: + - Updated standards-version to 3.9.1 -- no changes. + + -- Sebastian Harl Wed, 28 Jul 2010 18:45:31 +0200 + + collectd (4.10.0-1) unstable; urgency=low + + * New upstream release: + New plugins: + - Parse XML data: curl_xml + - Parse values from Modbus/TCP enabled devices: modbus (disabled in + Debian; libmodbus is not available) + - Timing values from Pinba: pinba + * debian/control: + - Build-depend on libprotobuf-c0-dev and protobuf-c-compiler required by + the 'pinba' plugin. + - Updated to standards-version 3.8.4 -- no changes. + * debian/patches: + - Removed bts566199_collection_hide_types -- applied upstream. + - Removed typo_fixes -- applied upstream. + - Added bts575029-collectd2html-xhtml, adding support for XHTML to + collectd2html.pl; thanks to Ivan Shmakov for reporting this and Max + Henkel and Timur Kirilichev for providing patches (Closes: #575029). + * debian/rules: + - Define (and pass to configure) $JAR, required by current versions of the + Java bindings. + - Added support for Renesas SH4 to the Java arch mapping; thanks to + Nobuhiro Iwamatsu for the patch (Closes: #564165). + * debian/collectd.postinst: + - Manually replace /usr/share/doc/collectd/examples/ with a symlink when + upgrading from versions << 4.10.0-1~ -- this is not handled by dpkg + according to policy 6.6; thanks to Joey Hess for reporting this + (Closes: #569268). + * debian/collectd-core.overrides: + - Override 'capitalization-error-in-description python Python' -- all + plugin names are spelled in lower-case letters. + + -- Sebastian Harl Tue, 08 Jun 2010 00:42:56 +0200 + +collectd (4.9.1-2~bpo50+2) lenny-backports; urgency=low + + * debian/control: + - Build-depend on "libsnmp-dev | libsnmp9-dev" rather than specifying the + right combination of libsnmp-dev and perl, which might confuse buildds + on Lenny. Lenny is not affected by #559087 (see 4.8.2-1). + + -- Sebastian Harl Thu, 08 Apr 2010 20:05:46 +0200 + +collectd (4.9.1-2~bpo50+1) lenny-backports; urgency=low + + * Rebuild for lenny-backports. + * debian/control: + - Build-conflict with iptables-dev to force the use of the shipped libiptc + (this allows building the iptables plugin on all architectures). + - Build-depend on libltdl3-dev, rather than libltdl-dev -- the latter is + not available in Lenny. + - Build-depend on libsensors-dev, rather than libsensors4-dev, which is + not available in Lenny. This limits the functionality of the "sensors" + plugin which does not work well with libsensors3 and lm-sensors-3 + (Re-opens: #538795). + * debian/collectd.conf, debian/control, debian/rules: + - Disabled the "gmond" plugin, which requires libganglia (>= 3) which is + not available in Lenny; removed build-dependency on libganglia-dev. + - Disabled the "memcachec" plugin, which requires libmemcached which is + not available in Lenny; removed build-dependency on libmemcached-dev. + - Disabled the "rrdcached" plugin, which requires rrdclient support in + librrd; removed version from librrd-dev build-dependency. + - Disabled the "tokyotyrant" plugin, which requires libtokyotyrant which + is not available in Lenny; removed libtokyocabinet-dev and + libtokyotyrant-dev build-dependencies. + - Disabled the "curl_json" plugin, which requires libyajl which is not + available in Lenny; removed libyajl-dev build-dependency. + + -- Sebastian Harl Mon, 22 Mar 2010 23:31:30 +0100 + collectd (4.9.1-2) unstable; urgency=low * debian/rules: diff --cc debian/collectd.conf index b138a50,b5fc462..a05694a --- a/debian/collectd.conf +++ b/debian/collectd.conf @@@ -38,6 -40,8 +40,7 @@@ LoadPlugin cp #LoadPlugin cpufreq #LoadPlugin csv #LoadPlugin curl -#LoadPlugin curl_json + #LoadPlugin curl_xml #LoadPlugin dbi LoadPlugin df LoadPlugin disk @@@ -173,6 -182,56 +177,25 @@@ LoadPlugin user # # -# -## See: http://wiki.apache.org/couchdb/Runtime_Statistics -# -# Instance "httpd" -# -# Type "http_requests" -# -# -# -# Type "http_request_methods" -# -# -# -# Type "http_response_codes" -# -# -## Database status metrics: -# -# Instance "dbs" -# -# Type "gauge" -# -# -# Type "counter" -# -# -# Type "bytes" -# -# -# - + # + # + # Host "my_host" + # Instance "some_instance" + # User "collectd" + # Password "thaiNg0I" + # VerifyPeer true + # VerifyHost true + # CACert "/path/to/ca.crt" + # + # + # Type "magic_level" + # InstancePrefix "prefix-" + # InstanceFrom "td[1]" + # ValuesFrom "td[2]/span[@class=\"level\"]" + # + # + # + # # # Statement "SELECT 'customers' AS c_key, COUNT(*) AS c_value \ diff --cc debian/control index 9f607a0,1fb6d82..54bbabb --- a/debian/control +++ b/debian/control @@@ -18,17 -21,24 +18,19 @@@ Build-Depends: debhelper (>= 5), dpkg-d libpcap0.8-dev | libpcap-dev, libperl-dev, libpq-dev, + libprotobuf-c0-dev, - librrd-dev (>= 1.4~), - libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64], -# libsnmp-dev (>= 5.4.2.1~dfsg-4~) | (libsnmp-dev & perl (<< 5.10.1~rc2-1~)) - libsnmp-dev (>= 5.4.2.1~dfsg-4~) | libsnmp-dev | libsnmp9-dev, - libsnmp-dev (>= 5.4.2.1~dfsg-4~) | perl (<< 5.10.1~rc2-1~), - libtokyocabinet-dev [!kfreebsd-i386 !kfreebsd-amd64], - libtokyotyrant-dev [!kfreebsd-i386 !kfreebsd-amd64], + librrd-dev, + libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64], + libsnmp-dev | libsnmp9-dev, libupsclient1-dev, libvirt-dev (>= 0.4.0-6) [!kfreebsd-i386 !kfreebsd-amd64], libxml2-dev, - libyajl-dev, linux-libc-dev (>= 2.6.25-4) [!kfreebsd-i386 !kfreebsd-amd64] | linux-libc-dev (<< 2.6.25-1) [!kfreebsd-i386 !kfreebsd-amd64], openjdk-6-jdk [!hppa !kfreebsd-i386 !kfreebsd-amd64], + protobuf-c-compiler, python-dev -Build-Conflicts: libpthread-dev +Build-Conflicts: libpthread-dev, iptables-dev - Standards-Version: 3.8.3 + Standards-Version: 3.9.1 Homepage: http://collectd.org/ Vcs-Git: git://git.tokkee.org/pkg-collectd.git Vcs-Browser: http://git.tokkee.org/?p=pkg-collectd.git @@@ -75,6 -86,8 +78,7 @@@ Description: statistics collection and * CPU frequency: cpufreq * output to comma separated values (CSV) files: csv * parse statistics from websites: curl - * parse JSON files: curl_json + * parse XML data: curl_xml * query data from a relational database: dbi * disk space usage: df * disk and partition throughput: disk @@@ -97,8 -111,10 +101,9 @@@ * logging to files, STDOUT and STDERR: logfile * Atheros wireless LAN chipset statistics: madwifi * motherboard monitor: mbmon - * Query and parse data from a memcache daemon: memcachec * statistics of the memcached distributed caching system: memcached * memory usage: memory + * statistics from mon.itor.us: Monitorus (Perl based plugin) * multimeter statistics: multimeter * MySQL statistics provided by MySQL's "show status" command: mysql * detailed Linux network interface and routing statistics: netlink @@@ -114,10 -134,10 +123,9 @@@ * PostgreSQL database statistics: postgresql * PowerDNS name server statistics: powerdns * number of processes: processes - * output to RRD files: rrdtool - * embedded Perl interpreter: perl - * network latency statistics: ping * information about network protocols: protocols + * embedded Python interpreter: python - * write data via the RRD accelerator daemon: rrdcached + * output to RRD files: rrdtool * lm_sensors information (e.g. CPU temperature, fan speeds): sensors * serial port traffic: serial * values from SNMP enabled network devices: snmp @@@ -126,9 -146,10 +134,9 @@@ * parse table-like structured files: table * incremental parsing of logfiles: tail * number of TCP connections to specific ports: tcpconns + * TeamSpeak2 server statistics: teamspeak2 * power consumption measurements from "The Energy Detective" (TED): ted * Linux ACPI thermal zone information: thermal - * TeamSpeak2 server statistics: teamspeak2 - * Tokyo Tyrant server statistics: tokyotyrant * external runtime interface: unixsock * system uptime: uptime * number of users logged into the system: users diff --cc debian/rules index fb9ad0a,068edec..46fdbf8 --- a/debian/rules +++ b/debian/rules @@@ -61,15 -62,9 +62,18 @@@ confflags = --host=$(DEB_HOST_GNU_TYPE # These plugins do not provide any functionality under Linux. confflags += --disable-apple_sensors --disable-tape +# libyajl is required for the curl_json plugin. +confflags += --disable-curl_json + +# libganglia >= 3 is required for the gmond plugin. +confflags += --disable-gmond + +# libmemcached is required for the memcachec plugin. +confflags += --disable-memcachec + + # libmodbus is required for the modbus plugin. + confflags += --disable-modbus + # libnetapp is required for the netapp plugin. confflags += --disable-netapp