tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 14:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use service short name for evaluating targeted service rules

Browse Source
This commit is contained in:
Yonas Habteab 2022-11-04 10:19:26 +01:00 committed by Julian Brost
parent e29de04687
commit a15bbfe913
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/icinga/dependency-apply.cpp
View File

@ -156,7 +156,7 @@ void Dependency::EvaluateApplyRules(const Service::Ptr& service)
rule->AddMatch(); 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)) if (EvaluateApplyRule(service, *rule, true))
rule->AddMatch(); rule->AddMatch();
} }

2
lib/icinga/notification-apply.cpp
View File

@ -156,7 +156,7 @@ void Notification::EvaluateApplyRules(const Service::Ptr& service)
rule->AddMatch(); 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)) if (EvaluateApplyRule(service, *rule, true))
rule->AddMatch(); rule->AddMatch();
} }

2
lib/icinga/scheduleddowntime-apply.cpp
View File

@ -154,7 +154,7 @@ void ScheduledDowntime::EvaluateApplyRules(const Service::Ptr& service)
rule->AddMatch(); 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)) if (EvaluateApplyRule(service, *rule, true))
rule->AddMatch(); rule->AddMatch();
} }