mirror of
https://github.com/Icinga/icinga2.git
synced 2025-07-27 07:34:15 +02:00
parent
245dd66bab
commit
6428fc6123
@ -197,6 +197,8 @@ void ExternalCommandProcessor::Initialize(void)
|
|||||||
RegisterCommand("CHANGE_SVC_CHECK_COMMAND", &ExternalCommandProcessor::ChangeSvcCheckCommand);
|
RegisterCommand("CHANGE_SVC_CHECK_COMMAND", &ExternalCommandProcessor::ChangeSvcCheckCommand);
|
||||||
RegisterCommand("CHANGE_MAX_HOST_CHECK_ATTEMPTS", &ExternalCommandProcessor::ChangeMaxHostCheckAttempts);
|
RegisterCommand("CHANGE_MAX_HOST_CHECK_ATTEMPTS", &ExternalCommandProcessor::ChangeMaxHostCheckAttempts);
|
||||||
RegisterCommand("CHANGE_MAX_SVC_CHECK_ATTEMPTS", &ExternalCommandProcessor::ChangeMaxSvcCheckAttempts);
|
RegisterCommand("CHANGE_MAX_SVC_CHECK_ATTEMPTS", &ExternalCommandProcessor::ChangeMaxSvcCheckAttempts);
|
||||||
|
RegisterCommand("CHANGE_HOST_CHECK_TIMEPERIOD", &ExternalCommandProcessor::ChangeHostCheckTimeperiod);
|
||||||
|
RegisterCommand("CHANGE_SVC_CHECK_TIMEPERIOD", &ExternalCommandProcessor::ChangeSvcCheckTimeperiod);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ExternalCommandProcessor::RegisterCommand(const String& command, const ExternalCommandProcessor::Callback& callback)
|
void ExternalCommandProcessor::RegisterCommand(const String& command, const ExternalCommandProcessor::Callback& callback)
|
||||||
@ -2167,3 +2169,53 @@ void ExternalCommandProcessor::ChangeMaxSvcCheckAttempts(double time, const std:
|
|||||||
service->SetMaxCheckAttempts(attempts);
|
service->SetMaxCheckAttempts(attempts);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ExternalCommandProcessor::ChangeHostCheckTimeperiod(double time, const std::vector<String>& arguments)
|
||||||
|
{
|
||||||
|
if (arguments.size() < 2)
|
||||||
|
BOOST_THROW_EXCEPTION(std::invalid_argument("Expected 2 arguments."));
|
||||||
|
|
||||||
|
Host::Ptr host = Host::GetByName(arguments[0]);
|
||||||
|
|
||||||
|
if (!host)
|
||||||
|
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot change check period for non-existent host '" + arguments[0] + "'"));
|
||||||
|
|
||||||
|
Service::Ptr hc = host->GetCheckService();
|
||||||
|
|
||||||
|
TimePeriod::Ptr tp = TimePeriod::GetByName(arguments[2]);
|
||||||
|
|
||||||
|
if (!tp)
|
||||||
|
BOOST_THROW_EXCEPTION(std::invalid_argument("Time period '" + arguments[1] + "' does not exist."));
|
||||||
|
|
||||||
|
Log(LogInformation, "icinga", "Changing check period for host '" + arguments[0] + "' to '" + arguments[1] + "'");
|
||||||
|
|
||||||
|
{
|
||||||
|
ObjectLock olock(hc);
|
||||||
|
|
||||||
|
hc->SetCheckPeriod(tp);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ExternalCommandProcessor::ChangeSvcCheckTimeperiod(double time, const std::vector<String>& arguments)
|
||||||
|
{
|
||||||
|
if (arguments.size() < 2)
|
||||||
|
BOOST_THROW_EXCEPTION(std::invalid_argument("Expected 3 arguments."));
|
||||||
|
|
||||||
|
Service::Ptr service = Service::GetByNamePair(arguments[0], arguments[1]);
|
||||||
|
|
||||||
|
if (!service)
|
||||||
|
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot change check period for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'"));
|
||||||
|
|
||||||
|
TimePeriod::Ptr tp = TimePeriod::GetByName(arguments[2]);
|
||||||
|
|
||||||
|
if (!tp)
|
||||||
|
BOOST_THROW_EXCEPTION(std::invalid_argument("Time period '" + arguments[2] + "' does not exist."));
|
||||||
|
|
||||||
|
Log(LogInformation, "icinga", "Changing check period for service '" + arguments[1] + "' to '" + arguments[2] + "'");
|
||||||
|
|
||||||
|
{
|
||||||
|
ObjectLock olock(service);
|
||||||
|
|
||||||
|
service->SetCheckPeriod(tp);
|
||||||
|
}
|
||||||
|
}
|
@ -147,6 +147,8 @@ private:
|
|||||||
static void ChangeSvcCheckCommand(double time, const std::vector<String>& arguments);
|
static void ChangeSvcCheckCommand(double time, const std::vector<String>& arguments);
|
||||||
static void ChangeMaxHostCheckAttempts(double time, const std::vector<String>& arguments);
|
static void ChangeMaxHostCheckAttempts(double time, const std::vector<String>& arguments);
|
||||||
static void ChangeMaxSvcCheckAttempts(double time, const std::vector<String>& arguments);
|
static void ChangeMaxSvcCheckAttempts(double time, const std::vector<String>& arguments);
|
||||||
|
static void ChangeHostCheckTimeperiod(double time, const std::vector<String>& arguments);
|
||||||
|
static void ChangeSvcCheckTimeperiod(double time, const std::vector<String>& arguments);
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -64,7 +64,19 @@ void Service::SetCheckCommand(const CheckCommand::Ptr& command)
|
|||||||
|
|
||||||
TimePeriod::Ptr Service::GetCheckPeriod(void) const
|
TimePeriod::Ptr Service::GetCheckPeriod(void) const
|
||||||
{
|
{
|
||||||
return TimePeriod::GetByName(GetCheckPeriodRaw());
|
String tp;
|
||||||
|
|
||||||
|
if (!GetOverrideCheckPeriod().IsEmpty())
|
||||||
|
tp = GetOverrideCheckPeriod();
|
||||||
|
else
|
||||||
|
tp = GetCheckPeriodRaw();
|
||||||
|
|
||||||
|
return TimePeriod::GetByName(tp);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Service::SetCheckPeriod(const TimePeriod::Ptr& tp)
|
||||||
|
{
|
||||||
|
SetOverrideCheckPeriod(tp->GetName());
|
||||||
}
|
}
|
||||||
|
|
||||||
double Service::GetCheckInterval(void) const
|
double Service::GetCheckInterval(void) const
|
||||||
|
@ -310,6 +310,9 @@ int Service::GetModifiedAttributes(void) const
|
|||||||
if (!GetOverrideMaxCheckAttempts().IsEmpty())
|
if (!GetOverrideMaxCheckAttempts().IsEmpty())
|
||||||
attrs |= ModAttrMaxCheckAttempts;
|
attrs |= ModAttrMaxCheckAttempts;
|
||||||
|
|
||||||
|
if (!GetOverrideCheckPeriod().IsEmpty())
|
||||||
|
attrs |= ModAttrCheckTimeperiod;
|
||||||
|
|
||||||
// TODO: finish
|
// TODO: finish
|
||||||
|
|
||||||
return attrs;
|
return attrs;
|
||||||
@ -349,6 +352,9 @@ void Service::SetModifiedAttributes(int flags)
|
|||||||
|
|
||||||
if ((flags & ModAttrMaxCheckAttempts) == 0)
|
if ((flags & ModAttrMaxCheckAttempts) == 0)
|
||||||
SetOverrideMaxCheckAttempts(Empty);
|
SetOverrideMaxCheckAttempts(Empty);
|
||||||
|
|
||||||
|
if ((flags & ModAttrCheckTimeperiod) == 0)
|
||||||
|
SetOverrideCheckPeriod(Empty);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Service::ResolveMacro(const String& macro, const CheckResult::Ptr& cr, String *result) const
|
bool Service::ResolveMacro(const String& macro, const CheckResult::Ptr& cr, String *result) const
|
||||||
|
@ -112,6 +112,7 @@ public:
|
|||||||
void SetCheckCommand(const shared_ptr<CheckCommand>& command);
|
void SetCheckCommand(const shared_ptr<CheckCommand>& command);
|
||||||
|
|
||||||
TimePeriod::Ptr GetCheckPeriod(void) const;
|
TimePeriod::Ptr GetCheckPeriod(void) const;
|
||||||
|
void SetCheckPeriod(const TimePeriod::Ptr& tp);
|
||||||
|
|
||||||
double GetCheckInterval(void) const;
|
double GetCheckInterval(void) const;
|
||||||
void SetCheckInterval(double interval);
|
void SetCheckInterval(double interval);
|
||||||
|
@ -139,6 +139,7 @@ class Service : DynamicObject
|
|||||||
[state] Value override_event_command;
|
[state] Value override_event_command;
|
||||||
[state] Value override_check_command;
|
[state] Value override_check_command;
|
||||||
[state] Value override_max_check_attempts;
|
[state] Value override_max_check_attempts;
|
||||||
|
[state] Value override_check_period;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user