diff options
author | Alan Pevec <apevec@fedoraproject.org> | 2008-11-30 10:06:55 +0000 |
---|---|---|
committer | Alan Pevec <apevec@fedoraproject.org> | 2008-11-30 10:06:55 +0000 |
commit | 8d483f50a5621a3831bd51231b5294a63e266b28 (patch) | |
tree | cf1104f7f2d0308935ef9b7291b50779851707d9 | |
parent | fc928c371c6253bfde16c10816961d8812a07bff (diff) | |
download | collectd-8d483f50a5621a3831bd51231b5294a63e266b28.tar.gz collectd-8d483f50a5621a3831bd51231b5294a63e266b28.tar.xz collectd-8d483f50a5621a3831bd51231b5294a63e266b28.zip |
- New upstream version 4.5.1, bz# 470943collectd-4_5_1-1_fc11
http://collectd.org/news.shtml#news59
- enable Network UPS Tools (nut) plugin, bz# 465729
- enable postgresql plugin
- spec cleanup, bz# 473641
-rw-r--r-- | .cvsignore | 2 | ||||
-rw-r--r-- | collectd-4.5.1-include-collectd.d.patch (renamed from collectd-4.4.1-include-collectd.d.patch) | 24 | ||||
-rw-r--r-- | collectd.spec | 58 | ||||
-rw-r--r-- | sources | 2 |
4 files changed, 66 insertions, 20 deletions
@@ -1 +1 @@ -collectd-4.4.2.tar.bz2 +collectd-4.5.1.tar.bz2 diff --git a/collectd-4.4.1-include-collectd.d.patch b/collectd-4.5.1-include-collectd.d.patch index 30a7c28..e5b4816 100644 --- a/collectd-4.4.1-include-collectd.d.patch +++ b/collectd-4.5.1-include-collectd.d.patch @@ -1,14 +1,14 @@ ---- 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 +--- collectd-4.5.1/src/collectd.conf.in.ORIG 2008-10-16 22:29:56.000000000 +0200 ++++ collectd-4.5.1/src/collectd.conf.in 2008-11-30 10:39:23.000000000 +0100 +@@ -26,7 +26,6 @@ + # LogLevel info + #</Plugin> -@BUILD_PLUGIN_APACHE_TRUE@LoadPlugin apache @BUILD_PLUGIN_APCUPS_TRUE@LoadPlugin apcups @BUILD_PLUGIN_APPLE_SENSORS_TRUE@LoadPlugin apple_sensors @BUILD_PLUGIN_ASCENT_TRUE@LoadPlugin ascent -@@ -23,38 +22,29 @@ +@@ -36,7 +35,6 @@ @BUILD_PLUGIN_CSV_TRUE@LoadPlugin csv @BUILD_PLUGIN_DF_TRUE@LoadPlugin df @BUILD_PLUGIN_DISK_TRUE@LoadPlugin disk @@ -16,6 +16,7 @@ @BUILD_PLUGIN_EMAIL_TRUE@LoadPlugin email @BUILD_PLUGIN_ENTROPY_TRUE@LoadPlugin entropy @BUILD_PLUGIN_EXEC_TRUE@LoadPlugin exec +@@ -44,34 +42,24 @@ @BUILD_PLUGIN_HDDTEMP_TRUE@LoadPlugin hddtemp @BUILD_PLUGIN_INTERFACE_TRUE@LoadPlugin interface @BUILD_PLUGIN_IPTABLES_TRUE@LoadPlugin iptables @@ -24,7 +25,6 @@ @BUILD_PLUGIN_IRQ_TRUE@LoadPlugin irq -@BUILD_PLUGIN_LIBVIRT_TRUE@LoadPlugin libvirt @BUILD_PLUGIN_LOAD_TRUE@LoadPlugin load - @BUILD_PLUGIN_LOGFILE_TRUE@LoadPlugin logfile @BUILD_PLUGIN_MBMON_TRUE@LoadPlugin mbmon @BUILD_PLUGIN_MEMCACHED_TRUE@LoadPlugin memcached @BUILD_PLUGIN_MEMORY_TRUE@LoadPlugin memory @@ -34,10 +34,14 @@ @BUILD_PLUGIN_NETWORK_TRUE@LoadPlugin network @BUILD_PLUGIN_NFS_TRUE@LoadPlugin nfs -@BUILD_PLUGIN_NGINX_TRUE@LoadPlugin nginx + @BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@LoadPlugin notify_desktop + @BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@LoadPlugin notify_email @BUILD_PLUGIN_NTPD_TRUE@LoadPlugin ntpd - @BUILD_PLUGIN_NUT_TRUE@LoadPlugin nut +-@BUILD_PLUGIN_NUT_TRUE@LoadPlugin nut + @BUILD_PLUGIN_ONEWIRE_TRUE@LoadPlugin onewire -@BUILD_PLUGIN_PERL_TRUE@LoadPlugin perl @BUILD_PLUGIN_PING_TRUE@LoadPlugin ping +-@BUILD_PLUGIN_POSTGRESQL_TRUE@LoadPlugin postgresql @BUILD_PLUGIN_POWERDNS_TRUE@LoadPlugin powerdns @BUILD_PLUGIN_PROCESSES_TRUE@LoadPlugin processes -@BUILD_PLUGIN_RRDTOOL_TRUE@LoadPlugin rrdtool @@ -45,9 +49,9 @@ @BUILD_PLUGIN_SERIAL_TRUE@LoadPlugin serial -@BUILD_PLUGIN_SNMP_TRUE@LoadPlugin snmp @BUILD_PLUGIN_SWAP_TRUE@LoadPlugin swap - @BUILD_PLUGIN_SYSLOG_TRUE@LoadPlugin syslog @BUILD_PLUGIN_TAIL_TRUE@LoadPlugin tail -@@ -347,3 +337,4 @@ + @BUILD_PLUGIN_TAPE_TRUE@LoadPlugin tape +@@ -423,3 +411,4 @@ # Verbose false #</Plugin> diff --git a/collectd.spec b/collectd.spec index 3863a6e..1b23991 100644 --- a/collectd.spec +++ b/collectd.spec @@ -1,13 +1,13 @@ Summary: Statistics collection daemon for filling RRD files Name: collectd -Version: 4.4.2 +Version: 4.5.1 Release: 1%{?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 +Patch0: %{name}-%{version}-include-collectd.d.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libvirt-devel, libxml2-devel @@ -25,6 +25,8 @@ BuildRequires: net-snmp-devel BuildRequires: libpcap-devel BuildRequires: mysql-devel BuildRequires: OpenIPMI-devel +BuildRequires: postgresql-devel +BuildRequires: nut-devel %description collectd is a small daemon written in C for performance. It reads various @@ -37,7 +39,7 @@ fine grained since the files are updated every 10 seconds. %package apache Summary: Apache plugin for collectd Group: System Environment/Daemons -Requires: collectd = %{version}-%{release}, curl +Requires: collectd = %{version}-%{release} %description apache This plugin collects data provided by Apache's 'mod_status'. @@ -61,7 +63,7 @@ This plugin collects data provided by spamassassin. %package ipmi Summary: IPMI module for collectd Group: System Environment/Daemons -Requires: collectd = %{version}-%{release}, OpenIPMI +Requires: collectd = %{version}-%{release} %description ipmi This plugin for collectd provides IPMI support. @@ -69,7 +71,7 @@ This plugin for collectd provides IPMI support. %package mysql Summary: MySQL module for collectd Group: System Environment/Daemons -Requires: collectd = %{version}-%{release}, mysql +Requires: collectd = %{version}-%{release} %description mysql MySQL querying plugin. This plugins provides data of issued commands, called handlers and database traffic. @@ -78,10 +80,16 @@ called handlers and database traffic. %package nginx Summary: Nginx plugin for collectd Group: System Environment/Daemons -Requires: collectd = %{version}-%{release}, curl +Requires: collectd = %{version}-%{release} %description nginx This plugin gets data provided by nginx. +%package nut +Summary: Network UPS Tools module for collectd +Group: System Environment/Daemons +Requires: collectd = %{version}-%{release} +%description nut +This plugin for collectd provides Network UPS Tools support. %package -n perl-Collectd Summary: Perl bindings for collectd @@ -92,6 +100,14 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) This package contains Perl bindings and plugin for collectd. +%package postgresql +Summary: PostgreSQL module for collectd +Group: System Environment/Daemons +Requires: collectd = %{version}-%{release} +%description postgresql +PostgreSQL querying plugin. This plugins provides data of issued commands, +called handlers and database traffic. + %package rrdtool Summary: RRDTool module for collectd Group: System Environment/Daemons @@ -120,7 +136,7 @@ This plugin for collectd provides querying of net-snmp. %package virt Summary: Libvirt plugin for collectd Group: System Environment/Daemons -Requires: collectd = %{version}-%{release}, libvirt +Requires: collectd = %{version}-%{release} %description virt This plugin collects information from virtualized guests. @@ -144,6 +160,8 @@ sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in --enable-perl \ --enable-unixsock \ --enable-ipmi \ + --enable-nut \ + --enable-postgresql \ --with-perl-bindings=INSTALLDIRS=vendor %{__make} %{?_smp_mflags} @@ -173,6 +191,9 @@ find %{buildroot} -name perllocal.pod -exec rm {} \; mkdir perl-examples find contrib -name '*.p[lm]' -exec mv {} perl-examples/ \; +# postresql config example will be included by %doc +rm %{buildroot}%{_datadir}/collectd/postgresql_default.conf + # Move config contribs mkdir -p %{buildroot}/etc/collectd.d/ cp contrib/redhat/apache.conf %{buildroot}/etc/collectd.d/apache.conf @@ -183,7 +204,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 perl rrdtool +for p in dns ipmi libvirt nut perl postgresql rrdtool do %{__cat} > %{buildroot}/etc/collectd.d/$p.conf <<EOF LoadPlugin $p @@ -237,6 +258,7 @@ fi %{_sbindir}/collectdmon %dir %{_localstatedir}/lib/collectd/ +%dir %{_libdir}/collectd %{_libdir}/collectd/*.so* %{_libdir}/collectd/types.db %exclude %{_libdir}/collectd/apache.so* @@ -244,9 +266,11 @@ fi %exclude %{_libdir}/collectd/email.so* %exclude %{_libdir}/collectd/ipmi.so* %exclude %{_libdir}/collectd/libvirt.so* +%exclude %{_libdir}/collectd/nut.so* %exclude %{_libdir}/collectd/mysql.so* %exclude %{_libdir}/collectd/nginx.so* %exclude %{_libdir}/collectd/perl.so* +%exclude %{_libdir}/collectd/postgresql.so* %exclude %{_libdir}/collectd/rrdtool.so* %exclude %{_libdir}/collectd/sensors.so* %exclude %{_libdir}/collectd/snmp.so* @@ -298,6 +322,12 @@ fi %config(noreplace) %{_sysconfdir}/collectd.d/nginx.conf +%files nut +%defattr(-, root, root, -) +%{_libdir}/collectd/nut.so* +%config(noreplace) %{_sysconfdir}/collectd.d/nut.conf + + %files -n perl-Collectd %defattr(-, root, root, -) %doc perl-examples/* @@ -308,6 +338,11 @@ fi %doc %{_mandir}/man5/collectd-perl.5* %doc %{_mandir}/man3/Collectd::Unixsock.3pm* +%files postgresql +%defattr(-, root, root, -) +%{_libdir}/collectd/postgresql.so* +%config(noreplace) %{_sysconfdir}/collectd.d/postgresql.conf +%doc src/postgresql_default.conf %files rrdtool %defattr(-, root, root, -) @@ -335,6 +370,13 @@ fi %changelog +* Sun Oct 22 2008 Alan Pevec <apevec@redhat.com> 4.5.1-1 +- New upstream version 4.5.1, bz# 470943 + http://collectd.org/news.shtml#news59 +- enable Network UPS Tools (nut) plugin, bz# 465729 +- enable postgresql plugin +- spec cleanup, bz# 473641 + * Fri Aug 01 2008 Alan Pevec <apevec@redhat.com> 4.4.2-1 - New upstream version 4.4.2. @@ -1 +1 @@ -faee2bb6e38da1051fdd31762bdf3ab7 collectd-4.4.2.tar.bz2 +d85e00de03d40ca66d5eb4775e58fc1f collectd-4.5.1.tar.bz2 |