Accepting request 330598 from home:matwey:branches:server:monitoring

OBS-URL: https://build.opensuse.org/request/show/330598
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=128

collectd.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Sep 12 10:58:03 UTC 2015 - matwey.kornilov@gmail.com
+
+- Add modbus plugin
+
 -------------------------------------------------------------------
 Fri Jun  5 06:49:33 UTC 2015 - mpluskal@suse.com
 

collectd.spec

@@ -50,6 +50,11 @@
 %define memcachec 0
 %define memcached_plugin %{nil}
 %endif
+%if ! 0%{?_without_modbus:1}
+%define modbus 1
+%else
+%define modbus 0
+%endif
 %if 0%{?suse_version} < 1000
 %define libnotify 0
 %else
@@ -253,6 +258,9 @@ BuildRequires:  libdbi-devel
 %if %{memcachec}
 BuildRequires:  libmemcached-devel
 %endif
+%if %{modbus}
+BuildRequires:  libmodbus-devel
+%endif
 %if %{protobuf}
 BuildRequires:  protobuf-c
 %endif
@@ -426,6 +434,16 @@ Requires:       %{name} = %{version}-%{release}
 Optional %{name} plugin to sample memcached statistics.
 %endif #memcachec
 
+%if %{modbus}
+%package plugin-modbus
+Summary:        ModBus Plugin for %{name}
+Group:          System/Monitoring
+Requires:       %{name} = %{version}-%{release}
+
+%description plugin-modbus
+Optional %{name} plugin to collect data using ModBus protocol.
+%endif #modbus
+
 %if %{protobuf}
 %package plugin-pinba
 Summary:        Pinba Collector Plugin for %{name}
@@ -471,6 +489,9 @@ Requires:       %{name}-plugin-dbi = %{version}-%{release}
 %if %{memcachec}
 Requires:       %{name}-plugin-memcachec = %{version}-%{release}
 %endif #memcachec
+%if %{modbus}
+Requires:       %{name}-plugin-modbus = %{version}-%{release}
+%endif #modbus
 %if %{protobuf}
 Requires:       %{name}-plugin-pinba = %{version}-%{release}
 %endif #protobuf
@@ -608,6 +629,11 @@ export KERNEL_DIR=%{_prefix}/src/linux
 %else
     --disable-memcached \
 %endif #memcachec
+%if %{modbus}
+    --enable-modbus \
+%else
+    --disable-modbus \
+%endif #modbus
 %if 0%{?suse_version} < 930
     --disable-mysql \
 %endif
@@ -933,6 +959,13 @@ ln -s "../..%{_initddir}/collectd" "%{buildroot}%{_sbindir}/rccollectd"
 %{_libdir}/collectd/memcachec.la
 %endif #memcachec
 
+%if %{modbus}
+%files plugin-modbus
+%defattr(-,root,root)
+%{_libdir}/collectd/modbus.so
+%{_libdir}/collectd/modbus.la
+%endif #modbus
+
 %files spamassassin
 %defattr(-,root,root)
 %dir %{_datadir}/spamassassin