From a8017b5878561cb40e82f2e7715e0638d87f2600 Mon Sep 17 00:00:00 2001
From: ndarshan <dnarayan@redhat.com>
Date: Tue, 6 Jan 2015 10:47:25 +0530
Subject: nagios-plugins: Disk utilization plugin revamp.

This patch is aimed at revamping the existing check_disk_and_inode
plugin in such a way that the plugin behaviour is same for both
disk utilization service and brick utilization service. It has
just two options include and exclude to include or exclude the
mountpoints to be monitoried. This plugin monitors the data, inode,
thinpool, thinpool-metadata utilization irrespective of service
using this plugin.

Change-Id: I98b18d6f3b22915978f8c6381adc99729a4e1161
Bug-Url:https://bugzilla.redhat.com/show_bug.cgi?id=1167771
Signed-off-by: ndarshan <dnarayan@redhat.com>
Reviewed-on: http://review.gluster.org/9389
Reviewed-by: Bala FA <barumuga@redhat.com>
Reviewed-by: Sahina Bose <sabose@redhat.com>
---
 gluster-nagios-addons.spec.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gluster-nagios-addons.spec.in')

diff --git a/gluster-nagios-addons.spec.in b/gluster-nagios-addons.spec.in
index f3b9f07..dc35720 100644
--- a/gluster-nagios-addons.spec.in
+++ b/gluster-nagios-addons.spec.in
@@ -132,12 +132,12 @@ fi
 
 cat >> %{_sysconfdir}/nagios/nrpe.cfg <<EOF
 %{_start_conf_section}
-command[check_disk_and_inode]=sudo %{_libdir}/nagios/plugins/gluster/check_disk_and_inode.py -w 80 -c 90 -l -i /boot -i /var -i /root -n --inode -s
+command[check_disk_and_inode]=sudo %{_libdir}/nagios/plugins/gluster/check_mounts.py -w 80 -c 90
 command[check_memory]=%{_libdir}/nagios/plugins/gluster/memory.py -w 80 -c 90 -t 2
 command[check_swap_usage]=%{_libdir}/nagios/plugins/gluster/swap.py -w 80 -c 90 -t 2
 command[check_cpu_multicore]=%{_libdir}/nagios/plugins/gluster/cpu.py -w 80 -c 90 -t 2
 command[check_interfaces]=%{_libdir}/nagios/plugins/gluster/network.py -e lo -e ';vdsmdummy;' -t 2
-command[check_brick_usage]=sudo %{_libdir}/nagios/plugins/gluster/check_disk_and_inode.py -w 80 -c 90 -n -t -i \$ARG1\$
+command[check_brick_usage]=sudo %{_libdir}/nagios/plugins/gluster/check_mounts.py -w 80 -c 90 -i \$ARG1\$
 command[check_vol_utilization]=sudo %{_libdir}/nagios/plugins/gluster/check_vol_utilization.py \$ARG1\$ -w \$ARG2\$ -c \$ARG3\$
 command[check_vol_status]=sudo %{_libdir}/nagios/plugins/gluster/check_volume_status.py -v \$ARG1\$ -t \$ARG2\$
 command[check_proc_status]=sudo %{_libdir}/nagios/plugins/gluster/check_gluster_proc_status.py -t \$ARG1\$
-- 
cgit