From 496189dd59baf20e890a5e3634f9344887d9334c Mon Sep 17 00:00:00 2001 From: MassimilianoPinto Date: Tue, 18 Apr 2017 10:18:15 +0200 Subject: [PATCH] MXS-1221: Nagios plugin scripts does not process -S option properly Nagios plugin scripts does not process -S option properly --- plugins/nagios/check_maxscale_monitors.pl | 2 +- plugins/nagios/check_maxscale_resources.pl | 2 +- plugins/nagios/check_maxscale_threads.pl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/nagios/check_maxscale_monitors.pl b/plugins/nagios/check_maxscale_monitors.pl index 6fb266e5b..6b4fe8a8a 100755 --- a/plugins/nagios/check_maxscale_monitors.pl +++ b/plugins/nagios/check_maxscale_monitors.pl @@ -85,7 +85,7 @@ if (!defined $MAXADMIN || length($MAXADMIN) == 0) { $MAXADMIN = $MAXADMIN_DEFAULT; } if (defined $MAXADMIN_SOCKET && length($MAXADMIN_SOCKET) > 0) { - $MAXADMIN_SOCKET = ' -S $MAXADMIN_SOCKET'; + $MAXADMIN_SOCKET = ' -S ' . $MAXADMIN_SOCKET; } else { $MAXADMIN_SOCKET = ''; } diff --git a/plugins/nagios/check_maxscale_resources.pl b/plugins/nagios/check_maxscale_resources.pl index 9ab7ec8e6..e5b0e74b1 100755 --- a/plugins/nagios/check_maxscale_resources.pl +++ b/plugins/nagios/check_maxscale_resources.pl @@ -86,7 +86,7 @@ if (!defined $MAXADMIN || length($MAXADMIN) == 0) { } if (defined $MAXADMIN_SOCKET && length($MAXADMIN_SOCKET) > 0) { - $MAXADMIN_SOCKET = ' -S $MAXADMIN_SOCKET'; + $MAXADMIN_SOCKET = ' -S ' . $MAXADMIN_SOCKET; } else { $MAXADMIN_SOCKET = ''; } diff --git a/plugins/nagios/check_maxscale_threads.pl b/plugins/nagios/check_maxscale_threads.pl index 034d99290..d8e5a187f 100755 --- a/plugins/nagios/check_maxscale_threads.pl +++ b/plugins/nagios/check_maxscale_threads.pl @@ -86,7 +86,7 @@ if (!defined $MAXADMIN || length($MAXADMIN) == 0) { } if (defined $MAXADMIN_SOCKET && length($MAXADMIN_SOCKET) > 0) { - $MAXADMIN_SOCKET = ' -S $MAXADMIN_SOCKET'; + $MAXADMIN_SOCKET = ' -S ' . $MAXADMIN_SOCKET; } else { $MAXADMIN_SOCKET = ''; }