X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcollectd.git;a=blobdiff_plain;f=collectd.spec;h=c0528db04573db2141261c7404c8e378c8e84bcc;hp=19f4319cf2d9b9a87a18bf82dcc11adb4219248f;hb=bd5ba4fc4334a45771d81ca7655e3a7cb2192755;hpb=1bb843303b49c3530be83667f70e78b80bdd2352 diff --git a/collectd.spec b/collectd.spec index 19f4319..c0528db 100644 --- a/collectd.spec +++ b/collectd.spec @@ -5,35 +5,39 @@ # mainstream library: # liboconfig . . . . . yes (shipped version) # - Libraries not found by configure: -# libganglia . . . . . no (gm_protocol.h not found) -# libiokit . . . . . . no +# libcredis . . . . . . no (credis.h not found) (http://code.google.com/p/credis/) +# libganglia . . . . . no (gm_protocol.h not found) (http://ganglia.info/) +# libiokit . . . . . . no (Darwin only) # libjvm . . . . . . . no (javac not found) # libkstat . . . . . . no (Solaris only) -# libkvm . . . . . . . no -# libnetapp . . . . . . no (netapp_api.h not found) -# libperl . . . . . . . no -# librouteros . . . . . no ('routeros_api.h' not found) -# libtokyotyrant . . . no (tcrdb.h not found) -# libvirt . . . . . . . no (pkg-config doesn't know library) +# 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 # oracle . . . . . . . no (ORACLE_HOME is not set) # - 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) -# multimeter . . . . no ? -# onewire . . . . . . no (needs libowfs) -# perl . . . . . . . no (buggy perl: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=467072) -# rrdcached . . . . . no (requires rrdtool >= 1.4.0) -# tape . . . . . . . no ? -# curl_json . . . . . . no +# amqp . . . . . . . no +# apple_sensors . . . . no (Darwin only) # gmond . . . . . . . . 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) # oracle . . . . . . . no +# pinba . . . . . . . . no +# redis . . . . . . . . no # routeros . . . . . . no -# rrdcached . . . . . . no +# tape . . . . . . . . no ? # tokyotyrant . . . . . no +# write_redis . . . . . no # zfs_arc . . . . . . . no # - logrotate file for logfile plugin # - %desc -l pl for plugins @@ -45,6 +49,7 @@ %bcond_without ipmi # IPMI plugin %bcond_without iptables # iptables plugin %bcond_without libesmtp # notify_email plugin +%bcond_without libvirt # libvirt plugin %bcond_with multimeter # multimeter plugin %bcond_without mysql # MySQL plugin %bcond_without netlink # netlink plugin @@ -55,24 +60,19 @@ %bcond_without sensors # sensors plugin %bcond_without snmp # SNMP plugin %bcond_without ups # nut plugin +%bcond_without varnish # varnish plugin %bcond_without xml # ascent, bind and libvirt plugins %bcond_without xmms # XMMS plugin -# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=358637 -%ifarch %{x8664} -%undefine with_iptables -%undefine with_netlink -%endif - 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: 3 +Version: 5.0.1 +Release: 4 License: GPL v2 Group: Daemons Source0: http://collectd.org/files/%{name}-%{version}.tar.bz2 -# Source0-md5: 5753496651c8c84afaea1fe290876bfc +# Source0-md5: 9ad1e4334bd4a671284e8e92a3e3323e Source1: %{name}.conf Source2: %{name}.init Source3: %{name}-http.conf @@ -81,12 +81,14 @@ Source10: %{name}-df.conf Source11: %{name}-rrdtool.conf Patch0: %{name}-collection.patch Patch1: compile.patch +Patch2: noquote.patch +Patch3: libiptc.patch +Patch4: pld.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} @@ -94,6 +96,7 @@ BuildRequires: libltdl-devel BuildRequires: libmemcached-devel BuildRequires: libnetlink-devel %{?with_netlink:BuildRequires: libnetlink-devel} +%{?with_libvirt:BuildRequires: libnl1-devel} %{?with_notify:BuildRequires: libnotify-devel} %{?with_ping:BuildRequires: liboping-devel} %{?with_dns:BuildRequires: libpcap-devel} @@ -103,8 +106,10 @@ BuildRequires: libtool %{?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_ups:BuildRequires: nut-devel} BuildRequires: perl-devel BuildRequires: pkgconfig @@ -113,10 +118,13 @@ BuildRequires: python-devel BuildRequires: python-modules BuildRequires: rpmbuild(macros) >= 1.268 %{?with_rrd:BuildRequires: rrdtool-devel} +%{?with_varnish:BuildRequires: varnish-devel} BuildRequires: which #BuildRequires: xfsprogs-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) @@ -141,11 +149,11 @@ 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 -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. +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. %package libs Summary: %{name} libraries @@ -184,7 +192,7 @@ Pliki statyczne bibliotek %{name}. %package apache Summary: apache-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka apache dla collectd +Summary(pl.UTF-8): Wtyczka apache dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -197,29 +205,29 @@ Wtyczka collectd zbierająca informacje udostępniane przez moduł %package apcups Summary: APC UPS plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka APC UPS dla collectd +Summary(pl.UTF-8): Wtyczka APC UPS dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} %description apcups The APC UPS plugin connects to an instance of Apcupsd to read various -statistics about a connected uninterruptible power supply (UPS), such as -voltage, load, etc. +statistics about a connected uninterruptible power supply (UPS), such +as voltage, load, etc. %package ascent Summary: ascent-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka ascent dla collectd +Summary(pl.UTF-8): Wtyczka ascent dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} %description ascent -The Ascent plugin reads and parses the statistics page of Ascent, a free and -open-source server software for the game World of Warcraft by Blizzard -Entertainment. +The Ascent plugin reads and parses the statistics page of Ascent, a +free and open-source server software for the game World of Warcraft by +Blizzard Entertainment. %package battery Summary: battery plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka battery dla collectd +Summary(pl.UTF-8): Wtyczka battery dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -229,7 +237,7 @@ battery's voltage. %package bind Summary: bind plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka bind dla collectd +Summary(pl.UTF-8): Wtyczka bind dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -242,7 +250,7 @@ collectd. %package collection Summary: Web script for collectd -Summary(pl_PL.UTF-8): Web script for collectd +Summary(pl.UTF-8): Web script for collectd Group: Applications/WWW Requires: %{name} = %{version}-%{release} Requires: perl(CGI) @@ -258,11 +266,13 @@ Web script for collectd. %package collection3 Summary: Web script for collectd -Summary(pl_PL.UTF-8): 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: webserver(cgi) Suggests: fonts-TTF-DejaVu @@ -272,17 +282,17 @@ Web script for collectd. %package contextswitch Summary: contextswitch-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka contextswitch dla collectd +Summary(pl.UTF-8): Wtyczka contextswitch dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} %description contextswitch -The ContextSwitch plugin collects the number of context switches -done by the operating system. +The ContextSwitch plugin collects the number of context switches done +by the operating system. %package conntrack Summary: conntrack-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka conntrack dla collectd +Summary(pl.UTF-8): Wtyczka conntrack dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -291,7 +301,7 @@ The conntrack-plugin collects the connection tracking table size. %package cpu Summary: cpu-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka cpu dla collectd +Summary(pl.UTF-8): Wtyczka cpu dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -302,7 +312,7 @@ waiting for IO operations and being idle. %package cpufreq Summary: cpufreq-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka cpufreq dla collectd +Summary(pl.UTF-8): Wtyczka cpufreq dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -311,7 +321,7 @@ Collects the current CPU's frequency, mostly for mobile computers. %package csv Summary: CSV output plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka wyjściowa CSV dla collectd +Summary(pl.UTF-8): Wtyczka wyjściowa CSV dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -320,7 +330,7 @@ CSV output plugin for collectd. %package curl Summary: cURL output plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka wyjściowa cURL dla collectd +Summary(pl.UTF-8): Wtyczka wyjściowa cURL dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -329,9 +339,21 @@ The curl plugin uses the libcurl to read web pages and the match infrastructure (the same code used by the tail plugin) to use regular expressions with the received data. +%package curl_json +Summary: cURL JSON plugin for collectd +Summary(pl.UTF-8): Wtyczka cURL JSON dla collectd +Group: Daemons +Requires: %{name} = %{version}-%{release} + +%description curl_json +The cURL-JSON plugin queries JavaScript Object Notation (JSON) data +using the cURL library and parses it according to the user's +configuration using Yet Another JSON Library (YAJL). This can be used +to query statistics information from a CouchDB instance, for example. + %package dbi Summary: dbi plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka dbi dla collectd +Summary(pl.UTF-8): Wtyczka dbi dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -345,7 +367,7 @@ to these rules. %package df Summary: df-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka df dla collectd +Summary(pl.UTF-8): Wtyczka df dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -357,7 +379,7 @@ that's been around forever. %package disk Summary: disk-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka disk dla collectd +Summary(pl.UTF-8): Wtyczka disk dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -367,7 +389,7 @@ supported, partitions. %package dns Summary: dns-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka dns dla collectd +Summary(pl.UTF-8): Wtyczka dns dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} Requires: perl-rrdtool @@ -379,7 +401,7 @@ interprets the packets and collects statistics of your DNS traffic. %package email Summary: email-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka email dla collectd +Summary(pl.UTF-8): Wtyczka email dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -394,18 +416,18 @@ is included in contrib/, but is of course not limited to that use. %package entropy Summary: entropy-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka entropy dla collectd +Summary(pl.UTF-8): Wtyczka entropy dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} %description entropy -The Entropy plugin collects the available entropy on a system. Entropy is -important to generate random numbers, which are used for encryption, -authorization and similar tasks. +The Entropy plugin collects the available entropy on a system. Entropy +is important to generate random numbers, which are used for +encryption, authorization and similar tasks. %package exec Summary: exec-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka exec dla collectd +Summary(pl.UTF-8): Wtyczka exec dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -415,7 +437,7 @@ dispatch notifications to the outside world. %package filecount Summary: filecount-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka filecount dla collectd +Summary(pl.UTF-8): Wtyczka filecount dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -428,7 +450,7 @@ in your home directory. %package fscache Summary: fscache-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka fscache dla collectd +Summary(pl.UTF-8): Wtyczka fscache dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -438,7 +460,7 @@ caching framework. %package hddtemp Summary: hddtemp-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka hddtemp dla collectd +Summary(pl.UTF-8): Wtyczka hddtemp dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} Suggests: hddtemp-hddtempd @@ -449,7 +471,7 @@ and queried by the external hddtemp-daemon. %package interface Summary: interface-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka interface dla collectd +Summary(pl.UTF-8): Wtyczka interface dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -459,7 +481,7 @@ packets and errors of interfaces. %package iptables Summary: iptables-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka iptables dla collectd +Summary(pl.UTF-8): Wtyczka iptables dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -476,29 +498,44 @@ packets and much more. %package ipmi Summary: ipmi-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka ipmi dla collectd +Summary(pl.UTF-8): Wtyczka ipmi dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} %description ipmi -The IPMI plugin uses the OpenIPMI library to read hardware sensors from -servers using the Intelligent Platform Management Interface (IPMI). IPMI -is very common with server hardware but usually not available in consumer -hardware. +The IPMI plugin uses the OpenIPMI library to read hardware sensors +from servers using the Intelligent Platform Management Interface +(IPMI). IPMI is very common with server hardware but usually not +available in consumer hardware. %package irq Summary: IRQs-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka IRQs dla collectd +Summary(pl.UTF-8): Wtyczka IRQs dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} %description irq -The IRQ plugin collects the number of times each interrupt has been handled -by the operating system. +The IRQ plugin collects the number of times each interrupt has been +handled by the operating system. + +%package libvirt +Summary: libvirt-plugin for collectd +Summary(pl.UTF-8): Wtyczka libvirt dla collectd +Group: Daemons +Requires: %{name} = %{version}-%{release} + +%description libvirt +The libvirt plugin uses the virtualization API libvirt, created by +RedHat's Emerging Technology group, to gather statistics about +virtualized guests on a system. This way, you can collect CPU, network +interface and block device usage for each guest without installing +collectd on the guest systems. Because the statistics are received +from the hypervisor directly, this works not only with +para-virtualized hosts, but with hardware virtualized machines, too. %package load Summary: load-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka load dla collectd +Summary(pl.UTF-8): Wtyczka load dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -508,40 +545,41 @@ utilization of a machine, though their meaning is mostly overrated. %package logfile Summary: logfile-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka logfile dla collectd +Summary(pl.UTF-8): Wtyczka logfile dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} %description logfile -The LogFile plugin receives log messages from the daemon and writes them to -a text file. +The LogFile plugin receives log messages from the daemon and writes +them to a text file. %package madwifi Summary: madwifi plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka madwifi dla collectd +Summary(pl.UTF-8): Wtyczka madwifi dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} %description madwifi -The MadWifi plugin collects information about Atheros wireless LAN chipsets -from the MadWifi driver. It uses the /sys filesystem to identify cards -handled by this driver automatically but can be configured manually, too. -Because very many statistics are available, an advanced selection mechanism -is provided. +The MadWifi plugin collects information about Atheros wireless LAN +chipsets from the MadWifi driver. It uses the /sys filesystem to +identify cards handled by this driver automatically but can be +configured manually, too. Because very many statistics are available, +an advanced selection mechanism is provided. %package match_empty_counter Summary: match_empty_counter plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka match_empty_counter dla collectd +Summary(pl.UTF-8): Wtyczka match_empty_counter dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} %description match_empty_counter -Empty Counter match matches value lists, where at least one data source is -of type COUNTER and the counter value of all counter data sources is zero. +Empty Counter match matches value lists, where at least one data +source is of type COUNTER and the counter value of all counter data +sources is zero. %package match_hashed Summary: match_hashed plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka match_hashed dla collectd +Summary(pl.UTF-8): Wtyczka match_hashed dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -551,7 +589,7 @@ redundant storage. %package match_regex Summary: match_regex plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka match_regex dla collectd +Summary(pl.UTF-8): Wtyczka match_regex dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -560,7 +598,7 @@ match_regex plugin for collectd. %package match_timediff Summary: match_timediff plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka match_timediff dla collectd +Summary(pl.UTF-8): Wtyczka match_timediff dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -569,7 +607,7 @@ match_timediff plugin for collectd. %package match_value Summary: match_value plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka match_value dla collectd +Summary(pl.UTF-8): Wtyczka match_value dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -578,7 +616,7 @@ match_value plugin for collectd. %package mbmon Summary: mbmon plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka mbmon dla collectd +Summary(pl.UTF-8): Wtyczka mbmon dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -587,19 +625,19 @@ 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 +Summary(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. +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 +Summary(pl.UTF-8): Wtyczka memcached dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -611,7 +649,7 @@ bytes sent and received. %package memory Summary: memory-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka memory dla collectd +Summary(pl.UTF-8): Wtyczka memory dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -620,20 +658,21 @@ Collects physical memory utilization for collectd. %package multimeter Summary: multimeter-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka multimeter dla collectd +Summary(pl.UTF-8): Wtyczka multimeter dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} %description multimeter -The Multimeter plugin reads a value (usually a voltage or current) from a -multimeter connected to a serial bus. The plugin tries /dev/ttyS0-9 in order -to find a multimeter – no configuration is possible. +The Multimeter plugin reads a value (usually a voltage or current) +from a multimeter connected to a serial bus. The plugin tries +/dev/ttyS0-9 in order to find a multimeter – no configuration is +possible. The multimeter used for development was a Metex M-4650CR. %package mysql Summary: mysql-plugin for collectd -Summary(pl_PL.UTF-8): Moduł mysql dla collectd. +Summary(pl.UTF-8): Moduł mysql dla collectd. Group: Daemons Requires: %{name} = %{version}-%{release} Requires: mysql-client @@ -648,7 +687,7 @@ poleceniach, wywoływanych procedurach obsługi i ruchu bazodanowym. %package netlink Summary: netlink-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka netlink dla collectd +Summary(pl.UTF-8): Wtyczka netlink dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -661,17 +700,17 @@ information to gather using the configuration. %package network Summary: network-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka network dla collectd +Summary(pl.UTF-8): Wtyczka network dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} %description network -The Network plugin can send values to other instances and receive values -from other %{name} instances. +The Network plugin can send values to other instances and receive +values from other %{name} instances. %package nfs Summary: NFS-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka NFS dla collectd +Summary(pl.UTF-8): Wtyczka NFS dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -681,7 +720,7 @@ NFS procedures. %package nginx Summary: nginx-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka nginx dla collectd +Summary(pl.UTF-8): Wtyczka nginx dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -693,7 +732,7 @@ compiled by default. %package notify_desktop Summary: notify_desktop for collectd -Summary(pl_PL.UTF-8): Wtyczka notify_desktop dla collectd +Summary(pl.UTF-8): Wtyczka notify_desktop dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} Requires: dbus(org.freedesktop.Notifications) @@ -704,17 +743,17 @@ defined in the Desktop Notification Specification. %package notify_email Summary: notify_email-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka notify_email dla collectd +Summary(pl.UTF-8): Wtyczka notify_email dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} %description notify_email -The Notify Email plugin uses libESMTP to send notifications to a configured -email address(es). +The Notify Email plugin uses libESMTP to send notifications to a +configured email address(es). %package ntpd Summary: ntpd-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka ntpd dla collectd +Summary(pl.UTF-8): Wtyczka ntpd dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -722,11 +761,12 @@ Requires: %{name} = %{version}-%{release} The NTPd plugin queries an NTP server (usually the local one, where statistics access is allowed) and extracts : - "local" clock parameters: time offset, error and offset loop, -- parameters for each NTP server used to sync time: offset, dispersion, delay. +- parameters for each NTP server used to sync time: offset, + dispersion, delay. %package nut Summary: nut-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka nut dla collectd +Summary(pl.UTF-8): Wtyczka nut dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -737,18 +777,17 @@ power, frequencies, load, and temperatures. %package olsrd Summary: olsrd plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka olsrd dla collectd +Summary(pl.UTF-8): Wtyczka olsrd dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} -Requires: openvpn %description olsrd -The olsrd plugin reads information about meshed networks from the txtinfo -plugin of the Optimized Link State Routing daemon (olsrd). +The olsrd plugin reads information about meshed networks from the +txtinfo plugin of the Optimized Link State Routing daemon (olsrd). %package openvpn Summary: openvpn plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka openvpn dla collectd +Summary(pl.UTF-8): Wtyczka openvpn dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} Requires: openvpn @@ -757,9 +796,25 @@ Requires: openvpn The OpenVPN plugin reads a status file maintained by OpenVPN and gathers traffic statistics about connected clients. +%package perl +Summary: perl plugin for collectd +Summary(pl.UTF-8): Wtyczka perl dla collectd +Group: Daemons +Requires: %{name} = %{version}-%{release} +Requires: perl-Collectd = %{version}-%{release} + +%description perl +The Perl plugin embeds a Perl interpreter into collectd and exposes +the application programming interface (API) to Perl-scripts. This +allows to write own plugins in the popular scripting language, which +are then loaded and executed by the daemon without the need to start a +new process and interpreter every few seconds. Perl-modules written +for the Perl plugin are therefore more powerful and efficient than +scripts executed by the Exec plugin. + %package ping Summary: ping-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka ping dla collectd +Summary(pl.UTF-8): Wtyczka ping dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} Requires: liboping >= 1.1.2 @@ -775,7 +830,7 @@ etc. %package postgresql Summary: mysql-plugin for collectd -Summary(pl_PL.UTF-8): Moduł postgresql dla collectd. +Summary(pl.UTF-8): Moduł postgresql dla collectd. Group: Daemons Requires: %{name} = %{version}-%{release} @@ -786,7 +841,7 @@ reconnect if the connection has been interrupted. %package powerdns Summary: powerdns-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka powerdns dla collectd +Summary(pl.UTF-8): Wtyczka powerdns dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -798,7 +853,7 @@ may be useful for some. %package processes Summary: processes-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka processes dla collectd +Summary(pl.UTF-8): Wtyczka processes dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -809,7 +864,7 @@ select detailed statistics about selected processes, grouped by name. %package protocols Summary: protocols-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka protocols dla collectd +Summary(pl.UTF-8): Wtyczka protocols dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -819,22 +874,34 @@ such as IP, TCP and UDP. %package python Summary: python-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka python dla collectd +Summary(pl.UTF-8): Wtyczka python dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} %description python -The Python plugin embeds a Python interpreter into collectd and exposes -the application programming interface (API) to Python-scripts. This allows -to write own plugins in the popular scripting language, which are then -loaded and executed by the daemon without the need to start a new process -and interpreter every few seconds. Python-modules written for the Python -plugin are therefore more powerful and efficient than scripts executed by -the Exec plugin. +The Python plugin embeds a Python interpreter into collectd and +exposes the application programming interface (API) to Python-scripts. +This allows to write own plugins in the popular scripting language, +which are then loaded and executed by the daemon without the need to +start a new process and interpreter every few seconds. Python-modules +written for the Python plugin are therefore more powerful and +efficient than scripts executed by the Exec plugin. + +%package rrdcached +Summary: rrdcached-plugin for collectd +Summary(pl.UTF-8): Wtyczka rrdcached dla collectd +Group: Daemons +Requires: %{name} = %{version}-%{release} + +%description rrdcached +The rrdcached plugin uses the RRDtool accelerator daemon, rrdcached, +to store values to RRD files in an efficient manner. The combination +of the rrdcached plugin and the rrdcached daemon is very similar to +the way the rrdtool plugin works. %package rrdtool Summary: rrdtool-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka rrdtool dla collectd +Summary(pl.UTF-8): Wtyczka rrdtool dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} Requires: rrdtool @@ -844,7 +911,7 @@ The RRDtool plugin writes values to RRD-files using librrd. %package sensors Summary: sensors-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka sensors dla collectd +Summary(pl.UTF-8): Wtyczka sensors dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -855,7 +922,7 @@ correct data. %package serial Summary: serial-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka serial dla collectd +Summary(pl.UTF-8): Wtyczka serial dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -864,7 +931,7 @@ The Serial plugin collects the traffic on serial interfaces. %package snmp Summary: snmp-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka snmp dla collectd +Summary(pl.UTF-8): Wtyczka snmp dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -877,17 +944,17 @@ another instance or whatever you configured. %package swap Summary: swap-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka swap dla collectd +Summary(pl.UTF-8): Wtyczka swap dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} %description swap -The Swap plugin collects the amount of memory currently written onto hard -disk or whatever the system calls “swap”. +The Swap plugin collects the amount of memory currently written onto +hard disk or whatever the system calls “swap”. %package syslog Summary: syslog-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka syslog dla collectd +Summary(pl.UTF-8): Wtyczka syslog dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -897,7 +964,7 @@ them to syslog(3). %package table Summary: table-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka table dla collectd +Summary(pl.UTF-8): Wtyczka table dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -907,7 +974,7 @@ such as many files beneath /proc. %package target_notification Summary: target_notification-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka target_notification dla collectd +Summary(pl.UTF-8): Wtyczka target_notification dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -916,7 +983,7 @@ target_notification plugin for collectd. %package target_replace Summary: target_replace-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka target_replace dla collectd +Summary(pl.UTF-8): Wtyczka target_replace dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -925,7 +992,7 @@ target_replace plugin for collectd. %package target_scale Summary: target_scale-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka target_scale dla collectd +Summary(pl.UTF-8): Wtyczka target_scale dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -934,16 +1001,26 @@ Target to scale (multiply) values by an arbitrary value. %package target_set Summary: target_set-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka target_set dla collectd +Summary(pl.UTF-8): Wtyczka target_set dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} %description target_set target_set plugin for collectd. +%package target_v5upgrade +Summary: target_v5upgrade-plugin for collectd +Summary(pl.UTF-8): Wtyczka target_v5upgrade dla collectd +Group: Daemons +Requires: %{name} = %{version}-%{release} + +%description target_v5upgrade +The v5 upgrade target can be used to upgrade version 4 data to a +changed version 5 layout. + %package tail Summary: tail-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka tail dla collectd +Summary(pl.UTF-8): Wtyczka tail dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -954,7 +1031,7 @@ if the line is relevant for any statistics using a regular expression. %package tcpconns Summary: tcpconns-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka tcpconns dla collectd +Summary(pl.UTF-8): Wtyczka tcpconns dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -966,7 +1043,7 @@ the remote port are outgoing connections. %package teamspeak2 Summary: teamspeak2-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka teamspeak2 dla collectd +Summary(pl.UTF-8): Wtyczka teamspeak2 dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -978,7 +1055,7 @@ servers. %package ted Summary: ted-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka ted dla collectd +Summary(pl.UTF-8): Wtyczka ted dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -988,17 +1065,26 @@ Detective” (TED). %package thermal Summary: thermal-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka thermal dla collectd +Summary(pl.UTF-8): Wtyczka thermal dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} %description thermal -The thermal plugin reads ACPI thermal zone information from the sysfs or -procfs file system, i. e. mostly system temperature information. +The thermal plugin reads ACPI thermal zone information from the sysfs +or procfs file system, i. e. mostly system temperature information. + +%package threshold +Summary: threshold-plugin for collectd +Summary(pl.UTF-8): Wtyczka threshold dla collectd +Group: Daemons +Requires: %{name} = %{version}-%{release} + +%description threshold +threshold-plugin for collectd. %package unixsock Summary: unixsock-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka unixsock dla collectd +Summary(pl.UTF-8): Wtyczka unixsock dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -1010,7 +1096,7 @@ externally collected values to collectd. %package uptime Summary: uptime-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka uptime dla collectd +Summary(pl.UTF-8): Wtyczka uptime dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -1019,7 +1105,7 @@ The uptime-plugin can collect the server's uptime. %package users Summary: users-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka users dla collectd +Summary(pl.UTF-8): Wtyczka users dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -1028,7 +1114,7 @@ Number of users currently logged in. %package uuid Summary: uuid-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka uuid dla collectd +Summary(pl.UTF-8): Wtyczka uuid dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -1039,9 +1125,19 @@ machine, usually taken from the machine's BIOS. This is most useful if the machine is running in a virtual environment such as Xen, in which case the UUID is preserved across shutdowns and migration. +%package varnish +Summary: varnish-plugin for collectd +Summary(pl.UTF-8): Wtyczka varnish dla collectd +Group: Daemons +Requires: %{name} = %{version}-%{release} + +%description varnish +The Varnish plugin collects information about Varnish, an HTTP +accelerator. + %package vmem Summary: vmem-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka vmem dla collectd +Summary(pl.UTF-8): Wtyczka vmem dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -1052,7 +1148,7 @@ detailed, they are collected very detailed. %package vserver Summary: vserver-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka vserver dla collectd +Summary(pl.UTF-8): Wtyczka vserver dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -1062,7 +1158,7 @@ using Linux-Vserver. %package write_http Summary: write_http-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka write_http dla collectd +Summary(pl.UTF-8): Wtyczka write_http dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -1073,7 +1169,7 @@ commands. %package wireless Summary: wireless-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka wireless dla collectd +Summary(pl.UTF-8): Wtyczka wireless dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -1083,7 +1179,7 @@ signal-to-noise ratio for wireless LAN cards. %package xmms Summary: xmms-plugin for collectd -Summary(pl_PL.UTF-8): Wtyczka xmms dla collectd +Summary(pl.UTF-8): Wtyczka xmms dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} @@ -1103,6 +1199,9 @@ Perl files from Collectd package %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p0 %build %{__libtoolize} @@ -1112,29 +1211,39 @@ Perl files from Collectd package %{__automake} %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 \ - --%{?with_dns:en}%{!?with_dns:dis}able-dns \ - --%{?with_ipmi:en}%{!?with_ipmi:dis}able-ipmi \ - --%{?with_iptables:en}%{!?with_iptables:dis}able-iptables \ - --%{?with_multimeter:en}%{!?with_multimeter:dis}able-multimeter \ - --%{?with_mysql:en}%{!?with_mysql:dis}able-mysql \ - --%{?with_netlink:en}%{!?with_netlink:dis}able-netlink \ - --%{?with_notify:en}%{!?with_notify:dis}able-notify_desktop \ - --%{?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_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 \ - --%{?with_xmms:en}%{!?with_xmms:dis}able-xmms \ - %{!?with_curl:--disable-{apache,ascent,bind,curl,nginx}} \ - %{!?with_xml:--disable-{ascent,bind,libvirt}} \ - --disable-ipvs \ - --disable-libvirt \ - --disable-perl + --enable-perl \ + %{__enable_disable dns} \ + %{__enable_disable ipmi} \ + %{__enable_disable iptables} \ + %{__enable_disable multimeter} \ + %{__enable_disable mysql} \ + %{__enable_disable netlink} \ + %{__enable_disable notify notify_desktop} \ + %{__enable_disable libesmtp notify_email} \ + %{__enable_disable libvirt} \ + %{__enable_disable ups nut} \ + %{__enable_disable ping} \ + %{__enable_disable pgsql postgresql} \ + %{__enable_disable rrd rrdtool} \ + %{__enable_disable sensors} \ + %{__enable_disable snmp} \ + %{__enable_disable xmms} \ + %{__enable_disable varnish} \ + %{__enable_disable curl} \ + %{__enable_disable curl apache} \ + %{__enable_disable curl ngix} \ + %{__enable_disable curl ascent} \ + %{__disable curl ascent} \ + %{__disable curl bind} \ + %{__disable xml ascent} \ + %{__disable xml bind} \ + --disable-ipvs %{__make} LDFLAGS="%{rpmldflags} -lstatgrab" \ @@ -1144,7 +1253,7 @@ Perl files from Collectd package %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_var}/{log/,lib/%{name}},/etc/{rc.d/init.d/,collectd.d}} \ - $RPM_BUILD_ROOT{%{_appdir}/cgi-bin,%{_webappdir},%{_pkglibdir},%{perl_vendorlib}/} + $RPM_BUILD_ROOT{%{_appdir}/cgi-bin,%{_webappdir},%{_pkglibdir},%{perl_vendorlib}/,%{_mandir}/man3} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT @@ -1160,6 +1269,9 @@ install %{SOURCE3} $RPM_BUILD_ROOT%{_webappdir}/httpd.conf install %{SOURCE4} $RPM_BUILD_ROOT%{_webappdir}/lighttpd.conf cp -R contrib/collection3 $RPM_BUILD_ROOT%{_appdir} +mv $RPM_BUILD_ROOT%{_appdir}/collection3/etc/collection.conf $RPM_BUILD_ROOT%{_webappdir}/collection3.conf +ln -sf %{_webappdir}/collection3.conf $RPM_BUILD_ROOT%{_appdir}/collection3/etc/collection.conf +sed -i -e 's@#DataDir "/var/lib/collectd/rrd"@DataDir "%{_var}/lib/%{name}"@' $RPM_BUILD_ROOT%{_webappdir}/collection3.conf ### Configs instalation ### for i in `egrep "^(#|)LoadPlugin" src/collectd.conf |awk '{print $NF}' ` ; do @@ -1175,6 +1287,7 @@ install %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/df.conf install %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/rrdtool.conf mv $RPM_BUILD_ROOT%{_datadir}/perl5/Collectd* $RPM_BUILD_ROOT%{perl_vendorlib}/ +mv $RPM_BUILD_ROOT/usr/man/man3/Collectd::Unixsock.3pm $RPM_BUILD_ROOT%{_mandir}/man3/ # Cleanups: rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la @@ -1213,6 +1326,7 @@ fi %module_scripts cpufreq %module_scripts csv %module_scripts curl +%module_scripts curl_json %module_scripts dbi %module_scripts df %module_scripts disk @@ -1227,6 +1341,7 @@ fi %module_scripts ipmi %module_scripts iptables %module_scripts irq +%module_scripts libvirt %module_scripts load %module_scripts logfile %module_scripts madwifi @@ -1251,12 +1366,14 @@ fi %module_scripts nut %module_scripts olsrd %module_scripts openvpn +%module_scripts perl %module_scripts ping %module_scripts postgresql %module_scripts powerdns %module_scripts processes %module_scripts protocols %module_scripts python +%module_scripts rrdcached %module_scripts rrdtool %module_scripts sensors %module_scripts serial @@ -1269,14 +1386,17 @@ fi %module_scripts target_replace %module_scripts target_scale %module_scripts target_set +%module_scripts target_v5upgrade %module_scripts tcpconns %module_scripts teamspeak2 %module_scripts ted %module_scripts thermal +%module_scripts threshold %module_scripts unixsock %module_scripts uptime %module_scripts users %module_scripts uuid +%module_scripts varnish %module_scripts vmem %module_scripts vserver %module_scripts write_http @@ -1306,18 +1426,21 @@ fi %doc AUTHORS ChangeLog README TODO contrib %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf %dir %{_sysconfdir}/%{name}.d +%dir %{_webappdir} %attr(755,root,root) %{_sbindir}/collectd %attr(755,root,root) %{_sbindir}/collectdmon +%attr(755,root,root) %{_bindir}/collectdctl %attr(755,root,root) %{_bindir}/collectd-nagios +%dir %{_libdir}/%{name} %dir %{_datadir}/%{name} %{_datadir}/%{name}/types.db %attr(754,root,root) /etc/rc.d/init.d/%{name} %{_mandir}/man1/collectd.1* %{_mandir}/man1/collectd-nagios.1* +%{_mandir}/man1/collectdctl.1* %{_mandir}/man1/collectdmon.1* %{_mandir}/man5/collectd.conf.5* %{_mandir}/man5/collectd-java.5* -%{_mandir}/man5/collectd-perl.5* %{_mandir}/man5/types.db.5* %dir %{_var}/lib/%{name} @@ -1325,7 +1448,6 @@ fi %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libcollectdclient.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libcollectdclient.so.0 -%dir %{_libdir}/%{name} %files devel %defattr(644,root,root,755) @@ -1342,7 +1464,6 @@ fi %files collection %defattr(644,root,root,755) -%dir %{_webappdir} %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/collection.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/apache.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/httpd.conf @@ -1353,7 +1474,14 @@ fi %files collection3 %defattr(644,root,root,755) -%{_appdir}/collection3 +%doc contrib/collection3/README +%config(noreplace) %verify(not md5 mtime size) %{_webappdir}/collection3.conf +%dir %{_appdir}/collection3 +%dir %{_appdir}/collection3/bin +%attr(755,root,root) %{_appdir}/collection3/bin/*.cgi +%{_appdir}/collection3/etc +%{_appdir}/collection3/lib +%{_appdir}/collection3/share ########## PLUGINS: %if %{with xml} @@ -1421,6 +1549,15 @@ fi %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 + +%files curl_json +%defattr(640,root,root,755) +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/curl_json.conf +%attr(755,root,root) %{_libdir}/%{name}/curl_json.so %endif %files dbi @@ -1501,6 +1638,13 @@ fi %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/irq.conf %attr(755,root,root) %{_libdir}/%{name}/irq.so +%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 +%endif + %files load %defattr(644,root,root,755) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/load.conf @@ -1636,6 +1780,12 @@ fi %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/openvpn.conf %attr(755,root,root) %{_libdir}/%{name}/openvpn.so +%files perl +%defattr(644,root,root,755) +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/perl.conf +%attr(755,root,root) %{_libdir}/%{name}/perl.so +%{_mandir}/man5/collectd-perl.5* + %if %{with ping} %files ping %defattr(644,root,root,755) @@ -1673,6 +1823,11 @@ fi %{_mandir}/man5/collectd-python.5* %if %{with rrd} +%files rrdcached +%defattr(644,root,root,755) +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/rrdcached.conf +%attr(755,root,root) %{_libdir}/%{name}/rrdcached.so + %files rrdtool %defattr(644,root,root,755) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/rrdtool.conf @@ -1739,6 +1894,10 @@ fi %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/target_set.conf %attr(755,root,root) %{_libdir}/%{name}/target_set.so +%files target_v5upgrade +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/%{name}/target_v5upgrade.so + %files tcpconns %defattr(644,root,root,755) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/tcpconns.conf @@ -1759,6 +1918,12 @@ fi %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/thermal.conf %attr(755,root,root) %{_libdir}/%{name}/thermal.so +%files threshold +%defattr(644,root,root,755) +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/threshold.conf +%attr(755,root,root) %{_libdir}/%{name}/threshold.so +%{_mandir}/man5/collectd-threshold.5* + %files unixsock %defattr(644,root,root,755) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/unixsock.conf @@ -1780,6 +1945,11 @@ fi %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/uuid.conf %attr(755,root,root) %{_libdir}/%{name}/uuid.so +%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 + %files vmem %defattr(644,root,root,755) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/vmem.conf @@ -1811,3 +1981,4 @@ fi %defattr(644,root,root,755) %{perl_vendorlib}/Collectd.pm %{perl_vendorlib}/Collectd +%{_mandir}/man3/*.3*