5.4.0
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=118
This commit is contained in:
Pascal Bleser
Git OBS Bridge
parent
ff1ee825cb
commit
e689823fed
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5b04150f3c79f90f1a610ed22a2287ef5d8a07dcc2d0fa7a6a650edd9dc1ea01
|
||||
size 1501308
|
||||
3
collectd-5.4.0.tar.bz2
Normal file
3
collectd-5.4.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:90973894a1f10775d409fe23ce7bc4d89c1b7c6f4d9918b305d160605871923e
|
||||
size 1506520
|
||||
@ -1,20 +0,0 @@
|
||||
--- src/netlink.c.orig 2013-06-04 02:27:05.160790797 +0200
|
||||
+++ src/netlink.c 2013-06-04 02:27:36.463800911 +0200
|
||||
@@ -568,7 +568,7 @@
|
||||
|
||||
#ifdef RTNL_DUMP_FILTER_FIVE_ARGS
|
||||
if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL,
|
||||
- NULL, NULL) != 0)
|
||||
+ (rtnl_filter_t)NULL, NULL) != 0)
|
||||
#elif defined(RTNL_DUMP_FILTER_THREE_ARGS)
|
||||
if (rtnl_dump_filter (&rth, link_filter, /* arg = */ NULL) != 0)
|
||||
#else
|
||||
@@ -612,7 +612,7 @@
|
||||
|
||||
#ifdef RTNL_DUMP_FILTER_FIVE_ARGS
|
||||
if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex,
|
||||
- NULL, NULL) != 0)
|
||||
+ (rtnl_filter_t)NULL, NULL) != 0)
|
||||
#elif defined(RTNL_DUMP_FILTER_THREE_ARGS)
|
||||
if (rtnl_dump_filter (&rth, qos_filter, /* arg = */ &ifindex) != 0)
|
||||
#else
|
||||
@ -1,6 +1,6 @@
|
||||
--- configure.orig 2012-01-26 01:16:29.955106532 +0100
|
||||
+++ configure 2012-01-26 01:17:57.822103406 +0100
|
||||
@@ -23690,11 +23690,11 @@
|
||||
--- configure.orig 2013-08-23 07:39:03.431280602 +0200
|
||||
+++ configure 2013-08-23 07:40:51.242303290 +0200
|
||||
@@ -26052,11 +26052,11 @@
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify\""; } >&5
|
||||
@ -11,10 +11,10 @@
|
||||
test $ac_status = 0; }; then
|
||||
- pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify" 2>/dev/null`
|
||||
+ pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify" "gtk+-2.0" 2>/dev/null`
|
||||
test "x$?" != "x0" && pkg_failed=yes
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
@@ -23706,11 +23706,11 @@
|
||||
@@ -26069,11 +26069,11 @@
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify\""; } >&5
|
||||
@ -25,24 +25,24 @@
|
||||
test $ac_status = 0; }; then
|
||||
- pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify" 2>/dev/null`
|
||||
+ pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify" "gtk+-2.0" 2>/dev/null`
|
||||
test "x$?" != "x0" && pkg_failed=yes
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
@@ -23730,9 +23730,9 @@
|
||||
@@ -26094,9 +26094,9 @@
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
- LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify" 2>&1`
|
||||
+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify" "gtk+-2.0" 2>&1`
|
||||
- LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnotify" 2>&1`
|
||||
+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnotify" "gtk+-2.0" 2>&1`
|
||||
else
|
||||
- LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify" 2>&1`
|
||||
+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify" "gtk+-2.0" 2>&1`
|
||||
- LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnotify" 2>&1`
|
||||
+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnotify" "gtk+-2.0" 2>&1`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$LIBNOTIFY_PKG_ERRORS" >&5
|
||||
--- configure.in.orig 2012-01-26 01:16:14.664107075 +0100
|
||||
+++ configure.in 2012-01-26 01:16:28.342106589 +0100
|
||||
@@ -4184,7 +4184,7 @@
|
||||
--- configure.in.orig 2013-08-23 07:40:53.933303888 +0200
|
||||
+++ configure.in 2013-08-23 07:41:03.963306130 +0200
|
||||
@@ -4612,7 +4612,7 @@
|
||||
fi
|
||||
# }}}
|
||||
|
||||
|
||||
@ -1,3 +1,67 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 23 05:33:18 UTC 2013 - pascal.bleser@opensuse.org
|
||||
|
||||
- update to 5.4.0:
|
||||
* collectd: The "LoadPlugin" config option no longer attempts to load
|
||||
plugins twice. If more than one "LoadPlugin" statement or block is
|
||||
encountered, only the first will have any effect.
|
||||
* collectd: The "AutoLoadPlugin" option allows to automatically load
|
||||
plugins for which a configuration is found.
|
||||
* collectd: The "WriteQueueLimitHigh" and "WriteQueueLimitLow" options
|
||||
allow collectd to drop values when under stress, to avoid running out
|
||||
of memory.
|
||||
* amqp plugin: The "GraphiteSeparateInstances" and
|
||||
"GraphiteAlwaysAppendDS" options have been added.
|
||||
* aquaero plugin: This new plugin reads various metrics, e.g. fan
|
||||
speeds and temperatures, from Aquaero 5, a fan and water cooling
|
||||
control panel.
|
||||
* curl plugin: The "MeasureResponseCode" option has been added.
|
||||
* curl_json plugin: Support for UNIX domain sockets and array wildcards
|
||||
has been added.
|
||||
* curl_xml plugin: Support for long URLs has been improved.
|
||||
* cgroups plugin: This new plugin collects CPU accounting information
|
||||
for processes in a cgroup.
|
||||
* df plugin: The "ValuesAbsolute" and "ValuesPercentage" options have
|
||||
been added.
|
||||
* exec plugin: Do UID / GID lookups before forking. This should prevent
|
||||
a race condition in the NSS library.
|
||||
* lvm plugin: This new plugin collects size information from Linux'
|
||||
Logical Volume Manager (LVM).
|
||||
* memcached plugin: Support for increment and decrement counts has been
|
||||
added.
|
||||
* mic plugin: This new plugin collects CPU and memory usage, power
|
||||
consumption and temperatures of Intel's Many-Integrated-Core (MIC)
|
||||
architecture, such as Xeon Phi cards.
|
||||
* netlink plugin: This plugin has been converted to use the supported
|
||||
"libmnl" library.
|
||||
* nginx plugin: Collection of accepted and handled connections has been
|
||||
added.
|
||||
* sigrok plugin: This new plugin collects metrics from sigrok, a signal
|
||||
processing framework reading various hardware devices, from light
|
||||
meters to spectrum analyzers.
|
||||
* statsd plugin: This new plugin listens to a UDP socket and reads
|
||||
metrics in the StatsD format.
|
||||
* varnish plugin: Many additional metrics have been added.
|
||||
* write_graphite plugin: Support for "UDP" has been added.
|
||||
* write_riemann plugin: The "TTLFactor" option has been added.
|
||||
|
||||
- changes from 5.3.1:
|
||||
* Configuration: Fix error handling: Errors in included files were
|
||||
ignored, causing configuration mistakes to go unnoticed.
|
||||
* dns plugin: Don't abort when PCAP returns an error.
|
||||
* modbus plugin: The reconnection strategy was improved, fixing a
|
||||
segfault in the libmodbud library.
|
||||
* mysql plugin: The notification about a newly running MySQL slave
|
||||
thread has been fixed.
|
||||
* snmp plugin: A build issue has been fixed (C99 mixed declaration).
|
||||
* threshold plugin: Handling of the "Interesting" configuration option
|
||||
has been fixed.
|
||||
* write_riemann plugin: A memory leak has been fixed.
|
||||
|
||||
- dropped collectd-fix-warnings.patch, as it only fixed warnings in the
|
||||
netlink plugin, which has been rewritten
|
||||
- disable dns plugin on SLE_11_SP2, libpcap too old there
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 23 05:26:54 UTC 2013 - pascal.bleser@opensuse.org
|
||||
|
||||
|
||||
@ -78,6 +78,15 @@
|
||||
%define rrdcached_plugin %{nil}
|
||||
%endif
|
||||
|
||||
%define pcap_version %({rpm -q --qf='%{VERSION}\n' libpcap-devel 2>/dev/null || echo 0.0.0} | %__awk -F. '{print $1*10000+$2*100+$3}')
|
||||
%if %pcap_version >= 10000
|
||||
%define dns 1
|
||||
%define dns_plugin dns
|
||||
%else
|
||||
%define dns 0
|
||||
%define dns_plugin %{nil}
|
||||
%endif
|
||||
|
||||
%define snmp 1
|
||||
%define with_esmtp 1
|
||||
|
||||
@ -107,10 +116,10 @@
|
||||
|
||||
%define ipvs_plugin ipvs
|
||||
|
||||
%define plugins apache apcups battery %{expand:%bind_plugin} curl %{expand:%curl_json_plugin} %{expand:%curl_xml_plugin} conntrack contextswitch cpu cpufreq csv df disk dns email entropy exec filecount fscache hddtemp interface %{expand:%ipvs_plugin} irq load logfile match_empty_counter match_hashed match_regex match_timediff match_value mbmon %{expand:%memcached_plugin} memory multimeter netlink network nfs nginx ntpd olsrd openvpn perl ping protocols powerdns processes rrdtool sensors serial swap syslog table tail target_notification target_replace target_scale target_set target_v5upgrade tcpconns teamspeak2 ted thermal threshold unixsock uptime users uuid vmem vserver wireless write_http %{expand:%ascent_plugin} %{expand:%iptables_plugin} %{expand:%madwifi_plugin} %{expand:%rrdcached_plugin} aggregation ethstat md numa tail_csv write_graphite write_riemann
|
||||
%define plugins apache apcups battery %{expand:%bind_plugin} cgroups curl %{expand:%curl_json_plugin} %{expand:%curl_xml_plugin} conntrack contextswitch cpu cpufreq csv df disk %{expand:%dns_plugin} email entropy exec filecount fscache hddtemp interface %{expand:%ipvs_plugin} irq load logfile match_empty_counter match_hashed match_regex match_timediff match_value mbmon %{expand:%memcached_plugin} memory multimeter netlink network nfs nginx ntpd olsrd openvpn perl ping protocols powerdns processes rrdtool sensors serial statsd swap syslog table tail target_notification target_replace target_scale target_set target_v5upgrade tcpconns teamspeak2 ted thermal threshold unixsock uptime users uuid vmem vserver wireless write_http %{expand:%ascent_plugin} %{expand:%iptables_plugin} %{expand:%madwifi_plugin} %{expand:%rrdcached_plugin} aggregation ethstat md numa tail_csv write_graphite write_riemann
|
||||
|
||||
Name: collectd
|
||||
Version: 5.3.0
|
||||
Version: 5.4.0
|
||||
Release: 0
|
||||
Summary: Statistics Collection Daemon for filling RRD Files
|
||||
License: GPL-2.0
|
||||
@ -130,7 +139,6 @@ Patch9: collectd-version.patch
|
||||
Patch10: collectd-perl-vendor.patch
|
||||
# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=467072
|
||||
Patch11: collectd-fix_broken_perl-5.10.patch
|
||||
Patch12: collectd-fix-warnings.patch
|
||||
Patch17: collectd-fix_libltdl_autoreconf.patch
|
||||
Patch18: collectd-fix_collection_cgi.patch
|
||||
Patch19: collectd-fix_spamassassin_doc.patch
|
||||
@ -143,7 +151,6 @@ Url: http://collectd.org/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Requires: rrdtool
|
||||
Requires: sensors
|
||||
#BuildConflicts: libnetlink-devel
|
||||
BuildRequires: bind-devel
|
||||
BuildRequires: bison
|
||||
BuildRequires: flex
|
||||
@ -153,6 +160,7 @@ BuildRequires: intltool
|
||||
BuildRequires: libevent-devel
|
||||
BuildRequires: libnetlink-devel
|
||||
#BuildRequires: libmodbus-devel
|
||||
BuildRequires: libmnl-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: libstatgrab-devel
|
||||
BuildRequires: perl
|
||||
@ -529,7 +537,6 @@ to write %{name} unixsock clients.
|
||||
%patch9
|
||||
%patch10
|
||||
%patch11
|
||||
%patch12
|
||||
%patch17
|
||||
%patch18
|
||||
%patch19
|
||||
@ -577,7 +584,11 @@ export KERNEL_DIR=/usr/src/linux
|
||||
--with-libstatgrab \
|
||||
--with-rrdtool \
|
||||
--disable-static \
|
||||
%if %dns
|
||||
--enable-dns \
|
||||
%else
|
||||
--disable-dns \
|
||||
%endif
|
||||
--disable-nut \
|
||||
--enable-netlink \
|
||||
--enable-python \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user