# libjvm . . . . . . . no (javac not found)
# libkstat . . . . . . no (Solaris only)
# libkvm . . . . . . . no
-# libmemcached . . . . no (libmemcached/memcached.h not found)
# libnetapp . . . . . . no (netapp_api.h not found)
# libperl . . . . . . . no
# librouteros . . . . . no ('routeros_api.h' not found)
# libvirt . . . . . . . no (pkg-config doesn't know library)
# libyajl . . . . . . . no (yajl/yajl_parse.h not found)
# oracle . . . . . . . no (ORACLE_HOME is not set)
-# - Disabled modules:
+# - Disabled modules (build most of them an package):
# apple_sensors . . . no (obvious)
# ipvs . . . . . . . no (ip_vs.h not found - llh to be fixed)
# libvirt . . . . . . no (requires library)
# curl_json . . . . . . no
# gmond . . . . . . . . no
# java . . . . . . . . no
-# memcachec . . . . . . no
# netapp . . . . . . . no
# oracle . . . . . . . no
# routeros . . . . . . no
-# rrdcached . . . . . . no
# tokyotyrant . . . . . no
# zfs_arc . . . . . . . no
# - logrotate file for logfile plugin
%bcond_without netlink # netlink plugin
%bcond_without notify # notify_desktop plugin
%bcond_without ping # ping plugin
-%bcond_without psql # PostgreSQL plugin
+%bcond_without pgsql # PostgreSQL plugin
%bcond_without rrd # rrdtool and rrdcached plugins
%bcond_without sensors # sensors plugin
%bcond_without snmp # SNMP plugin
Summary: Collects system information in RRD files
Summary(pl.UTF-8): Zbieranie informacji o systemie w plikach RRD
Name: collectd
-Version: 4.9.1
-Release: 0.9
+Version: 4.10.2
+Release: 1
License: GPL v2
Group: Daemons
Source0: http://collectd.org/files/%{name}-%{version}.tar.bz2
-# Source0-md5: 5753496651c8c84afaea1fe290876bfc
+# Source0-md5: 85d9d8d0a1327782661e3c89800aa70e
Source1: %{name}.conf
Source2: %{name}.init
Source3: %{name}-http.conf
Source10: %{name}-df.conf
Source11: %{name}-rrdtool.conf
Patch0: %{name}-collection.patch
+Patch1: compile.patch
URL: http://collectd.org/
%{?with_ipmi:BuildRequires: OpenIPMI-devel >= 2.0.14-3}
BuildRequires: autoconf
BuildRequires: libdbi-devel
%{?with_libesmtp:BuildRequires: libesmtp-devel}
BuildRequires: libltdl-devel
+BuildRequires: libmemcached-devel
+BuildRequires: libnetlink-devel
%{?with_netlink:BuildRequires: libnetlink-devel}
%{?with_notify:BuildRequires: libnotify-devel}
%{?with_ping:BuildRequires: liboping-devel}
%{?with_xml:BuildRequires: libxml2-devel}
%{?with_sensors:BuildRequires: lm_sensors-devel}
%{?with_mysql:BuildRequires: mysql-devel}
+BuildRequires: ncurses-devel
%{?with_snmp:BuildRequires: net-snmp-devel}
%{?with_ups:BuildRequires: nut-devel}
BuildRequires: perl-devel
-%{?with_psql:BuildRequires: postgresql-devel}
+BuildRequires: pkgconfig
+%{?with_pgsql:BuildRequires: postgresql-devel}
+BuildRequires: python-devel
+BuildRequires: python-modules
BuildRequires: rpmbuild(macros) >= 1.268
%{?with_rrd:BuildRequires: rrdtool-devel}
+BuildRequires: which
+#BuildRequires: xfsprogs-devel
%{?with_xmms:BuildRequires: xmms-devel}
Requires(post,preun): /sbin/chkconfig
Requires: rc-scripts
%description mbmon
The mbmon plugin uses mbmon to retrieve temperature, voltage, etc.
+%package memcachec
+Summary: memcachec-plugin for collectd
+Summary(pl_PL.UTF-8): Wtyczka memcachec dla collectd
+Group: Daemons
+Requires: %{name} = %{version}-%{release}
+
+%description memcachec
+The memcachec plugin connects to a memcached server, queries one or more
+given pages and parses the returned data according to user specification.
+The matches used are similar to the matches used in the cURL and Tail
+plugins.
+
%package memcached
Summary: memcached-plugin for collectd
Summary(pl_PL.UTF-8): Wtyczka memcached dla collectd
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%{__libtoolize}
--%{?with_libesmtp:en}%{!?with_libesmtp:dis}able-notify_email \
--%{?with_ups:en}%{!?with_ups:dis}able-nut \
--%{?with_ping:en}%{!?with_ping:dis}able-ping \
- --%{?with_psql:en}%{!?with_psql:dis}able-postgresql \
+ --%{?with_pgsql:en}%{!?with_pgsql:dis}able-postgresql \
--%{?with_rrd:en}%{!?with_rrd:dis}able-rrdtool \
--%{?with_sensors:en}%{!?with_sensors:dis}able-sensors \
--%{?with_snmp:en}%{!?with_snmp:dis}able-snmp \
%module_scripts match_timediff
%module_scripts match_value
%module_scripts mbmon
+%module_scripts memcachec
%module_scripts memcached
%module_scripts memory
%module_scripts multimeter
%defattr(640,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/curl.conf
%attr(755,root,root) %{_libdir}/%{name}/curl.so
+%if %{with xml}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/curl_xml.conf
+%attr(755,root,root) %{_libdir}/%{name}/curl_xml.so
+%endif
%endif
%files dbi
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/madwifi.conf
%attr(755,root,root) %{_libdir}/%{name}/madwifi.so
-
+
%files match_empty_counter
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/match_empty_counter.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/mbmon.conf
%attr(755,root,root) %{_libdir}/%{name}/mbmon.so
+%files memcachec
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/memcachec.conf
+%attr(755,root,root) %{_libdir}/%{name}/memcachec.so
+
%files memcached
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/memcached.conf
%attr(755,root,root) %{_libdir}/%{name}/ping.so
%endif
-%if %{with psql}
+%if %{with pgsql}
%files postgresql
%defattr(640,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/postgresql.conf