summaryrefslogtreecommitdiffstats
path: root/gluster-nagios-addons.spec.in
diff options
context:
space:
mode:
authorndarshan <dnarayan@redhat.com>2014-03-17 12:21:42 +0530
committerBala.FA <barumuga@redhat.com>2014-04-29 10:14:32 +0530
commit686b574d3c1e55a778088b58a1a2fc75ce72d280 (patch)
tree89e6335b46c42dcea1c66e80cd7500059856ffd5 /gluster-nagios-addons.spec.in
parentfcf78fd752dd24a8bb8b0bf8f62e7ba7ec0aac55 (diff)
plugins:Fix to handle sadf not accepting time range, test case addition
This patch handles the issue of sadf not accepting time range when used with -x (xml output) option(seen in version 9.0.4). Added unit-test for memory, cpu, swap, network plugins and refactored them. Change-Id: Ie7c2ecfbb38060f236a6faed606bce0aedd27d7a Signed-off-by: ndarshan <dnarayan@redhat.com> Reviewed-on: https://cuckoo.blr.redhat.com:8443/14 Reviewed-by: Bala FA <barumuga@redhat.com> Tested-by: Bala FA <barumuga@redhat.com>
Diffstat (limited to 'gluster-nagios-addons.spec.in')
-rw-r--r--gluster-nagios-addons.spec.in10
1 files changed, 5 insertions, 5 deletions
diff --git a/gluster-nagios-addons.spec.in b/gluster-nagios-addons.spec.in
index b2775a1..84d0e46 100644
--- a/gluster-nagios-addons.spec.in
+++ b/gluster-nagios-addons.spec.in
@@ -119,10 +119,10 @@ rm -rf %{buildroot}
cat >> %{_sysconfdir}/nagios/nrpe.cfg <<EOF
### gluster nrpe plugins ###
command[check_disk_and_inode]=%{_libdir}/nagios/plugins/gluster/check_disk_and_inode.py -w 80 -c 90 -l -i /boot -i /var -i /root -n
-command[check_memory]=%{_libdir}/nagios/plugins/gluster/sadf.py -m -w 80 -c 90
-command[check_swap_usage]=%{_libdir}/nagios/plugins/gluster/sadf.py -s -w 80 -c 90
-command[check_cpu_multicore]=%{_libdir}/nagios/plugins/gluster/sadf.py -cp -w 80 -c 90
-command[check_interfaces]=%{_libdir}/nagios/plugins/gluster/sadf.py -n -e lo
+command[check_memory]=%{_libdir}/nagios/plugins/gluster/memory.py -w 80 -c 90
+command[check_swap_usage]=%{_libdir}/nagios/plugins/gluster/swap.py -w 80 -c 90
+command[check_cpu_multicore]=%{_libdir}/nagios/plugins/gluster/cpu.py -w 80 -c 90
+command[check_interfaces]=%{_libdir}/nagios/plugins/gluster/network.py -e lo -e ;vdsmdummy;
EOF
%_init_enable nrpe
%_init_restart crond
@@ -138,7 +138,7 @@ sed -i '/check_cpu_multicore.py/d' %{_sysconfdir}/nagios/nrpe.cfg
%files
%defattr(-,root,root,-)
-%{_libdir}/nagios/plugins/gluster/*
+%attr(0755, -, -) %{_libdir}/nagios/plugins/gluster/*
%{_sysconfdir}/cron.d/gluster-sysstat.crontab
%files tests