From bea8a14ad30c43aa5689e40315cada2ae33a93d6 Mon Sep 17 00:00:00 2001
From: Richard Mayhew <richard@splash.co.za>
Date: Fri, 3 Feb 2017 22:06:42 +0200
Subject: [PATCH] fix: Added the service parameter to checks that were missing
 it (#5753)

---
 includes/services/check_ftp.inc.php    | 2 +-
 includes/services/check_icmp.inc.php   | 2 +-
 includes/services/check_mysql.inc.php  | 2 +-
 includes/services/check_pop.inc.php    | 2 +-
 includes/services/check_simap.inc.php  | 2 +-
 includes/services/check_spop.inc.php   | 2 +-
 includes/services/check_telnet.inc.php | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/includes/services/check_ftp.inc.php b/includes/services/check_ftp.inc.php
index c8209acc4a..63447f83cb 100644
--- a/includes/services/check_ftp.inc.php
+++ b/includes/services/check_ftp.inc.php
@@ -1,3 +1,3 @@
 <?php
 
-$check_cmd = $config['nagios_plugins'] . "/check_ftp -H ".$service['hostname'];
+$check_cmd = $config['nagios_plugins'] . "/check_ftp -H ".$service['hostname']." ".$service['service_param'];
diff --git a/includes/services/check_icmp.inc.php b/includes/services/check_icmp.inc.php
index 4264c10049..7d20a96239 100644
--- a/includes/services/check_icmp.inc.php
+++ b/includes/services/check_icmp.inc.php
@@ -1,6 +1,6 @@
 <?php
 // check_cmd is the command that is run to execute the check
-$check_cmd = $config['nagios_plugins'] . "/check_icmp ".($service['service_ip'] ? $service['service_ip'] : $service['hostname']);
+$check_cmd = $config['nagios_plugins'] . "/check_icmp ".($service['service_ip'] ? $service['service_ip'] : $service['hostname'])." ".$service['service_param'];
 
 // Check DS is a json array of the graphs that are available
 $check_ds = '{"rtt":"s","pl":"%"}';
diff --git a/includes/services/check_mysql.inc.php b/includes/services/check_mysql.inc.php
index 372b30754f..f5d9fc4155 100644
--- a/includes/services/check_mysql.inc.php
+++ b/includes/services/check_mysql.inc.php
@@ -6,7 +6,7 @@ if ($service['service_param']) {
 } else {
     $dbname = "mysql";
 }
-$check_cmd = $config['nagios_plugins'] . "/check_mysql -H ".$service['hostname']." ".$dbname;
+$check_cmd = $config['nagios_plugins'] . "/check_mysql -H ".$service['hostname']." ".$dbname." ".$service['service_param'];
 
 // Check DS is a json array of the graphs that are available
 $check_ds = '{"mysqlqueries":"c","mysql":"c","mysqluptime":"c","mysqlQcache":"c"}';
diff --git a/includes/services/check_pop.inc.php b/includes/services/check_pop.inc.php
index 567274830b..633944d11b 100644
--- a/includes/services/check_pop.inc.php
+++ b/includes/services/check_pop.inc.php
@@ -1,2 +1,2 @@
 <?php
-$check_cmd = $config['nagios_plugins'] . "/check_pop -H ".$service['hostname'];
+$check_cmd = $config['nagios_plugins'] . "/check_pop -H ".$service['hostname']." ".$service['service_param'];
diff --git a/includes/services/check_simap.inc.php b/includes/services/check_simap.inc.php
index 60b93b32c8..01e4887778 100644
--- a/includes/services/check_simap.inc.php
+++ b/includes/services/check_simap.inc.php
@@ -1,2 +1,2 @@
 <?php
-$check_cmd = $config['nagios_plugins'] . "/check_simap -H ".$service['hostname'];
+$check_cmd = $config['nagios_plugins'] . "/check_simap -H ".$service['hostname']." ".$service['service_param'];
diff --git a/includes/services/check_spop.inc.php b/includes/services/check_spop.inc.php
index 3f9a40dd03..898265b8fc 100644
--- a/includes/services/check_spop.inc.php
+++ b/includes/services/check_spop.inc.php
@@ -1,2 +1,2 @@
 <?php
-$check_cmd = $config['nagios_plugins'] . "/check_spop -H ".$service['hostname'];
+$check_cmd = $config['nagios_plugins'] . "/check_spop -H ".$service['hostname']." ".$service['service_param'];
diff --git a/includes/services/check_telnet.inc.php b/includes/services/check_telnet.inc.php
index 155032ebf4..2727479afa 100644
--- a/includes/services/check_telnet.inc.php
+++ b/includes/services/check_telnet.inc.php
@@ -4,4 +4,4 @@ if ($service['service_port']) {
 } else {
     $port = '23';
 }
-$check_cmd = $config['nagios_plugins'] . "/check_telnet -H ".$service['hostname']." -p ".$port;
+$check_cmd = $config['nagios_plugins'] . "/check_telnet -H ".$service['hostname']." -p ".$port." ".$service['service_param'];