pool/collectd
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 915471 from home:cvoegl:branches:server:monitoring

Browse Source 
- Disabled the mqtt plugin for SLES and the modbus plugin for 
  everything except Tumpleweed as the dependencies are not met in 
  those distributions
- Added the modbus plugin as dependency to plugins-all

OBS-URL: https://build.opensuse.org/request/show/915471
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=173
This commit is contained in:
Christian Vögl 2021-09-01 12:18:57 +00:00 committed by Git OBS Bridge
parent 138347db68
commit fc23dd9e28
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
collectd.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Sep 1 11:14:56 UTC 2021 - Christian Vögl <christian.voegl@suse.com>
- Disabled the mqtt plugin for SLES and the modbus plugin for
everything except Tumpleweed as the dependencies are not met in
those distributions
- Added the modbus plugin as dependency to plugins-all
-------------------------------------------------------------------
Mon Aug 30 08:09:48 UTC 2021 - Johannes Segitz <jsegitz@suse.com>

17
collectd.spec
View File

@ -110,8 +110,12 @@ BuildRequires: pkgconfig(libiptc)
BuildRequires: pkgconfig(libmemcached)
BuildRequires: pkgconfig(libmicrohttpd)
BuildRequires: pkgconfig(libmnl)
%if 0%{?suse_version} > 1500
BuildRequires: pkgconfig(libmodbus)
%endif
%if 0%{?is_opensuse}
BuildRequires: pkgconfig(libmosquitto)
%endif
BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(liboping)
BuildRequires: pkgconfig(libpq)
@ -296,6 +300,7 @@ Requires: %{name} = %{version}-%{release}
%description plugin-memcachec
Optional %{name} plugin to sample memcached statistics.
%if 0%{?suse_version} > 1500
%package plugin-modbus
Summary: TCP Modbus Plugin for %{name}
Group: System/Monitoring
@ -303,7 +308,9 @@ Requires: %{name} = %{version}-%{release}
%description plugin-modbus
Optional %{name} plugin to communicate with TCP Modbus devices.
%endif
%if 0%{?is_opensuse}
%package plugin-mqtt
Summary: MQTT Plugin for %{name}
Group: System/Monitoring
@ -311,6 +318,7 @@ Requires: %{name} = %{version}-%{release}
%description plugin-mqtt
Optional %{name} plugin to send and receive MQTT messages.
%endif
%package plugin-pinba
Summary: Pinba Collector Plugin for %{name}
@ -483,7 +491,12 @@ Requires: %{name}-plugin-logparser = %{version}-%{release}
Requires: %{name}-plugin-lua = %{version}-%{release}
Requires: %{name}-plugin-mcelog = %{version}-%{release}
Requires: %{name}-plugin-memcachec = %{version}-%{release}
%if 0%{?suse_version} > 1500
Requires: %{name}-plugin-modbus = %{version}-%{release}
%endif
%if 0%{?is_opensuse}
Requires: %{name}-plugin-mqtt = %{version}-%{release}
%endif
Requires: %{name}-plugin-mysql = %{version}-%{release}
Requires: %{name}-plugin-notify-desktop = %{version}-%{release}
Requires: %{name}-plugin-openldap = %{version}-%{release}
@ -817,13 +830,17 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
%{_libdir}/collectd/memcachec.so
%{_libdir}/collectd/memcachec.la
%if 0%{?suse_version} > 1500
%files plugin-modbus
%{_libdir}/collectd/modbus.so
%{_libdir}/collectd/modbus.la
%endif
%if 0%{?is_opensuse}
%files plugin-mqtt
%{_libdir}/collectd/mqtt.so
%{_libdir}/collectd/mqtt.la
%endif
%if 0%{?sle_version} < 150000 || 0%{?is_opensuse}