X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=contrib%2Fredhat%2Fcollectd.spec;h=4dfcc9a8b5aeeeef4269d403fdf6d186748da087;hb=42a7c90f4478e98dc970927cfda7ec2e1081f364;hp=20f6dd5f215e8554c808beae5da556423df9374b;hpb=1b6906d2288a984af21f43aabc3d71d3d1024b1b;p=collectd.git diff --git a/contrib/redhat/collectd.spec b/contrib/redhat/collectd.spec index 20f6dd5f..4dfcc9a8 100644 --- a/contrib/redhat/collectd.spec +++ b/contrib/redhat/collectd.spec @@ -52,6 +52,7 @@ %{?el6:%global _has_iproute 1} %{?el6:%global _has_atasmart 1} %{?el6:%global _has_hiredis 1} +%{?el6:%global _has_asm_msr_index 1} %{?el7:%global _has_libyajl 1} %{?el7:%global _has_recent_libpcap 1} @@ -66,6 +67,8 @@ %{?el7:%global _has_iproute 1} %{?el7:%global _has_atasmart 1} %{?el7:%global _has_hiredis 1} +%{?el7:%global _has_asm_msr_index 1} +%{?el7:%global _has_libmosquitto 1} # plugins enabled by default %define with_aggregation 0%{!?_without_aggregation:1} @@ -94,6 +97,7 @@ %define with_entropy 0%{!?_without_entropy:1} %define with_ethstat 0%{!?_without_ethstat:0%{?_has_recent_sockios_h}} %define with_exec 0%{!?_without_exec:1} +%define with_fhcount 0%{!?_without_fhcount:1} %define with_filecount 0%{!?_without_filecount:1} %define with_fscache 0%{!?_without_fscache:1} %define with_gmond 0%{!?_without_gmond:0%{?_has_recent_libganglia}} @@ -118,6 +122,7 @@ %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_mqtt 0%{!?_without_mqtt:0%{?_has_libmosquitto}} %define with_mysql 0%{!?_without_mysql:1} %define with_netlink 0%{!?_without_netlink:0%{?_has_iproute}} %define with_network 0%{!?_without_network:1} @@ -125,6 +130,7 @@ %define with_nginx 0%{!?_without_nginx:1} %define with_notify_desktop 0%{!?_without_notify_desktop:1} %define with_notify_email 0%{!?_without_notify_email:1} +%define with_notify_nagios 0%{!?_without_notify_nagios:1} %define with_ntpd 0%{!?_without_ntpd:1} %define with_numa 0%{!?_without_numa:1} %define with_nut 0%{!?_without_nut:1} @@ -157,6 +163,7 @@ %define with_ted 0%{!?_without_ted:1} %define with_thermal 0%{!?_without_thermal:1} %define with_threshold 0%{!?_without_threshold:1} +%define with_turbostat 0%{!?_without_turbostat:0%{?_has_asm_msr_index}} %define with_unixsock 0%{!?_without_unixsock:1} %define with_uptime 0%{!?_without_uptime:1} %define with_users 0%{!?_without_users:1} @@ -210,17 +217,19 @@ %define with_write_mongodb 0%{!?_without_write_mongodb:0} # plugin xmms disabled, requires xmms %define with_xmms 0%{!?_without_xmms:0} +# plugin zone disabled, requires Solaris +%define with_zone 0%{!?_without_zone:0} Summary: statistics collection and monitoring daemon Name: collectd -Version: 5.4.2 +Version: 5.5.0 Release: 1%{?dist} URL: http://collectd.org Source: http://collectd.org/files/%{name}-%{version}.tar.bz2 License: GPLv2 Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: libgcrypt-devel, kernel-headers, libtool-ltdl-devel +BuildRequires: libgcrypt-devel, kernel-headers, libtool-ltdl-devel, libcap-devel Vendor: collectd development team %if 0%{?el7:1} @@ -510,6 +519,16 @@ MySQL querying plugin. This plugin provides data of issued commands, called handlers and database traffic. %endif +%if %{with_mqtt} +%package mqtt +Summary: mqtt plugin for collectd +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: mosquitto-devel +%description mqtt +The MQTT plugin publishes and subscribes to MQTT topics. +%endif + %if %{with_netlink} %package netlink Summary: netlink plugin for collectd @@ -999,6 +1018,12 @@ Collectd utilities %define _with_exec --disable-exec %endif +%if %{with_fhcount} +%define _with_fhcount --enable-fhcount +%else +%define _with_fhcount --disable-fhcount +%endif + %if %{with_filecount} %define _with_filecount --enable-filecount %else @@ -1155,6 +1180,12 @@ Collectd utilities %define _with_multimeter --disable-multimeter %endif +%if %{with_mqtt} +%define _with_mqtt --enable-mqtt +%else +%define _with_mqtt --disable-mqtt +%endif + %if %{with_mysql} %define _with_mysql --enable-mysql %else @@ -1203,6 +1234,12 @@ Collectd utilities %define _with_notify_email --disable-notify_email %endif +%if %{with_notify_nagios} +%define _with_notify_nagios --enable-notify_nagios +%else +%define _with_notify_nagios --disable-notify_nagios +%endif + %if %{with_ntpd} %define _with_ntpd --enable-ntpd %else @@ -1441,6 +1478,12 @@ Collectd utilities %define _with_tokyotyrant --disable-tokyotyrant %endif +%if %{with_turbostat} +%define _with_turbostat --enable-turbostat +%else +%define _with_turbostat --disable-turbostat +%endif + %if %{with_unixsock} %define _with_unixsock --enable-unixsock %else @@ -1555,6 +1598,12 @@ Collectd utilities %define _with_zfs_arc --disable-zfs_arc %endif +%if %{with_zone} +%define _with_zone --enable-zone +%else +%define _with_zone --disable-zone +%endif + %if %{with_zookeeper} %define _with_zookeeper --enable-zookeeper %else @@ -1604,6 +1653,7 @@ Collectd utilities %{?_with_entropy} \ %{?_with_ethstat} \ %{?_with_exec} \ + %{?_with_fhcount} \ %{?_with_filecount} \ %{?_with_fscache} \ %{?_with_gmond} \ @@ -1622,6 +1672,7 @@ Collectd utilities %{?_with_mic} \ %{?_with_modbus} \ %{?_with_multimeter} \ + %{?_with_mqtt} \ %{?_with_mysql} \ %{?_with_netapp} \ %{?_with_netlink} \ @@ -1655,6 +1706,7 @@ Collectd utilities %{?_with_write_redis} \ %{?_with_xmms} \ %{?_with_zfs_arc} \ + %{?_with_zone} \ %{?_with_zookeeper} \ %{?_with_irq} \ %{?_with_load} \ @@ -1666,6 +1718,7 @@ Collectd utilities %{?_with_memory} \ %{?_with_network} \ %{?_with_nfs} \ + %{?_with_notify_nagios} \ %{?_with_ntpd} \ %{?_with_numa} \ %{?_with_olsrd} \ @@ -1685,6 +1738,7 @@ Collectd utilities %{?_with_ted} \ %{?_with_thermal} \ %{?_with_threshold} \ + %{?_with_turbostat} \ %{?_with_unixsock} \ %{?_with_uptime} \ %{?_with_users} \ @@ -1880,6 +1934,9 @@ fi %if %{with_exec} %{_libdir}/%{name}/exec.so %endif +%if %{with_fhcount} +%{_libdir}/%{name}/fhcount.so +%endif %if %{with_filecount} %{_libdir}/%{name}/filecount.so %endif @@ -1928,6 +1985,9 @@ fi %if %{with_nfs} %{_libdir}/%{name}/nfs.so %endif +%if %{with_notify_nagios} +%{_libdir}/%{name}/notify_nagios.so +%endif %if %{with_ntpd} %{_libdir}/%{name}/ntpd.so %endif @@ -1985,6 +2045,9 @@ fi %if %{with_threshold} %{_libdir}/%{name}/threshold.so %endif +%if %{with_turbostat} +%{_libdir}/%{name}/turbostat.so +%endif %if %{with_unixsock} %{_libdir}/%{name}/unixsock.so %endif @@ -2172,6 +2235,11 @@ fi %{_libdir}/%{name}/modbus.so %endif +%if %{with_mqtt} +%files mqtt +%{_libdir}/%{name}/mqtt.so +%endif + %if %{with_mysql} %files mysql %{_libdir}/%{name}/mysql.so @@ -2311,14 +2379,22 @@ fi %doc contrib/ %changelog -# * TODO 5.5.0-1 -# - New upstream version -# - New plugins enabled by default: ceph, drbd, log_logstash, write_tsdb, smart, openldap, redis, write_redis, zookeeper, write_log, write_sensu, ipc -# - New plugins disabled by default: barometer, write_kafka -# - Enable zfs_arc, now supported on Linux -# - Install disk plugin in a dedicated package, as it depends on libudev -# - use systemd on EL7, sysvinit on EL6 & EL5 -# - Install collectdctl, collectd-tg and collectd-nagios in collectd-utils.rpm +#* TODO: next feature release changelog +#- New upstream version +#- New plugins enabled by default: mqtt, notify_nagios +#- New plugins disabled by default: zone +# +* Wed May 27 2015 Marc Fournier 5.5.0-1 +- New upstream version +- New plugins enabled by default: ceph, drbd, log_logstash, write_tsdb, smart, + openldap, redis, write_redis, zookeeper, write_log, write_sensu, ipc, + turbostat, fhcount +- New plugins disabled by default: barometer, write_kafka +- Enable zfs_arc, now supported on Linux +- Install disk plugin in a dedicated package, as it depends on libudev +- use systemd on EL7, sysvinit on EL6 & EL5 +- Install collectdctl, collectd-tg and collectd-nagios in collectd-utils.rpm +- Add build-dependency on libcap-devel * Mon Aug 19 2013 Marc Fournier 5.4.0-1 - New upstream version