X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=contrib%2Fredhat%2Fcollectd.spec;h=8dc778b845f9882e0365d22b4ef376ef67855b78;hb=56eae4e9b3e549f50b7df52bcff61109b3ed862b;hp=355c9e3d9a39f6c3e7772445c08e4dc27760d0b1;hpb=ec9ed6fe4108f7fd3d4ef84e887bb6d3dc022e14;p=collectd.git diff --git a/contrib/redhat/collectd.spec b/contrib/redhat/collectd.spec index 355c9e3d..8dc778b8 100644 --- a/contrib/redhat/collectd.spec +++ b/contrib/redhat/collectd.spec @@ -73,6 +73,7 @@ %define with_gmond 0%{!?_without_gmond:1} %define with_gps 0%{!?_without_gps:1} %define with_hddtemp 0%{!?_without_hddtemp:1} +%define with_hugepages 0%{!?_without_hugepages:1} %define with_interface 0%{!?_without_interface:1} %define with_ipc 0%{!?_without_ipc:1} %define with_ipmi 0%{!?_without_ipmi:1} @@ -83,9 +84,11 @@ %define with_load 0%{!?_without_load:1} %define with_log_logstash 0%{!?_without_log_logstash:1} %define with_logfile 0%{!?_without_logfile:1} +%define with_lua 0%{!?_without_lua:1} %define with_lvm 0%{!?_without_lvm:1} %define with_madwifi 0%{!?_without_madwifi:1} %define with_mbmon 0%{!?_without_mbmon:1} +%define with_mcelog 0%{!?_without_mcelog:1} %define with_md 0%{!?_without_md:1} %define with_memcachec 0%{!?_without_memcachec:1} %define with_memcached 0%{!?_without_memcached:1} @@ -146,6 +149,7 @@ %define with_write_graphite 0%{!?_without_write_graphite:1} %define with_write_http 0%{!?_without_write_http:1} %define with_write_log 0%{!?_without_write_log:1} +%define with_write_prometheus 0%{!?_without_write_prometheus:1} %define with_write_redis 0%{!?_without_write_redis:1} %define with_write_sensu 0%{!?_without_write_sensu:1} %define with_write_tsdb 0%{!?_without_write_tsdb:1} @@ -164,8 +168,12 @@ %define with_barometer 0%{!?_without_barometer:0} # plugin grpc disabled, requires protobuf-compiler >= 3.0 %define with_grpc 0%{!?_without_grpc:0} +# plugin dpdkstat disabled, requires libdpdk +%define with_dpdkstat 0%{!?_without_dpdkstat:0} # plugin lpar disabled, requires AIX %define with_lpar 0%{!?_without_lpar:0} +# plugin intel_rdt disabled, requires intel-cmt-cat +%define with_intel_rdt 0%{!?_without_intel_rdt:0} # plugin mic disabled, requires Mic %define with_mic 0%{!?_without_mic:0} # plugin netapp disabled, requires libnetapp @@ -211,6 +219,7 @@ %define with_redis 0 %define with_smart 0 %define with_turbostat 0 +%define with_write_prometheus 0 %define with_write_redis 0 %endif @@ -219,20 +228,22 @@ %define with_cpusleep 0 %define with_gps 0 %define with_mqtt 0 +%define with_redis 0 %define with_rrdcached 0 +%define with_write_redis 0 %define with_xmms 0 %endif Summary: Statistics collection and monitoring daemon Name: collectd -Version: 5.5.2 -Release: 1%{?dist} +Version: 5.7.0 +Release: 3%{?dist} URL: https://collectd.org Source: https://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, libcap-devel, which +BuildRequires: libgcrypt-devel, kernel-headers, libcap-devel, which Vendor: collectd development team %if 0%{?fedora} || 0%{?rhel} >= 7 @@ -450,6 +461,17 @@ The HDDTemp plugin collects the temperature of hard disks. The temperatures are provided via SMART and queried by the external hddtemp daemon. %endif +%if %{with_intel_rdt} +%package intel_rdt +Summary: Intel RDT plugin for collectd +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: intel-cmt-cat +%description intel_rdt +The intel_rdt plugin collects information provided by monitoring features of +Intel Resource Director Technology (Intel(R) RDT). +%endif + %if %{with_ipmi} %package ipmi Summary: IPMI plugin for collectd @@ -495,6 +517,17 @@ BuildRequires: yajl-devel This plugin logs in logstash JSON format %endif +%if %{with_lua} +%package lua +Summary: Lua plugin for collectd +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: lua-devel +%description lua +The Lua plugin embeds a Lua interpreter into collectd and exposes the +application programming interface (API) to Lua scripts. +%endif + %if %{with_lvm} %package lvm Summary: LVM plugin for collectd @@ -506,6 +539,16 @@ This plugin collects size of “Logical Volumes” (LV) and “Volume Groups” of Linux' “Logical Volume Manager” (LVM). %endif +%if %{with_mcelog} +%package mcelog +Summary: Mcelog plugin for collectd +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +%description mcelog +This plugin monitors machine check exceptions reported by mcelog and generates +appropriate notifications when machine check exceptions are detected. +%endif + %if %{with_memcachec} %package memcachec Summary: Memcachec plugin for collectd @@ -800,6 +843,17 @@ BuildRequires: librdkafka-devel The write_kafka plugin sends values to kafka, a distributed messaging system. %endif +%if %{with_write_prometheus} +%package write_prometheus +Summary: Write-prometheus plugin for collectd +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: libmicrohttpd-devel +%description write_prometheus +The Write Prometheus plugin exposes collected values using an embedded HTTP +server, turning the collectd daemon into a Prometheus exporter. +%endif + %if %{with_write_redis} %package write_redis Summary: Write-Redis plugin for collectd @@ -1056,6 +1110,12 @@ Collectd utilities %define _with_drbd --disable-drbd %endif +%if %{with_dpdkstat} +%define _with_dpdkstat --enable-dpdkstat +%else +%define _with_dpdkstat --disable-dpdkstat +%endif + %if %{with_email} %define _with_email --enable-email %else @@ -1122,6 +1182,18 @@ Collectd utilities %define _with_hddtemp --disable-hddtemp %endif +%if %{with_hugepages} +%define _with_hugepages --enable-hugepages +%else +%define _with_hugepages --disable-hugepages +%endif + +%if %{with_intel_rdt} +%define _with_intel_rdt --enable-intel_rdt +%else +%define _with_intel_rdt --disable-intel_rdt +%endif + %if %{with_interface} %define _with_interface --enable-interface %else @@ -1194,6 +1266,12 @@ Collectd utilities %define _with_lpar --disable-lpar %endif +%if %{with_lua} +%define _with_lua --enable-lua +%else +%define _with_lua --disable-lua +%endif + %if %{with_lvm} %define _with_lvm --enable-lvm %else @@ -1212,6 +1290,12 @@ Collectd utilities %define _with_mbmon --disable-mbmon %endif +%if %{with_mcelog} +%define _with_mcelog --enable-mcelog +%else +%define _with_mbmon --disable-mcelog +%endif + %if %{with_md} %define _with_md --enable-md %else @@ -1637,6 +1721,12 @@ Collectd utilities %define _with_write_mongodb --disable-write_mongodb %endif +%if %{with_write_prometheus} +%define _with_write_prometheus --enable-write_prometheus +%else +%define _with_write_prometheus --disable-write_prometheus +%endif + %if %{with_write_redis} %define _with_write_redis --enable-write_redis %else @@ -1694,7 +1784,6 @@ Collectd utilities %configure CFLAGS="%{optflags} -DLT_LAZY_OR_NOW=\"RTLD_LAZY|RTLD_GLOBAL\"" \ %{?_python_config} \ --disable-static \ - --without-included-ltdl \ --enable-all-plugins=yes \ --enable-match_empty_counter \ --enable-match_hashed \ @@ -1733,6 +1822,7 @@ Collectd utilities %{?_with_disk} \ %{?_with_dns} \ %{?_with_drbd} \ + %{?_with_dpdkstat} \ %{?_with_email} \ %{?_with_entropy} \ %{?_with_ethstat} \ @@ -1744,6 +1834,8 @@ Collectd utilities %{?_with_gps} \ %{?_with_grpc} \ %{?_with_hddtemp} \ + %{?_with_hugepages} \ + %{?_with_intel_rdt} \ %{?_with_interface} \ %{?_with_ipc} \ %{?_with_ipmi} \ @@ -1755,9 +1847,11 @@ Collectd utilities %{?_with_log_logstash} \ %{?_with_logfile} \ %{?_with_lpar} \ + %{?_with_lua} \ %{?_with_lvm} \ %{?_with_madwifi} \ %{?_with_mbmon} \ + %{?_with_mcelog} \ %{?_with_md} \ %{?_with_memcachec} \ %{?_with_memcached} \ @@ -1830,6 +1924,7 @@ Collectd utilities %{?_with_write_kafka} \ %{?_with_write_log} \ %{?_with_write_mongodb} \ + %{?_with_write_prometheus} \ %{?_with_write_redis} \ %{?_with_write_riemann} \ %{?_with_write_sensu} \ @@ -1881,6 +1976,10 @@ rm -f %{buildroot}%{_datadir}/collectd/java/generic-jmx.jar rm -f %{buildroot}%{_mandir}/man5/collectd-java.5* %endif +%if ! %{with_lua} +rm -f %{buildroot}%{_mandir}/man5/collectd-lua.5* +%endif + %if ! %{with_perl} rm -f %{buildroot}%{_mandir}/man5/collectd-perl.5* rm -f %{buildroot}%{_mandir}/man3/Collectd::Unixsock.3pm* @@ -2004,6 +2103,9 @@ fi %if %{with_drbd} %{_libdir}/%{name}/drbd.so %endif +%if %{with_dpdkstat} +%{_libdir}/%{name}/dpdkstat.so +%endif %if %{with_ethstat} %{_libdir}/%{name}/ethstat.so %endif @@ -2022,6 +2124,9 @@ fi %if %{with_fscache} %{_libdir}/%{name}/fscache.so %endif +%if %{with_hugepages} +%{_libdir}/%{name}/hugepages.so +%endif %if %{with_interface} %{_libdir}/%{name}/interface.so %endif @@ -2046,6 +2151,9 @@ fi %if %{with_mbmon} %{_libdir}/%{name}/mbmon.so %endif +%if %{with_mcelog} +%{_libdir}/%{name}/mcelog.so +%endif %if %{with_md} %{_libdir}/%{name}/md.so %endif @@ -2281,6 +2389,11 @@ fi %{_libdir}/%{name}/hddtemp.so %endif +%if %{with_intel_rdt} +%files intel_rdt +%{_libdir}/%{name}/intel_rdt.so +%endif + %if %{with_ipmi} %files ipmi %{_libdir}/%{name}/ipmi.so @@ -2309,6 +2422,12 @@ fi %{_libdir}/%{name}/log_logstash.so %endif +%if %{with_lua} +%files lua +%{_mandir}/man5/collectd-lua* +%{_libdir}/%{name}/lua.so +%endif + %if %{with_lvm} %files lvm %{_libdir}/%{name}/lvm.so @@ -2451,6 +2570,11 @@ fi %{_libdir}/%{name}/write_kafka.so %endif +%if %{with_write_prometheus} +%files write_prometheus +%{_libdir}/%{name}/write_prometheus.so +%endif + %if %{with_write_redis} %files write_redis %{_libdir}/%{name}/write_redis.so @@ -2483,6 +2607,25 @@ fi %doc contrib/ %changelog +* Sat Dec 31 2016 Ruben Kerkhof - 5.7.0-3 +- Add new mcelog plugin + +* Tue Nov 29 2016 Ruben Kerkhof - 5.7.0-2 +- Disable redis plugin on RHEL 6, hiredis has been retired from EPEL6 + +* Mon Oct 10 2016 Marc Fournier - 5.7.0-1 +- New PRE-RELEASE version +- New plugins enabled by default: hugepages, write_prometheus +- New plugins disabled by default: dpdkstat, intel_rdt + +* Mon Oct 10 2016 Victor Demonchy - 5.6.1-1 +- New upstream version + +* Sun Aug 14 2016 Ruben Kerkhof - 5.6.0-1 +- New upstream version +- New plugins enabled by default: chrony, cpusleep, gps, lua, mqtt, notify_nagios +- New plugins disabled by default: grpc, xencpu, zone + * Tue Jul 26 2016 Ruben Kerkhof - 5.5.2-1 - New upstream version - Contains fix for CVE-2016-6254 @@ -2490,8 +2633,6 @@ fi * Sat Jun 04 2016 Ruben Kerkhof 5.5.1-1 - New upstream version -- New plugins enabled by default: chrony, mqtt, notify_nagios -- New plugins disabled by default: grpc, zone, xencpu * Wed May 27 2015 Marc Fournier 5.5.0-1 - New upstream version