diff options
-rw-r--r-- | collectd-4.9.1-include-collectd.d.patch | 4 | ||||
-rw-r--r-- | collectd.spec | 25 |
2 files changed, 24 insertions, 5 deletions
diff --git a/collectd-4.9.1-include-collectd.d.patch b/collectd-4.9.1-include-collectd.d.patch index f76aadc..4832b12 100644 --- a/collectd-4.9.1-include-collectd.d.patch +++ b/collectd-4.9.1-include-collectd.d.patch @@ -31,7 +31,7 @@ index 049b07d..a795169 100644 @BUILD_PLUGIN_LOAD_TRUE@@BUILD_PLUGIN_LOAD_TRUE@LoadPlugin load #@BUILD_PLUGIN_MADWIFI_TRUE@LoadPlugin madwifi #@BUILD_PLUGIN_MBMON_TRUE@LoadPlugin mbmon -@@ -88,33 +83,25 @@ FQDNLookup true +@@ -88,33 +83,24 @@ FQDNLookup true #@BUILD_PLUGIN_MEMCACHED_TRUE@LoadPlugin memcached @BUILD_PLUGIN_MEMORY_TRUE@@BUILD_PLUGIN_MEMORY_TRUE@LoadPlugin memory #@BUILD_PLUGIN_MULTIMETER_TRUE@LoadPlugin multimeter @@ -50,7 +50,7 @@ index 049b07d..a795169 100644 #@BUILD_PLUGIN_OPENVPN_TRUE@LoadPlugin openvpn #@BUILD_PLUGIN_ORACLE_TRUE@LoadPlugin oracle -#@BUILD_PLUGIN_PERL_TRUE@LoadPlugin perl - #@BUILD_PLUGIN_PING_TRUE@LoadPlugin ping +-#@BUILD_PLUGIN_PING_TRUE@LoadPlugin ping -#@BUILD_PLUGIN_POSTGRESQL_TRUE@LoadPlugin postgresql #@BUILD_PLUGIN_POWERDNS_TRUE@LoadPlugin powerdns #@BUILD_PLUGIN_PROCESSES_TRUE@LoadPlugin processes diff --git a/collectd.spec b/collectd.spec index 6058e7a..a10bb39 100644 --- a/collectd.spec +++ b/collectd.spec @@ -1,7 +1,7 @@ Summary: Statistics collection daemon for filling RRD files Name: collectd Version: 4.9.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://collectd.org/ @@ -33,6 +33,7 @@ BuildRequires: OpenIPMI-devel BuildRequires: postgresql-devel BuildRequires: nut-devel BuildRequires: iptables-devel +BuildRequires: liboping-devel %description collectd is a small daemon written in C for performance. It reads various @@ -108,6 +109,14 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) This package contains Perl bindings and plugin for collectd. +%package ping +Summary: ping module for collectd +Group: System Environment/Daemons +Requires: collectd = %{version}-%{release} +%description ping +This plugin for collectd provides network latency statistics. + + %package postgresql Summary: PostgreSQL module for collectd Group: System Environment/Daemons @@ -174,7 +183,7 @@ sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in --enable-nut \ --enable-postgresql \ --enable-iptables \ - --disable-ping \ + --enable-ping \ --with-libiptc \ --with-perl-bindings=INSTALLDIRS=vendor %{__make} %{?_smp_mflags} @@ -218,7 +227,7 @@ cp contrib/redhat/sensors.conf %{buildroot}/etc/collectd.d/sensors.conf cp contrib/redhat/snmp.conf %{buildroot}/etc/collectd.d/snmp.conf # configs for subpackaged plugins -for p in dns ipmi libvirt nut perl postgresql rrdtool +for p in dns ipmi libvirt nut perl ping postgresql rrdtool do %{__cat} > %{buildroot}/etc/collectd.d/$p.conf <<EOF LoadPlugin $p @@ -263,6 +272,7 @@ fi %exclude %{_sysconfdir}/collectd.d/nginx.conf %exclude %{_sysconfdir}/collectd.d/nut.conf %exclude %{_sysconfdir}/collectd.d/perl.conf +%exclude %{_sysconfdir}/collectd.d/ping.conf %exclude %{_sysconfdir}/collectd.d/postgresql.conf %exclude %{_sysconfdir}/collectd.d/rrdtool.conf %exclude %{_sysconfdir}/collectd.d/sensors.conf @@ -412,6 +422,12 @@ fi %doc %{_mandir}/man3/Collectd::Unixsock.3pm* +%files ping +%defattr(-, root, root, -) +%{_libdir}/collectd/ping.so +%config(noreplace) %{_sysconfdir}/collectd.d/ping.conf + + %files postgresql %defattr(-, root, root, -) %{_libdir}/collectd/postgresql.so @@ -445,6 +461,9 @@ fi %changelog +* Fri Mar 26 2010 Alan Pevec <apevec@redhat.com> 4.9.1-2 +- enable ping plugin bz#541744 + * Mon Mar 08 2010 Lubomir Rintel <lkundrak@v3.sl> 4.9.1-1 - New upstream version 4.9.1 http://collectd.org/news.shtml#news81 |