X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=contrib%2Fredhat%2Fcollectd.spec;h=864ef1b3068de12d370606233352a12d97aabcf1;hp=4c566a2ef41b39f1a6aafd73e206476367d27911;hb=0e73c26f5670b2f11eecfdadaf545bcc7f260658;hpb=3fecfdaa17500840ecdab16b0684d3bdc7d72e1a diff --git a/contrib/redhat/collectd.spec b/contrib/redhat/collectd.spec index 4c566a2e..864ef1b3 100644 --- a/contrib/redhat/collectd.spec +++ b/contrib/redhat/collectd.spec @@ -53,6 +53,7 @@ %define with_ceph 0%{!?_without_ceph:1} %define with_cgroups 0%{!?_without_cgroups:1} %define with_chrony 0%{!?_without_chrony:1} +%define with_connectivity 0%{!?_without_connectivity:1} %define with_conntrack 0%{!?_without_conntrack:1} %define with_contextswitch 0%{!?_without_contextswitch:1} %define with_cpu 0%{!?_without_cpu:1} @@ -89,7 +90,6 @@ %define with_log_logstash 0%{!?_without_log_logstash:1} %define with_logfile 0%{!?_without_logfile:1} %define with_lua 0%{!?_without_lua:1} -%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} @@ -123,6 +123,7 @@ %define with_postgresql 0%{!?_without_postgresql:1} %define with_powerdns 0%{!?_without_powerdns:1} %define with_processes 0%{!?_without_processes:1} +%define with_procevent 0%{!?_without_procevent:1} %define with_protocols 0%{!?_without_protocols:1} %define with_python 0%{!?_without_python:1} %define with_redis 0%{!?_without_redis:1} @@ -234,7 +235,6 @@ %define with_gmond 0 %define with_iptables 0 %define with_ipvs 0 -%define with_lvm 0 %define with_modbus 0 %define with_netlink 0 %define with_redis 0 @@ -247,11 +247,13 @@ # Plugins not buildable on RHEL < 7 %if 0%{?rhel} && 0%{?rhel} < 7 +%define with_connectivity 0 %define with_cpusleep 0 %define with_gps 0 %define with_mqtt 0 %define with_ovs_events 0 %define with_ovs_stats 0 +%define with_procevent 0 %define with_redis 0 %define with_rrdcached 0 %define with_sysevent 0 @@ -262,8 +264,8 @@ Summary: Statistics collection and monitoring daemon Name: collectd -Version: 5.9.0 -Release: 1%{?dist} +Version: 5.9.2 +Release: 2%{?dist} URL: https://collectd.org Source: https://collectd.org/files/%{name}-%{version}.tar.bz2 License: GPLv2 @@ -382,6 +384,16 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Chrony plugin for collectd %endif +%if %{with_connectivity} +%package connectivity +Summary: Connectivity plugin for collectd +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: libmnl-devel, yajl-devel +%description connectivity +Monitors network interface up/down status via netlink library. +%endif + %if %{with_curl} %package curl Summary: Curl plugin for collectd @@ -576,17 +588,6 @@ The Lua plugin embeds a Lua interpreter into collectd and exposes the application programming interface (API) to Lua scripts. %endif -%if %{with_lvm} -%package lvm -Summary: LVM plugin for collectd -Group: System Environment/Daemons -Requires: %{name}%{?_isa} = %{version}-%{release} -BuildRequires: lvm2-devel -%description lvm -This plugin collects size of “Logical Volumes” (LV) and “Volume Groups” (VG) -of Linux' “Logical Volume Manager” (LVM). -%endif - %if %{with_mcelog} %package mcelog Summary: Mcelog plugin for collectd @@ -794,6 +795,16 @@ The PostgreSQL plugin connects to and executes SQL statements on a PostgreSQL database. %endif +%if %{with_procevent} +%package procevent +Summary: Processes event plugin for collectd +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: yajl-devel +%description procevent +Monitors process starts/stops via netlink library. +%endif + %if %{with_python} %package python Summary: Python plugin for collectd @@ -1148,6 +1159,12 @@ Collectd utilities %define _with_chrony --disable-chrony %endif +%if %{with_connectivity} +%define _with_connectivity --enable-connectivity +%else +%define _with_connectivity --disable-connectivity +%endif + %if %{with_conntrack} %define _with_conntrack --enable-conntrack %else @@ -1412,12 +1429,6 @@ Collectd utilities %define _with_lua --disable-lua %endif -%if %{with_lvm} -%define _with_lvm --enable-lvm -%else -%define _with_lvm --disable-lvm -%endif - %if %{with_madwifi} %define _with_madwifi --enable-madwifi %else @@ -1646,6 +1657,12 @@ Collectd utilities %define _with_processes --disable-processes %endif +%if %{with_procevent} +%define _with_procevent --enable-procevent +%else +%define _with_procevent --disable-procevent +%endif + %if %{with_protocols} %define _with_protocols --enable-protocols %else @@ -2010,6 +2027,7 @@ Collectd utilities %{?_with_ceph} \ %{?_with_cgroups} \ %{?_with_chrony} \ + %{?_with_connectivity} \ %{?_with_conntrack} \ %{?_with_contextswitch} \ %{?_with_cpufreq} \ @@ -2052,7 +2070,6 @@ Collectd utilities %{?_with_logfile} \ %{?_with_lpar} \ %{?_with_lua} \ - %{?_with_lvm} \ %{?_with_madwifi} \ %{?_with_mbmon} \ %{?_with_mcelog} \ @@ -2091,6 +2108,7 @@ Collectd utilities %{?_with_postgresql} \ %{?_with_powerdns} \ %{?_with_processes} \ + %{?_with_procevent} \ %{?_with_protocols} \ %{?_with_python} \ %{?_with_redis} \ @@ -2558,6 +2576,11 @@ fi %{_libdir}/%{name}/chrony.so %endif +%if %{with_connectivity} +%files connectivity +%{_libdir}/%{name}/connectivity.so +%endif + %if %{with_curl} %files curl %{_libdir}/%{name}/curl.so @@ -2667,11 +2690,6 @@ fi %{_libdir}/%{name}/lua.so %endif -%if %{with_lvm} -%files lvm -%{_libdir}/%{name}/lvm.so -%endif - %if %{with_memcachec} %files memcachec %{_libdir}/%{name}/memcachec.so @@ -2767,6 +2785,11 @@ fi %{_libdir}/%{name}/postgresql.so %endif +%if %{with_procevent} +%files procevent +%{_libdir}/%{name}/procevent.so +%endif + %if %{with_python} %files python %{_mandir}/man5/collectd-python* @@ -2881,6 +2904,9 @@ fi %doc contrib/ %changelog +* Mon Oct 14 2019 Ruben Kerkhof - 5.9.2-2 +- Remove lvm plugin, liblvmapp has been deprecated upstream + * Fri Jun 14 2019 Fabien Wernli - 5.9.0-1 - add code for write_stackdriver (disabled for now) - add code for gpu_nvidia (disabled for now)