diff --git a/check_cpu.sh/trunk/nagios-plugins-check_cpu.spec b/check_cpu.sh/trunk/nagios-plugins-check_cpu.spec index 0f1d5e6..6534075 100644 --- a/check_cpu.sh/trunk/nagios-plugins-check_cpu.spec +++ b/check_cpu.sh/trunk/nagios-plugins-check_cpu.spec @@ -2,13 +2,13 @@ Summary: A Nagios plugin to check CPU on Linux servers Name: nagios-plugins-check_cpu -Version: 0.1 +Version: 0.2 Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.matejunkie.com/cpu-check-plugin-for-nagios/ -Source0: http://www.monitoringexchange.org/attachment/download/Check-Plugins/Operating-Systems/check_cpu-sh/check_cpu.sh -Requires: nagios-plugins +Source0: http://opensource.ok.is/trac/browser/nagios-plugins/check_cpu/releases/nagios-plugins-check_cpu-%{version}.tar.gz +Requires: nrpe BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Packager: Tomas Edwardsson @@ -18,25 +18,31 @@ through /proc/stat accepting seperate threshholds and returning the data in a format suitable for performance data processing %prep -#%setup -q -n nagios-check_sip-%{version} -#cp %{SOURCE1} % -# lib64 fix -#perl -pi -e "s|/usr/lib|%{_libdir}|g" check_sip +%setup -q +perl -pi -e "s|/usr/lib/|%{_libdir}/|g" nrpe.d/check_cpu.cfg +perl -pi -e "s|/usr/lib64/|%{_libdir}/|g" nrpe.d/check_cpu.cfg %build + %install rm -rf %{buildroot} -install -D -p -m 0755 %{SOURCE0} %{buildroot}%{_libdir}/nagios/plugins/check_cpu.sh +install -D -p -m 0755 check_cpu.sh %{buildroot}%{_libdir}/nagios/plugins/check_cpu.sh +install -D -p -m 0755 nrpe.d/check_cpu.cfg %{buildroot}/etc/nrpe.d/check_cpu.cfg %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) -#%doc README COPYING CHANGES -%{_libdir}/nagios/plugins/check_cpu.sh +#%doc README LICENSE +%{_libdir}/nagios/plugins/* +/etc/nrpe.d/check_cpu.cfg + %changelog +* Thu Nov 25 2010 Pall Sigurdsson 0.1-2 +- Nrpe config now ships with plugin by default * Mon Mar 1 2010 Tomas Edwardsson 0.1-1 - Initial packaging + diff --git a/check_cpu.sh/trunk/nrpe.d/check_cpu.cfg b/check_cpu.sh/trunk/nrpe.d/check_cpu.cfg new file mode 100644 index 0000000..45eaf3a --- /dev/null +++ b/check_cpu.sh/trunk/nrpe.d/check_cpu.cfg @@ -0,0 +1 @@ +command[check_cpu]=/usr/lib/nagios/plugins/check_cpu.sh