X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=contrib%2Fredhat%2Fcollectd.spec;h=66d1914e06297f0c0a0480e1aa31999503a5e56d;hb=b4c17cc31997759c0b0811cdc805910c6cb57424;hp=8726d7c64a166cc93cb38314e5975e795c6e7a50;hpb=9ce6b729cce93feb07697887799ea2e80803ab34;p=collectd.git diff --git a/contrib/redhat/collectd.spec b/contrib/redhat/collectd.spec index 8726d7c6..66d1914e 100644 --- a/contrib/redhat/collectd.spec +++ b/contrib/redhat/collectd.spec @@ -111,6 +111,7 @@ %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} @@ -126,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} @@ -152,6 +154,7 @@ %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}} @@ -167,12 +170,16 @@ %define with_aquaero 0%{!?_without_aquaero:0} # plugin barometer disabled, requires a libi2c %define with_barometer 0%{!?_without_barometer:0} -# plugin grpc disabled, requires protobuf-compiler >= 3.0 -%define with_grpc 0%{!?_without_grpc: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 @@ -197,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 @@ -222,6 +227,7 @@ %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 @@ -230,16 +236,18 @@ %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.7.0 -Release: 4%{?dist} +Version: 5.7.1 +Release: 7%{?dist} URL: https://collectd.org Source: https://collectd.org/files/%{name}-%{version}.tar.bz2 License: GPLv2 @@ -249,6 +257,7 @@ 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 @@ -463,6 +472,16 @@ 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 @@ -678,6 +697,17 @@ 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 @@ -816,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 @@ -883,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 @@ -1124,6 +1164,12 @@ 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 @@ -1202,6 +1248,12 @@ Collectd utilities %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 @@ -1466,6 +1518,12 @@ Collectd utilities %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 @@ -1579,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 @@ -1842,6 +1906,7 @@ Collectd utilities %{?_with_disk} \ %{?_with_dns} \ %{?_with_drbd} \ + %{?_with_dpdkevents} \ %{?_with_dpdkstat} \ %{?_with_email} \ %{?_with_entropy} \ @@ -1855,6 +1920,7 @@ Collectd utilities %{?_with_grpc} \ %{?_with_hddtemp} \ %{?_with_hugepages} \ + %{?_with_intel_pmu} \ %{?_with_intel_rdt} \ %{?_with_interface} \ %{?_with_ipc} \ @@ -1898,6 +1964,7 @@ Collectd utilities %{?_with_openvpn} \ %{?_with_oracle} \ %{?_with_ovs_events} \ + %{?_with_ovs_stats} \ %{?_with_perl} \ %{?_with_pf} \ %{?_with_pinba} \ @@ -1916,6 +1983,7 @@ Collectd utilities %{?_with_sigrok} \ %{?_with_smart} \ %{?_with_snmp} \ + %{?_with_snmp_agent} \ %{?_with_statsd} \ %{?_with_swap} \ %{?_with_syslog} \ @@ -2124,9 +2192,6 @@ 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 @@ -2208,9 +2273,6 @@ fi %if %{with_olsrd} %{_libdir}/%{name}/olsrd.so %endif -%if %{with_ovs_events} -%{_libdir}/%{name}/ovs_events.so -%endif %if %{with_powerdns} %{_libdir}/%{name}/powerdns.so %endif @@ -2388,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 @@ -2413,6 +2485,11 @@ 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 @@ -2512,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 @@ -2579,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 @@ -2631,6 +2723,28 @@ fi %doc contrib/ %changelog +* 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