X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=contrib%2Fredhat%2Fcollectd.spec;h=09cc3b18feaf554158410d61a9524448f4b7380d;hb=797ed5e5bee9ee89361f12e447ffc6ceb6ef79d2;hp=73e69c75395e4d1d07a23ef2857102525b0069b5;hpb=b4a45047de41551b5b8879eba548dcf2a199fa9b;p=collectd.git diff --git a/contrib/redhat/collectd.spec b/contrib/redhat/collectd.spec index 73e69c75..09cc3b18 100644 --- a/contrib/redhat/collectd.spec +++ b/contrib/redhat/collectd.spec @@ -148,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} @@ -166,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 @@ -213,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 @@ -221,7 +227,9 @@ %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 @@ -234,7 +242,7 @@ 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 @@ -452,6 +460,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 @@ -813,6 +832,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 @@ -1069,6 +1099,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 @@ -1141,6 +1177,12 @@ Collectd utilities %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 @@ -1662,6 +1704,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 @@ -1719,7 +1767,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 \ @@ -1758,6 +1805,7 @@ Collectd utilities %{?_with_disk} \ %{?_with_dns} \ %{?_with_drbd} \ + %{?_with_dpdkstat} \ %{?_with_email} \ %{?_with_entropy} \ %{?_with_ethstat} \ @@ -1770,6 +1818,7 @@ Collectd utilities %{?_with_grpc} \ %{?_with_hddtemp} \ %{?_with_hugepages} \ + %{?_with_intel_rdt} \ %{?_with_interface} \ %{?_with_ipc} \ %{?_with_ipmi} \ @@ -1857,6 +1906,7 @@ Collectd utilities %{?_with_write_kafka} \ %{?_with_write_log} \ %{?_with_write_mongodb} \ + %{?_with_write_prometheus} \ %{?_with_write_redis} \ %{?_with_write_riemann} \ %{?_with_write_sensu} \ @@ -2035,6 +2085,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 @@ -2315,6 +2368,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 @@ -2491,6 +2549,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 @@ -2523,12 +2586,19 @@ fi %doc contrib/ %changelog -* Tue Aug 23 2016 Marc Fournier - 5.7.0-1 +* 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 +- 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 PRE-RELEASE version +- New upstream version - New plugins enabled by default: chrony, cpusleep, gps, lua, mqtt, notify_nagios - New plugins disabled by default: grpc, xencpu, zone