From 89f62577a90db54fc5c9b87ade25b26796cb6f9f Mon Sep 17 00:00:00 2001
From: MassimilianoPinto <massimiliano.pinto@mariadb.com>
Date: Thu, 12 Mar 2015 16:45:30 +0100
Subject: [PATCH] Nagios Documentation Update

Nagios Documentation Update
---
 Documentation/Tutorials/Nagios-Plugins.md | 24 +++++++++++------------
 plugins/nagios/maxscale_commands.cfg      |  1 +
 plugins/nagios/server1.cfg                |  4 ++--
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Documentation/Tutorials/Nagios-Plugins.md b/Documentation/Tutorials/Nagios-Plugins.md
index 4cf32379f..6c4a00924 100644
--- a/Documentation/Tutorials/Nagios-Plugins.md
+++ b/Documentation/Tutorials/Nagios-Plugins.md
@@ -65,20 +65,20 @@ define service{
 	4) Restart Nagios
 
 
-# Nagios Plugin usag
+# Nagios Plugin usage
 
- ./check_maxscale_threads.pl -h
+	./check_maxscale_threads.pl -h
 
-MaxScale monitor checker plugin for Nagios
+	MaxScale monitor checker plugin for Nagios
 
-Usage: check_maxscale_threads.pl [-r <resource>] [-H <host>] [-P <port>] [-u <user>] [-p <pass>] [-m <maxadmin>] [-h]
+	Usage: check_maxscale_threads.pl [-r <resource>] [-H <host>] [-P <port>] [-u <user>] [-p <pass>] [-m <maxadmin>] [-h]
 
-Options:
-       -r <resource>	= threads
-       -h		= provide this usage message
-       -H <host>	= which host to connect to
-       -P <port>	= port to use
-       -u <user>	= username to connect as
-       -p <pass>	= password to use for <user> at <host>
-       -m <maxadmin>	= /path/to/maxadmin
+	Options:
+		-r <resource>	= threads
+		-h		= provide this usage message
+		-H <host>	= which host to connect to
+		-P <port>	= port to use
+		-u <user>	= username to connect as
+		-p <pass>	= password to use for <user> at <host>
+		-m <maxadmin>	= /path/to/maxadmin
 
diff --git a/plugins/nagios/maxscale_commands.cfg b/plugins/nagios/maxscale_commands.cfg
index ca3446d4e..23bbb3594 100644
--- a/plugins/nagios/maxscale_commands.cfg
+++ b/plugins/nagios/maxscale_commands.cfg
@@ -1,6 +1,7 @@
 ###############################################################################
 # MAXSCALE_COMMANDS.CFG - SAMPLE COMMAND DEFINITIONS FOR NAGIOS 3.5.1
 #
+# Massimiliano Pinto
 # Last Modified: 06-03-2015
 #
 # NOTES: This config file provides you with some example command definitions
diff --git a/plugins/nagios/server1.cfg b/plugins/nagios/server1.cfg
index d571fb1aa..d0f471ed1 100644
--- a/plugins/nagios/server1.cfg
+++ b/plugins/nagios/server1.cfg
@@ -101,11 +101,11 @@ define service{
 	notifications_enabled		0
 	}
 
-# Define a service to check Script on the remote machine.
+# Define a service to check Script on the remote machine, with maxadmin path
 define service{
 	use                             local-service         ; Name of service template to use
 	host_name                      	server1 
 	service_description             MaxScale_threads
-	check_command                   check_maxscale_threads!6603!admin!skysql!threads
+	check_command                   check_maxscale_threads!6603!admin!skysql!threads!/usr/local/skysql/maxscale/bin/maxadmin
 	notifications_enabled           0
 	}