From ddb7d3e4945e3f4a272c17d63caa80211b1006bc4a084b9e1c03b227fb480ceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20V=C3=B6gl?= Date: Thu, 24 Sep 2020 12:24:39 +0000 Subject: [PATCH] Accepting request 836220 from home:dirkmueller:branches:server:monitoring - update to 5.12.0: * varnish plugin: Added varnish 6 support. * amqp1 plugin: New options to limit send queue length has been added. * mdevents plugin: New plugin to generate notifications about events * amqp plugin: Updated option to allow multiple hosts to support failover. * mysql plugin: Reporting of the fields Slave_IO_Running and Slave_SQL_Running has been added. * write_http plugin: libcurl default HTTP response has been moved to a buffer instead of stdout. * disk plugin: Provided an udev rule with ID_SERIAL based attribute so disk and partition data don't get mixed incorrectly in udev-based disk naming. * swap plugin: Implementation for NetBSD has been added. * netstat_udp plugin: New plugin ((currently NetBSD-only) to report UDP summary statistics has been aded. * smart plugin: SMART plugin has been extended with NVMe device functionality. * infiniband plugin: New plugin to collect metrics about IB ports has been added. * snmp plugin: Count option was added allowing to gather the number of table entries (matching given criteria) rather than their values. * cpu plugin: Implementation for NetBSD has been added. * irq plugin: Implementation for NetBSD has been added. * processes plugin: Implementation for NetBSD has been added. * entropy plugin: Implementation for NetBSD has been added. * netlink plugin: VFs statistics and link info has been added. * memory plugin: Implementation for NetBSD has been added. * curl_jolokia plugin: New plugin has been added to integrate jolokia to fetch jmx counters via HTTP/json. Thanks to Wilfried Goesgens. #2470 OBS-URL: https://build.opensuse.org/request/show/836220 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=165 --- collectd-5.11.0.tar.bz2 | 3 -- collectd-5.12.0.tar.bz2 | 3 ++ collectd-fix_collection_cgi.patch | 20 ++++++------ collectd.changes | 52 +++++++++++++++++++++++++++++++ collectd.spec | 6 ++-- 5 files changed, 69 insertions(+), 15 deletions(-) delete mode 100644 collectd-5.11.0.tar.bz2 create mode 100644 collectd-5.12.0.tar.bz2 diff --git a/collectd-5.11.0.tar.bz2 b/collectd-5.11.0.tar.bz2 deleted file mode 100644 index 8e01b1b..0000000 --- a/collectd-5.11.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:37b10a806e34aa8570c1cafa6006c604796fae13cc2e1b3e630d33dcba9e5db2 -size 1851663 diff --git a/collectd-5.12.0.tar.bz2 b/collectd-5.12.0.tar.bz2 new file mode 100644 index 0000000..a6d1b85 --- /dev/null +++ b/collectd-5.12.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5bae043042c19c31f77eb8464e56a01a5454e0b39fa07cf7ad0f1bfc9c3a09d6 +size 1902756 diff --git a/collectd-fix_collection_cgi.patch b/collectd-fix_collection_cgi.patch index 0e2a920..5366c3f 100644 --- a/collectd-fix_collection_cgi.patch +++ b/collectd-fix_collection_cgi.patch @@ -1,18 +1,20 @@ ---- collectd-5.11.0/contrib/collection.cgi.orig 2020-06-24 18:22:39.045940659 +0200 -+++ collectd-5.11.0/contrib/collection.cgi 2020-06-24 18:23:01.377983888 +0200 -@@ -32,7 +32,7 @@ +Index: collectd-5.12.0/contrib/collection.cgi +=================================================================== +--- collectd-5.12.0.orig/contrib/collection.cgi ++++ collectd-5.12.0/contrib/collection.cgi +@@ -32,7 +32,7 @@ use URI::Escape ('uri_escape'); use RRDs (); use Data::Dumper (); -our $Config = "/etc/collection.conf"; -+our $Config = "/etc/collectd/collection.conf"; - our $TypesDB = "/usr/share/collectd/types.db"; ++our $Config = "/etc/collectd/collection.conf" our @DataDirs = (); our @DontShowTypes = (); -diff --git a/contrib/collection.conf b/contrib/collection.conf -index e8444f5..063141f 100644 ---- a/contrib/collection.conf -+++ b/contrib/collection.conf + our $LibDir; +Index: collectd-5.12.0/contrib/collection.conf +=================================================================== +--- collectd-5.12.0.orig/contrib/collection.conf ++++ collectd-5.12.0/contrib/collection.conf @@ -1,3 +1,2 @@ -datadir: "/opt/collectd/var/lib/collectd/rrd/" -libdir: "/opt/collectd/lib/collectd/" diff --git a/collectd.changes b/collectd.changes index 338542a..41a7078 100644 --- a/collectd.changes +++ b/collectd.changes @@ -1,3 +1,55 @@ +------------------------------------------------------------------- +Wed Sep 23 06:29:55 UTC 2020 - Dirk Mueller + +- update to 5.12.0: + * varnish plugin: Added varnish 6 support. + * amqp1 plugin: New options to limit send queue length has been added. + * mdevents plugin: New plugin to generate notifications about events + * amqp plugin: Updated option to allow multiple hosts to support + failover. + * mysql plugin: Reporting of the fields Slave_IO_Running and + Slave_SQL_Running has been added. + * write_http plugin: libcurl default HTTP response has been moved to a + buffer instead of stdout. + * disk plugin: Provided an udev rule with ID_SERIAL based attribute so + disk and partition data don't get mixed incorrectly in udev-based disk + naming. + * swap plugin: Implementation for NetBSD has been added. + * netstat_udp plugin: New plugin ((currently NetBSD-only) to report UDP + summary statistics has been aded. + * smart plugin: SMART plugin has been extended with NVMe device + functionality. + * infiniband plugin: New plugin to collect metrics about IB ports has + been added. + * snmp plugin: Count option was added allowing to gather the number of + table entries (matching given criteria) rather than their values. + * cpu plugin: Implementation for NetBSD has been added. + * irq plugin: Implementation for NetBSD has been added. + * processes plugin: Implementation for NetBSD has been added. + * entropy plugin: Implementation for NetBSD has been added. + * netlink plugin: VFs statistics and link info has been added. + * memory plugin: Implementation for NetBSD has been added. + * curl_jolokia plugin: New plugin has been added to integrate jolokia to + fetch jmx counters via HTTP/json. Thanks to Wilfried Goesgens. #2470 + * write_sensu plugin: IncludeSource option has been added. + * intel_pmu plugin: Check for libjevents version has been improved. + * python plugin: Error-handling code of PyType_Ready has been added. + * collectd: Updated specfile for EL8. Thanks to Fabien Wernli. #3346 + * openvpn plugin: Parsing of empty fields has been fixed. + * dpdk_telemetry plugin: Build issues has been fixed. + * mqtt plugin: A problem with stuck after 20 (qos=1) messages has been + fixed. + * varnish plugin: Target in category for varnish 6 has been added. + * mqtt plugin: Resubscribe after a reconnect. Thanks to Maciej + * zookeeper plugin: Missing 3.5 mntr fields has been added. Thanks to + * sensors plugin: The documentation has been improved. Thanks to Florian + * types.db(5): Documentation of metric definitions has been improved. + * intel_pmu plugin: The possible crash on plugin init has been fixed. + * processes plugin: Size of reading buffer for /proc/stat has been + * ubi plugin: Data source type has been fixed from counter to gauge. + * intelrdt plugin: NaN values in csv output has been fixed. Thanks to + * capabilities plugin: Conditionalized return type for microhttpd + ------------------------------------------------------------------- Thu Jun 25 12:18:05 UTC 2020 - Christian Vögl diff --git a/collectd.spec b/collectd.spec index e895bb2..86b6ea4 100644 --- a/collectd.spec +++ b/collectd.spec @@ -21,10 +21,10 @@ ceph cgroups chrony curl curl_json curl_xml conntrack contextswitch cpu cpufreq cpusleep csv \\\ df disk dns drbd \\\ email entropy ethstat exec fhcount filecount fscache hddtemp hugepages \\\ - interface ipc iptables ipvs irq \\\ + infiniband interface ipc iptables ipvs irq \\\ load logfile log_logstash \\\ madwifi match_empty_counter match_hashed match_regex match_timediff match_value \\\ - mbmon md memcached memory multimeter \\\ + mdevents mbmon md memcached memory multimeter \\\ netlink network nfs nginx notify_nagios ntpd numa olsrd openvpn \\\ perl ping protocols powerdns processes \\\ rrdcached rrdtool %{expand:%{sensors_plugin}} serial statsd swap syslog \\\ @@ -42,7 +42,7 @@ %define sensors_plugin %{nil} %endif Name: collectd -Version: 5.11.0 +Version: 5.12.0 Release: 0 Summary: Statistics Collection Daemon for filling RRD Files License: GPL-2.0-only AND MIT