mirror of https://github.com/Icinga/icinga2.git
Use service short name for evaluating targeted service rules
This commit is contained in:
parent
2610fb1285
commit
a8d46e6d47
|
@ -156,7 +156,7 @@ void Dependency::EvaluateApplyRules(const Service::Ptr& service)
|
|||
rule->AddMatch();
|
||||
}
|
||||
|
||||
for (auto& rule : ApplyRule::GetTargetedServiceRules(Dependency::TypeInstance, service->GetHost()->GetName(), service->GetName())) {
|
||||
for (auto& rule : ApplyRule::GetTargetedServiceRules(Dependency::TypeInstance, service->GetHost()->GetName(), service->GetShortName())) {
|
||||
if (EvaluateApplyRule(service, *rule, true))
|
||||
rule->AddMatch();
|
||||
}
|
||||
|
|
|
@ -156,7 +156,7 @@ void Notification::EvaluateApplyRules(const Service::Ptr& service)
|
|||
rule->AddMatch();
|
||||
}
|
||||
|
||||
for (auto& rule : ApplyRule::GetTargetedServiceRules(Notification::TypeInstance, service->GetHost()->GetName(), service->GetName())) {
|
||||
for (auto& rule : ApplyRule::GetTargetedServiceRules(Notification::TypeInstance, service->GetHost()->GetName(), service->GetShortName())) {
|
||||
if (EvaluateApplyRule(service, *rule, true))
|
||||
rule->AddMatch();
|
||||
}
|
||||
|
|
|
@ -154,7 +154,7 @@ void ScheduledDowntime::EvaluateApplyRules(const Service::Ptr& service)
|
|||
rule->AddMatch();
|
||||
}
|
||||
|
||||
for (auto& rule : ApplyRule::GetTargetedServiceRules(ScheduledDowntime::TypeInstance, service->GetHost()->GetName(), service->GetName())) {
|
||||
for (auto& rule : ApplyRule::GetTargetedServiceRules(ScheduledDowntime::TypeInstance, service->GetHost()->GetName(), service->GetShortName())) {
|
||||
if (EvaluateApplyRule(service, *rule, true))
|
||||
rule->AddMatch();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue