From: Marc Fournier Date: Mon, 8 Sep 2014 15:21:38 +0000 (+0200) Subject: Merge branch 'collectd-5.3' into collectd-5.4 X-Git-Tag: collectd-5.4.2~15 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=9f2145dc771af94c7a7c49c20210d6870c7955e7;hp=-c;p=collectd.git Merge branch 'collectd-5.3' into collectd-5.4 Conflicts: contrib/redhat/collectd.spec --- 9f2145dc771af94c7a7c49c20210d6870c7955e7 diff --combined contrib/redhat/collectd.spec index 08502775,d561dc37..7decec5c --- a/contrib/redhat/collectd.spec +++ b/contrib/redhat/collectd.spec @@@ -1,7 -1,7 +1,7 @@@ # # q: What is this ? # a: A specfile for building RPM packages of current collectd releases, for - # RHEL/CentOS versions 5 and 6. By default all the plugins which are + # RHEL/CentOS versions 5, 6 and 7. By default all the plugins which are # buildable based on the libraries available in the distribution + the # EPEL repository, will be built. Plugins depending on external libs will # be packaged in separate RPMs. @@@ -43,8 -43,18 +43,19 @@@ %{?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_libmodbus 1} + %{?el6:%global _has_iproute 1} + + %{?el7:%global _has_libyajl 1} + %{?el7:%global _has_recent_libpcap 1} + %{?el7:%global _has_recent_sockios_h 1} + %{?el7:%global _has_working_libiptc 1} + %{?el7:%global _has_ip_vs_h 1} + %{?el7:%global _has_recent_librrd 1} + %{?el7:%global _has_varnish4 1} + %{?el7:%global _has_broken_libmemcached 1} + %{?el7:%global _has_iproute 1} # plugins enabled by default %define with_aggregation 0%{!?_without_aggregation:1} @@@ -54,7 -64,6 +65,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} @@@ -84,17 -93,16 +95,17 @@@ %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} - %define with_memcachec 0%{!?_without_memcachec:1} + %define with_memcachec 0%{!?_without_memcachec:0%{!?_has_broken_libmemcached:1}} %define with_memcached 0%{!?_without_memcached:1} %define with_memory 0%{!?_without_memory:1} %define with_multimeter 0%{!?_without_multimeter:1} %define with_modbus 0%{!?_without_modbus:0%{?_has_libmodbus}} %define with_mysql 0%{!?_without_mysql:1} - %define with_netlink 0%{!?_without_netlink:1} + %define with_netlink 0%{!?_without_netlink:0%{?_has_iproute}} %define with_network 0%{!?_without_network:1} %define with_nfs 0%{!?_without_nfs:1} %define with_nginx 0%{!?_without_nginx:1} @@@ -113,11 -121,11 +124,12 @@@ %define with_processes 0%{!?_without_processes:1} %define with_protocols 0%{!?_without_protocols:1} %define with_python 0%{!?_without_python:1} + %define with_rrdcached 0%{!?_without_rrdcached:0%{?_has_recent_librrd}} %define with_rrdtool 0%{!?_without_rrdtool:1} %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} @@@ -132,7 -140,7 +144,7 @@@ %define with_uptime 0%{!?_without_uptime:1} %define with_users 0%{!?_without_users:1} %define with_uuid 0%{!?_without_uuid:1} - %define with_varnish 0%{!?_without_varnish:1} + %define with_varnish 0%{!?_without_varnish:0%{!?_has_varnish4:1}} %define with_vmem 0%{!?_without_vmem:1} %define with_vserver 0%{!?_without_vserver:1} %define with_wireless 0%{!?_without_wireless:1} @@@ -145,12 -153,8 +157,12 @@@ # 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 netapp disabled, requires libnetapp %define with_netapp 0%{!?_without_netapp:0} # plugin onewire disabled, requires libowfs @@@ -163,10 -167,6 +175,8 @@@ %define with_redis 0%{!?_without_redis:0} # plugin routeros disabled, requires librouteros %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 @@@ -182,7 -182,7 +192,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 @@@ -225,15 -225,6 +235,15 @@@ BuildRequires: curl-deve 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 @@@ -388,17 -379,6 +398,17 @@@ BuildRequires: libvirt-deve 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 @@@ -411,16 -391,6 +421,16 @@@ instance. Note that another plugin, nam 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_modbus} %package modbus Summary: modbus plugin for collectd @@@ -447,10 -417,9 +457,9 @@@ handlers and database traffic Summary: netlink plugin for collectd Group: System Environment/Daemons Requires: %{name}%{?_isa} = %{version}-%{release} - BuildRequires: libmnl-devel -BuildRequires: iproute-devel ++BuildRequires: libmnl-devel, iproute-devel %description netlink - This plugin collects very detailed Linux network interface and routing - statistics. + The netlink plugin collects detailed network interface and routing statistics. %endif %if %{with_nginx} @@@ -601,17 -570,6 +610,17 @@@ BuildRequires: lm_sensors-deve 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 @@@ -740,12 -698,6 +749,12 @@@ Development files for libcollectdclien %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 @@@ -764,12 -716,6 +773,12 @@@ %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 @@@ -950,12 -896,6 +959,12 @@@ %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 @@@ -992,12 -932,6 +1001,12 @@@ %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 @@@ -1010,12 -944,6 +1019,6 @@@ %define _with_multimeter --disable-multimeter %endif - %if %{with_modbus} - %define _with_modbus --enable-modbus - %else - %define _with_modbus --disable-modbus - %endif - %if %{with_mysql} %define _with_mysql --enable-mysql %else @@@ -1200,24 -1128,12 +1203,24 @@@ %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 @@@ -1399,11 -1315,9 +1402,11 @@@ %{?_with_apache} \ %{?_with_apcups} \ %{?_with_apple_sensors} \ + %{?_with_aquaero} \ %{?_with_ascent} \ %{?_with_battery} \ %{?_with_bind} \ + %{?_with_cgroups} \ %{?_with_conntrack} \ %{?_with_contextswitch} \ %{?_with_cpu} \ @@@ -1431,9 -1345,7 +1434,9 @@@ %{?_with_java} \ %{?_with_libvirt} \ %{?_with_lpar} \ + %{?_with_lvm} \ %{?_with_memcachec} \ + %{?_with_mic} \ %{?_with_modbus} \ %{?_with_multimeter} \ %{?_with_mysql} \ @@@ -1456,7 -1368,6 +1459,7 @@@ %{?_with_rrdcached} \ %{?_with_rrdtool} \ %{?_with_sensors} \ + %{?_with_sigrok} \ %{?_with_snmp} \ %{?_with_tape} \ %{?_with_tokyotyrant} \ @@@ -1484,7 -1395,6 +1487,7 @@@ %{?_with_processes} \ %{?_with_protocols} \ %{?_with_serial} \ + %{?_with_statsd} \ %{?_with_swap} \ %{?_with_syslog} \ %{?_with_table} \ @@@ -1626,9 -1536,6 +1629,9 @@@ f %if %{with_battery} %{_libdir}/%{name}/battery.so %endif +%if %{with_cgroups} +%{_libdir}/%{name}/cgroups.so +%endif %if %{with_conntrack} %{_libdir}/%{name}/conntrack.so %endif @@@ -1728,9 -1635,6 +1731,9 @@@ %if %{with_serial} %{_libdir}/%{name}/serial.so %endif +%if %{with_statsd} +%{_libdir}/%{name}/statsd.so +%endif %if %{with_swap} %{_libdir}/%{name}/swap.so %endif @@@ -1808,11 -1712,6 +1811,11 @@@ %{_libdir}/%{name}/apache.so %endif +%if %{with_aquaero} +%files aquaero +%{_libdir}/%{name}/aquaero.so +%endif + %if %{with_ascent} %files ascent %{_libdir}/%{name}/ascent.so @@@ -1886,21 -1785,16 +1889,26 @@@ %{_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_modbus} + %files modbus + %{_libdir}/%{name}/modbus.so + %endif + %if %{with_mysql} %files mysql %{_libdir}/%{name}/mysql.so @@@ -1983,11 -1877,6 +1991,11 @@@ %{_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* @@@ -2026,12 -1915,6 +2034,12 @@@ %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: @@@ -2041,8 -1924,10 +2049,10 @@@ - Removed duplicate --enable-aggregation - Added some comments & usage examples - Replaced a couple of "Buildrequires" by "BuildRequires" - - Enabled modbus plugin + - Enabled modbus plugin on RHEL6 + - Enabled netlink plugin on RHEL6 and RHEL7 - Allow perl plugin to build on RHEL5 + - Add support for RHEL7 * Wed Apr 10 2013 Marc Fournier 5.3.0-1 - New upstream version @@@ -2050,7 -1935,7 +2060,7 @@@ - Enabled tail_csv plugin - Installed collectd-tc manpage - * Thu Jan 11 2013 Marc Fournier 5.2.0-3 + * Fri Jan 11 2013 Marc Fournier 5.2.0-3 - remove dependency on libstatgrab, which isn't required on linux * Thu Jan 03 2013 Marc Fournier 5.2.0-2 @@@ -2098,11 -1983,11 +2108,11 @@@ non-essential stuff. - Replaced BuildPrereq by BuildRequires - * Tue Jan 03 2011 Monetate 5.0.1 + * Mon Jan 03 2011 Monetate 5.0.1 - New upstream version - Changes to support 5.0.1 - * Tue Jan 04 2010 Rackspace 4.9.0 + * Mon Jan 04 2010 Rackspace 4.9.0 - New upstream version - Changes to support 4.9.0 - Added support for Java/GenericJMX plugin @@@ -2120,7 -2005,7 +2130,7 @@@ - New major releas - Changes to support 4.0.5 - * Wed Jan 11 2007 Iain Lea 3.11.0-0 + * Thu Jan 11 2007 Iain Lea 3.11.0-0 - fixed spec file to build correctly on fedora core - added improved init.d script to work with chkconfig - added %%post and %%postun to call chkconfig automatically @@@ -2128,10 -2013,10 +2138,10 @@@ * Sun Jul 09 2006 Florian octo Forster 3.10.0-1 - New upstream version - * Tue Jun 25 2006 Florian octo Forster 3.9.4-1 + * Sun Jun 25 2006 Florian octo Forster 3.9.4-1 - New upstream version - * Tue Jun 01 2006 Florian octo Forster 3.9.3-1 + * Thu Jun 01 2006 Florian octo Forster 3.9.3-1 - New upstream version * Tue May 09 2006 Florian octo Forster 3.9.2-1 @@@ -2147,10 -2032,10 +2157,10 @@@ - New upstream version - Added the `apache' package. - * Thu Mar 14 2006 Florian octo Forster 3.8.2-1 + * Tue Mar 14 2006 Florian octo Forster 3.8.2-1 - New upstream version - * Thu Mar 13 2006 Florian octo Forster 3.8.1-1 + * Mon Mar 13 2006 Florian octo Forster 3.8.1-1 - New upstream version * Thu Mar 09 2006 Florian octo Forster 3.8.0-1 @@@ -2187,7 -2072,7 +2197,7 @@@ * Sat Nov 05 2005 Florian octo Forster 3.3.0-1 - New upstream version - * Tue Oct 26 2005 Florian octo Forster 3.2.0-1 + * Wed Oct 26 2005 Florian octo Forster 3.2.0-1 - New upstream version - Added statement to remove the `*.la' files. This fixes a problem when `Unpackaged files terminate build' is in effect. @@@ -2204,13 -2089,13 +2214,13 @@@ * Fri Sep 16 2005 Florian octo Forster 2.1.0-1 - New upstream version - * Mon Sep 10 2005 Florian octo Forster 2.0.0-1 + * Sat Sep 10 2005 Florian octo Forster 2.0.0-1 - New upstream version * Mon Aug 29 2005 Florian octo Forster 1.8.0-1 - New upstream version - * Sun Aug 25 2005 Florian octo Forster 1.7.0-1 + * Thu Aug 25 2005 Florian octo Forster 1.7.0-1 - New upstream version * Sun Aug 21 2005 Florian octo Forster 1.6.0-1