From: Ruben Kerkhof Date: Tue, 29 Nov 2016 11:38:59 +0000 (+0100) Subject: Merge branch 'collectd-5.6' into collectd-5.7 X-Git-Tag: collectd-5.7.0~7 X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=2e632b0929fb957fd686231658bc2999fdfb4b20;hp=-c Merge branch 'collectd-5.6' into collectd-5.7 Conflicts: contrib/redhat/collectd.spec --- 2e632b0929fb957fd686231658bc2999fdfb4b20 diff --combined contrib/redhat/collectd.spec index 74c02ea7,e7ffb077..4fc76e11 --- a/contrib/redhat/collectd.spec +++ b/contrib/redhat/collectd.spec @@@ -73,7 -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} @@@ -148,7 -147,6 +148,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} @@@ -167,12 -165,8 +167,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 @@@ -218,7 -212,6 +218,7 @@@ %define with_redis 0 %define with_smart 0 %define with_turbostat 0 +%define with_write_prometheus 0 %define with_write_redis 0 %endif @@@ -227,14 -220,16 +227,16 @@@ %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.6.1 +Version: 5.7.0 - Release: 1%{?dist} + Release: 2%{?dist} URL: https://collectd.org Source: https://collectd.org/files/%{name}-%{version}.tar.bz2 License: GPLv2 @@@ -458,17 -453,6 +460,17 @@@ The HDDTemp plugin collects the tempera 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 @@@ -830,17 -814,6 +832,17 @@@ BuildRequires: librdkafka-deve 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 @@@ -1097,12 -1070,6 +1099,12 @@@ Collectd utilitie %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 @@@ -1169,18 -1136,6 +1171,18 @@@ %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 @@@ -1702,12 -1657,6 +1704,12 @@@ %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 @@@ -1804,7 -1753,6 +1806,7 @@@ %{?_with_disk} \ %{?_with_dns} \ %{?_with_drbd} \ + %{?_with_dpdkstat} \ %{?_with_email} \ %{?_with_entropy} \ %{?_with_ethstat} \ @@@ -1816,8 -1764,6 +1818,8 @@@ %{?_with_gps} \ %{?_with_grpc} \ %{?_with_hddtemp} \ + %{?_with_hugepages} \ + %{?_with_intel_rdt} \ %{?_with_interface} \ %{?_with_ipc} \ %{?_with_ipmi} \ @@@ -1905,7 -1851,6 +1907,7 @@@ %{?_with_write_kafka} \ %{?_with_write_log} \ %{?_with_write_mongodb} \ + %{?_with_write_prometheus} \ %{?_with_write_redis} \ %{?_with_write_riemann} \ %{?_with_write_sensu} \ @@@ -2084,9 -2029,6 +2086,9 @@@ f %if %{with_drbd} %{_libdir}/%{name}/drbd.so %endif +%if %{with_dpdkstat} +%{_libdir}/%{name}/dpdkstat.so +%endif %if %{with_ethstat} %{_libdir}/%{name}/ethstat.so %endif @@@ -2105,9 -2047,6 +2107,9 @@@ %if %{with_fscache} %{_libdir}/%{name}/fscache.so %endif +%if %{with_hugepages} +%{_libdir}/%{name}/hugepages.so +%endif %if %{with_interface} %{_libdir}/%{name}/interface.so %endif @@@ -2367,11 -2306,6 +2369,11 @@@ %{_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 @@@ -2548,11 -2482,6 +2550,11 @@@ %{_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 @@@ -2585,10 -2514,8 +2587,13 @@@ %doc contrib/ %changelog -* Tue Nov 29 2016 Ruben Kerkhof - 5.6.1-2 -- Disable redis plugin on RHEL < 7, hiredis has been retired from EPEL6 ++* 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