diff --git a/contrib/process_check_result b/contrib/process_check_result new file mode 100755 index 000000000..2f7a8036b --- /dev/null +++ b/contrib/process_check_result @@ -0,0 +1,93 @@ +#!/bin/sh + +#/****************************************************************************** +# * Icinga 2 * +# * Copyright (C) 2012-2013 Icinga Development Team (http://www.icinga.org/) * +# * * +# * This program is free software; you can redistribute it and/or * +# * modify it under the terms of the GNU General Public License * +# * as published by the Free Software Foundation; either version 2 * +# * of the License, or (at your option) any later version. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU General Public License for more details. * +# * * +# * You should have received a copy of the GNU General Public License * +# * along with this program; if not, write to the Free Software Foundation * +# * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * +# ******************************************************************************/ +usage(){ +cat << EOF +usage: $0 options + This script sends check results to an icinga(2) cmd pipe. + OPTIONS: + -h Show this message + -c External command pipe file path, e.g. '/var/run/icinga2/icinga2.cmd' + -H Host name for the check result + -S Service name for the check result. If not provided, a host check result is assumed. + -r Return code of the check result + -o Output of the checkresult +EOF +} + + +ECHO="/bin/echo" +CMDFILE="/var/run/icinga2/icinga2.cmd" +HOST="" +SERVICE="" +RETURNCODE=0 +OUTPUT="icinga2 extcmdfile test @ `date +%s`" + +while getopts ":c:H:S:r:o:h" opt; do + case $opt in + h) + usage + exit 1 + ;; + c) + CMDFILE=$OPTARG + ;; + H) + HOST=$OPTARG + ;; + S) + SERVICE=$OPTARG + ;; + r) + RETURNCODE=$OPTARG + ;; + o) + OUTPUT=$OPTARG + ;; + \?) + echo "Invalid option: -$OPTARG" >&2 + usage + exit 1 + ;; + :) + echo "Option -$OPTARG requires an argument." >&2 + usage + exit 1 + ;; + esac +done + +DATETIME=`date +%s` + +if [ -z "$HOST" ]; then + echo "Host name missing. Please use -h with a valid host name." + exit 1; +fi + +if [ -z "$SERVICE" ]; then + CMDLINE="[$DATETIME] PROCESS_HOST_CHECK_RESULT;$HOST;$RETURNCODE;$OUTPUT" +else + CMDLINE="[$DATETIME] PROCESS_SERVICE_CHECK_RESULT;$HOST;$SERVICE;$RETURNCODE;$OUTPUT" +fi + +echo "Sending '$ECHO $CMDLINE >> $CMDFILE'" +`$ECHO $CMDLINE >> $CMDFILE` + +exit 0 diff --git a/lib/icinga/externalcommandprocessor.cpp b/lib/icinga/externalcommandprocessor.cpp index e31aebd32..538d60a91 100644 --- a/lib/icinga/externalcommandprocessor.cpp +++ b/lib/icinga/externalcommandprocessor.cpp @@ -180,6 +180,9 @@ void ExternalCommandProcessor::ProcessHostCheckResult(double time, const std::ve Host::Ptr host = Host::GetByName(arguments[0]); + if (!host) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot passive host check result for non-existent host '" + arguments[0] + "'")); + Service::Ptr hc = host->GetCheckService(); if (!hc->GetEnablePassiveChecks()) @@ -215,6 +218,9 @@ void ExternalCommandProcessor::ProcessServiceCheckResult(double time, const std: Service::Ptr service = Service::GetByNamePair(arguments[0], arguments[1]); + if (!service) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot process passive service check result for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); + if (!service->GetEnablePassiveChecks()) BOOST_THROW_EXCEPTION(std::invalid_argument("Got passive check result for service '" + arguments[1] + "' which has passive checks disabled.")); @@ -248,6 +254,9 @@ void ExternalCommandProcessor::ScheduleHostCheck(double, const std::vectorGetCheckService(); if (!hc) { @@ -283,6 +292,9 @@ void ExternalCommandProcessor::ScheduleForcedHostCheck(double, const std::vector Host::Ptr host = Host::GetByName(arguments[0]); + if (!host) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot reschedule forced host check for non-existent host '" + arguments[0] + "'")); + Service::Ptr hc = host->GetCheckService(); if (!hc) { @@ -308,6 +320,9 @@ void ExternalCommandProcessor::ScheduleSvcCheck(double, const std::vector service->GetNextCheck()) { @@ -335,6 +350,9 @@ void ExternalCommandProcessor::ScheduleForcedSvcCheck(double, const std::vector< Service::Ptr service = Service::GetByNamePair(arguments[0], arguments[1]); + if (!service) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot reschedule forced service check for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); + Log(LogInformation, "icinga", "Rescheduling next check for service '" + arguments[1] + "'"); { @@ -352,6 +370,9 @@ void ExternalCommandProcessor::EnableHostCheck(double, const std::vector Host::Ptr host = Host::GetByName(arguments[0]); + if (!host) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable host check non-existent host '" + arguments[0] + "'")); + Log(LogInformation, "icinga", "Enabling active checks for host '" + arguments[0] + "'"); Service::Ptr hc = host->GetCheckService(); @@ -372,6 +393,9 @@ void ExternalCommandProcessor::DisableHostCheck(double, const std::vectorGetCheckService(); @@ -392,6 +416,9 @@ void ExternalCommandProcessor::EnableSvcCheck(double, const std::vector& Service::Ptr service = Service::GetByNamePair(arguments[0], arguments[1]); + if (!service) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable service check for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); + Log(LogInformation, "icinga", "Enabling active checks for service '" + arguments[1] + "'"); { @@ -408,6 +435,9 @@ void ExternalCommandProcessor::DisableSvcCheck(double, const std::vector Service::Ptr service = Service::GetByNamePair(arguments[0], arguments[1]); + if (!service) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable service check for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); + Log(LogInformation, "icinga", "Disabling active checks for service '" + arguments[1] + "'"); { @@ -438,6 +468,9 @@ void ExternalCommandProcessor::ScheduleForcedHostSvcChecks(double, const std::ve Host::Ptr host = Host::GetByName(arguments[0]); + if (!host) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot reschedule forced host service checks for non-existent host '" + arguments[0] + "'")); + BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) { Log(LogInformation, "icinga", "Rescheduling next check for service '" + service->GetName() + "'"); @@ -459,6 +492,9 @@ void ExternalCommandProcessor::ScheduleHostSvcChecks(double, const std::vectorGetServices()) { Log(LogInformation, "icinga", "Enabling active checks for service '" + service->GetName() + "'"); service->SetEnableActiveChecks(true); @@ -499,6 +538,9 @@ void ExternalCommandProcessor::DisableHostSvcChecks(double, const std::vectorGetServices()) { Log(LogInformation, "icinga", "Disabling active checks for service '" + service->GetName() + "'"); @@ -519,6 +561,9 @@ void ExternalCommandProcessor::AcknowledgeSvcProblem(double, const std::vectorGetState() == StateOK) BOOST_THROW_EXCEPTION(std::invalid_argument("The service '" + arguments[1] + "' is OK.")); @@ -538,6 +583,9 @@ void ExternalCommandProcessor::AcknowledgeSvcProblemExpire(double, const std::ve Service::Ptr service = Service::GetByNamePair(arguments[0], arguments[1]); + if (!service) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot acknowledge service problem with expire time for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); + if (service->GetState() == StateOK) BOOST_THROW_EXCEPTION(std::invalid_argument("The service '" + arguments[1] + "' is OK.")); @@ -554,6 +602,9 @@ void ExternalCommandProcessor::RemoveSvcAcknowledgement(double, const std::vecto Service::Ptr service = Service::GetByNamePair(arguments[0], arguments[1]); + if (!service) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot remove service acknowledgement for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); + Log(LogInformation, "icinga", "Removing acknowledgement for service '" + service->GetName() + "'"); service->ClearAcknowledgement(); @@ -568,6 +619,9 @@ void ExternalCommandProcessor::AcknowledgeHostProblem(double, const std::vector< Host::Ptr host = Host::GetByName(arguments[0]); + if (!host) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot acknowledge host problem for non-existent host '" + arguments[0] + "'")); + Log(LogInformation, "icinga", "Setting acknowledgement for host '" + host->GetName() + "'"); Service::Ptr service = host->GetCheckService(); if (service) { @@ -589,6 +643,9 @@ void ExternalCommandProcessor::AcknowledgeHostProblemExpire(double, const std::v Host::Ptr host = Host::GetByName(arguments[0]); + if (!host) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot acknowledge host problem with expire time for non-existent host '" + arguments[0] + "'")); + Log(LogInformation, "icinga", "Setting timed acknowledgement for host '" + host->GetName() + "'"); Service::Ptr service = host->GetCheckService(); if (service) { @@ -607,6 +664,9 @@ void ExternalCommandProcessor::RemoveHostAcknowledgement(double, const std::vect Host::Ptr host = Host::GetByName(arguments[0]); + if (!host) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot remove acknowledgement for non-existent host '" + arguments[0] + "'")); + Log(LogInformation, "icinga", "Removing acknowledgement for host '" + host->GetName() + "'"); Service::Ptr service = host->GetCheckService(); if (service) @@ -620,6 +680,9 @@ void ExternalCommandProcessor::EnableHostgroupSvcChecks(double, const std::vecto HostGroup::Ptr hg = HostGroup::GetByName(arguments[0]); + if (!hg) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable hostgroup service checks for non-existent hostgroup '" + arguments[0] + "'")); + BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) { BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) { Log(LogInformation, "icinga", "Enabling active checks for service '" + service->GetName() + "'"); @@ -640,6 +703,9 @@ void ExternalCommandProcessor::DisableHostgroupSvcChecks(double, const std::vect HostGroup::Ptr hg = HostGroup::GetByName(arguments[0]); + if (!hg) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable hostgroup service checks for non-existent hostgroup '" + arguments[0] + "'")); + BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) { BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) { Log(LogInformation, "icinga", "Disabling active checks for service '" + service->GetName() + "'"); @@ -660,6 +726,9 @@ void ExternalCommandProcessor::EnableServicegroupSvcChecks(double, const std::ve ServiceGroup::Ptr sg = ServiceGroup::GetByName(arguments[0]); + if (!sg) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable servicegroup service checks for non-existent servicegroup '" + arguments[0] + "'")); + BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { Log(LogInformation, "icinga", "Enabling active checks for service '" + service->GetName() + "'"); @@ -678,6 +747,9 @@ void ExternalCommandProcessor::DisableServicegroupSvcChecks(double, const std::v ServiceGroup::Ptr sg = ServiceGroup::GetByName(arguments[0]); + if (!sg) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable servicegroup service checks for non-existent servicegroup '" + arguments[0] + "'")); + BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { Log(LogInformation, "icinga", "Disabling active checks for service '" + service->GetName() + "'"); @@ -696,6 +768,9 @@ void ExternalCommandProcessor::EnablePassiveHostChecks(double, const std::vector Host::Ptr host = Host::GetByName(arguments[0]); + if (!host) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable passive host checks for non-existent host '" + arguments[0] + "'")); + Log(LogInformation, "icinga", "Enabling passive checks for host '" + arguments[0] + "'"); Service::Ptr hc = host->GetCheckService(); @@ -716,6 +791,9 @@ void ExternalCommandProcessor::DisablePassiveHostChecks(double, const std::vecto Host::Ptr host = Host::GetByName(arguments[0]); + if (!host) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable passive host checks for non-existent host '" + arguments[0] + "'")); + Log(LogInformation, "icinga", "Disabling passive checks for host '" + arguments[0] + "'"); Service::Ptr hc = host->GetCheckService(); @@ -736,6 +814,9 @@ void ExternalCommandProcessor::EnablePassiveSvcChecks(double, const std::vector< Service::Ptr service = Service::GetByNamePair(arguments[0], arguments[1]); + if (!service) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable service checks for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); + Log(LogInformation, "icinga", "Enabling passive checks for service '" + arguments[1] + "'"); { @@ -752,6 +833,9 @@ void ExternalCommandProcessor::DisablePassiveSvcChecks(double, const std::vector Service::Ptr service = Service::GetByNamePair(arguments[0], arguments[1]); + if (!service) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable service checks for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); + Log(LogInformation, "icinga", "Disabling passive checks for service '" + arguments[1] + "'"); { @@ -768,6 +852,9 @@ void ExternalCommandProcessor::EnableServicegroupPassiveSvcChecks(double, const ServiceGroup::Ptr sg = ServiceGroup::GetByName(arguments[0]); + if (!sg) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable servicegroup passive service checks for non-existent servicegroup '" + arguments[0] + "'")); + BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { Log(LogInformation, "icinga", "Enabling passive checks for service '" + service->GetName() + "'"); @@ -786,6 +873,9 @@ void ExternalCommandProcessor::DisableServicegroupPassiveSvcChecks(double, const ServiceGroup::Ptr sg = ServiceGroup::GetByName(arguments[0]); + if (!sg) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable servicegroup passive service checks for non-existent servicegroup '" + arguments[0] + "'")); + BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { Log(LogInformation, "icinga", "Disabling passive checks for service '" + service->GetName() + "'"); @@ -804,6 +894,9 @@ void ExternalCommandProcessor::EnableHostgroupPassiveSvcChecks(double, const std HostGroup::Ptr hg = HostGroup::GetByName(arguments[0]); + if (!hg) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable hostgroup passive service checks for non-existent hostgroup '" + arguments[0] + "'")); + BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) { BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) { Log(LogInformation, "icinga", "Enabling passive checks for service '" + service->GetName() + "'"); @@ -824,6 +917,9 @@ void ExternalCommandProcessor::DisableHostgroupPassiveSvcChecks(double, const st HostGroup::Ptr hg = HostGroup::GetByName(arguments[0]); + if (!hg) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable hostgroup passive service checks for non-existent hostgroup '" + arguments[0] + "'")); + BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) { BOOST_FOREACH(const Service::Ptr& service, host->GetServices()) { Log(LogInformation, "icinga", "Disabling passive checks for service '" + service->GetName() + "'"); @@ -878,6 +974,9 @@ void ExternalCommandProcessor::ScheduleSvcDowntime(double, const std::vector& Host::Ptr host = Host::GetByName(arguments[0]); + if (!host) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot add host comment for non-existent host '" + arguments[0] + "'")); + Log(LogInformation, "icinga", "Creating comment for host " + host->GetName()); Service::Ptr service = host->GetCheckService(); if (service) @@ -1098,6 +1218,9 @@ void ExternalCommandProcessor::AddSvcComment(double, const std::vector& Service::Ptr service = Service::GetByNamePair(arguments[0], arguments[1]); + if (!service) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot add service comment for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); + Log(LogInformation, "icinga", "Creating comment for service " + service->GetName()); (void) service->AddComment(CommentUser, arguments[3], arguments[4], 0); } @@ -1121,6 +1244,9 @@ void ExternalCommandProcessor::DelAllHostComments(double, const std::vectorGetName()); Service::Ptr service = host->GetCheckService(); if (service) @@ -1134,6 +1260,9 @@ void ExternalCommandProcessor::DelAllSvcComments(double, const std::vectorGetName()); service->RemoveAllComments(); } @@ -1144,6 +1273,10 @@ void ExternalCommandProcessor::SendCustomHostNotification(double, const std::vec BOOST_THROW_EXCEPTION(std::invalid_argument("Expected 4 arguments.")); Host::Ptr host = Host::GetByName(arguments[0]); + + if (!host) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot send custom host notification for non-existent host '" + arguments[0] + "'")); + int options = Convert::ToLong(arguments[1]); Log(LogInformation, "icinga", "Sending custom notification for host " + host->GetName()); @@ -1164,6 +1297,10 @@ void ExternalCommandProcessor::SendCustomSvcNotification(double, const std::vect BOOST_THROW_EXCEPTION(std::invalid_argument("Expected 5 arguments.")); Service::Ptr service = Service::GetByNamePair(arguments[0], arguments[1]); + + if (!service) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot send custom service notification for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); + int options = Convert::ToLong(arguments[2]); Log(LogInformation, "icinga", "Sending custom notification for service " + service->GetName()); @@ -1183,6 +1320,9 @@ void ExternalCommandProcessor::DelayHostNotification(double, const std::vectorGetName()); Service::Ptr hc = host->GetCheckService(); if (!hc) @@ -1202,6 +1342,9 @@ void ExternalCommandProcessor::DelaySvcNotification(double, const std::vectorGetName()); BOOST_FOREACH(const Notification::Ptr& notification, service->GetNotifications()) { @@ -1218,6 +1361,9 @@ void ExternalCommandProcessor::EnableHostNotifications(double, const std::vector Host::Ptr host = Host::GetByName(arguments[0]); + if (!host) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable host notifications for non-existent host '" + arguments[0] + "'")); + Log(LogInformation, "icinga", "Enabling notifications for host '" + arguments[0] + "'"); Service::Ptr hc = host->GetCheckService(); @@ -1238,6 +1384,9 @@ void ExternalCommandProcessor::DisableHostNotifications(double, const std::vecto Host::Ptr host = Host::GetByName(arguments[0]); + if (!host) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable host notifications for non-existent host '" + arguments[0] + "'")); + Log(LogInformation, "icinga", "Disabling notifications for host '" + arguments[0] + "'"); Service::Ptr hc = host->GetCheckService(); @@ -1258,6 +1407,9 @@ void ExternalCommandProcessor::EnableSvcNotifications(double, const std::vector< Service::Ptr service = Service::GetByNamePair(arguments[0], arguments[1]); + if (!service) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable service notifications for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); + Log(LogInformation, "icinga", "Enabling notifications for service '" + arguments[1] + "'"); { @@ -1274,6 +1426,9 @@ void ExternalCommandProcessor::DisableSvcNotifications(double, const std::vector Service::Ptr service = Service::GetByNamePair(arguments[0], arguments[1]); + if (!service) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable service notifications for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); + Log(LogInformation, "icinga", "Disabling notifications for service '" + arguments[1] + "'"); { @@ -1290,6 +1445,9 @@ void ExternalCommandProcessor::DisableHostgroupHostChecks(double, const std::vec HostGroup::Ptr hg = HostGroup::GetByName(arguments[0]); + if (!hg) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable hostgroup host checks for non-existent hostgroup '" + arguments[0] + "'")); + BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) { Service::Ptr hc = host->GetCheckService(); @@ -1313,6 +1471,9 @@ void ExternalCommandProcessor::DisableHostgroupPassiveHostChecks(double, const s HostGroup::Ptr hg = HostGroup::GetByName(arguments[0]); + if (!hg) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable hostgroup passive host checks for non-existent hostgroup '" + arguments[0] + "'")); + BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) { Service::Ptr hc = host->GetCheckService(); @@ -1336,6 +1497,9 @@ void ExternalCommandProcessor::DisableServicegroupHostChecks(double, const std:: ServiceGroup::Ptr sg = ServiceGroup::GetByName(arguments[0]); + if (!sg) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable servicegroup host checks for non-existent servicegroup '" + arguments[0] + "'")); + BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { Host::Ptr host = service->GetHost(); @@ -1364,6 +1528,9 @@ void ExternalCommandProcessor::DisableServicegroupPassiveHostChecks(double, cons ServiceGroup::Ptr sg = ServiceGroup::GetByName(arguments[0]); + if (!sg) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot disable servicegroup passive host checks for non-existent servicegroup '" + arguments[0] + "'")); + BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { Host::Ptr host = service->GetHost(); @@ -1392,6 +1559,9 @@ void ExternalCommandProcessor::EnableHostgroupHostChecks(double, const std::vect HostGroup::Ptr hg = HostGroup::GetByName(arguments[0]); + if (!hg) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable hostgroup host checks for non-existent hostgroup '" + arguments[0] + "'")); + BOOST_FOREACH(const Host::Ptr& host, hg->GetMembers()) { Service::Ptr hc = host->GetCheckService(); @@ -1422,6 +1592,9 @@ void ExternalCommandProcessor::EnableServicegroupHostChecks(double, const std::v ServiceGroup::Ptr sg = ServiceGroup::GetByName(arguments[0]); + if (!sg) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable servicegroup host checks for non-existent servicegroup '" + arguments[0] + "'")); + BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { Host::Ptr host = service->GetHost(); @@ -1450,6 +1623,9 @@ void ExternalCommandProcessor::EnableServicegroupPassiveHostChecks(double, const ServiceGroup::Ptr sg = ServiceGroup::GetByName(arguments[0]); + if (!sg) + BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot enable servicegroup passive host checks for non-existent servicegroup '" + arguments[0] + "'")); + BOOST_FOREACH(const Service::Ptr& service, sg->GetMembers()) { Host::Ptr host = service->GetHost(); @@ -1478,6 +1654,9 @@ void ExternalCommandProcessor::EnableHostFlapping(double, const std::vectorGetCheckService(); @@ -1498,6 +1677,9 @@ void ExternalCommandProcessor::DisableHostFlapping(double, const std::vectorGetCheckService(); @@ -1518,6 +1700,9 @@ void ExternalCommandProcessor::EnableSvcFlapping(double, const std::vector