# TODO:
+#warning: Installed (but unpackaged) file(s) found:
+# /etc/collectd.d/aggregation.conf
+# /etc/collectd.d/ceph.conf
+# /etc/collectd.d/cgroups.conf
+# /etc/collectd.d/drbd.conf
+# /etc/collectd.d/fhcount.conf
+# /etc/collectd.d/ipc.conf
+# /etc/collectd.d/java.conf
+# /etc/collectd.d/log_logstash.conf
+# /etc/collectd.d/lvm.conf
+# /etc/collectd.d/openldap.conf
+# /etc/collectd.d/pinba.conf
+# /etc/collectd.d/redis.conf
+# /etc/collectd.d/sigrok.conf
+# /etc/collectd.d/smart.conf
+# /etc/collectd.d/statsd.conf
+# /etc/collectd.d/tail_csv.conf
+# /etc/collectd.d/target_v5upgrade.conf
+# /etc/collectd.d/turbostat.conf
+# /etc/collectd.d/write_log.conf
+# /etc/collectd.d/write_redis.conf
+# /etc/collectd.d/write_riemann.conf
+# /etc/collectd.d/write_sensu.conf
+# /etc/collectd.d/write_tsdb.conf
+# /etc/collectd.d/zfs_arc.conf
+# /etc/collectd.d/zookeeper.conf
+# /usr/bin/collectd-tg
+# /usr/lib64/collectd/aggregation.so
+# /usr/lib64/collectd/ceph.so
+# /usr/lib64/collectd/cgroups.so
+# /usr/lib64/collectd/drbd.so
+# /usr/lib64/collectd/fhcount.so
+# /usr/lib64/collectd/ipc.so
+# /usr/lib64/collectd/java.so
+# /usr/lib64/collectd/log_logstash.so
+# /usr/lib64/collectd/lvm.so
+# /usr/lib64/collectd/openldap.so
+# /usr/lib64/collectd/pinba.so
+# /usr/lib64/collectd/redis.so
+# /usr/lib64/collectd/sigrok.so
+# /usr/lib64/collectd/smart.so
+# /usr/lib64/collectd/statsd.so
+# /usr/lib64/collectd/tail_csv.so
+# /usr/lib64/collectd/turbostat.so
+# /usr/lib64/collectd/write_log.so
+# /usr/lib64/collectd/write_redis.so
+# /usr/lib64/collectd/write_riemann.so
+# /usr/lib64/collectd/write_sensu.so
+# /usr/lib64/collectd/write_tsdb.so
+# /usr/lib64/collectd/zfs_arc.so
+# /usr/lib64/collectd/zookeeper.so
+# /usr/share/collectd/collection3/README
+# /usr/share/collectd/collection3/bin/.htaccess
+# /usr/share/collectd/collection3/test.px
+# /usr/share/collectd/java/collectd-api.jar
+# /usr/share/collectd/java/generic-jmx.jar
+# /usr/share/man/man1/collectd-tg.1.gz
+#
# - package contrib scripts as %doc
# - perl modules with Collectd classes package to separate package
# - Bundled libraries - check if its not changed ones and if it can be
# libjvm . . . . . . . no (javac not found)
# libkstat . . . . . . no (Solaris only)
# libkvm . . . . . . . no (BSD only)
-# libmodbus . . . . . . no (pkg-config doesn't know modbus) (http://www.libmodbus.org/)
# libnetapp . . . . . . no (netapp_api.h not found) (properitary)
# libperfstat . . . . . no (AIX only)
# librabbitmq . . . . . no (amqp.h not found) (http://hg.rabbitmq.com/rabbitmq-c/)
# librouteros . . . . . no ('routeros_api.h' not found) (http://verplant.org/librouteros/)
# libtokyotyrant . . . no (tcrdb.h not found) (http://1978th.net/tokyotyrant/)
# libyajl . . . . . . . no (yajl/yajl_parse.h not found)
-# protobuf-c . . . . . no
+# protobuf-c . . . . . no
# oracle . . . . . . . no (ORACLE_HOME is not set)
# - Disabled modules (build most of them an package):
# amqp . . . . . . . no
# ipvs . . . . . . . . no (ip_vs.h not found - llh to be fixed)
# java . . . . . . . . no
# lpar... . . . . . . . no
-# modbus . . . . . . . no
# multimeter . . . . . no ?
# netapp . . . . . . . no
# onewire . . . . . . . no (needs libowfs)
%bcond_without dns # DNS plugin
%bcond_without ipmi # IPMI plugin
%bcond_without iptables # iptables plugin
+%bcond_with java
%bcond_without libesmtp # notify_email plugin
%bcond_without libvirt # libvirt plugin
+%bcond_without modbus # modbus plugin
%bcond_with multimeter # multimeter plugin
%bcond_without mysql # MySQL plugin
%bcond_without netlink # netlink plugin
Summary: Collects system information in RRD files
Summary(pl.UTF-8): Zbieranie informacji o systemie w plikach RRD
Name: collectd
-Version: 5.0.0
-Release: 5.1
+Version: 5.5.0
+Release: 4
License: GPL v2
Group: Daemons
Source0: http://collectd.org/files/%{name}-%{version}.tar.bz2
-# Source0-md5: 7bfea6e82d35b36f16d1da2c71397213
+# Source0-md5: c39305ef5514b44238b0d31f77e29e6a
Source1: %{name}.conf
Source2: %{name}.init
Source3: %{name}-http.conf
Source4: %{name}-lighttpd.conf
+Source5: %{name}-apache.conf
Source10: %{name}-df.conf
Source11: %{name}-rrdtool.conf
Patch0: %{name}-collection.patch
Patch1: compile.patch
-Patch2: netfilter.patch
-Patch3: libnotify.patch
-Patch4: noquote.patch
-Patch5: libiptc.patch
+Patch2: noquote.patch
+
+Patch5: no-Werror.patch
+Patch6: %{name}-modbus.patch
URL: http://collectd.org/
%{?with_ipmi:BuildRequires: OpenIPMI-devel >= 2.0.14-3}
BuildRequires: autoconf
BuildRequires: automake
%{?with_curl:BuildRequires: curl-devel}
-BuildRequires: hal-devel
%{?with_iptables:BuildRequires: iptables-devel >= 1.4.1.1-4}
BuildRequires: libdbi-devel
%{?with_libesmtp:BuildRequires: libesmtp-devel}
BuildRequires: libltdl-devel
BuildRequires: libmemcached-devel
-BuildRequires: libnetlink-devel
-%{?with_netlink:BuildRequires: libnetlink-devel}
+%{?with_modbus:BuildRequires: libmodbus-devel}
+%{?with_netlink:BuildRequires: libmnl-devel}
%{?with_libvirt:BuildRequires: libnl1-devel}
-%{?with_notify:BuildRequires: libnotify-devel >= 0.7.0}
+%{?with_notify:BuildRequires: libnotify-devel}
%{?with_ping:BuildRequires: liboping-devel}
%{?with_dns:BuildRequires: libpcap-devel}
BuildRequires: libstatgrab-devel >= 0.12
BuildRequires: libstdc++-devel
BuildRequires: libtool
+%{?with_libvirt:BuildRequires: libvirt-devel}
%{?with_xml:BuildRequires: libxml2-devel}
%{?with_sensors:BuildRequires: lm_sensors-devel}
%{?with_mysql:BuildRequires: mysql-devel}
-%{?with_libvirt:BuildRequires: libvirt-devel}
BuildRequires: ncurses-devel
%{?with_snmp:BuildRequires: net-snmp-devel}
%{?with_libvirt:BuildRequires: numactl-devel}
%{?with_xmms:BuildRequires: xmms-devel}
BuildRequires: yajl-devel
Requires(post,preun): /sbin/chkconfig
+Requires: %{name}-libs = %{version}-%{release}
Requires: rc-scripts
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
10 second resolution while being nice to the system.
%description -l pl.UTF-8
-collectd to mały demon zbierający co 10 sekund informacje o systemie
-i zapisujący wyniki do pliku RRD.
+collectd to mały demon zbierający co 10 sekund informacje o systemie i
+zapisujący wyniki do pliku RRD.
W odróżnieniu od innych podobnych programów collectd nie jest
-skryptem, lecz jest napisany w czystym C z myślą o wydajności
-i przenośności. Jako demon pozostaje w pamięci, więc nie ma potrzeby
+skryptem, lecz jest napisany w czystym C z myślą o wydajności i
+przenośności. Jako demon pozostaje w pamięci, więc nie ma potrzeby
urychamiania ciężkiego interpretera za każdym razem, kiedy powinny być
zapisane nowe wartości. Dzięki temu collect może mieć rozdzielczość 10
sekund i nie obciążać zbytnio systemu.
Requires: perl(URI::Escape)
Requires: webserver(cgi)
Suggests: fonts-TTF-DejaVu
+Conflicts: apache-base < 2.4.0-1
%description collection
Web script for collectd.
Summary(pl.UTF-8): Web script for collectd
Group: Applications/WWW
Requires: %{name} = %{version}-%{release}
-Requires: perl-Collectd = %{version}-%{release}
Requires: perl(Config::General)
Requires: perl(HTML::Entities)
-Requires: perl(Regexp::Common)
Requires: perl(RRDs)
+Requires: perl(Regexp::Common)
+Requires: perl-Collectd = %{version}-%{release}
Requires: webserver(cgi)
Suggests: fonts-TTF-DejaVu
+Conflicts: apache-base < 2.4.0-1
%description collection3
Web script for collectd.
is important to generate random numbers, which are used for
encryption, authorization and similar tasks.
+%package ethstat
+Summary: ethstat-plugin for collectd
+Summary(pl.UTF-8): Wyczka ethstat dla collectd
+Group: Daemons
+Requires: %{name} = %{version}-%{release}
+
+%description ethstat
+The ethstat plugin reads performance statistics directly from ethernet
+cards
+
%package exec
Summary: exec-plugin for collectd
Summary(pl.UTF-8): Wtyczka exec dla collectd
%description mbmon
The mbmon plugin uses mbmon to retrieve temperature, voltage, etc.
+%package md
+Summary: md plugin for collectd
+Summary(pl.UTF-8): Wtyczka md dla collectd
+Group: Daemons
+Requires: %{name} = %{version}-%{release}
+
+%description md
+The md plugin reports the number of disks in various states in Linux
+software RAID devices.
+
%package memcachec
Summary: memcachec-plugin for collectd
Summary(pl.UTF-8): Wtyczka memcachec dla collectd
%description memory
Collects physical memory utilization for collectd.
+%package modbus
+Summary: modbus-plugin for collectd
+Summary(pl.UTF-8): Wtyczka modbus dla collectd
+Group: Daemons
+Requires: %{name} = %{version}-%{release}
+
+%description modbus
+The Modbus plugin connects to a Modbus "slave" via Modbus/TCP and
+reads register values. It supports reading single registers (unsigned
+16 bit values), large integer values (unsigned 32 bit values) and
+floating point values (two registers interpreted as IEEE floats in big
+endian notation).
+
%package multimeter
Summary: multimeter-plugin for collectd
Summary(pl.UTF-8): Wtyczka multimeter dla collectd
- parameters for each NTP server used to sync time: offset,
dispersion, delay.
+%package numa
+Summary: numa-plugin for collectd
+Summary(pl.UTF-8): Wtyczka numa dla collectd
+Group: Daemons
+Requires: %{name} = %{version}-%{release}
+
+%description numa
+The numa plugin reports statistics of the Non-Uniform Memory Access
+(NUMA) subsystem of Linux.
+
%package nut
Summary: nut-plugin for collectd
Summary(pl.UTF-8): Wtyczka nut dla collectd
Collects information about the virtual servers running on a system,
using Linux-Vserver.
+%package write_graphite
+Summary: write_graphite-plugin for collectd
+Summary(pl.UTF-8): wtyczka write_graphite dla collectd
+Group: Daemons
+Requires: %{name} = %{version}-%{release}
+
+%description write_graphite
+The Write Graphite plugin stores values in Carbon, the storage layer
+of Graphite. The plugin aims to be very efficient. It keeps the TCP
+connection to Carbon open in order to minimize the connection
+handshake overhead. It buffers the data in a buffer to send many lines
+at once, rather than generating lots of small network packets. The
+size of this buffer (1428 bytes) is dimensioned so that the buffer as
+well as the TCP and IP header fit into one Ethernet frame and can
+(hopefully) be delivered without fragmentation.
+
%package write_http
Summary: write_http-plugin for collectd
Summary(pl.UTF-8): Wtyczka write_http dla collectd
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+
%patch5 -p1
+#%patch6 -p1
%build
-%{__libtoolize}
+%{__libtoolize} --ltdl
%{__aclocal}
%{__autoconf}
%{__autoheader}
%configure \
CPPFLAGS="-Wno-unused-but-set-variable" \
c_cv_have_libperl=yes \
+ --with-libiptc=/usr \
--with-libstatgrab=/usr \
--with-lm-sensors=/usr \
--with-libmysql=/usr \
%{__enable_disable dns} \
%{__enable_disable ipmi} \
%{__enable_disable iptables} \
+ %{__with_without java} \
%{__enable_disable multimeter} \
%{__enable_disable mysql} \
%{__enable_disable netlink} \
%{__enable_disable notify notify_desktop} \
%{__enable_disable libesmtp notify_email} \
+ %{__enable_disable modbus } \
%{__enable_disable libvirt} \
%{__enable_disable ups nut} \
%{__enable_disable ping} \
--disable-ipvs
-%{__make} LDFLAGS="%{rpmldflags} -lstatgrab" \
+%{__make} -j1 LDFLAGS="%{rpmldflags} -lstatgrab" \
BUILD_WITH_OPENIPMI_CFLAGS="-I/usr/include" \
BUILD_WITH_OPENIPMI_LIBS="-L%{_libdir} -lOpenIPMIutils -lOpenIPMIpthread"
# Web frontend:
install contrib/collection.conf $RPM_BUILD_ROOT%{_webappdir}
install contrib/collection.cgi $RPM_BUILD_ROOT%{_appdir}/cgi-bin
-install %{SOURCE3} $RPM_BUILD_ROOT%{_webappdir}/apache.conf
+install %{SOURCE5} $RPM_BUILD_ROOT%{_webappdir}/apache.conf
install %{SOURCE3} $RPM_BUILD_ROOT%{_webappdir}/httpd.conf
install %{SOURCE4} $RPM_BUILD_ROOT%{_webappdir}/lighttpd.conf
%module_scripts dns
%module_scripts email
%module_scripts entropy
+%module_scripts ethstat
%module_scripts exec
%module_scripts filecount
%module_scripts fscache
%module_scripts match_timediff
%module_scripts match_value
%module_scripts mbmon
+%module_scripts md
%module_scripts memcachec
%module_scripts memcached
%module_scripts memory
%module_scripts notify_desktop
%module_scripts notify_email
%module_scripts ntpd
+%module_scripts numa
%module_scripts nut
%module_scripts olsrd
%module_scripts openvpn
%module_scripts varnish
%module_scripts vmem
%module_scripts vserver
+%module_scripts write_graphite
%module_scripts write_http
%module_scripts wireless
%module_scripts xmms
%triggerun collection -- apache1 < 1.3.37-3, apache1-base
%webapp_unregister apache %{_webapp}
-%triggerin collection -- apache < 2.2.0, apache-base
+%triggerin collection -- apache-base
%webapp_register httpd %{_webapp}
-%triggerun collection -- apache < 2.2.0, apache-base
+%triggerun collection -- apache-base
%webapp_unregister httpd %{_webapp}
%triggerin collection -- lighttpd
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libcollectdclient.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcollectdclient.so.0
+%attr(755,root,root) %ghost %{_libdir}/libcollectdclient.so.1
%files devel
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/entropy.conf
%attr(755,root,root) %{_libdir}/%{name}/entropy.so
+%files ethstat
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/ethstat.conf
+%attr(755,root,root) %{_libdir}/%{name}/ethstat.so
+
%files exec
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/exec.conf
%if %{with libvirt}
%files libvirt
%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/libvirt.conf
-%attr(755,root,root) %{_libdir}/%{name}/libvirt.so
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/virt.conf
+%attr(755,root,root) %{_libdir}/%{name}/virt.so
%endif
%files load
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/mbmon.conf
%attr(755,root,root) %{_libdir}/%{name}/mbmon.so
+%files md
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/md.conf
+%attr(755,root,root) %{_libdir}/%{name}/md.so
+
%files memcachec
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/memcachec.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/memory.conf
%attr(755,root,root) %{_libdir}/%{name}/memory.so
+%if %{with modbus}
+%files modbus
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/modbus.conf
+%attr(755,root,root) %{_libdir}/%{name}/modbus.so
+%endif
+
%if %{with multimeter}
%files multimeter
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/ntpd.conf
%attr(755,root,root) %{_libdir}/%{name}/ntpd.so
+%files numa
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/numa.conf
+%attr(755,root,root) %{_libdir}/%{name}/numa.so
+
%if %{with ups}
%files nut
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/uuid.conf
%attr(755,root,root) %{_libdir}/%{name}/uuid.so
+%if %{with varnish}
%files varnish
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/varnish.conf
%attr(755,root,root) %{_libdir}/%{name}/varnish.so
+%endif
%files vmem
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/wireless.conf
%attr(755,root,root) %{_libdir}/%{name}/wireless.so
+%files write_graphite
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/write_graphite.conf
+%attr(755,root,root) %{_libdir}/%{name}/write_graphite.so
+
%files write_http
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/write_http.conf
projects / packages / collectd.git / blobdiff