From c1748ae3c58b91c25daa1519f85475e321f8ad2d Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Sun, 25 Apr 2010 17:53:14 +0000 Subject: [PATCH] add ; to old db update script git-svn-id: http://www.observium.org/svn/observer/trunk@1078 61d68cd4-352d-0410-923a-c4978735b2b8 --- database-update-pre1000.sql | 2 +- includes/services/telnet/check.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/database-update-pre1000.sql b/database-update-pre1000.sql index fb7ad26b5..3e22fd124 100644 --- a/database-update-pre1000.sql +++ b/database-update-pre1000.sql @@ -73,7 +73,7 @@ ALTER TABLE `devices` MODIFY `type` varchar(8) DEFAULT 'unknown'; ALTER TABLE `devices` CHANGE `os` `os` VARCHAR( 32 ) NULL DEFAULT NULL; ALTER TABLE `temperature` ADD `temp_precision` INT(11) NULL DEFAULT '1'; UPDATE temperature SET temp_precision=10 WHERE temp_tenths=1; -ALTER TABLE `temperature` ADD `temp_index` INT NOT NULL AFTER `temp_host` , ADD `temp_mibtype` VARCHAR( 32 ) NOT NULL AFTER `temp_index` +ALTER TABLE `temperature` ADD `temp_index` INT NOT NULL AFTER `temp_host` , ADD `temp_mibtype` VARCHAR( 32 ) NOT NULL AFTER `temp_index`; ALTER TABLE `temperature` DROP `temp_tenths`; CREATE TABLE IF NOT EXISTS `dbSchema` ( `revision` int(11) NOT NULL default '0', PRIMARY KEY (`revision`)) ENGINE=MyISAM DEFAULT CHARSET=latin1; ALTER TABLE `storage` ADD `storage_perc_warn` INT(11) NULL DEFAULT '60'; diff --git a/includes/services/telnet/check.inc b/includes/services/telnet/check.inc index e4a38754c..8ac486521 100644 --- a/includes/services/telnet/check.inc +++ b/includes/services/telnet/check.inc @@ -2,7 +2,7 @@ if($service['service_port']) { $port = $service['service_port']; } else { $port = '23'; } -$check = shell_exec($config['nagios_plugins'] . "/check_dns -H ".$service['hostname']." -p ".$port); +$check = shell_exec($config['nagios_plugins'] . "/check_telnet -H ".$service['hostname']." -p ".$port); list($check, $time) = split("\|", $check);