X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=contrib%2Fredhat%2Fcollectd.spec;h=537edf732a8433edda1c7daa7b4ce3e415157648;hb=28e701a07d1ea28b12d0e7c2e6ce57c993b2d509;hp=6fc8e515044e1f8128aa66cfaa3ffff02f2cb374;hpb=fd958eb99c09d819a51dd147db7c189366e9382a;p=collectd.git diff --git a/contrib/redhat/collectd.spec b/contrib/redhat/collectd.spec index 6fc8e515..537edf73 100644 --- a/contrib/redhat/collectd.spec +++ b/contrib/redhat/collectd.spec @@ -38,6 +38,9 @@ %global _hardened_build 1 %{?perl_default_filter} +# disable collectd debug by default +%bcond_with debug + # plugins enabled by default %define with_aggregation 0%{!?_without_aggregation:1} %define with_amqp 0%{!?_without_amqp:1} @@ -132,6 +135,7 @@ %define with_statsd 0%{!?_without_statsd:1} %define with_swap 0%{!?_without_swap:1} %define with_synproxy 0%{!?_without_synproxy:0} +%define with_sysevent 0%{!?_without_sysevent:1} %define with_syslog 0%{!?_without_syslog:1} %define with_table 0%{!?_without_table:1} %define with_tail 0%{!?_without_tail:1} @@ -241,6 +245,7 @@ %define with_ovs_stats 0 %define with_redis 0 %define with_rrdcached 0 +%define with_sysevent 0 %define with_write_redis 0 %define with_write_riemann 0 %define with_xmms 0 @@ -249,7 +254,7 @@ Summary: Statistics collection and monitoring daemon Name: collectd Version: 5.7.1 -Release: 8%{?dist} +Release: 9%{?dist} URL: https://collectd.org Source: https://collectd.org/files/%{name}-%{version}.tar.bz2 License: GPLv2 @@ -869,6 +874,16 @@ BuildRequires: net-snmp-devel This plugin for collectd to support AgentX integration. %endif +%if %{with_sysevent} +%package sysevent +Summary: Rsyslog event plugin for collectd +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: yajl-devel +%description sysevent +Monitors rsyslog for system events. +%endif + %if %{with_varnish} %package varnish Summary: Varnish plugin for collectd @@ -1378,7 +1393,7 @@ Collectd utilities %if %{with_mcelog} %define _with_mcelog --enable-mcelog %else -%define _with_mbmon --disable-mcelog +%define _with_mcelog --disable-mcelog %endif %if %{with_md} @@ -1680,6 +1695,12 @@ Collectd utilities %define _with_synproxy --disable-synproxy %endif +%if %{with_sysevent} +%define _with_sysevent --enable-sysevent +%else +%define _with_sysevent --disable-sysevent +%endif + %if %{with_syslog} %define _with_syslog --enable-syslog %else @@ -1890,8 +1911,15 @@ Collectd utilities %define _with_zookeeper --disable-zookeeper %endif +%if %{with debug} +%define _feature_debug --enable-debug +%else +%define _feature_debug --disable-debug +%endif + %configure CFLAGS="%{optflags} -DLT_LAZY_OR_NOW=\"RTLD_LAZY|RTLD_GLOBAL\"" \ %{?_python_config} \ + %{?_feature_debug} \ --disable-static \ --enable-all-plugins=yes \ --enable-match_empty_counter \ @@ -2013,6 +2041,7 @@ Collectd utilities %{?_with_statsd} \ %{?_with_swap} \ %{?_with_synproxy} \ + %{?_with_sysevent} \ %{?_with_syslog} \ %{?_with_table} \ %{?_with_tail_csv} \ @@ -2709,6 +2738,11 @@ fi %{_libdir}/%{name}/snmp_agent.so %endif +%if %{with_sysevent} +%files sysevent +%{_libdir}/%{name}/sysevent.so +%endif + %if %{with_varnish} %files varnish %{_libdir}/%{name}/varnish.so @@ -2761,6 +2795,9 @@ fi %doc contrib/ %changelog +* Thu Sep 28 2017 Jakub Jankowski - 5.7.1-9 +- Fix mbmon/mcelog build options + * Thu Sep 28 2017 xakru - 5.7.1-8 - Add new libcollectdclient/network_parse - Add new libcollectdclient/server