From 296fec5ad60587485013993c5f5aad2a38834049 Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Thu, 8 Aug 2013 18:37:26 +0200 Subject: [PATCH] RedHat RPM spec: updates for 5.4.0 --- contrib/redhat/collectd.spec | 146 ++++++++++++++++++++++++++++++++++- 1 file changed, 143 insertions(+), 3 deletions(-) diff --git a/contrib/redhat/collectd.spec b/contrib/redhat/collectd.spec index 4f70fd69..2379c8d5 100644 --- a/contrib/redhat/collectd.spec +++ b/contrib/redhat/collectd.spec @@ -43,6 +43,7 @@ %{?el6:%global _has_recent_libganglia 1} %{?el6:%global _has_working_libiptc 1} %{?el6:%global _has_ip_vs_h 1} +%{?el6:%global _has_lvm2app_h 1} %{?el6:%global _has_perl_extutils_embed 1} # plugins enabled by default @@ -53,6 +54,7 @@ %define with_ascent 0%{!?_without_ascent:1} %define with_battery 0%{!?_without_battery:1} %define with_bind 0%{!?_without_bind:1} +%define with_cgroups 0%{!?_without_cgroups:1} %define with_conntrack 0%{!?_without_conntrack:1} %define with_contextswitch 0%{!?_without_contextswitch:1} %define with_cpu 0%{!?_without_cpu:1} @@ -82,6 +84,7 @@ %define with_libvirt 0%{!?_without_libvirt:1} %define with_load 0%{!?_without_load:1} %define with_logfile 0%{!?_without_logfile:1} +%define with_lvm 0%{!?_without_lvm:0%{?_has_lvm2app_h}} %define with_madwifi 0%{!?_without_madwifi:1} %define with_mbmon 0%{!?_without_mbmon:1} %define with_md 0%{!?_without_md:1} @@ -90,6 +93,7 @@ %define with_memory 0%{!?_without_memory:1} %define with_multimeter 0%{!?_without_multimeter:1} %define with_mysql 0%{!?_without_mysql:1} +%define with_netlink 0%{!?_without_netlink:1} %define with_network 0%{!?_without_network:1} %define with_nfs 0%{!?_without_nfs:1} %define with_nginx 0%{!?_without_nginx:1} @@ -112,6 +116,7 @@ %define with_sensors 0%{!?_without_sensors:1} %define with_serial 0%{!?_without_serial:1} %define with_snmp 0%{!?_without_snmp:1} +%define with_statsd 0%{!?_without_statsd:1} %define with_swap 0%{!?_without_swap:1} %define with_syslog 0%{!?_without_syslog:1} %define with_table 0%{!?_without_table:1} @@ -139,14 +144,16 @@ # plugin apple_sensors disabled, requires a Mac %define with_apple_sensors 0%{!?_without_apple_sensors:0} +# plugin aquaero disabled, requires a libaquaero5 +%define with_aquaero 0%{!?_without_aquaero:0} # plugin lpar disabled, requires AIX %define with_lpar 0%{!?_without_lpar:0} +# plugin mic disabled, requires Mic +%define with_mic 0%{!?_without_mic:0} # plugin modbus disabled, requires libmodbus %define with_modbus 0%{!?_without_modbus:0} # plugin netapp disabled, requires libnetapp %define with_netapp 0%{!?_without_netapp:0} -# plugin netlink disabled, requires libnetlink.h -%define with_netlink 0%{!?_without_netlink:0} # plugin onewire disabled, requires libowfs %define with_onewire 0%{!?_without_onewire:0} # plugin oracle disabled, requires Oracle @@ -159,6 +166,8 @@ %define with_routeros 0%{!?_without_routeros:0} # plugin rrdcached disabled, requires rrdtool >= 1.4 %define with_rrdcached 0%{!?_without_rrdcached:0} +# plugin sigrok disabled, requires libsigrok +%define with_sigrok 0%{!?_without_sigrok:0} # plugin tape disabled, requires libkstat %define with_tape 0%{!?_without_tape:0} # plugin tokyotyrant disabled, requires tcrdb.h @@ -174,7 +183,7 @@ Summary: Statistics collection daemon for filling RRD files Name: collectd -Version: 5.3.1 +Version: 5.4.0 Release: 1%{?dist} URL: http://collectd.org Source: http://collectd.org/files/%{name}-%{version}.tar.bz2 @@ -217,6 +226,15 @@ BuildRequires: curl-devel This plugin collects data provided by Apache's `mod_status'. %endif +%if %{with_aquaero} +%package aquaero +Summary: aquaero plugin for collectd +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +%description aquaero +Various sensors in the Aquaero 5 watercooling board made by Aquacomputer. +%endif + %if %{with_ascent} %package ascent Summary: Ascent plugin for collectd @@ -371,6 +389,17 @@ BuildRequires: libvirt-devel This plugin collects information from virtualized guests. %endif +%if %{with_lvm} +%package lvm +Summary: LVM plugin for collectd +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: lvm2-devel +%description lvm +This plugin collects size of “Logical Volumes” (LV) and “Volume Groups” (VG) +of Linux' “Logical Volume Manager” (LVM). +%endif + %if %{with_memcachec} %package memcachec Summary: Memcachec plugin for collectd @@ -383,6 +412,16 @@ instance. Note that another plugin, named `memcached', exists and does a similar job, without requiring the installation of libmemcached. %endif +%if %{with_mic} +%package mic +Summary: mic plugin for collectd +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +%description mic +The mic plugin collects CPU usage, memory usage, temperatures and power +consumption from Intel Many Integrated Core (MIC) CPUs. +%endif + %if %{with_mysql} %package mysql Summary: MySQL plugin for collectd @@ -394,6 +433,17 @@ MySQL querying plugin. This plugin provides data of issued commands, called handlers and database traffic. %endif +%if %{with_netlink} +%package netlink +Summary: netlink plugin for collectd +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: libmnl-devel +%description netlink +This plugin collects very detailed Linux network interface and routing +statistics. +%endif + %if %{with_nginx} %package nginx Summary: Nginx plugin for collectd @@ -538,6 +588,17 @@ BuildRequires: lm_sensors-devel This plugin for collectd provides querying of sensors supported by lm_sensors. %endif +%if %{with_sigrok} +%package sigrok +Summary: sigrok plugin for collectd +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +%description sigrok +Uses libsigrok as a backend, allowing any sigrok-supported device to have its +measurements fed to collectd. This includes multimeters, sound level meters, +thermometers, and much more. +%endif + %if %{with_snmp} %package snmp Summary: SNMP plugin for collectd @@ -666,6 +727,12 @@ Development files for libcollectdclient %define _with_apple_sensors --disable-apple_sensors %endif +%if %{with_aquaero} +%define _with_aquaero --enable-aquaero +%else +%define _with_aquaero --disable-aquaero +%endif + %if %{with_ascent} %define _with_ascent --enable-ascent %else @@ -684,6 +751,12 @@ Development files for libcollectdclient %define _with_bind --disable-bind %endif +%if %{with_cgroups} +%define _with_cgroups --enable-cgroups +%else +%define _with_cgroups --disable-cgroups +%endif + %if %{with_conntrack} %define _with_conntrack --enable-conntrack %else @@ -864,6 +937,12 @@ Development files for libcollectdclient %define _with_lpar --disable-lpar %endif +%if %{with_lvm} +%define _with_lvm --enable-lvm +%else +%define _with_lvm --disable-lvm +%endif + %if %{with_madwifi} %define _with_madwifi --enable-madwifi %else @@ -900,6 +979,12 @@ Development files for libcollectdclient %define _with_memory --disable-memory %endif +%if %{with_mic} +%define _with_mic --enable-mic +%else +%define _with_mic --disable-mic +%endif + %if %{with_modbus} %define _with_modbus --enable-modbus %else @@ -1096,12 +1181,24 @@ Development files for libcollectdclient %define _with_serial --disable-serial %endif +%if %{with_sigrok} +%define _with_sigrok --enable-sigrok +%else +%define _with_sigrok --disable-sigrok +%endif + %if %{with_snmp} %define _with_snmp --enable-snmp %else %define _with_snmp --disable-snmp %endif +%if %{with_statsd} +%define _with_statsd --enable-statsd +%else +%define _with_statsd --disable-statsd +%endif + %if %{with_swap} %define _with_swap --enable-swap %else @@ -1283,9 +1380,11 @@ Development files for libcollectdclient %{?_with_apache} \ %{?_with_apcups} \ %{?_with_apple_sensors} \ + %{?_with_aquaero} \ %{?_with_ascent} \ %{?_with_battery} \ %{?_with_bind} \ + %{?_with_cgroups} \ %{?_with_conntrack} \ %{?_with_contextswitch} \ %{?_with_cpu} \ @@ -1313,7 +1412,9 @@ Development files for libcollectdclient %{?_with_java} \ %{?_with_libvirt} \ %{?_with_lpar} \ + %{?_with_lvm} \ %{?_with_memcachec} \ + %{?_with_mic} \ %{?_with_modbus} \ %{?_with_multimeter} \ %{?_with_mysql} \ @@ -1336,6 +1437,7 @@ Development files for libcollectdclient %{?_with_rrdcached} \ %{?_with_rrdtool} \ %{?_with_sensors} \ + %{?_with_sigrok} \ %{?_with_snmp} \ %{?_with_tape} \ %{?_with_tokyotyrant} \ @@ -1363,6 +1465,7 @@ Development files for libcollectdclient %{?_with_processes} \ %{?_with_protocols} \ %{?_with_serial} \ + %{?_with_statsd} \ %{?_with_swap} \ %{?_with_syslog} \ %{?_with_table} \ @@ -1504,6 +1607,9 @@ fi %if %{with_battery} %{_libdir}/%{name}/battery.so %endif +%if %{with_cgroups} +%{_libdir}/%{name}/cgroups.so +%endif %if %{with_conntrack} %{_libdir}/%{name}/conntrack.so %endif @@ -1603,6 +1709,9 @@ fi %if %{with_serial} %{_libdir}/%{name}/serial.so %endif +%if %{with_statsd} +%{_libdir}/%{name}/statsd.so +%endif %if %{with_swap} %{_libdir}/%{name}/swap.so %endif @@ -1680,6 +1789,11 @@ fi %{_libdir}/%{name}/apache.so %endif +%if %{with_aquaero} +%files aquaero +%{_libdir}/%{name}/aquaero.so +%endif + %if %{with_ascent} %files ascent %{_libdir}/%{name}/ascent.so @@ -1753,16 +1867,31 @@ fi %{_libdir}/%{name}/libvirt.so %endif +%if %{with_lvm} +%files lvm +%{_libdir}/%{name}/lvm.so +%endif + %if %{with_memcachec} %files memcachec %{_libdir}/%{name}/memcachec.so %endif +%if %{with_mic} +%files mic +%{_libdir}/%{name}/mic.so +%endif + %if %{with_mysql} %files mysql %{_libdir}/%{name}/mysql.so %endif +%if %{with_netlink} +%files netlink +%{_libdir}/%{name}/netlink.so +%endif + %if %{with_nginx} %files nginx %{_libdir}/%{name}/nginx.so @@ -1835,6 +1964,11 @@ fi %{_libdir}/%{name}/sensors.so %endif +%if %{with_sigrok} +%files sigrok +%{_libdir}/%{name}/sigrok.so +%endif + %if %{with_snmp} %files snmp %{_mandir}/man5/collectd-snmp.5* @@ -1873,6 +2007,12 @@ fi %doc contrib/ %changelog +* Mon Aug 19 2013 Marc Fournier 5.4.0-1 +- New upstream version +- Build netlink plugin by default +- Enable cgroups, lvm and statsd plugins +- Enable (but don't build by default) mic, aquaero and sigrok plugins + * Tue Aug 06 2013 Marc Fournier 5.3.1-1 - New upstream version - Added RHEL5 support: -- 2.30.2