![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc@bl.uem.li> | |
| Thu, 5 Jan 2017 21:25:07 +0000 (22:25 +0100) | ||
| committer | Marc Fournier <marc@bl.uem.li> | |
| Thu, 5 Jan 2017 21:25:07 +0000 (22:25 +0100) |
| 1 | 2 | |||
|---|---|---|---|---|
| debian/changelog | patch | | diff1 | | diff2 | | blob | history |
| debian/control | patch | | diff1 | | diff2 | | blob | history |
| debian/rules | patch | | diff1 | | diff2 | | blob | history |
diff --combined debian/changelog
index eb0c3bdc2fd19fdb43f70042bde96bb7bc56c276,094f89d3227899b3ea4928dc05589bef05987d83..0ceef78bb5087dcedc7f88f72d1ca137cddb98ee
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
+ collectd (5.7.0-3) unstable; urgency=medium
+
+ * debian/control: Skip libdpdk-dev build dependency on non-Intel
+ architectures.
+
+ -- Marc Fournier <marc@bl.uem.li> Sun, 18 Dec 2016 22:08:27 +0100
+
+ collectd (5.7.0-2) unstable; urgency=medium
+
+ * debian/patches: add dpdkstat-portable-format-string.patch, fixing the
+ build on i386.
+ * debian/rules: Disable dpdkstat plugin on non-Intel architectures.
+
+ -- Marc Fournier <marc@bl.uem.li> Sun, 18 Dec 2016 17:05:10 +0100
+
+ collectd (5.7.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ New plugins:
+ - DPDK interface statistics: dpdkstat
+ - Report the number of used and free hugepages: hugepages (Linux-specific)
+ - Intel Resource Director Technology statistics: intel_rdt (disabled in
+ Debian because of missing dependencies)
+ - Publish values in a Prometheus-compatible format: write_prometheus
+ * debian/rules:
+ - Disable hugepages plugin on non-Linux.
+ - Disable the intel_rdt plugin.
+ * debian/control:
+ - Build-depend on libdpdk-dev: Needed by the new dpdkstat plugin.
+ - Build-depend on libmicrohttpd-dev: Needed by the new write_prometheus
+ plugin.
+ - Suggests icinga instead of nagios packages (nagios3 removed from
+ Debian. Closes: #846859). Thanks to Bas Couwenberg.
+ * debian/patches:
+ - Removed configure_find_lc_all.patch; included upstream.
+ - Added nagios-debian-paths.patch, to use nagios-nrpe-server &
+ monitoring-plugin paths for Debian. Thanks to Bas Couwenberg.
+
+ -- Marc Fournier <marc@bl.uem.li> Fri, 16 Dec 2016 22:11:21 +0100
+
+ collectd (5.6.1-2) unstable; urgency=medium
+
+ * debian/control:
+ - Add libdevstat-dev and libgeom-dev to kfreebsd build-deps, as they're
+ needed by the disk plugin. Thanks to Florian Forster for pointing this
+ out.
+ - Update "Vcs-Git" and "Vcs-Browser" fields to point to GitHub repo.
+ - Changed build-dependency libmysqlclient-dev to
+ default-libmysqlclient-dev, and mysql-server to default-mysql-server.
+ - collectd-core.deb: Add "Depends" on lsb-base, as /etc/init.d/collectd
+ requires /lib/lsb/init-functions.
+ - Remove "Multi-Arch: same" from libcollectdclient-dev, until the package
+ gets reworked to really be multi-arch ready.
+ * debian/control, debian/compat:
+ - Bump debhelper compat version to 9.
+
+ -- Marc Fournier <marc@bl.uem.li> Tue, 01 Nov 2016 07:32:47 +0100
+
+ collectd (5.6.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ - write_graphite plugin is no longer linked against libyajl. Thanks to
+ Shish for reporting this (Closes: #839771).
+ - rrdcached plugin now reconnects to daemon. Thanks to Matthias Urlichs
+ for reporting this (Closes: #657877).
+ * debian/control:
+ - Add "Multi-Arch: same" to libcollectdclient-dev, as suggested by the
+ Multiarch hinter.
+ * debian/patches:
+ - Update configure_find_lc_all.patch to reliably pick the same JVM for
+ each build, making the process reproducible.
+ * debian/rules:
+ - Disable building the barometer, drbd, fhcount and ipc plugins on
+ kfreebsd architectures, as they are Linux-only.
+ - Run the test suite using dh_auto_test.
+
+ -- Marc Fournier <marc@bl.uem.li> Sun, 09 Oct 2016 21:42:29 +0200
+
+ collectd (5.6.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ - The disk plugin now supports FreeBSD; enable it in debian/rules.
+ - Suppress spammy debug messages; thanks to Antonio Russo for reporting
+ this (Closes: #797687).
+ New plugins:
+ - Chrony daemon statistics: chrony
+ - CPU sleep: Time spent in suspend: cpusleep (Linux-specific)
+ - Monitor gps related data through gpsd: gps
+ - Send or receive values over the network using the gRPC framework: grpc
+ (disabled in Debian because of missing dependencies)
+ - Lua interpreter embedded into collectd: lua
+ - Publishes and subscribes to MQTT topics: mqtt
+ - Submit notifications as passive check results to a local nagios
+ instance: notify_nagios
+ - XEN Hypervisor CPU stats: xencpu
+ - Solaris zone metrics: zone (disabled in Debian; Solaris specific)
+ * debian/rules:
+ - Disable cpusleep plugin on non-Linux.
+ - Disable xencpu plugin except on amd64, arm64, armhf, and i386.
+ - Disable the zone plugin.
+ - Do not cripple include files in collectd-dev when patching them; thanks
+ to Scott Talbert for reporting this (Closes: #827759).
+ * debian/control:
+ - Build-depend on libgps-dev: Needed by the new gps plugin.
+ - Build-depend on liblua5.3-dev: Needed by the new lua plugin.
+ - Build-depend on libmosquitto-dev: Needed by the new mqtt plugin.
+ - Build-depend on libxen-dev [amd64 arm64 armhf i386]: Needed by the new
+ xencpu plugin.
+ - Build-depend on libriemann-client-dev, riemann-c-client: Now needed by
+ the riemann plugin.
+ * debian/patches:
+ - Removed bts832577-gcry-control.patch; included upstream.
+ - Removed gcc6.patch; included upstream.
+
+ -- Sebastian Harl <tokkee@debian.org> Sat, 24 Sep 2016 15:19:10 +0200
+
+ collectd (5.5.2-2) unstable; urgency=low
+
+ * debian/changelog:
+ - Set urgency back to low.
+ * debian/control:
+ - Update GCrypt's package name to libgcrypt20-dev.
+ * debian/patches:
+ - Added configure_find_lc_all.patch: forcing locale in configure script
+ will hopefully fix build reproducibility on non-amd64 plafroms.
+
+ -- Marc Fournier <marc@bl.uem.li> Wed, 21 Sep 2016 14:01:55 +0200
+
+collectd (5.5.2-1~bpo7+1) wheezy-backports-sloppy; urgency=high
+
+ * Rebuild for wheezy-backports-sloopy.
+
+ -- Marc Fournier <marc@bl.uem.li> Sat, 06 Aug 2016 00:43:12 +0200
+
collectd (5.5.2-1) unstable; urgency=high
* New upstream release.
-- Sebastian Harl <tokkee@debian.org> Sat, 02 Apr 2016 11:02:49 +0200
+collectd (5.5.1-1~bpo7+1) wheezy-backports-sloppy; urgency=medium
+
+ * Rebuild for wheezy-backports-sloppy.
+
+ -- Marc Fournier <marc@bl.uem.li> Fri, 29 Jan 2016 14:18:24 +0100
+
collectd (5.5.1-1) unstable; urgency=medium
* New upstream release:
-- Marc Fournier <marc@bl.uem.li> Mon, 16 Nov 2015 21:03:31 +0100
+collectd (5.5.0-3~bpo7+1) wheezy-backports-sloppy; urgency=medium
+
+ * Rebuild for wheezy-backports-sloppy.
+ * debian/rules, debian/control:
+ - remove references to systemd and strip-nondeterminism, which were
+ introduced in jessie.
+ - disable building sigrok, turbostat and write_kafka plugins, as the
+ required build-dependencies aren't available in wheezy.
+ - build uuid plugin against libhal, as this lib is still available on
+ wheezy.
+ - adjust libprotobuf build-dependency name.
+
+ -- Marc Fournier <marc@bl.uem.li> Thu, 08 Oct 2015 08:26:10 +0200
+
collectd (5.5.0-3) unstable; urgency=medium
* debian/rules, debian/control:
diff --combined debian/control
index f89f5bbd4192a8d9e6527ecdfcd301d94c8d584b,0ffd81adb21cf3f130ba3c244a8eef4ce250b2cc..e8406b260050518db500da36aac1f7d4a083977d
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
Priority: optional
Maintainer: Sebastian Harl <tokkee@debian.org>
Uploaders: Marc Fournier <marc@bl.uem.li>
- Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf, dh-autoreconf,
-Build-Depends: debhelper (>= 9.20120909~), dpkg-dev (>= 1.14.10), po-debconf, dh-systemd (>= 1.5), dh-strip-nondeterminism, dh-autoreconf,
++Build-Depends: debhelper (>= 9.20120909~), dpkg-dev (>= 1.14.10), po-debconf, dh-autoreconf, dh-autoreconf,
bison, flex, autotools-dev, libltdl-dev, pkg-config,
+ default-libmysqlclient-dev,
iptables-dev (>= 1.4.3.2-2) [linux-any],
javahelper,
kfreebsd-kernel-headers [kfreebsd-any],
libatasmart-dev [linux-any],
- libcap-dev [linux-any],
+# libcap-dev [linux-any],
libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev,
+ libdevstat-dev [kfreebsd-any],
libdbi0-dev,
+ libdpdk-dev [amd64 i386],
libesmtp-dev,
libganglia1-dev (>= 3) [linux-any],
- libgcrypt11-dev,
+ libgeom-dev [kfreebsd-any],
+ libgcrypt20-dev,
libglib2.0-dev,
+ libgps-dev,
+ libhal-dev,
libhiredis-dev,
libi2c-dev,
libkvm-dev [kfreebsd-any],
libldap2-dev,
+ liblua5.3-dev,
liblvm2-dev [linux-any],
libmemcached-dev,
+ libmicrohttpd-dev,
libmodbus-dev,
+ libmosquitto-dev,
libmnl-dev [linux-any],
- libmysqlclient-dev,
libnotify-dev,
libopenipmi-dev,
liboping-dev (>= 0.3.3),
libpcap0.8-dev | libpcap-dev,
libperl-dev,
libpq-dev,
- libprotobuf-c-dev,
+ libprotobuf-c0-dev,
+# librdkafka-dev,
librabbitmq-dev,
+ librdkafka-dev,
+ libriemann-client-dev,
librrd-dev (>= 1.4~),
libsensors4-dev [linux-any],
- libsigrok-dev (>= 0.2~) [linux-any],
+# libsigrok-dev (>= 0.2~),
# 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~),
libupsclient-dev | libupsclient1-dev,
libvarnishapi-dev,
libvirt-dev (>= 0.4.0-6) [linux-any],
+ libxen-dev [amd64 arm64 armhf i386],
libxml2-dev,
libyajl-dev,
linux-libc-dev (>= 2.6.25-4) [linux-any] | linux-libc-dev (<< 2.6.25-1) [linux-any],
default-jdk [!hppa !sparc !kfreebsd-i386 !kfreebsd-amd64],
protobuf-c-compiler,
- python-dev,
- riemann-c-client
-Build-Conflicts: libpthread-dev, libhal-dev
+ python-dev
+Build-Conflicts: libpthread-dev
Standards-Version: 3.9.8
- Homepage: http://collectd.org/
- Vcs-Git: git://git.tokkee.org/pkg-collectd.git
- Vcs-Browser: http://git.tokkee.org/?p=pkg-collectd.git
+ Homepage: https://collectd.org/
+ Vcs-Git: https://github.com/collectd/pkg-debian.git
+ Vcs-Browser: https://github.com/collectd/pkg-debian.git
Package: collectd-core
Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
+ Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base
Recommends: perl, rrdtool
Suggests: collectd-dev,
# collection.cgi / collection3 dependencies
librrds-perl, liburi-perl, libhtml-parser-perl, libregexp-common-perl,
libconfig-general-perl, httpd-cgi,
# services providing data that may be collected by collectd
- apache2, apcupsd, bind9, ceph, hddtemp, iptables, ipvsadm, lm-sensors, mbmon,
- memcached, mysql-server | virtual-mysql-server, nginx, notification-daemon, nut, openvpn, olsrd,
- pdns-server, postgresql, redis-server, slapd, time-daemon, varnish, zookeeper,
+ apache2, apcupsd, bind9, ceph, chrony, default-mysql-server, gpsd, hddtemp,
+ iptables, ipvsadm, lm-sensors, mbmon, memcached, nginx, notification-daemon,
+ nut, openvpn, olsrd, pdns-server, postgresql, redis-server, slapd,
+ time-daemon, varnish, zookeeper,
${shlibs:Suggests}, default-jre-headless
Replaces: collectd (<< 4.8.2-1~)
Description: statistics collection and monitoring daemon (core system)
* bind9 name-server and zone statistics: bind
* Ceph distributed storage system statitics: ceph
* CGroups resource usage: cgroups
+ * Chrony daemon statistics: Local clock drift, offset to peers: chrony
* connection tracking table size: conntrack
* number of context switches done by the operating system: contextswitch
* CPU utilization: cpu
* CPU frequency: cpufreq
+ * CPU sleep: Time spent in suspend : cpusleep
* output to comma separated values (CSV) files: csv
* parse statistics from websites: curl
* parse JSON files: curl_json
* disk space usage: df
* disk and partition throughput: disk
* DNS traffic information: dns
+ * DPDK interface statistics: dpdkstat
* Distributed Replicated Block Device status: drbd
* E-Mail statistics (count, traffic, spam scores and checks): email
* amount of available entropy: entropy
* count the number of open file handles: fhcount
* count the number of files in directories: filecount
* Linux file-system based caching framework statistics: fscache
+ * Monitor gps related data through gpsd: gps
* query data from Java processes using JMX: GenericJMX (Java based plugin)
* receive and interpret Ganglia multicast traffic: gmond
* harddisk temperature: hddtemp
+ * Report the number of used and free hugepages: hugepages
* network traffic: interface
* IPC statistics: ipc
* IPMI sensors information: ipmi
* system load averages: load
* logging to files, STDOUT and STDERR: logfile
* logging in logstash's JSON event format: log_logstash
+ * embedded Lua interpreter: lua
* Logical Volume Manager usage: lvm
* Atheros wireless LAN chipset statistics: madwifi
* motherboard monitor: mbmon
* memory usage: memory
* read values from Modbus/TCP enabled devices: modbus
* statistics from mon.itor.us: Monitorus (Perl based plugin)
+ * Publishes and subscribes to MQTT topics: mqtt
* multimeter statistics: multimeter
* MySQL statistics provided by MySQL's "show status" command: mysql
* detailed Linux network interface and routing statistics: netlink
* Nginx (a HTTP and E-Mail server/proxy) statistics: nginx
* send desktop notifications to a notification daemon: notify_desktop
* send notification E-mails: notify_email
+ * send notifications to nagios: notify_nagios
* NTP daemon's local clock drift, offset to peers, etc.: ntpd
* UPS information: nut
* Optimized Link State Routing daemon statistics: olsrd
* send collected values to a web-server: write_http
* send collected values to an Apache Kafka message broker: write_kafka
* send collected values to the logging subsystem: write_log
+ * publish collected values as a Prometheus exporter: write_prometheus
* send collected values to a Redis server: write_redis
* send collected values to a Riemann server: write_riemann
* send collected values to a Sensu client: write_sensu
* send collected values to an OpenTSDB server: write_tsdb
+ * XEN Hypervisor CPU stats: xencpu
* ZFS's Adaptive Replacement Cache statistics: zfs_arc
* data from Zookeeper's MNTR command: zookeeper
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: collectd
- Suggests: nagios3 | nagios2
+ Suggests: icinga
Replaces: collectd (<< 4.6.1-1~)
Description: statistics collection and monitoring daemon (utilities)
collectd is a small daemon which collects system information periodically and
Package: collectd-dev
Architecture: all
- Depends: collectd-core (>= ${source:Version}), collectd-core (<< 5.6~),
+ Depends: collectd-core (>= ${source:Version}), collectd-core (<< 5.8~),
${misc:Depends}
Description: statistics collection and monitoring daemon (development files)
collectd is a small daemon which collects system information periodically and
diff --combined debian/rules
index 1029f44b9c9317435aabe2f260aca76b1fdbfd4a,b3325ec7870a430c57e3f380e30fb5dca1fbbdbf..779f5a730e7b67dbed3bc0861ba1c5536695deb2
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
# librouteros is required for the routeros plugin.
confflags += --disable-routeros
+# libsigrok >= 0.2.0 is required for the sigrok plugin
+confflags += --disable-sigrok
+
+# linux-libc-dev >= 3.13 is required for the turbostat plugin.
+confflags += --disable-turbostat
+
# libmongoc is required for the write_mongodb plugin.
confflags += --disable-write_mongodb
+# librdkafka is required for the write_kafka plugin.
+confflags += --disable-write_kafka
+
# xmms1 is required for the xmms plugin.
confflags += --disable-xmms
+ # protobuf-compiler >= 3.0.0 and libgrpc++ are required for the grpc plugin.
+ confflags += --disable-grpc
+
+ # libqpos is required for the intel_rdt plugin.
+ confflags += --disable-intel_rdt
+
# These plugins are Linux-specific.
ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
confflags += \
+ --disable-barometer \
--disable-cgroups \
+ --disable-cpusleep \
+ --disable-drbd \
--disable-ethstat \
+ --disable-fhcount \
+ --disable-hugepages \
+ --disable-ipc \
--disable-iptables \
--disable-ipvs \
--disable-lvm \
--disable-pf
endif
+ # This plugin is Solaris-specific.
+ confflags += \
+ --disable-zone
+
# These plugins have not been ported to FreeBSD yet.
ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
# Work-around an incomplete check for kvm functionality
--disable-conntrack \
--disable-contextswitch \
--disable-cpufreq \
- --disable-disk \
--disable-entropy \
--disable-fscache \
--disable-irq \
--disable-java
endif
- # This plugin is Intel-hardware specific.
+ # These plugins are Intel-hardware specific.
ifeq (,$(filter amd64 i386, $(DEB_BUILD_ARCH)))
confflags += \
+ --disable-dpdkstat \
--disable-turbostat
endif
+ # This plugin is x86 and arm specific.
+ ifeq (,$(filter amd64 arm64 armhf i386, $(DEB_BUILD_ARCH)))
+ confflags += \
+ --disable-xencpu
+ endif
+
# libatasmart isn't available on these platforms.
ifneq (,$(filter hurd-i386 kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
confflags += --disable-smart
|| ( status=$$?; cat config.log; exit $$status )
$(MAKE)
+ dh_auto_test
perl ./debian/bin/check_plugins.pl
touch build-stamp
libname=$$(basename $$lib); \
fullpath=$$(echo $$lib | sed -r -e 's,^\./,collectd/,'); \
for dir in $$(find . -mindepth 1 -type d); do \
- sed -r -i -e "s,(include\s+)\".*$$libname\",\1\"$$fullpath\"," $$dir/*.h; \
+ sed -r -i -e "s,(include\s+)\".*\<$$libname\",\1\"$$fullpath\"," $$dir/*.h; \
done; \
done )
dh_testdir
dh_testroot
dh_installchangelogs -i ChangeLog
- dh_installdocs -A -i debian/README.Debian AUTHORS README TODO
+ dh_installdocs -A -i debian/README.Debian AUTHORS README
dh_installexamples -i contrib/examples/myplugin.c \
contrib/examples/MyPlugin.pm
dh_compress -i -Xexamples/
dh_testdir
dh_testroot
dh_installchangelogs -a ChangeLog
- dh_installdocs -A -a debian/README.Debian AUTHORS README TODO
+ dh_installdocs -A -a debian/README.Debian AUTHORS README
dh_installdocs -a debian/NEWS.Debian debian/README.Debian.plugins
dh_installexamples -a contrib/collectd2html.pl contrib/collection.cgi \
contrib/collection3/ contrib/php-collection/ \
&& rm -f lib/Collectd/Graph/File.pm lib/Collectd/Graph/Filter.pm \
&& rm -f lib/Collectd/Graph/MetaData.pm )
dh_installdebconf -a
- dh_systemd_enable -pcollectd-core --name=collectd
dh_installinit -pcollectd-core --name=collectd -- defaults 95
- dh_systemd_start -pcollectd-core
dh_link -a
dh_strip -a --dbg-package=collectd-dbg
- dh_strip_nondeterminism -pcollectd-core
dh_compress -a -Xexamples/
dh_fixperms -a
dh_makeshlibs -a