X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=contrib%2Fredhat%2Fcollectd.spec;h=66d1914e06297f0c0a0480e1aa31999503a5e56d;hb=a35895c171ea67c7c707f98f49134236f9143c53;hp=e7ffb0773f78ec842d94073558377c079ee0fbd8;hpb=8dcf1473b25c4649289ea8b8fb5cb390f2493ce3;p=collectd.git diff --git a/contrib/redhat/collectd.spec b/contrib/redhat/collectd.spec index e7ffb077..66d1914e 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} @@ -87,6 +88,7 @@ %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} @@ -108,6 +110,8 @@ %define with_olsrd 0%{!?_without_olsrd:1} %define with_openldap 0%{!?_without_openldap:1} %define with_openvpn 0%{!?_without_openvpn:1} +%define with_ovs_events 0%{!?_without_ovs_events:1} +%define with_ovs_stats 0%{!?_without_ovs_stats:1} %define with_perl 0%{!?_without_perl:1} %define with_pinba 0%{!?_without_pinba:1} %define with_ping 0%{!?_without_ping:1} @@ -123,6 +127,7 @@ %define with_serial 0%{!?_without_serial:1} %define with_smart 0%{!?_without_smart:1} %define with_snmp 0%{!?_without_snmp:1} +%define with_snmp_agent 0%{!?_without_snmp_agent:1} %define with_statsd 0%{!?_without_statsd:1} %define with_swap 0%{!?_without_swap:1} %define with_syslog 0%{!?_without_syslog:1} @@ -147,7 +152,9 @@ %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_riemann 0%{!?_without_write_riemann:1} %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}} @@ -163,10 +170,18 @@ %define with_aquaero 0%{!?_without_aquaero:0} # plugin barometer disabled, requires a libi2c %define with_barometer 0%{!?_without_barometer:0} +# plugin dpdkevents disabled, requires libdpdk +%define with_dpdkevents 0%{!?_without_dpdkevents:0} +# plugin dpdkstat disabled, requires libdpdk +%define with_dpdkstat 0%{!?_without_dpdkstat:0} # plugin grpc disabled, requires protobuf-compiler >= 3.0 %define with_grpc 0%{!?_without_grpc:0} # plugin lpar disabled, requires AIX %define with_lpar 0%{!?_without_lpar:0} +# plugin intel_pmu disabled, requires libjevents +%define with_intel_pmu 0%{!?_without_intel_pmu: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 @@ -189,8 +204,6 @@ %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 write_riemann disabled, requires a new enough riemann_c_client -%define with_write_riemann 0%{!?_without_write_riemann:0} # plugin xencpu disabled, requires xen-devel from non-default repo %define with_xencpu 0%{!?_without_xencpu:0} # plugin zone disabled, requires Solaris @@ -212,7 +225,9 @@ %define with_redis 0 %define with_smart 0 %define with_turbostat 0 +%define with_write_prometheus 0 %define with_write_redis 0 +%define with_write_riemann 0 %endif # Plugins not buildable on RHEL < 7 @@ -220,25 +235,29 @@ %define with_cpusleep 0 %define with_gps 0 %define with_mqtt 0 +%define with_ovs_events 0 +%define with_ovs_stats 0 %define with_redis 0 %define with_rrdcached 0 %define with_write_redis 0 +%define with_write_riemann 0 %define with_xmms 0 %endif Summary: Statistics collection and monitoring daemon Name: collectd -Version: 5.6.1 -Release: 2%{?dist} +Version: 5.7.1 +Release: 7%{?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 +BuildRequires: xfsprogs-devel %{?systemd_requires} BuildRequires: systemd %else @@ -453,6 +472,27 @@ 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_pmu} +%package intel_pmu +Summary: Intel PMU plugin for collectd +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +%description intel_pmu +The intel_pmu plugin reads performance counters provided by the Linux +kernel perf interface. +%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 @@ -520,6 +560,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 @@ -635,6 +685,29 @@ BuildRequires: openldap-devel This plugin reads monitoring information from OpenLDAP's cn=Monitor subtree. %endif +%if %{with_ovs_events} +%package ovs_events +Summary: Open vSwitch events plugin for collectd +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: yajl-devel +%description ovs_events +This plugin monitors the link status of Open vSwitch (OVS) connected +interfaces, dispatches the values to collectd and sends notifications +whenever a link state change occurs in the OVS database. +%endif + +%if %{with_ovs_stats} +%package ovs_stats +Summary: Open vSwitch statistics plugin for collectd +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: yajl-devel +%description ovs_stats +This plugin collects statictics of OVS connected bridges and +interfaces. +%endif + %if %{with_perl} %package perl Summary: Perl plugin for collectd @@ -773,6 +846,16 @@ BuildRequires: net-snmp-devel This plugin for collectd allows querying of network equipment using SNMP. %endif +%if %{with_snmp_agent} +%package snmp_agent +Summary: SNMP AgentX plugin for collectd +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: net-snmp-devel +%description snmp_agent +This plugin for collectd to support AgentX integration. +%endif + %if %{with_varnish} %package varnish Summary: Varnish plugin for collectd @@ -814,6 +897,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 @@ -829,7 +923,7 @@ The Write Redis plugin stores values in Redis, a “data structures server”. Summary: riemann plugin for collectd Group: System Environment/Daemons Requires: %{name}%{?_isa} = %{version}-%{release} -BuildRequires: protobuf-c-devel +BuildRequires: riemann-c-client-devel >= 1.6 %description write_riemann The riemann plugin submits values to Riemann, an event stream processor. %endif @@ -1070,6 +1164,18 @@ Collectd utilities %define _with_drbd --disable-drbd %endif +%if %{with_dpdkevents} +%define _with_dpdkevents --enable-dpdkevents +%else +%define _with_dpdkevents --disable-dpdkevents +%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 @@ -1136,6 +1242,24 @@ 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_pmu} +%define _with_intel_pmu --enable-intel_pmu +%else +%define _with_intel_pmu --disable-intel_pmu +%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 @@ -1232,6 +1356,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 @@ -1382,6 +1512,18 @@ Collectd utilities %define _with_oracle --disable-oracle %endif +%if %{with_ovs_events} +%define _with_ovs_events --enable-ovs_events +%else +%define _with_ovs_events --disable-ovs_events +%endif + +%if %{with_ovs_stats} +%define _with_ovs_stats --enable-ovs_stats +%else +%define _with_ovs_stats --disable-ovs_stats +%endif + %if %{with_perl} %define _with_perl --enable-perl --with-perl-bindings="INSTALLDIRS=vendor" %else @@ -1495,6 +1637,12 @@ Collectd utilities %define _with_snmp --disable-snmp %endif +%if %{with_snmp_agent} +%define _with_snmp_agent --enable-snmp_agent +%else +%define _with_snmp_agent --disable-snmp_agent +%endif + %if %{with_statsd} %define _with_statsd --enable-statsd %else @@ -1657,6 +1805,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 @@ -1714,7 +1868,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 \ @@ -1753,6 +1906,8 @@ Collectd utilities %{?_with_disk} \ %{?_with_dns} \ %{?_with_drbd} \ + %{?_with_dpdkevents} \ + %{?_with_dpdkstat} \ %{?_with_email} \ %{?_with_entropy} \ %{?_with_ethstat} \ @@ -1764,6 +1919,9 @@ Collectd utilities %{?_with_gps} \ %{?_with_grpc} \ %{?_with_hddtemp} \ + %{?_with_hugepages} \ + %{?_with_intel_pmu} \ + %{?_with_intel_rdt} \ %{?_with_interface} \ %{?_with_ipc} \ %{?_with_ipmi} \ @@ -1779,6 +1937,7 @@ Collectd utilities %{?_with_lvm} \ %{?_with_madwifi} \ %{?_with_mbmon} \ + %{?_with_mcelog} \ %{?_with_md} \ %{?_with_memcachec} \ %{?_with_memcached} \ @@ -1804,6 +1963,8 @@ Collectd utilities %{?_with_openldap} \ %{?_with_openvpn} \ %{?_with_oracle} \ + %{?_with_ovs_events} \ + %{?_with_ovs_stats} \ %{?_with_perl} \ %{?_with_pf} \ %{?_with_pinba} \ @@ -1822,6 +1983,7 @@ Collectd utilities %{?_with_sigrok} \ %{?_with_smart} \ %{?_with_snmp} \ + %{?_with_snmp_agent} \ %{?_with_statsd} \ %{?_with_swap} \ %{?_with_syslog} \ @@ -1851,6 +2013,7 @@ Collectd utilities %{?_with_write_kafka} \ %{?_with_write_log} \ %{?_with_write_mongodb} \ + %{?_with_write_prometheus} \ %{?_with_write_redis} \ %{?_with_write_riemann} \ %{?_with_write_sensu} \ @@ -2047,6 +2210,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 @@ -2071,6 +2237,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 +2450,16 @@ fi %{_libdir}/%{name}/dbi.so %endif +%if %{with_dpdkevents} +%files dpdkevents +%{_libdir}/%{name}/dpdkevents.so +%endif + +%if %{with_dpdkstat} +%files dpdkstat +%{_libdir}/%{name}/dpdkstat.so +%endif + %if %{with_email} %files email %{_libdir}/%{name}/email.so @@ -2306,6 +2485,16 @@ fi %{_libdir}/%{name}/hddtemp.so %endif +%if %{with_intel_pmu} +%files intel_pmu +%{_libdir}/%{name}/intel_pmu.so +%endif + +%if %{with_intel_rdt} +%files intel_rdt +%{_libdir}/%{name}/intel_rdt.so +%endif + %if %{with_ipmi} %files ipmi %{_libdir}/%{name}/ipmi.so @@ -2400,6 +2589,16 @@ fi %{_libdir}/%{name}/openldap.so %endif +%if %{with_ovs_events} +%files ovs_events +%{_libdir}/%{name}/ovs_events.so +%endif + +%if %{with_ovs_stats} +%files ovs_stats +%{_libdir}/%{name}/ovs_stats.so +%endif + %if %{with_perl} %files perl %{perl_vendorlib}/Collectd.pm @@ -2467,6 +2666,11 @@ fi %{_libdir}/%{name}/snmp.so %endif +%if %{with_snmp_agent} +%files snmp_agent +%{_libdir}/%{name}/snmp_agent.so +%endif + %if %{with_varnish} %files varnish %{_libdir}/%{name}/varnish.so @@ -2482,6 +2686,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 @@ -2514,8 +2723,41 @@ fi %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 +* Fri Aug 18 2017 Ruben Kerkhof - 5.7.1-7 +- Add new intel_pmu plugin + +* Sun Mar 05 2017 Ruben Kerkhof - 5.7.1-6 +- Move recently added plugins to subpackages + +* Sun Mar 05 2017 Ruben Kerkhof - 5.7.1-5 +- Add new ovs_stats plugin + +* Sun Mar 05 2017 Ruben Kerkhof - 5.7.1-4 +- Don't enable XFS support on RHEL6, it is missing for i386 + +* Sun Mar 05 2017 Ruben Kerkhof - 5.7.1-3 +- Add dpdkevents plugin, disabled by default + +* Wed Feb 22 2017 Ruben Kerkhof - 5.7.1-2 +- Enable XFS support in df plugin +- Fix bogus date in changelog + +* Sun Jan 01 2017 Marc Fournier - 5.7.1-1 +- New upstream version + +* Sat Dec 31 2016 Ruben Kerkhof - 5.7.0-4 +- Add new ovs_events plugin + +* 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