X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=contrib%2Fredhat%2Fcollectd.spec;h=d863debbb2824721801174a9df5f8159c1ef2a6a;hb=e5089315555853af90e7e0e57cabe9ead2c1640f;hp=4dfcc9a8b5aeeeef4269d403fdf6d186748da087;hpb=029e88709f60d90fede55ed31f775602c1487d24;p=collectd.git diff --git a/contrib/redhat/collectd.spec b/contrib/redhat/collectd.spec index 4dfcc9a8..d863debb 100644 --- a/contrib/redhat/collectd.spec +++ b/contrib/redhat/collectd.spec @@ -62,13 +62,13 @@ %{?el7:%global _has_lvm2app_h 1} %{?el7:%global _has_libudev 1} %{?el7:%global _has_recent_librrd 1} -%{?el7:%global _has_varnish4 1} -%{?el7:%global _has_broken_libmemcached 1} %{?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} +%{?el7:%global _has_libmodbus 1} +%{?el7:%global _has_xmms 1} # plugins enabled by default %define with_aggregation 0%{!?_without_aggregation:1} @@ -80,6 +80,7 @@ %define with_bind 0%{!?_without_bind:1} %define with_ceph 0%{!?_without_ceph:0%{?_has_libyajl}} %define with_cgroups 0%{!?_without_cgroups:1} +%define with_chrony 0%{!?_without_chrony:1} %define with_conntrack 0%{!?_without_conntrack:1} %define with_contextswitch 0%{!?_without_contextswitch:1} %define with_cpu 0%{!?_without_cpu:1} @@ -117,7 +118,7 @@ %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:0%{!?_has_broken_libmemcached:1}} +%define with_memcachec 0%{!?_without_memcachec:1} %define with_memcached 0%{!?_without_memcached:1} %define with_memory 0%{!?_without_memory:1} %define with_multimeter 0%{!?_without_multimeter:1} @@ -168,7 +169,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:0%{!?_has_varnish4:1}} +%define with_varnish 0%{!?_without_varnish:1} %define with_vmem 0%{!?_without_vmem:1} %define with_vserver 0%{!?_without_vserver:1} %define with_wireless 0%{!?_without_wireless:1} @@ -176,9 +177,10 @@ %define with_write_http 0%{!?_without_write_http:1} %define with_write_log 0%{!?_without_write_log:1} %define with_write_redis 0%{!?_without_write_redis:0%{?_has_hiredis}} -%define with_write_riemann 0%{!?_without_write_riemann:1} +%define with_write_riemann 0%{!?_without_write_riemann:0%{?_has_recent_riemann_c_client}} %define with_write_sensu 0%{!?_without_write_sensu:1} %define with_write_tsdb 0%{!?_without_write_tsdb:1} +%define with_xmms 0%{!?_without_xmms:0%{?_has_xmms}} %define with_zfs_arc 0%{!?_without_zfs_arc:1} %define with_zookeeper 0%{!?_without_zookeeper:1} @@ -215,14 +217,14 @@ %define with_write_kafka 0%{!?_without_write_kafka:0} # plugin write_mongodb disabled, requires libmongoc %define with_write_mongodb 0%{!?_without_write_mongodb:0} -# plugin xmms disabled, requires xmms -%define with_xmms 0%{!?_without_xmms:0} +# plugin xencpu disabled, requires xen-devel from non-default repo +%define with_xencpu 0%{!?_without_xencpu:0} # plugin zone disabled, requires Solaris %define with_zone 0%{!?_without_zone:0} Summary: statistics collection and monitoring daemon Name: collectd -Version: 5.5.0 +Version: 5.5.1 Release: 1%{?dist} URL: http://collectd.org Source: http://collectd.org/files/%{name}-%{version}.tar.bz2 @@ -323,6 +325,15 @@ BuildRequires: yajl-devel Ceph plugin for collectd %endif +%if %{with_chrony} +%package chrony +Summary: Chrony plugin for collectd +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +%description chrony +Chrony plugin for collectd +%endif + %if %{with_curl} %package curl Summary: Curl plugin for collectd @@ -790,6 +801,26 @@ BuildRequires: protobuf-c-devel The riemann plugin submits values to Riemann, an event stream processor. %endif +%if %{with_xencpu} +%package xencpu +Summary: xencpu plugin for collectd +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: xen-devel +%description xencpu +The xencpu plugin collects CPU statistics from Xen. +%endif + +%if %{with_xmms} +%package xmms +Summary: XMMS plugin for collectd +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: xmms-devel +%description xmms +The xmms plugin collects information from the XMMS music player. +%endif + %package collection3 Summary: Web-based viewer for collectd Group: System Environment/Daemons @@ -910,6 +941,12 @@ Collectd utilities %define _with_cgroups --disable-cgroups %endif +%if %{with_chrony} +%define _with_chrony --enable-chrony +%else +%define _with_chrony --disable-chrony +%endif + %if %{with_conntrack} %define _with_conntrack --enable-conntrack %else @@ -1586,6 +1623,12 @@ Collectd utilities %define _with_write_tsdb --disable-write_tsdb %endif +%if %{with_xencpu} +%define _with_xencpu --enable-xencpu +%else +%define _with_xencpu --disable-xencpu +%endif + %if %{with_xmms} %define _with_xmms --enable-xmms %else @@ -1636,6 +1679,7 @@ Collectd utilities %{?_with_bind} \ %{?_with_ceph} \ %{?_with_cgroups} \ + %{?_with_chrony} \ %{?_with_conntrack} \ %{?_with_contextswitch} \ %{?_with_cpu} \ @@ -1704,6 +1748,7 @@ Collectd utilities %{?_with_write_kafka} \ %{?_with_write_mongodb} \ %{?_with_write_redis} \ + %{?_with_xencpu} \ %{?_with_xmms} \ %{?_with_zfs_arc} \ %{?_with_zone} \ @@ -2094,9 +2139,9 @@ fi %{_includedir}/collectd/network_buffer.h %{_includedir}/collectd/lcc_features.h %{_libdir}/pkgconfig/libcollectdclient.pc +%{_libdir}/libcollectdclient.so %files -n libcollectdclient -%{_libdir}/libcollectdclient.so %{_libdir}/libcollectdclient.so.* %files -n collectd-utils @@ -2142,6 +2187,11 @@ fi %{_libdir}/%{name}/ceph.so %endif +%if %{with_chrony} +%files chrony +%{_libdir}/%{name}/chrony.so +%endif + %if %{with_curl} %files curl %{_libdir}/%{name}/curl.so @@ -2367,6 +2417,16 @@ fi %{_libdir}/%{name}/write_riemann.so %endif +%if %{with_xencpu} +%files xencpu +%{_libdir}/%{name}/xencpu.so +%endif + +%if %{with_xmms} +%files xmms +%{_libdir}/%{name}/xmms.so +%endif + %files collection3 %{_localstatedir}/www/collection3 %{_sysconfdir}/httpd/conf.d/collection3.conf @@ -2379,10 +2439,14 @@ fi %doc contrib/ %changelog +* Sat Jun 04 2016 Ruben Kerkhof 5.5.1-1 +- New upstream version +- Add Chrony plugin, enabled by default + #* TODO: next feature release changelog #- New upstream version #- New plugins enabled by default: mqtt, notify_nagios -#- New plugins disabled by default: zone +#- New plugins disabled by default: zone, xencpu # * Wed May 27 2015 Marc Fournier 5.5.0-1 - New upstream version @@ -2396,11 +2460,12 @@ fi - 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 +* Mon Aug 19 2013 Marc Fournier 5.4.2-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 +- Enable modbus, memcachec and xmms plugins on RHEL7 * Tue Aug 06 2013 Marc Fournier 5.3.1-1 - New upstream version