diff options
| -rw-r--r-- | config/gluster-host-services.cfg | 10 | ||||
| -rwxr-xr-x | plugins/gluster_host_service_handler.py.in | 5 |
2 files changed, 3 insertions, 12 deletions
diff --git a/config/gluster-host-services.cfg b/config/gluster-host-services.cfg index fbcf9b9..9686183 100644 --- a/config/gluster-host-services.cfg +++ b/config/gluster-host-services.cfg @@ -5,7 +5,6 @@ define service{ hostgroup_name gluster_hosts service_description Memory Utilization normal_check_interval 1 - event_handler host_service_handler check_command check_nrpe!check_memory } @@ -14,7 +13,6 @@ define service{ hostgroup_name gluster_hosts service_description Swap Utilization normal_check_interval 1 - event_handler host_service_handler check_command check_nrpe!check_swap_usage } @@ -23,7 +21,6 @@ define service{ hostgroup_name gluster_hosts normal_check_interval 1 service_description Disk Utilization - event_handler host_service_handler check_command check_nrpe!check_disk_and_inode } @@ -40,7 +37,6 @@ define service{ hostgroup_name gluster_hosts service_description Network Utilization normal_check_interval 1 - event_handler host_service_handler check_command check_nrpe!check_interfaces } @@ -49,7 +45,6 @@ define service{ hostgroup_name gluster_hosts service_description Gluster Management normal_check_interval 1 - event_handler host_service_handler } define service{ @@ -57,7 +52,6 @@ define service{ hostgroup_name gluster_hosts service_description Quota normal_check_interval 1 - event_handler host_service_handler } define service{ @@ -65,7 +59,6 @@ define service{ hostgroup_name gluster_hosts service_description NFS normal_check_interval 1 - event_handler host_service_handler } define service{ @@ -73,7 +66,6 @@ define service{ hostgroup_name gluster_hosts service_description Self-Heal normal_check_interval 1 - event_handler host_service_handler } define service{ @@ -81,7 +73,6 @@ define service{ hostgroup_name gluster_hosts service_description CIFS normal_check_interval 1 - event_handler host_service_handler } define service{ @@ -89,5 +80,4 @@ define service{ hostgroup_name gluster_hosts service_description CTDB normal_check_interval 1 - event_handler host_service_handler } diff --git a/plugins/gluster_host_service_handler.py.in b/plugins/gluster_host_service_handler.py.in index db7cdad..1d7310e 100755 --- a/plugins/gluster_host_service_handler.py.in +++ b/plugins/gluster_host_service_handler.py.in @@ -44,10 +44,11 @@ def update_host_state(hostAddr, srvcName, statusCode): cmdStr = "[%s] PROCESS_HOST_CHECK_RESULT;%s;%s;" \ "Host Status WARNING - " \ "Service(s) ['%s'] in CRITICAL state\n" \ - % (now, hostAddr, statusCode, srvcName) + % (now, hostAddr, utils.PluginStatusCode.OK, srvcName) else: cmdStr = "[%s] PROCESS_HOST_CHECK_RESULT;%s;%s;Host Status OK - " \ - "Services in good health\n" % (now, hostAddr, statusCode) + "Services in good health\n" \ + % (now, hostAddr, utils.PluginStatusCode.OK) _writeNagiosCommand(cmdStr) |