rpms/collectd/devel collectd-4.4.1-include-collectd.d.patch, NONE, 1.1 collectd.spec, 1.6, 1.7
Alan Pevec (apevec)
fedora-extras-commits at redhat.com
Thu Jun 12 11:12:03 UTC 2008
Author: apevec
Update of /cvs/pkgs/rpms/collectd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21514
Modified Files:
collectd.spec
Added Files:
collectd-4.4.1-include-collectd.d.patch
Log Message:
* Wed Jun 12 2008 Alan Pevec <apevec at redhat.com> 4.4.1-2
- Split rrdtool into a subpackage (Chris Lalancette)
- cleanup subpackages, split dns plugin, enable ipmi
- include /etc/collectd.d (bz#443942)
collectd-4.4.1-include-collectd.d.patch:
--- NEW FILE collectd-4.4.1-include-collectd.d.patch ---
--- collectd-4.4.1/src/collectd.conf.in.orig 2008-05-31 10:34:36.000000000 +0200
+++ collectd-4.4.1/src/collectd.conf.in 2008-06-12 12:55:29.000000000 +0200
@@ -13,7 +13,6 @@
#Interval 10
#ReadThreads 5
- at BUILD_PLUGIN_APACHE_TRUE@LoadPlugin apache
@BUILD_PLUGIN_APCUPS_TRUE at LoadPlugin apcups
@BUILD_PLUGIN_APPLE_SENSORS_TRUE at LoadPlugin apple_sensors
@BUILD_PLUGIN_ASCENT_TRUE at LoadPlugin ascent
@@ -23,38 +22,29 @@
@BUILD_PLUGIN_CSV_TRUE at LoadPlugin csv
@BUILD_PLUGIN_DF_TRUE at LoadPlugin df
@BUILD_PLUGIN_DISK_TRUE at LoadPlugin disk
- at BUILD_PLUGIN_DNS_TRUE@LoadPlugin dns
@BUILD_PLUGIN_EMAIL_TRUE at LoadPlugin email
@BUILD_PLUGIN_ENTROPY_TRUE at LoadPlugin entropy
@BUILD_PLUGIN_EXEC_TRUE at LoadPlugin exec
@BUILD_PLUGIN_HDDTEMP_TRUE at LoadPlugin hddtemp
@BUILD_PLUGIN_INTERFACE_TRUE at LoadPlugin interface
@BUILD_PLUGIN_IPTABLES_TRUE at LoadPlugin iptables
- at BUILD_PLUGIN_IPMI_TRUE@LoadPlugin ipmi
@BUILD_PLUGIN_IPVS_TRUE at LoadPlugin ipvs
@BUILD_PLUGIN_IRQ_TRUE at LoadPlugin irq
- at BUILD_PLUGIN_LIBVIRT_TRUE@LoadPlugin libvirt
@BUILD_PLUGIN_LOAD_TRUE at LoadPlugin load
@BUILD_PLUGIN_LOGFILE_TRUE at LoadPlugin logfile
@BUILD_PLUGIN_MBMON_TRUE at LoadPlugin mbmon
@BUILD_PLUGIN_MEMCACHED_TRUE at LoadPlugin memcached
@BUILD_PLUGIN_MEMORY_TRUE at LoadPlugin memory
@BUILD_PLUGIN_MULTIMETER_TRUE at LoadPlugin multimeter
- at BUILD_PLUGIN_MYSQL_TRUE@LoadPlugin mysql
@BUILD_PLUGIN_NETLINK_TRUE at LoadPlugin netlink
@BUILD_PLUGIN_NETWORK_TRUE at LoadPlugin network
@BUILD_PLUGIN_NFS_TRUE at LoadPlugin nfs
- at BUILD_PLUGIN_NGINX_TRUE@LoadPlugin nginx
@BUILD_PLUGIN_NTPD_TRUE at LoadPlugin ntpd
@BUILD_PLUGIN_NUT_TRUE at LoadPlugin nut
- at BUILD_PLUGIN_PERL_TRUE@LoadPlugin perl
@BUILD_PLUGIN_PING_TRUE at LoadPlugin ping
@BUILD_PLUGIN_POWERDNS_TRUE at LoadPlugin powerdns
@BUILD_PLUGIN_PROCESSES_TRUE at LoadPlugin processes
- at BUILD_PLUGIN_RRDTOOL_TRUE@LoadPlugin rrdtool
- at BUILD_PLUGIN_SENSORS_TRUE@LoadPlugin sensors
@BUILD_PLUGIN_SERIAL_TRUE at LoadPlugin serial
- at BUILD_PLUGIN_SNMP_TRUE@LoadPlugin snmp
@BUILD_PLUGIN_SWAP_TRUE at LoadPlugin swap
@BUILD_PLUGIN_SYSLOG_TRUE at LoadPlugin syslog
@BUILD_PLUGIN_TAIL_TRUE at LoadPlugin tail
@@ -347,3 +337,4 @@
# Verbose false
#</Plugin>
+Include "/etc/collectd.d"
Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/collectd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- collectd.spec 9 Jun 2008 13:39:27 -0000 1.6
+++ collectd.spec 12 Jun 2008 11:11:12 -0000 1.7
@@ -1,12 +1,13 @@
Summary: Statistics collection daemon for filling RRD files
Name: collectd
Version: 4.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL: http://collectd.org/
Source: http://collectd.org/files/%{name}-%{version}.tar.bz2
+Patch0: %{name}-4.4.1-include-collectd.d.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: libvirt-devel, libxml2-devel
@@ -19,9 +20,7 @@
BuildRequires: net-snmp-devel
BuildRequires: libpcap-devel
BuildRequires: mysql-devel
-
-Requires: rrdtool
-
+BuildRequires: OpenIPMI-devel
%description
collectd is a small daemon written in C for performance. It reads various
@@ -34,32 +33,48 @@
%package apache
Summary: Apache plugin for collectd
Group: System Environment/Daemons
-Requires: collectd = %{version}, curl
+Requires: collectd = %{version}-%{release}, curl
%description apache
-This plugin collectd data provided by Apache's 'mod_status'.
+This plugin collects data provided by Apache's 'mod_status'.
+
+
+%package dns
+Summary: DNS traffic analysis module for collectd
+Group: System Environment/Daemons
+Requires: collectd = %{version}-%{release}
+%description dns
+This plugin collects DNS traffic data.
+
-
%package email
Summary: Email plugin for collectd
Group: System Environment/Daemons
-Requires: collectd = %{version}, spamassassin
+Requires: collectd = %{version}-%{release}, spamassassin
%description email
-This plugin collectd data provided by spamassassin.
+This plugin collects data provided by spamassassin.
+
+
+%package ipmi
+Summary: IPMI module for collectd
+Group: System Environment/Daemons
+Requires: collectd = %{version}-%{release}, OpenIPMI
+%description ipmi
+This plugin for collectd provides IPMI support.
%package mysql
Summary: MySQL module for collectd
Group: System Environment/Daemons
-Requires: collectd = %{version}, mysql
+Requires: collectd = %{version}-%{release}, mysql
%description mysql
MySQL querying plugin. This plugins provides data of issued commands,
called handlers and database traffic.
-
+
%package nginx
Summary: Nginx plugin for collectd
Group: System Environment/Daemons
-Requires: collectd = %{version}, curl
+Requires: collectd = %{version}-%{release}, curl
%description nginx
This plugin gets data provided by nginx.
@@ -67,17 +82,24 @@
%package -n perl-Collectd
Summary: Perl bindings for collectd
Group: System Environment/Daemons
-Requires: collectd = %{version}, curl
+Requires: collectd = %{version}-%{release}
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-
%description -n perl-Collectd
This package contains Perl bindings and plugin for collectd.
+%package rrdtool
+Summary: RRDTool module for collectd
+Group: System Environment/Daemons
+Requires: collectd = %{version}-%{release}, rrdtool
+%description rrdtool
+This plugin for collectd provides rrdtool support.
+
+
%package sensors
Summary: Libsensors module for collectd
Group: System Environment/Daemons
-Requires: collectd = %{version}, lm_sensors
+Requires: collectd = %{version}-%{release}, lm_sensors
%description sensors
This plugin for collectd provides querying of sensors supported by
lm_sensors.
@@ -86,7 +108,7 @@
%package snmp
Summary: SNMP module for collectd
Group: System Environment/Daemons
-Requires: collectd = %{version}, net-snmp
+Requires: collectd = %{version}-%{release}, net-snmp
%description snmp
This plugin for collectd provides querying of net-snmp.
@@ -94,13 +116,14 @@
%package virt
Summary: Libvirt plugin for collectd
Group: System Environment/Daemons
-Requires: collectd = %{version}, curl
+Requires: collectd = %{version}-%{release}, libvirt
%description virt
This plugin collects information from virtualized guests.
%prep
%setup -q
+%patch0 -p1
sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
@@ -116,6 +139,7 @@
--enable-apache \
--enable-perl \
--enable-unixsock \
+ --enable-ipmi \
--with-perl-bindings=INSTALLDIRS=vendor
%{__make} %{?_smp_mflags}
@@ -146,16 +170,25 @@
find contrib -name '*.p[lm]' -exec mv {} perl-examples/ \;
# Move config contribs
-mkdir -p $RPM_BUILD_ROOT/etc/collectd.d/
-cp contrib/redhat/apache.conf $RPM_BUILD_ROOT/etc/collectd.d/apache.conf
-cp contrib/redhat/email.conf $RPM_BUILD_ROOT/etc/collectd.d/email.conf
-cp contrib/redhat/sensors.conf $RPM_BUILD_ROOT/etc/collectd.d/sensors.conf
-cp contrib/redhat/mysql.conf $RPM_BUILD_ROOT/etc/collectd.d/mysql.conf
-cp contrib/redhat/nginx.conf $RPM_BUILD_ROOT/etc/collectd.d/nginx.conf
-cp contrib/redhat/snmp.conf $RPM_BUILD_ROOT/etc/collectd.d/snmp.conf
+mkdir -p %{buildroot}/etc/collectd.d/
+cp contrib/redhat/apache.conf %{buildroot}/etc/collectd.d/apache.conf
+cp contrib/redhat/email.conf %{buildroot}/etc/collectd.d/email.conf
+cp contrib/redhat/mysql.conf %{buildroot}/etc/collectd.d/mysql.conf
+cp contrib/redhat/nginx.conf %{buildroot}/etc/collectd.d/nginx.conf
+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 perl rrdtool
+do
+%{__cat} > %{buildroot}/etc/collectd.d/$p.conf <<EOF
+LoadPlugin $p
+EOF
+done
+
# *.la files shouldn't be distributed.
-rm -f $RPM_BUILD_ROOT/%{_libdir}/collectd/*.la
+rm -f %{buildroot}/%{_libdir}/collectd/*.la
%post
@@ -182,6 +215,17 @@
%config(noreplace) %{_sysconfdir}/collectd.conf
%config(noreplace) %{_sysconfdir}/collectd.d/
+%exclude %{_sysconfdir}/collectd.d/apache.conf
+%exclude %{_sysconfdir}/collectd.d/dns.conf
+%exclude %{_sysconfdir}/collectd.d/email.conf
+%exclude %{_sysconfdir}/collectd.d/ipmi.conf
+%exclude %{_sysconfdir}/collectd.d/libvirt.conf
+%exclude %{_sysconfdir}/collectd.d/mysql.conf
+%exclude %{_sysconfdir}/collectd.d/nginx.conf
+%exclude %{_sysconfdir}/collectd.d/perl.conf
+%exclude %{_sysconfdir}/collectd.d/rrdtool.conf
+%exclude %{_sysconfdir}/collectd.d/sensors.conf
+%exclude %{_sysconfdir}/collectd.d/snmp.conf
%{_initrddir}/collectd
%{_bindir}/collectd-nagios
@@ -192,11 +236,14 @@
%{_libdir}/collectd/*.so*
%{_libdir}/collectd/types.db
%exclude %{_libdir}/collectd/apache.so*
+%exclude %{_libdir}/collectd/dns.so*
%exclude %{_libdir}/collectd/email.so*
+%exclude %{_libdir}/collectd/ipmi.so*
%exclude %{_libdir}/collectd/libvirt.so*
%exclude %{_libdir}/collectd/mysql.so*
%exclude %{_libdir}/collectd/nginx.so*
%exclude %{_libdir}/collectd/perl.so*
+%exclude %{_libdir}/collectd/rrdtool.so*
%exclude %{_libdir}/collectd/sensors.so*
%exclude %{_libdir}/collectd/snmp.so*
@@ -211,57 +258,73 @@
%files apache
-%doc COPYING
%{_libdir}/collectd/apache.so*
%config(noreplace) %{_sysconfdir}/collectd.d/apache.conf
+%files dns
+%{_libdir}/collectd/dns.so*
+%config(noreplace) %{_sysconfdir}/collectd.d/dns.conf
+
+
%files email
-%doc COPYING
%{_libdir}/collectd/email.so*
%config(noreplace) %{_sysconfdir}/collectd.d/email.conf
%doc %{_mandir}/man5/collectd-email.5*
+%files ipmi
+%{_libdir}/collectd/ipmi.so*
+%config(noreplace) %{_sysconfdir}/collectd.d/ipmi.conf
+
+
%files mysql
-%doc COPYING
%{_libdir}/collectd/mysql.so*
%config(noreplace) %{_sysconfdir}/collectd.d/mysql.conf
%files nginx
-%doc COPYING
%{_libdir}/collectd/nginx.so*
%config(noreplace) %{_sysconfdir}/collectd.d/nginx.conf
%files -n perl-Collectd
-%doc COPYING perl-examples/*
+%doc perl-examples/*
%{_libdir}/collectd/perl.so*
%{perl_vendorlib}/Collectd.pm
%{perl_vendorlib}/Collectd/
+%config(noreplace) %{_sysconfdir}/collectd.d/perl.conf
%doc %{_mandir}/man5/collectd-perl.5*
%doc %{_mandir}/man3/Collectd::Unixsock.3pm*
+
+%files rrdtool
+%{_libdir}/collectd/rrdtool.so*
+%config(noreplace) %{_sysconfdir}/collectd.d/rrdtool.conf
+
+
%files sensors
-%doc COPYING
%{_libdir}/collectd/sensors.so*
%config(noreplace) %{_sysconfdir}/collectd.d/sensors.conf
%files snmp
-%doc COPYING
%{_libdir}/collectd/snmp.so*
%config(noreplace) %{_sysconfdir}/collectd.d/snmp.conf
%doc %{_mandir}/man5/collectd-snmp.5*
%files virt
-%doc COPYING
%{_libdir}/collectd/libvirt.so*
+%config(noreplace) %{_sysconfdir}/collectd.d/libvirt.conf
%changelog
+* Wed Jun 12 2008 Alan Pevec <apevec at redhat.com> 4.4.1-2
+- Split rrdtool into a subpackage (Chris Lalancette)
+- cleanup subpackages, split dns plugin, enable ipmi
+- include /etc/collectd.d (bz#443942)
+
* Mon Jun 09 2008 Alan Pevec <apevec at redhat.com> 4.4.1-1
- New upstream version 4.4.1.
- plugin changes: reenable iptables, disable ascent
More information about the fedora-extras-commits
mailing list