From 7de5bb0965f4cc0cf9d0a73c776be2b094180413 Mon Sep 17 00:00:00 2001 From: Ramesh Nachimuthu Date: Wed, 14 May 2014 13:29:25 +0530 Subject: server-addons: fix for hostgroup issue in brick status event handler Macro "$HOSTGROUPNAME$" is used in brick status event handler. But this macro gives only one of the host group to which the host belongs to. But in gluster monitoring, all gluster hosts will have two host groups ('gluster-host' and a host group with cluster name). So using the macro "$HOSTGROUPNAMES$" to pass all the host groups to event handler and internally getting the currect cluster name. Change-Id: I61713ecabff52bcd7f585e9f678426370b9b24d4 Signed-off-by: Ramesh Nachimuthu Reviewed-on: http://review.gluster.org/7761 Reviewed-by: Nishanth Thomas Reviewed-by: Kanagaraj M Reviewed-by: Timothy Asir --- config/gluster-commands.cfg | 5 +++++ config/gluster-templates.cfg | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/gluster-commands.cfg b/config/gluster-commands.cfg index 3110e5b..d2ebdce 100644 --- a/config/gluster-commands.cfg +++ b/config/gluster-commands.cfg @@ -106,6 +106,11 @@ define command{ command_line $USER1$/gluster/submit_external_command.py -c '$ARG1$' -H '$ARG2$' -s '$ARG3$' -t '$ARG4$' } +define command{ + command_name brick_status_event_handler + command_line $USER1$/gluster/brick_status_event_handler.py -hg '$HOSTGROUPNAMES$' -v $_SERVICEVOL_NAME$ -st $SERVICESTATETYPE$ +} + define command { command_name check_brick_status command_line $USER1$/check_nrpe -H $HOSTADDRESS$ -c check_brick_status -a $_SERVICEVOL_NAME$ $_SERVICEBRICK_DIR$ diff --git a/config/gluster-templates.cfg b/config/gluster-templates.cfg index 1530f21..b8b47bc 100644 --- a/config/gluster-templates.cfg +++ b/config/gluster-templates.cfg @@ -57,7 +57,7 @@ define service { use gluster-service register 0 _GLUSTER_ENTITY Brick - event_handler submit_external_command!'SCHEDULE_SVC_CHECK'!$HOSTGROUPNAME$!'Volume Status - $_SERVICEVOL_NAME$'!'$LONGDATETIME$' + event_handler brick_status_event_handler check_command check_brick_status } -- cgit