tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-30 01:04:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

modules/commands: Fix IcingaCommandFileCommandRenderer's getHost()' and `getService()' calls

Browse Source 
refs #6593
This commit is contained in:
Eric Lippmann 2014-09-16 18:45:31 +02:00
parent cc2d06e582
commit 05776651b4
1 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
View File

@ -9,6 +9,7 @@ use Icinga\Module\Monitoring\Command\Object\AddCommentCommand;
use Icinga\Module\Monitoring\Command\Object\DeleteCommentCommand; use Icinga\Module\Monitoring\Command\Object\DeleteCommentCommand;
use Icinga\Module\Monitoring\Command\Object\DeleteDowntimeCommand; use Icinga\Module\Monitoring\Command\Object\DeleteDowntimeCommand;
use Icinga\Module\Monitoring\Command\Object\ProcessCheckResultCommand; use Icinga\Module\Monitoring\Command\Object\ProcessCheckResultCommand;
use Icinga\Module\Monitoring\Command\Object\PropagateHostDowntimeCommand;
use Icinga\Module\Monitoring\Command\Object\RemoveAcknowledgementCommand; use Icinga\Module\Monitoring\Command\Object\RemoveAcknowledgementCommand;
use Icinga\Module\Monitoring\Command\Object\ScheduleServiceCheckCommand; use Icinga\Module\Monitoring\Command\Object\ScheduleServiceCheckCommand;
use Icinga\Module\Monitoring\Command\Object\ScheduleServiceDowntimeCommand; use Icinga\Module\Monitoring\Command\Object\ScheduleServiceDowntimeCommand;
@ -61,14 +62,14 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
/** @var \Icinga\Module\Monitoring\Object\Host $object */ /** @var \Icinga\Module\Monitoring\Object\Host $object */
$commandString = sprintf( $commandString = sprintf(
'ADD_HOST_COMMENT;%s', 'ADD_HOST_COMMENT;%s',
$object->getHost() $object->getName()
); );
} else { } else {
/** @var \Icinga\Module\Monitoring\Object\Service $object */ /** @var \Icinga\Module\Monitoring\Object\Service $object */
$commandString = sprintf( $commandString = sprintf(
'ADD_SVC_COMMENT;%s;%s', 'ADD_SVC_COMMENT;%s;%s',
$object->getHost(), $object->getHost()->getName(),
$object->getService() $object->getName()
); );
} }
return sprintf( return sprintf(
@ -87,14 +88,14 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
/** @var \Icinga\Module\Monitoring\Object\Host $object */ /** @var \Icinga\Module\Monitoring\Object\Host $object */
$commandString = sprintf( $commandString = sprintf(
'SEND_CUSTOM_HOST_NOTIFICATION;%s', 'SEND_CUSTOM_HOST_NOTIFICATION;%s',
$object->getHost() $object->getName()
); );
} else { } else {
/** @var \Icinga\Module\Monitoring\Object\Service $object */ /** @var \Icinga\Module\Monitoring\Object\Service $object */
$commandString = sprintf( $commandString = sprintf(
'SEND_CUSTOM_SVC_NOTIFICATION;%s;%s', 'SEND_CUSTOM_SVC_NOTIFICATION;%s;%s',
$object->getHost(), $object->getHost()->getName(),
$object->getService() $object->getName()
); );
} }
$options = 0; // 0 for no options $options = 0; // 0 for no options
@ -120,14 +121,14 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
/** @var \Icinga\Module\Monitoring\Object\Host $object */ /** @var \Icinga\Module\Monitoring\Object\Host $object */
$commandString = sprintf( $commandString = sprintf(
'PROCESS_HOST_CHECK_RESULT;%s', 'PROCESS_HOST_CHECK_RESULT;%s',
$object->getHost() $object->getName()
); );
} else { } else {
/** @var \Icinga\Module\Monitoring\Object\Service $object */ /** @var \Icinga\Module\Monitoring\Object\Service $object */
$commandString = sprintf( $commandString = sprintf(
'PROCESS_SVC_CHECK_RESULT;%s;%s', 'PROCESS_SVC_CHECK_RESULT;%s;%s',
$object->getHost(), $object->getHost()->getName(),
$object->getService() $object->getName()
); );
} }
$output = $command->getOutput(); $output = $command->getOutput();
@ -164,15 +165,15 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
$commandString = sprintf( $commandString = sprintf(
'%s;%s', '%s;%s',
$commandName, $commandName,
$object->getHost() $object->getName()
); );
} else { } else {
/** @var \Icinga\Module\Monitoring\Object\Service $object */ /** @var \Icinga\Module\Monitoring\Object\Service $object */
$commandString = sprintf( $commandString = sprintf(
'%s;%s;%s', '%s;%s;%s',
$command->getForced() === true ? 'SCHEDULE_FORCED_SVC_CHECK' : 'SCHEDULE_SVC_CHECK', $command->getForced() === true ? 'SCHEDULE_FORCED_SVC_CHECK' : 'SCHEDULE_SVC_CHECK',
$object->getHost(), $object->getHost()->getName(),
$object->getService() $object->getName()
); );
} }
return sprintf( return sprintf(
@ -188,7 +189,11 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
if ($command->getObject()->getType() === $command::TYPE_HOST) { if ($command->getObject()->getType() === $command::TYPE_HOST) {
/** @var \Icinga\Module\Monitoring\Object\Host $object */ /** @var \Icinga\Module\Monitoring\Object\Host $object */
/** @var \Icinga\Module\Monitoring\Command\Object\ScheduleHostDowntimeCommand $command */ /** @var \Icinga\Module\Monitoring\Command\Object\ScheduleHostDowntimeCommand $command */
if ($command->getForAllServices() === true) { if ($command instanceof PropagateHostDowntimeCommand) {
/** @var \Icinga\Module\Monitoring\Command\Object\PropagateHostDowntimeCommand $command */
$commandName = $command->getTriggered() === true ? 'SCHEDULE_AND_PROPAGATE_TRIGGERED_HOST_DOWNTIME'
: 'SCHEDULE_AND_PROPAGATE_HOST_DOWNTIME';
} elseif ($command->getForAllServices() === true) {
$commandName = 'SCHEDULE_HOST_SVC_DOWNTIME'; $commandName = 'SCHEDULE_HOST_SVC_DOWNTIME';
} else { } else {
$commandName = 'SCHEDULE_HOST_DOWNTIME'; $commandName = 'SCHEDULE_HOST_DOWNTIME';
@ -196,15 +201,15 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
$commandString = sprintf( $commandString = sprintf(
'%s;%s', '%s;%s',
$commandName, $commandName,
$object->getHost() $object->getName()
); );
} else { } else {
/** @var \Icinga\Module\Monitoring\Object\Service $object */ /** @var \Icinga\Module\Monitoring\Object\Service $object */
$commandString = sprintf( $commandString = sprintf(
'%s;%s;%s', '%s;%s;%s',
'SCHEDULE_SVC_DOWNTIME', 'SCHEDULE_SVC_DOWNTIME',
$object->getHost(), $object->getHost()->getName(),
$object->getService() $object->getName()
); );
} }
return sprintf( return sprintf(
@ -228,15 +233,15 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
$commandString = sprintf( $commandString = sprintf(
'%s;%s', '%s;%s',
$command->getExpireTime() !== null ? 'ACKNOWLEDGE_HOST_PROBLEM_EXPIRE' : 'ACKNOWLEDGE_HOST_PROBLEM', $command->getExpireTime() !== null ? 'ACKNOWLEDGE_HOST_PROBLEM_EXPIRE' : 'ACKNOWLEDGE_HOST_PROBLEM',
$object->getHost() $object->getName()
); );
} else { } else {
/** @var \Icinga\Module\Monitoring\Object\Service $object */ /** @var \Icinga\Module\Monitoring\Object\Service $object */
$commandString = sprintf( $commandString = sprintf(
'%s;%s;%s', '%s;%s;%s',
$command->getExpireTime() !== null ? 'ACKNOWLEDGE_SVC_PROBLEM_EXPIRE' : 'ACKNOWLEDGE_SVC_PROBLEM', $command->getExpireTime() !== null ? 'ACKNOWLEDGE_SVC_PROBLEM_EXPIRE' : 'ACKNOWLEDGE_SVC_PROBLEM',
$object->getHost(), $object->getHost()->getName(),
$object->getService() $object->getName()
); );
} }
$commandString = sprintf( $commandString = sprintf(
@ -301,15 +306,15 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
$commandString = sprintf( $commandString = sprintf(
$commandFormat . ';%s', $commandFormat . ';%s',
'HOST', 'HOST',
$object->getHost() $object->getName()
); );
} else { } else {
/** @var \Icinga\Module\Monitoring\Object\Service $object */ /** @var \Icinga\Module\Monitoring\Object\Service $object */
$commandString = sprintf( $commandString = sprintf(
$commandFormat . ';%s;%s', $commandFormat . ';%s;%s',
'SVC', 'SVC',
$object->getHost(), $object->getHost()->getName(),
$object->getService() $object->getName()
); );
} }
return $commandString; return $commandString;
@ -323,15 +328,15 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
$commandString = sprintf( $commandString = sprintf(
'%s;%s', '%s;%s',
'DEL_HOST_DOWNTIME', 'DEL_HOST_DOWNTIME',
$object->getHost() $object->getName()
); );
} else { } else {
/** @var \Icinga\Module\Monitoring\Object\Service $object */ /** @var \Icinga\Module\Monitoring\Object\Service $object */
$commandString = sprintf( $commandString = sprintf(
'%s;%s;%s', '%s;%s;%s',
'DEL_SVC_COMMENT', 'DEL_SVC_COMMENT',
$object->getHost(), $object->getHost()->getName(),
$object->getService() $object->getName()
); );
} }
return sprintf( return sprintf(
@ -349,15 +354,15 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
$commandString = sprintf( $commandString = sprintf(
'%s;%s', '%s;%s',
'DEL_HOST_DOWNTIME', 'DEL_HOST_DOWNTIME',
$object->getHost() $object->getName()
); );
} else { } else {
/** @var \Icinga\Module\Monitoring\Object\Service $object */ /** @var \Icinga\Module\Monitoring\Object\Service $object */
$commandString = sprintf( $commandString = sprintf(
'%s;%s;%s', '%s;%s;%s',
'DEL_SVC_DOWNTIME', 'DEL_SVC_DOWNTIME',
$object->getHost(), $object->getHost()->getName(),
$object->getService() $object->getName()
); );
} }
return sprintf( return sprintf(
@ -375,15 +380,15 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
$commandString = sprintf( $commandString = sprintf(
'%s;%s', '%s;%s',
'REMOVE_HOST_ACKNOWLEDGEMENT', 'REMOVE_HOST_ACKNOWLEDGEMENT',
$object->getHost() $object->getName()
); );
} else { } else {
/** @var \Icinga\Module\Monitoring\Object\Service $object */ /** @var \Icinga\Module\Monitoring\Object\Service $object */
$commandString = sprintf( $commandString = sprintf(
'%s;%s;%s', '%s;%s;%s',
'REMOVE_SVC_ACKNOWLEDGEMENT', 'REMOVE_SVC_ACKNOWLEDGEMENT',
$object->getHost(), $object->getHost()->getName(),
$object->getService() $object->getName()
); );
} }
return $commandString; return $commandString;