From 84ad4ad9cbf3a66e6c36809a1ed02918697958fe69ee467229811230535fb051 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Wed, 30 Jul 2014 21:35:13 +0000 Subject: [PATCH] - Renamed package to monitoring-plugins-sar-perf - check_iostat: use 5 seconds instead of 2 to get more useful data - check_iostat: add warning and critical levels for iowait - check_iostat: actually check current io stats, not since boot - more additions to check_iostat: can use device-mapper name - rewrite check_iostat in perl, also output iowait value - add requires sysstat - check_iostat: call iostat with "-k" to really display kb instead of blocks as unit - added check_iostat - also print the used arguments as output to STDOUT, so the user knows what is mesured (monitoring-plugins-sar-perf-stdout.patch) - added monitoring-plugins-sar-perf-output.patch : do not print DEV name for disk in performance output - initial version (git commit 4878d0cc66e928bd1075) defined as 0.1 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/monitoring-plugins-sar-perf?expand=0&rev=2 --- ...> monitoring-plugins-sar-perf-output.patch | 0 ...> monitoring-plugins-sar-perf-stdout.patch | 0 ...ges => monitoring-plugins-sar-perf.changes | 9 +++-- ...f.spec => monitoring-plugins-sar-perf.spec | 34 ++++++++++--------- 4 files changed, 25 insertions(+), 18 deletions(-) rename nagios-plugins-sar-perf-output.patch => monitoring-plugins-sar-perf-output.patch (100%) rename nagios-plugins-sar-perf-stdout.patch => monitoring-plugins-sar-perf-stdout.patch (100%) rename nagios-plugins-sar-perf.changes => monitoring-plugins-sar-perf.changes (86%) rename nagios-plugins-sar-perf.spec => monitoring-plugins-sar-perf.spec (66%) diff --git a/nagios-plugins-sar-perf-output.patch b/monitoring-plugins-sar-perf-output.patch similarity index 100% rename from nagios-plugins-sar-perf-output.patch rename to monitoring-plugins-sar-perf-output.patch diff --git a/nagios-plugins-sar-perf-stdout.patch b/monitoring-plugins-sar-perf-stdout.patch similarity index 100% rename from nagios-plugins-sar-perf-stdout.patch rename to monitoring-plugins-sar-perf-stdout.patch diff --git a/nagios-plugins-sar-perf.changes b/monitoring-plugins-sar-perf.changes similarity index 86% rename from nagios-plugins-sar-perf.changes rename to monitoring-plugins-sar-perf.changes index 1e00d02..bd5c58b 100644 --- a/nagios-plugins-sar-perf.changes +++ b/monitoring-plugins-sar-perf.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 30 19:20:45 UTC 2014 - lars@linux-schulserver.de + +- Renamed package to monitoring-plugins-sar-perf + ------------------------------------------------------------------- Fri Nov 9 16:57:05 CET 2012 - ro@suse.de @@ -39,12 +44,12 @@ Thu Nov 24 16:26:58 UTC 2011 - lars@linux-schulserver.de Tue Oct 4 15:27:09 UTC 2011 - lars@linux-schulserver.de - also print the used arguments as output to STDOUT, so the user - knows what is mesured (nagios-plugins-sar-perf-stdout.patch) + knows what is mesured (monitoring-plugins-sar-perf-stdout.patch) ------------------------------------------------------------------- Tue Oct 4 12:59:33 UTC 2011 - lars@linux-schulserver.de -- added nagios-plugins-sar-perf-output.patch : +- added monitoring-plugins-sar-perf-output.patch : do not print DEV name for disk in performance output ------------------------------------------------------------------- diff --git a/nagios-plugins-sar-perf.spec b/monitoring-plugins-sar-perf.spec similarity index 66% rename from nagios-plugins-sar-perf.spec rename to monitoring-plugins-sar-perf.spec index b70f2f4..9db4f00 100644 --- a/nagios-plugins-sar-perf.spec +++ b/monitoring-plugins-sar-perf.spec @@ -1,5 +1,7 @@ # -# spec file for package nagios-plugins-sar-perf +# spec file for package monitoring-plugins-sar-perf +# +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -13,24 +15,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - -Name: nagios-plugins-sar-perf -Summary: NRPE plugin to get performance data from sar +Name: monitoring-plugins-sar-perf +Summary: Get performance data from sar Version: 0.1 -Release: 1 +Release: 100 Url: https://github.com/nickanderson/check-sar-perf -License: GPL +License: GPL-2.0+ Group: System/Monitoring Source0: nickanderson-check-sar-perf-4878d0c.tar.gz Source1: check_iostat -Patch0: nagios-plugins-sar-perf-output.patch -Patch1: nagios-plugins-sar-perf-stdout.patch +Patch0: monitoring-plugins-sar-perf-output.patch +Patch1: monitoring-plugins-sar-perf-stdout.patch +BuildRequires: nagios-rpm-macros +Provides: nagios-plugins-sar-perf = %{version}-%{release} +Obsoletes: nagios-plugins-sar-perf < %{version}-%{release} Requires: python sysstat BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define libexecdir %_prefix/lib/nagios/plugins %description This plug-in was written to get performance data from sar. It was developed for @@ -55,8 +57,8 @@ sar OK| DEV=sda tps=0.00 rd_sec/s=0.00 wr_sec/s=0.00 avgrq-sz=0.00 %build %install -install -D -m755 check_sar_perf.py %{buildroot}/%{libexecdir}/check_sar_perf -install -m755 %{SOURCE1} %{buildroot}/%{libexecdir}/check_iostat +install -D -m755 check_sar_perf.py %{buildroot}/%{nagios_plugindir}/check_sar_perf +install -m755 %{SOURCE1} %{buildroot}/%{nagios_plugindir}/check_iostat %clean rm -rf %{buildroot} @@ -64,9 +66,9 @@ rm -rf %{buildroot} %files %defattr(-,root,root) # avoid build dependecy of nagios - own the dirs -%dir %{_prefix}/lib/nagios -%dir %{libexecdir} -%{libexecdir}/check_sar_perf -%{libexecdir}/check_iostat +%dir %{nagios_libdir} +%dir %{nagios_plugindir} +%{nagios_plugindir}/check_sar_perf +%{nagios_plugindir}/check_iostat %changelog