diff options
author | fhajny <fhajny@pkgsrc.org> | 2017-01-25 14:10:18 +0000 |
---|---|---|
committer | fhajny <fhajny@pkgsrc.org> | 2017-01-25 14:10:18 +0000 |
commit | be8274cf1975f552549bf70324dfc61f4af4086d (patch) | |
tree | 18fb4abe8a6dbc0fb4c3d25a874742ce69b82b4c /sysutils | |
parent | b022de98384d278aca7de58078457f889a5f34be (diff) | |
download | pkgsrc-be8274cf1975f552549bf70324dfc61f4af4086d.tar.gz |
Update sysutils/collectd to 5.7.1.
2017-01-23, Version 5.7.1
- collectd: Handling of boolean configuration options has been unified.
Thanks to Sebastian Harl. #2083, #2098
- collectd: Reporting of internal statistics has been fixed. Thanks to
Florian Forster. #2108
- collectd, various plugins: Bugs and issues reported by scan-build and
coverity-scan have been fixed. Thanks to Ruben Kerkhof and Florian
Forster.
- Build system: Parallel build have been fixed. Thanks to Ruben Kerkhof.
#2110
- DPDKStat plugin: Portability issues and a double-close bug have been
fixed. Thanks to Ruben Kerkhof and Marc Fournier.
- Intel RDT plugin: A check for the libpqos library version has been
added. Thanks to Serhiy Pshyk.
- NetApp plugin: Compilation problems have been corrected. Thanks to
Florian Forster. #2120
- Write Prometheus plugin: A memory leak has been fixed. Thanks to Ruben
Kerkhof.
2016-12-12, Version 5.7.0
- Documentation: The Turbostat plugin section has been improved. Thanks
to Florian Forster
- Documentation: The semantics of the "TypesDB" option have been
improved. Thanks to Florian Forster.
- collectd: A generic interface for parsing the text protocol has been
added. Thanks to Sebastian Harl. #1749
- collectd: Threads now get named, making them easier to track using
tools such as top, ps, etc. Thanks to Manuel Luis SanmartĂn Rozada
and Marc Fournier. #547
- AMQP plugin, Write Graphite plugin, Write Kafka plugin: The new
"[Graphite]PreserveSeparator" option allows retaining the default dot
separator rather than escaping it. Thanks to Florian Forster. #419
- Battery plugin: A StateFS backend for gathering statistics has been
added. Thanks to Rinigus. #1795
- CPU plugin: CPU aggregation on AIX was fixed. Thanks to Chao Yang.
#1957
- Collectd::Unixsock: Fractional seconds support has been made more
robust. Thanks to Matthias Bethke. #2052
- DPDKStat plugin: This new plugin collects DPDK interface statistics.
Thanks to Maryam Tahhan, Harry van Haaren, Taras Chornyi and Kim
Jones. #1649
- gRPC plugin: The "DispatchValues" option has been renamed to
"PutValues". Thanks to Florian Forster.
- HDDTemp plugin: The 32 devices limit has been removed. Thanks to
Benjamin Gilbert. #631
- Hugepages plugin: This new plugin reports the number of used and free
hugepages on Linux. Thanks to Jaroslav Safka, Maryam Tahhan, Kim Jones
and Florian Forster. #1799
- Intel RDT plugin: This new plugin collects statistics exposed by
Intel's Resource Director Technology . Thanks to SerhiyX. #1970
- memcached plugin: The new "Address" option allows connecting to a
different server than specified by the "Host" option. Thanks to Pavel
Rochnyack. #1975
- nginx plugin: Support for reporting failed connections has been added.
Thanks to Pavel Rochnyack. #1609
- Perl plugin: Significant internal reworking has been made. The new
"RegisterLegacyFlush" option has been added. Thanks to Pavel
Rochnyack. #1731
- PostgreSQL plugin: Timestamps are now RFC 3339-formatted local time.
Thanks to Igor Peshansky and Dave Cunningham. #1918
- Processes plugin: Internal performance improvements have been made.
Thanks to Pavel Rochnyack. #1980, #1981
- RRDCacheD plugin: The plugin now tries to reconnect upon failed
operations. Thanks to Sebastian Harl. #1959
- SpamAssassin: The plugin can now run in Perl's "tainted mode" ("-T").
Thanks to Akos Vandra. #1962
- Tail plugin: Support for calculating latency distribution of matching
values has been added. Thanks to Pavel Rochnyack and Florian Forster.
#1700
- Tail plugin: The new "GaugePersist" option has been added. Thanks to
Florian Forster. #2015
- Target:Set, Target:Replace, Match:RegEx: MetaData support has been
added . Thanks to Igor Peshansky. #1922, #1923, #1930
- turbostat plugin: The new "LogicalCoreNames" option allows switching
to per-core naming rather than per-CPU. Thanks to Brock Johnson. #2056
- virt plugin: The new "BlockDeviceFormat" and
"BlockDeviceFormatBasename" options help controlling the names
reported for block-device metrics. Thanks to Deyan Chepishev. #2004
- Write Graphite plugin: A new "DropDuplicateFields" option has been
added. Thanks to Michael Leinartas. #1915
- Write Kafka plugin: The "Key Random" setting has been reintroduced.
Thanks to Florian Forster. #1977
- Write Log plugin: Support for formatting output in JSON has been
added, using the new "Format" configuration option. Thanks to Igor
Peshansky. #1924
- Write Prometheus plugin: This new plugin publishes values using an
embedded HTTP server, in a format compatible with Prometheus'
collectd_exporter. Thanks to Florian Forster. #1967
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/collectd/Makefile | 4 | ||||
-rw-r--r-- | sysutils/collectd/Makefile.common | 9 | ||||
-rw-r--r-- | sysutils/collectd/distinfo | 12 | ||||
-rw-r--r-- | sysutils/collectd/patches/patch-src_entropy.c | 40 |
4 files changed, 29 insertions, 36 deletions
diff --git a/sysutils/collectd/Makefile b/sysutils/collectd/Makefile index 6c954c0bde2..552fae105ad 100644 --- a/sysutils/collectd/Makefile +++ b/sysutils/collectd/Makefile @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2017/01/19 17:20:42 he Exp $ +# $NetBSD: Makefile,v 1.20 2017/01/25 14:10:18 fhajny Exp $ .include "../../sysutils/collectd/Makefile.common" -PKGREVISION= 1 - COMMENT= Statistics collection daemon base RCD_SCRIPTS= collectd diff --git a/sysutils/collectd/Makefile.common b/sysutils/collectd/Makefile.common index ebab6b27564..ed0662633ca 100644 --- a/sysutils/collectd/Makefile.common +++ b/sysutils/collectd/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2016/12/07 17:28:39 fhajny Exp $ +# $NetBSD: Makefile.common,v 1.14 2017/01/25 14:10:18 fhajny Exp $ # # used by sysutils/collectd/Makefile # used by sysutils/collectd-amqp/Makefile @@ -16,7 +16,7 @@ # used by sysutils/p5-collectd/Makefile # used by sysutils/py-collectd/Makefile -DISTNAME= collectd-5.6.2 +DISTNAME= collectd-5.7.1 MASTER_SITES= http://collectd.org/files/ CATEGORIES= sysutils EXTRACT_SUFX= .tar.bz2 @@ -90,5 +90,10 @@ SUBST_SED.ver= -e 's,m4_esyscmd(./version-gen.sh),${PKGVERSION_NOREV},' pre-configure: cd ${WRKSRC} && autoreconf +# Dirty, but needed by several plugin sub-packages +pre-build: + cd ${WRKSRC}/src/daemon && ${BUILD_MAKE_CMD} ${MAKE_FLAGS} \ + libcommon.la libmetadata.la + .include "../../devel/libltdl/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/sysutils/collectd/distinfo b/sysutils/collectd/distinfo index 292306515b0..c742deb3088 100644 --- a/sysutils/collectd/distinfo +++ b/sysutils/collectd/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.32 2017/01/19 17:20:42 he Exp $ +$NetBSD: distinfo,v 1.33 2017/01/25 14:10:18 fhajny Exp $ -SHA1 (collectd-5.6.2.tar.bz2) = 358b53ac5e0b00532d74bd40eb2658c6772d1458 -RMD160 (collectd-5.6.2.tar.bz2) = 81818c24db06f7a8922dc24e7be8cbf5d86e050c -SHA512 (collectd-5.6.2.tar.bz2) = 81438e2e653649cf8a447f475b41844b7adb8ec436b43fb395ba9cf8b09b56a068633fe4b6c802d5cde3909d85a3af2542f5804005b3843f7936a37553911d61 -Size (collectd-5.6.2.tar.bz2) = 1806969 bytes +SHA1 (collectd-5.7.1.tar.bz2) = bc77d2493b26e5c38e167a8a44fedfe287742c09 +RMD160 (collectd-5.7.1.tar.bz2) = f743ebb21313ac0bae6a3ba78456e5c16f0d15cc +SHA512 (collectd-5.7.1.tar.bz2) = f2edf4ecf3bbf5f4e10c797614a7ae39c18678601038574cec4f2ea6a8773444af4592e2872ed75a5afe5f746adaff2449df51443d98d2560a23722e46bef164 +Size (collectd-5.7.1.tar.bz2) = 1797725 bytes SHA1 (patch-Makefile.am) = ed45b75293a4ea2dd577d04eeb3b9017b8f47319 SHA1 (patch-configure.ac) = f450d6b00e5c7c37214b4d90ca057c515ed08fa1 SHA1 (patch-src_Makefile.am) = 1d5cc2f58ce776df04feab2afc937f12ee7b0765 @@ -12,7 +12,7 @@ SHA1 (patch-src_cpu.c) = e645ae6b05c051c3c878f88a493fbbd7d548bb66 SHA1 (patch-src_daemon_Makefile.am) = e38d465faf8bdd750fd9cb7f0bd9f041fcc8f83c SHA1 (patch-src_df.c) = 5c6549cd9ec72efed5cdb7d8dd9297c50491426e SHA1 (patch-src_disk.c) = 1d458db9753be9c8ad1ae5edb3468acf7419a66b -SHA1 (patch-src_entropy.c) = 86e4a1a2160ae5967c8a6d242aefcc298eeb8cbf +SHA1 (patch-src_entropy.c) = 326e246c52f12f5bad4df5e78504adae3121f309 SHA1 (patch-src_irq.c) = 78f1757ff2ed6db9fb1d0e773c2a01eb190d53a0 SHA1 (patch-src_libcollectclient_network__buffer.c) = 62924943831e6d0585b103e567888f9af5c46f9e SHA1 (patch-src_memory.c) = 2934cd50e454fc14d0ec952854c88b0a830fa9a7 diff --git a/sysutils/collectd/patches/patch-src_entropy.c b/sysutils/collectd/patches/patch-src_entropy.c index 77a3ea43579..d5aebbbb829 100644 --- a/sysutils/collectd/patches/patch-src_entropy.c +++ b/sysutils/collectd/patches/patch-src_entropy.c @@ -1,37 +1,32 @@ -$NetBSD: patch-src_entropy.c,v 1.7 2016/12/07 17:28:39 fhajny Exp $ +$NetBSD: patch-src_entropy.c,v 1.8 2017/01/25 14:10:18 fhajny Exp $ Provide a NetBSD implementation for graphing available entropy. This version tries to keep /dev/urandom open (for repeated use), instead of constantly re-opening/closing it, since the latter will needlessly reduce the kernel's entropy estimate. ---- src/entropy.c.orig 2016-11-30 08:52:01.312911569 +0000 +--- src/entropy.c.orig 2017-01-23 07:53:57.704448789 +0000 +++ src/entropy.c -@@ -29,27 +29,16 @@ +@@ -29,23 +29,16 @@ #include "common.h" #include "plugin.h" -#if !KERNEL_LINUX --#error "No applicable input method." +static void entropy_submit (double); +static int entropy_read (void); + +#if !KERNEL_LINUX && !KERNEL_NETBSD -+# error "No applicable input method." + #error "No applicable input method." #endif +#if KERNEL_LINUX #define ENTROPY_FILE "/proc/sys/kernel/random/entropy_avail" --static void entropy_submit(double entropy) { -- value_t values[1]; +-static void entropy_submit(value_t value) { - value_list_t vl = VALUE_LIST_INIT; - -- values[0].gauge = entropy; -- -- vl.values = values; +- vl.values = &value; - vl.values_len = 1; -- sstrncpy(vl.host, hostname_g, sizeof(vl.host)); - sstrncpy(vl.plugin, "entropy", sizeof(vl.plugin)); - sstrncpy(vl.type, "entropy", sizeof(vl.type)); - @@ -39,10 +34,10 @@ needlessly reduce the kernel's entropy estimate. -} - static int entropy_read(void) { - double entropy; - FILE *fh; -@@ -72,6 +61,68 @@ static int entropy_read(void) { - + value_t v; + if (parse_value_file(ENTROPY_FILE, &v, DS_TYPE_GAUGE) != 0) { +@@ -56,6 +49,63 @@ static int entropy_read(void) { + entropy_submit(v); return (0); } +#endif /* KERNEL_LINUX */ @@ -92,20 +87,15 @@ needlessly reduce the kernel's entropy estimate. + +#endif /* KERNEL_NETBSD */ + -+static void entropy_submit (double entropy) -+{ -+ value_t values[1]; ++static void entropy_submit(value_t value) { + value_list_t vl = VALUE_LIST_INIT; + -+ values[0].gauge = entropy; -+ -+ vl.values = values; ++ vl.values = &value; + vl.values_len = 1; -+ sstrncpy (vl.host, hostname_g, sizeof (vl.host)); -+ sstrncpy (vl.plugin, "entropy", sizeof (vl.plugin)); -+ sstrncpy (vl.type, "entropy", sizeof (vl.type)); ++ sstrncpy(vl.plugin, "entropy", sizeof(vl.plugin)); ++ sstrncpy(vl.type, "entropy", sizeof(vl.type)); + -+ plugin_dispatch_values (&vl); ++ plugin_dispatch_values(&vl); +} void module_register(void) { |