rpm/collectd
SHA256
1
0
Fork 0
forked from pool/collectd
Code Pull Requests Activity
factory
collectd/collectd-fix_collection_cgi.patch

24 lines
816 B
Diff
Raw Permalink Normal View History

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
2020-09-24 14:24:39 +02:00
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');
Accepting request 59758 from YaST:Web Accepted submit request 59758 from user schubi2 OBS-URL: https://build.opensuse.org/request/show/59758 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/collectd?expand=0&rev=1
2011-02-03 02:08:32 +01:00
use RRDs ();
use Data::Dumper ();
-our $Config = "/etc/collection.conf";
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
2020-09-24 14:24:39 +02:00
+our $Config = "/etc/collectd/collection.conf"
Accepting request 59758 from YaST:Web Accepted submit request 59758 from user schubi2 OBS-URL: https://build.opensuse.org/request/show/59758 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/collectd?expand=0&rev=1
2011-02-03 02:08:32 +01:00
our @DataDirs = ();
our @DontShowTypes = ();
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
2020-09-24 14:24:39 +02:00
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
Accepting request 59758 from YaST:Web Accepted submit request 59758 from user schubi2 OBS-URL: https://build.opensuse.org/request/show/59758 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/collectd?expand=0&rev=1
2011-02-03 02:08:32 +01:00
@@ -1,3 +1,2 @@
-datadir: "/opt/collectd/var/lib/collectd/rrd/"
-libdir: "/opt/collectd/lib/collectd/"
-
+datadir: "/var/lib/collectd/"
+libdir: "@@LIBDIR@@/collectd/"
Copy Permalink