author | Marc Fournier <marc@bl.uem.li> | |
Thu, 5 Jan 2017 20:45:28 +0000 (21:45 +0100) | ||
committer | Marc Fournier <marc@bl.uem.li> | |
Thu, 5 Jan 2017 20:45:28 +0000 (21:45 +0100) |
31 files changed:
diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
index c0545b42b53d013d2e802ac84d07bf43a45abc0f..e5ee70f0d1d22b88dc2354dab596fc97174e51d4 100644 (file)
--- a/debian/NEWS.Debian
+++ b/debian/NEWS.Debian
Version 5 of collectd introduced a couple of backward-incompatible changes.
The full list of changes is documented in the collectd wiki found at
- <http://collectd.org/wiki/index.php/V4_to_v5_migration_guide>.
+ <https://collectd.org/wiki/index.php/V4_to_v5_migration_guide>.
In a client / server setups it's generally advised to upgrade the server
first. By using the v5_upgrade target plugin, the v5 server will be able to
required information are automatically loaded by collectd. You only need to
load plugins which are supposed to collect data locally.
- See also: http://collectd.org/migrate-v3-v4.shtml
+ See also: https://collectd.org/migrate-v3-v4.shtml
-- Sebastian Harl <sh@tokkee.org> Thu, 7 Jun 2007 17:36:58 +0200
diff --git a/debian/README.Debian b/debian/README.Debian
index cab3f6438cc1b39149199b0bf1a0062bbd592502..e2aeacc9fe6703504c980bbfd4ebb44518d82b74 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
appropriate collectd-<extension>(5) manual page for details.
- If you want to contribute plugins to the official distribution you should
- read http://collectd.org/dev-info.shtml.
+ read https://collectd.org/dev-info.shtml.
- If you want to build C plugins for your personal use only simply install the
collectd-dev package and use /usr/share/doc/collectd-dev/examples/myplugin.c
diff --git a/debian/changelog b/debian/changelog
index 7cf8ddb730c20f6a98f135e2c3248d6c65d70e80..4780c31817e426e9f5572f1e8aa754bfc821b7d5 100644 (file)
--- a/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~bpo8+1) jessie-backports; urgency=medium
* Rebuild for jessie-backports.
index f18b994c316fbf57250db7ec0cd0ebd4a668fa30..f1bb42943a103508503968dff73ab35d16b49987 100755 (executable)
#! /bin/bash
#
# collectd - start and stop the statistics collection daemon
-# http://collectd.org/
+# https://collectd.org/
#
# Copyright (C) 2005-2006 Florian Forster <octo@verplant.org>
# Copyright (C) 2006-2009 Sebastian Harl <tokkee@debian.org>
index 02b301c13a8453324a91961ef9243204d276e582..9ff7311007bd79a0279fe75cf238d4714162a24d 100644 (file)
which is currently not the case. You need to perform the migration manually.
.
See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at
- <http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details.
+ <https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details.
Template: collectd/auto-migrate-4-5
Type: boolean
experimental, though. Do not expect it to work in all cases.
.
See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at
- <http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details.
+ <https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details.
Template: collectd/postrm_purge_data
Type: boolean
diff --git a/debian/collectd.conf b/debian/collectd.conf
index f1759b6d3944ab645a7933431ffe062a1cc63136..76a3f546568c90cc9c42e02717f7d04a1ac8641b 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
LoadPlugin df
LoadPlugin disk
#LoadPlugin dns
+#LoadPlugin dpdkstat
#LoadPlugin drbd
#LoadPlugin email
LoadPlugin entropy
#LoadPlugin fscache
#LoadPlugin gmond
#LoadPlugin gps
+#LoadPlugin hugepages
#LoadPlugin hddtemp
LoadPlugin interface
#LoadPlugin ipc
#LoadPlugin write_http
#LoadPlugin write_kafka
#LoadPlugin write_log
+#LoadPlugin write_prometheus
#LoadPlugin write_redis
#LoadPlugin write_riemann
#LoadPlugin write_sensu
#<Plugin battery>
# ValuesPercentage false
# ReportDegraded false
+# QueryStateFS false
#</Plugin>
#<Plugin bind>
# SelectNumericQueryTypes false
#</Plugin>
+#<Plugin dpdkstat>
+# Interval 1
+# Coremask "0xf"
+# ProcessType "secondary"
+# FilePrefix "rte"
+# EnabledPortMask 0xffff
+# PortName "interface1"
+# PortName "interface2"
+#</Plugin>
+
#<Plugin email>
# SocketFile "/var/run/collectd-email"
# SocketGroup "collectd"
# Port 7634
#</Plugin>
+#<Plugin hugepages>
+# ReportPerNodeHP true
+# ReportRootHP true
+# ValuesPages true
+# ValuesBytes false
+# ValuesPercentage false
+#</Plugin>
+
#<Plugin interface>
# Interface "eth0"
# IgnoreSelected false
# <Instance "local">
# Socket "/var/run/memcached.sock"
# or:
-# Host "127.0.0.1"
+# #Host "memcache.example.com"
+# Address "127.0.0.1"
# Port "11211"
# </Instance>
#</Plugin>
#</Plugin>
#<Plugin notify_nagios>
-# CommandFile "/usr/local/nagios/var/rw/nagios.cmd"
+# CommandFile "/var/lib/icinga/rw/icinga.cmd"
#</Plugin>
#<Plugin ntpd>
# Instance "local_user"
# </Match>
# </File>
+# <File "/var/log/nginx/apache-time.log">
+# #Use the following log format in nginx:
+# #log_format response_time '[$host] "$upstream_response_time" ...'
+# Instance "apache"
+# <Match>
+# Regex "^\\S+ \"([0-9.]+)\""
+# <DSType Distribution>
+# Percentile 80 # -> latency-foo-80
+# Percentile 95 # -> latency-foo-95
+# Percentile 99 # -> latency-foo-99
+# Bucket 0 0.1 # -> bucket-latency-foo-0_0.1
+# Bucket 0.1 0.2 # -> bucket-latency-foo-0.1_0.2
+# Bucket 0.2 0.5 # -> bucket-latency-foo-0.2_0.5
+# Bucket 0.5 1.0 # -> bucket-latency-foo-0.5_1
+# Bucket 1.0 2.0 # -> bucket-latency-foo-1_2
+# Bucket 2.0 0 # -> bucket-latency-foo-2_inf
+# </DSType>
+# Type "latency"
+# Instance "foo"
+# </Match>
+# </File>
#</Plugin>
#<Plugin tail_csv>
# RefreshInterval 60
# Domain "name"
# BlockDevice "name:device"
+# BlockDeviceFormat target
+# BlockDeviceFormatBasename false
# InterfaceDevice "name:device"
# IgnoreSelected false
# HostnameFormat name
# StoreRates true
# AlwaysAppendDS false
# EscapeCharacter "_"
+# SeparateInstances false
+# PreserveSeparator false
+# DropDuplicateFields false
# </Node>
#</Plugin>
# </Topic>
#</Plugin>
+#<Plugin write_prometheus>
+# Port "9103"
+#</Plugin>
+
#<Plugin write_redis>
# <Node "example">
# Host "localhost"
diff --git a/debian/control b/debian/control
index cfb9b0c5ab6db787fa5c60b007a9e0340c01c68c..d1437e5f4939c741f4f636639bd2821011428de0 100644 (file)
--- a/debian/control
+++ b/debian/control
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],
libgeom-dev [kfreebsd-any],
liblua5.2-dev,
liblvm2-dev [linux-any],
libmemcached-dev,
+ libmicrohttpd-dev,
libmodbus-dev,
libmosquitto-dev,
libmnl-dev [linux-any],
riemann-c-client
Build-Conflicts: libpthread-dev, libhal-dev
Standards-Version: 3.9.8
-Homepage: http://collectd.org/
+Homepage: https://collectd.org/
Vcs-Git: https://github.com/collectd/pkg-debian.git
Vcs-Browser: https://github.com/collectd/pkg-debian.git
* 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
* 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
* 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
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.7~),
+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 --git a/debian/copyright b/debian/copyright
index 8058dc7fcbac24e6a93b84ffda05ad379ae67cc6..54fac4156ac51db17a6a56c28fa88a88661e036c 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
This package was debianized by Sebastian Harl <tokkee@debian.org> on
Wed, 10 May 2006 09:20:39 +0200.
-It was downloaded from <http://collectd.org/files/>.
+It was downloaded from <https://collectd.org/files/>.
Upstream Authors:
Core Developer:
Copyright © 2005-2006 Vincent Stehlé <vincent.stehle@free.fr>
Copyright © 2006-2007 Florian Forster <octo@verplant.org>
Copyright © 2008 Sebastian Harl <sh@tokkee.org>
+ Copyright © 2014 Carnegie Mellon University
License: GNU General Public License
File src/ipc.c
contrib/cussh.pl
proto/collectd.proto
proto/types.proto
- src/grpc.cc
src/types.db.pod
src/utils_cmd_flush.h
src/utils_curl_stats.c
src/utils_curl_stats.h
src/daemon/utils_subst.c
src/daemon/utils_subst.h
- Copyright © 2006-2009 Sebastian Harl <sh@tokkee.org>
+ Copyright © 2006-2016 Sebastian Harl <sh@tokkee.org>
License: MIT License
+ File src/grpc.cc
+ Copyright © 2015-2016 Sebastian Harl <sh@tokkee.org>
+ Copyright © 2016 Florian Forster <octo@verplant.org>
+
File contrib/collection.cgi
Copyright © 2006-2010 Florian Forster <octo@collectd.org>
2006-2008 Sebastian Harl <sh@tokkee.org>
Copyright © 2010-2012 Florian Forster <octo@verplant.org>
License: MIT License
+ File src/battery_statefs.c
+ Copyright © 2016 rinigus
+ License: MIT License
+
Files src/collectd-perl.pod
src/logfile.c
src/match_regex.c
src/nginx.c
src/scanner.l
src/utils_cmd_flush.c
+ src/utils_cmds.c
+ src/utils_cmds.h
src/daemon/utils_complain.c
src/daemon/utils_complain.h
src/vserver.c
Copyright © 2006-2013 Florian Forster
- Copyright © 2006-2009 Sebastian Harl
+ Copyright © 2006-2016 Sebastian Harl
License: MIT License
Files src/collectd-python.pod
Copyright © 2014 Tim Laszlo <tim.laszlo@gmail.com>
License: MIT License
+ File src/dpdkstat.c
+ Copyright © 2016 Intel Corporation
+ License: MIT License
+
File src/fhcount.c
Copyright © 2015 Jiri Tyr <jiri.tyr@gmail.com>
License: MIT License
Copyright © 2015 Nicolas JOURDEN <nicolas.jourden@laposte.net>
License: MIT License
+ File src/hugepages.c
+ Copyright © 2016 Intel Corporation
+ License: MIT License
+
+ File src/intel_rdt.c
+ Copyright © 2016 Intel Corporation
+ License: MIT License
+
File src/log_logstash.c
Copyright © 2013 Pierre-Yves Ritschard
License: MIT License
Copyright © 2005-2013 Florian octo Forster <octo@verplant.org>
License: MIT License
- Files src/daemon/utils_tail.c
- src/daemon/utils_tail_match.c
- src/daemon/utils_tail_match.h
+ Files src/utils_tail.c
+ src/utils_tail_match.c
+ src/utils_tail_match.h
Copyright © 2007-2008 C-Ware, Inc.
Copyright © 2008 Florian Forster
License: MIT License
Copyright © 2013 Florian 'octo' Forster <octo@collectd.org>
License: MIT License
+ Files src/utils_latency_config.c
+ src/utils_latency_config.h
+ Copyright © 2013-2016 Florian 'octo' Forster <octo@collectd.org>
+ Copyright © 2016 Pavel Rochnyak <pavel2000@ngs.ru>
+ License: MIT License
+
Files src/utils_format_kairosdb.c
src/utils_format_kairosdb.h
Copyright © 2016 Aurelien beorn Rougemont <beorn@gandi.net>
diff --git a/debian/patches/configure_find_lc_all.patch b/debian/patches/configure_find_lc_all.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: set locale when running find, to ensure a reproducible sort order
-Author: Marc Fournier <marc@bl.uem.li>
-diff --git a/configure.ac b/configure.ac
-index ceb0b30..2d05efa 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2258,7 +2258,7 @@ then
- if test -d "$with_java_home"
- then
- AC_MSG_CHECKING([for jni.h])
-- TMPVAR=`find -L "$with_java_home" -name jni.h -type f -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
-+ TMPVAR=`LC_ALL=C find -L "$with_java_home" -name jni.h -type f -exec 'dirname' '{}' ';' 2>/dev/null | sort | head -n 1`
- if test "x$TMPVAR" != "x"
- then
- AC_MSG_RESULT([found in $TMPVAR])
-@@ -2268,7 +2268,7 @@ then
- fi
-
- AC_MSG_CHECKING([for jni_md.h])
-- TMPVAR=`find -L "$with_java_home" -name jni_md.h -type f -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
-+ TMPVAR=`LC_ALL=C find -L "$with_java_home" -name jni_md.h -type f -exec 'dirname' '{}' ';' 2>/dev/null | sort | head -n 1`
- if test "x$TMPVAR" != "x"
- then
- AC_MSG_RESULT([found in $TMPVAR])
-@@ -2278,7 +2278,7 @@ then
- fi
-
- AC_MSG_CHECKING([for libjvm.so])
-- TMPVAR=`find -L "$with_java_home" -type f \( -name libjvm.so -o -name libjvm.dylib \) -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
-+ TMPVAR=`LC_ALL=C find -L "$with_java_home" -type f \( -name libjvm.so -o -name libjvm.dylib \) -exec 'dirname' '{}' ';' 2>/dev/null | sort | head -n 1`
- if test "x$TMPVAR" != "x"
- then
- AC_MSG_RESULT([found in $TMPVAR])
-@@ -2290,7 +2290,7 @@ then
- if test "x$JAVAC" = "x"
- then
- AC_MSG_CHECKING([for javac])
-- TMPVAR=`find -L "$with_java_home" -name javac -type f 2>/dev/null | head -n 1`
-+ TMPVAR=`LC_ALL=C find -L "$with_java_home" -name javac -type f 2>/dev/null | sort | head -n 1`
- if test "x$TMPVAR" != "x"
- then
- JAVAC="$TMPVAR"
-@@ -2302,7 +2302,7 @@ then
- if test "x$JAR" = "x"
- then
- AC_MSG_CHECKING([for jar])
-- TMPVAR=`find -L "$with_java_home" -name jar -type f 2>/dev/null | head -n 1`
-+ TMPVAR=`LC_ALL=C find -L "$with_java_home" -name jar -type f 2>/dev/null | sort | head -n 1`
- if test "x$TMPVAR" != "x"
- then
- JAR="$TMPVAR"
diff --git a/debian/patches/dpdkstat-portable-format-string.patch b/debian/patches/dpdkstat-portable-format-string.patch
--- /dev/null
@@ -0,0 +1,25 @@
+Description: Fix format string portability issue
+Author: Marc Fournier <marc@bl.uem.li>
+
+--- a/src/dpdkstat.c
++++ b/src/dpdkstat.c
+@@ -159,8 +159,8 @@ static int dpdk_shm_init(size_t size);
+ static void dpdk_config_init_default(void) {
+ g_configuration->interval = plugin_get_interval();
+ if (g_configuration->interval == cf_get_default_interval())
+- WARNING("dpdkstat: No time interval was configured, default value %lu ms "
+- "is set",
++ WARNING("dpdkstat: No time interval was configured, default value %" PRIu64
++ " ms is set",
+ CDTIME_T_TO_MS(g_configuration->interval));
+ /* Default is all ports enabled */
+ g_configuration->enabled_port_mask = ~0;
+@@ -413,7 +413,7 @@ static int dpdk_helper_spawn(enum DPDK_HELPER_ACTION action) {
+ if (pid > 0) {
+ close(g_configuration->helper_pipes[1]);
+ g_configuration->helper_pid = pid;
+- DEBUG("dpdkstat: helper pid %lu", (long)g_configuration->helper_pid);
++ DEBUG("dpdkstat: helper pid %li", (long)g_configuration->helper_pid);
+ /* Kick helper once its alive to have it start processing */
+ sem_post(&g_configuration->sema_helper_get_stats);
+ } else if (pid == 0) {
diff --git a/debian/patches/nagios-debian-paths.patch b/debian/patches/nagios-debian-paths.patch
--- /dev/null
@@ -0,0 +1,24 @@
+Description: Use paths for nagios-nrpe-server & monitoring-plugins Debian packages.
+Author: Bas Couwenberg <sebastic@debian.org>
+
+--- a/contrib/exec-nagios.conf
++++ b/contrib/exec-nagios.conf
+@@ -1,15 +1,15 @@
+ # Run `perldoc exec-nagios.px' for details on this config file.
+
+-NRPEConfig /etc/nrpe.cfg
++NRPEConfig /etc/nagios/nrpe.cfg
+
+ Interval 300
+
+-<Script /usr/lib/nagios/check_tcp>
++<Script /usr/lib/nagios/plugins/check_tcp>
+ Arguments -H alice -p 22
+ Type delay
+ </Script>
+
+-<Script /usr/lib/nagios/check_dns>
++<Script /usr/lib/nagios/plugins/check_dns>
+ Arguments -H alice
+ Type delay
+ </Script>
diff --git a/debian/patches/series b/debian/patches/series
index 7039a9de9782c5c1ab419cc008f6db2d77b543fe..b13e8f2cf1caeb8f8be2be482e3b3672cfec2cd9 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
-configure_find_lc_all.patch
rrd_filter_path.patch
collection_conf_path.patch
myplugin_includes.patch
+nagios-debian-paths.patch
+dpdkstat-portable-format-string.patch
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 74ceec00639fc4f3c82cf6280ab01c9d88c0a11b..37abe02ea055747622c3de30f087fed164fd5dc5 100644 (file)
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
-"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
+"<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
"Pro více informací se podívejte do souboru /usr/share/doc/collectd-core/NEWS."
-"Debian.gz a na wiki collectd na adrese <http://collectd.org/wiki/index.php/"
+"Debian.gz a na wiki collectd na adrese <https://collectd.org/wiki/index.php/"
"V4_to_v5_migration_guide>."
#. Type: boolean
diff --git a/debian/po/da.po b/debian/po/da.po
index 20f1d1b02c4d7ac54749f378a9a87e773e48bb37..b6cea86489cd780900f12fd940d9f97cab4bc3ca 100644 (file)
--- a/debian/po/da.po
+++ b/debian/po/da.po
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
-"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
+"<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
"Se /usr/share/doc/collectd-core/NEWS.Debian.gz og wikien for collectd på "
-"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for detaljer."
+"<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for detaljer."
#. Type: boolean
#. Description
diff --git a/debian/po/de.po b/debian/po/de.po
index 9dc6836a4b1abc65a34904c41c0563ce03a217c7..16d03b7829147496ee668fc9a4a3306a48f955e7 100644 (file)
--- a/debian/po/de.po
+++ b/debian/po/de.po
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
-"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
+"<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
"Siehe »/usr/share/doc/collectd-core/NEWS.Debian.gz« und das collectd Wiki "
-"unter <http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> "
+"unter <https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> "
"für Details."
#. Type: boolean
diff --git a/debian/po/es.po b/debian/po/es.po
index fe98a59c620a98d72bdb7b0bea8fa0e247713042..479cc0c3e351c2c3cd098ace14bf63dda0e52a23 100644 (file)
--- a/debian/po/es.po
+++ b/debian/po/es.po
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
-"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
+"<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
"Para más detalles consulte «/usr/share/doc/collectd-core/NEWS.Debian.gz» y la "
"página wiki de collectd en "
-"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide>."
+"<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide>."
#. Type: boolean
#. Description
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 404dc9c5de7f517ac073a25d612ef80d10d7ce64..d59a5995e415196c0eea911ddac9048d2f7700fc 100644 (file)
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
-"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
+"<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
"Voir /usr/share/doc/collectd-core/NEWS.Debian.gz et le wiki de collectd "
-"(<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide>) pour plus de "
+"(<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide>) pour plus de "
"détails."
#. Type: boolean
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 204c68013462922c17707943ddaa408e4952729c..78d4eccdd5001a51e744fe424b36d42b16d6a333 100644 (file)
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
-"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
+"<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
"Consulte o ficheiro /usr/share/doc/collectd-core/NEWS.Debian.gz e a wiki de "
-"collectd en <http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> "
+"collectd en <https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> "
"para obter máis detalles."
#. Type: boolean
diff --git a/debian/po/it.po b/debian/po/it.po
index d0d354f083bf6594c560e959df83e73a9dc74b23..2b4e41cd8d9f4de58a09cb58017447c26c11c6b1 100644 (file)
--- a/debian/po/it.po
+++ b/debian/po/it.po
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
-"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
+"<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
"Per i dettagli vedere /usr/share/doc/collectd-core/NEWS.Debian.gz e il wiki di "
"collectd all'indirizzo "
-"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide>."
+"<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide>."
#. Type: boolean
#. Description
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 86e2fbe9aded148014437a1b80e58c0cb9efe626..9d3415411ca1d04c07961249cfda818eb7af1c84 100644 (file)
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
-"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
+"<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
"詳細については /usr/share/doc/collectd-core/NEWS.Debian.gz 及び collectd wiki "
-"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> を見てください。"
+"<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> を見てください。"
#. Type: boolean
#. Description
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 8225f1d6b1421ea10d31e00f35ceba4583ab5720..4b67f9bd3aa063c3c9b6e5c0a804ffc0cc28d4ce 100644 (file)
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
-"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
+"<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
"Zie /usr/share/doc/collectd-core/NEWS.Debian.gz en de wikipagina van "
-"collectd, <http://collectd.org/wiki/index.php/V4_to_v5_migration_guide>, "
+"collectd, <https://collectd.org/wiki/index.php/V4_to_v5_migration_guide>, "
"voor meer informatie."
#. Type: boolean
diff --git a/debian/po/pl.po b/debian/po/pl.po
index 11401d9827bbc7bceb23c3d684336ad4a82d1db4..c43369c16cea822fbc92ef4a2af3358c5ba41781 100644 (file)
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
-"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
+"<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
"Plik /usr/share/doc/collectd-core/NEWS.Debian.gz oraz wiki collectd <http://"
"collectd.org/wiki/index.php/V4_to_v5_migration_guide> zawiera więcej "
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 810768cf30dd568e6cdc56ee24c60fb22ab33e03..c2fbcc3a4e4e4c9c0cbe4453acf94ce5939b5d8a 100644 (file)
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
-"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
+"<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
"Veja /usr/share/doc/collectd-core/NEWS.Debian.gz e o wiki do collectd em "
-"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> para mais "
+"<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> para mais "
"detalhes."
#. Type: boolean
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index bb762e61400eb16857cffc4872fafa4980463d6b..2313b01de6338ce30d43c9783a776ddf9d167822 100644 (file)
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
-"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
+"<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
"Veja /usr/share/doc/collectd-core/NEWS.Debian.gz e o wiki do collectd em "
-"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> para detalhes."
+"<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> para detalhes."
#. Type: boolean
#. Description
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 4907def9f8884ff72f7d55be60b638d6eab3ae5a..4fa8fc9eda3c33f3176024d9b518a6395ab186bd 100644 (file)
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
-"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
+"<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
"Дополнительную информацию можно найти в файле /usr/share/doc/collectd-core/"
-"NEWS.Debian.gz и вики collectd wiki по адресу <http://collectd.org/wiki/index."
+"NEWS.Debian.gz и вики collectd wiki по адресу <https://collectd.org/wiki/index."
"php/V4_to_v5_migration_guide>."
#. Type: boolean
diff --git a/debian/po/sk.po b/debian/po/sk.po
index eef93acad7a7b0ec4ce4c65cfa0b651a585797d2..c5138c3e8fcc0dd32663d9c800467a9f1fb2f4b2 100644 (file)
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
#. Description
#: ../collectd-core.templates:3001
#: ../collectd-core.templates:4001
-msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at <http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
-msgstr "Pozri podrobnosti v /usr/share/doc/collectd-core/NEWS.Debian.gz a na wiki collectd na adrese <http://collectd.org/wiki/index.php/V4_to_v5_migration_guide>"
+msgid "See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at <https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
+msgstr "Pozri podrobnosti v /usr/share/doc/collectd-core/NEWS.Debian.gz a na wiki collectd na adrese <https://collectd.org/wiki/index.php/V4_to_v5_migration_guide>"
#. Type: boolean
#. Description
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 6756339ef1f24de0402d7a722f6e3a1ed4051172..7145316591078f0b8e78b53e0bae495b97df99ed 100644 (file)
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
-"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
+"<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
"För mer information läs /usr/share/doc/collectd-core/NEWS.Debian.gz och "
-"collectd-wikin på <http://collectd.org/wiki/index.php/"
+"collectd-wikin på <https://collectd.org/wiki/index.php/"
"V4_to_v5_migration_guide>."
#. Type: boolean
index 54b0821b0d3fe9aaf2584ac00470cde5ecac0454..82d0becad40a0e913238cc13ac2f6374c5822a8d 100644 (file)
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
-"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
+"<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
#. Type: boolean
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 4e4439216c09d84c30b0cc75c9db11ae5a4a5a11..ee4cf3452c1d8bf3c44af4dbcca1773d93c36aa5 100644 (file)
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
#: ../collectd-core.templates:3001 ../collectd-core.templates:4001
msgid ""
"See /usr/share/doc/collectd-core/NEWS.Debian.gz and the collectd wiki at "
-"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
+"<https://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
msgstr ""
#. Type: boolean
diff --git a/debian/rules b/debian/rules
index 15026c773cfe832ad6e34bfb052dde525798e063..b3325ec7870a430c57e3f380e30fb5dca1fbbdbf 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
# 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-drbd \
--disable-ethstat \
--disable-fhcount \
+ --disable-hugepages \
--disable-ipc \
--disable-iptables \
--disable-ipvs \
--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
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/ \
diff --git a/debian/watch b/debian/watch
index d806e6a30ae7f7f04bad4ce846ce2c0d08b2144e..6d99a96d1f3a5da19e7de7d9cc46de784abaa04c 100644 (file)
--- a/debian/watch
+++ b/debian/watch
version=3
opts="uversionmangle=s/beta/~beta/;s/[-.]rc/~rc/" \
-http://collectd.org/files/ collectd-(.*)\.tar\..*
+https://collectd.org/files/ collectd-(.*)\.tar\..*