tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-09-23 09:48:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

T::EvaluateApplyRule(): don't squish non-for apply rules into apply-for logic

Browse Source 
to K. I. S. S. and avoid malloc().
This commit is contained in:
Alexander A. Klimov 2022-11-08 13:26:27 +01:00
parent a6b05059ab
commit ec704bcf18
4 changed files with 111 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,20 +81,17 @@ bool Dependency::EvaluateApplyRule(const Checkable::Ptr& checkable, const ApplyR
if (service) if (service)
frame.Locals->Set("service", service); frame.Locals->Set("service", service);
Value vinstances; bool match = false;
if (rule.GetFTerm()) { if (rule.GetFTerm()) {
Value vinstances;
try { try {
vinstances = rule.GetFTerm()->Evaluate(frame); vinstances = rule.GetFTerm()->Evaluate(frame);
} catch (const std::exception&) { } catch (const std::exception&) {
/* Silently ignore errors here and assume there are no instances. */ /* Silently ignore errors here and assume there are no instances. */
return false; return false;
} }
} else {
vinstances = new Array({ "" });
}
bool match = false;
if (vinstances.IsObjectType<Array>()) { if (vinstances.IsObjectType<Array>()) {
if (!rule.GetFVVar().IsEmpty()) if (!rule.GetFVVar().IsEmpty())
@ -106,10 +103,8 @@ bool Dependency::EvaluateApplyRule(const Checkable::Ptr& checkable, const ApplyR
for (const Value& instance : arr) { for (const Value& instance : arr) {
String name = rule.GetName(); String name = rule.GetName();
if (!rule.GetFKVar().IsEmpty()) {
frame.Locals->Set(rule.GetFKVar(), instance); frame.Locals->Set(rule.GetFKVar(), instance);
name += instance; name += instance;
}
if (EvaluateApplyRuleInstance(checkable, name, frame, rule, skipFilter)) if (EvaluateApplyRuleInstance(checkable, name, frame, rule, skipFilter))
match = true; match = true;
@ -128,6 +123,9 @@ bool Dependency::EvaluateApplyRule(const Checkable::Ptr& checkable, const ApplyR
match = true; match = true;
} }
} }
} else if (EvaluateApplyRuleInstance(checkable, rule.GetName(), frame, rule, skipFilter)) {
match = true;
}
return match; return match;
} }

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

@ -80,20 +80,17 @@ bool Notification::EvaluateApplyRule(const Checkable::Ptr& checkable, const Appl
if (service) if (service)
frame.Locals->Set("service", service); frame.Locals->Set("service", service);
Value vinstances; bool match = false;
if (rule.GetFTerm()) { if (rule.GetFTerm()) {
Value vinstances;
try { try {
vinstances = rule.GetFTerm()->Evaluate(frame); vinstances = rule.GetFTerm()->Evaluate(frame);
} catch (const std::exception&) { } catch (const std::exception&) {
/* Silently ignore errors here and assume there are no instances. */ /* Silently ignore errors here and assume there are no instances. */
return false; return false;
} }
} else {
vinstances = new Array({ "" });
}
bool match = false;
if (vinstances.IsObjectType<Array>()) { if (vinstances.IsObjectType<Array>()) {
if (!rule.GetFVVar().IsEmpty()) if (!rule.GetFVVar().IsEmpty())
@ -105,10 +102,8 @@ bool Notification::EvaluateApplyRule(const Checkable::Ptr& checkable, const Appl
for (const Value& instance : arr) { for (const Value& instance : arr) {
String name = rule.GetName(); String name = rule.GetName();
if (!rule.GetFKVar().IsEmpty()) {
frame.Locals->Set(rule.GetFKVar(), instance); frame.Locals->Set(rule.GetFKVar(), instance);
name += instance; name += instance;
}
if (EvaluateApplyRuleInstance(checkable, name, frame, rule, skipFilter)) if (EvaluateApplyRuleInstance(checkable, name, frame, rule, skipFilter))
match = true; match = true;
@ -127,6 +122,9 @@ bool Notification::EvaluateApplyRule(const Checkable::Ptr& checkable, const Appl
match = true; match = true;
} }
} }
} else if (EvaluateApplyRuleInstance(checkable, rule.GetName(), frame, rule, skipFilter)) {
match = true;
}
return match; return match;
} }

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

@ -79,20 +79,17 @@ bool ScheduledDowntime::EvaluateApplyRule(const Checkable::Ptr& checkable, const
if (service) if (service)
frame.Locals->Set("service", service); frame.Locals->Set("service", service);
Value vinstances; bool match = false;
if (rule.GetFTerm()) { if (rule.GetFTerm()) {
Value vinstances;
try { try {
vinstances = rule.GetFTerm()->Evaluate(frame); vinstances = rule.GetFTerm()->Evaluate(frame);
} catch (const std::exception&) { } catch (const std::exception&) {
/* Silently ignore errors here and assume there are no instances. */ /* Silently ignore errors here and assume there are no instances. */
return false; return false;
} }
} else {
vinstances = new Array({ "" });
}
bool match = false;
if (vinstances.IsObjectType<Array>()) { if (vinstances.IsObjectType<Array>()) {
if (!rule.GetFVVar().IsEmpty()) if (!rule.GetFVVar().IsEmpty())
@ -104,10 +101,8 @@ bool ScheduledDowntime::EvaluateApplyRule(const Checkable::Ptr& checkable, const
for (const Value& instance : arr) { for (const Value& instance : arr) {
String name = rule.GetName(); String name = rule.GetName();
if (!rule.GetFKVar().IsEmpty()) {
frame.Locals->Set(rule.GetFKVar(), instance); frame.Locals->Set(rule.GetFKVar(), instance);
name += instance; name += instance;
}
if (EvaluateApplyRuleInstance(checkable, name, frame, rule, skipFilter)) if (EvaluateApplyRuleInstance(checkable, name, frame, rule, skipFilter))
match = true; match = true;
@ -126,6 +121,9 @@ bool ScheduledDowntime::EvaluateApplyRule(const Checkable::Ptr& checkable, const
match = true; match = true;
} }
} }
} else if (EvaluateApplyRuleInstance(checkable, rule.GetName(), frame, rule, skipFilter)) {
match = true;
}
return match; return match;
} }

12
lib/icinga/service-apply.cpp
View File

@ -68,20 +68,17 @@ bool Service::EvaluateApplyRule(const Host::Ptr& host, const ApplyRule& rule, bo
rule.GetScope()->CopyTo(frame.Locals); rule.GetScope()->CopyTo(frame.Locals);
frame.Locals->Set("host", host); frame.Locals->Set("host", host);
Value vinstances; bool match = false;
if (rule.GetFTerm()) { if (rule.GetFTerm()) {
Value vinstances;
try { try {
vinstances = rule.GetFTerm()->Evaluate(frame); vinstances = rule.GetFTerm()->Evaluate(frame);
} catch (const std::exception&) { } catch (const std::exception&) {
/* Silently ignore errors here and assume there are no instances. */ /* Silently ignore errors here and assume there are no instances. */
return false; return false;
} }
} else {
vinstances = new Array({ "" });
}
bool match = false;
if (vinstances.IsObjectType<Array>()) { if (vinstances.IsObjectType<Array>()) {
if (!rule.GetFVVar().IsEmpty()) if (!rule.GetFVVar().IsEmpty())
@ -115,6 +112,9 @@ bool Service::EvaluateApplyRule(const Host::Ptr& host, const ApplyRule& rule, bo
match = true; match = true;
} }
} }
} else if (EvaluateApplyRuleInstance(host, rule.GetName(), frame, rule, skipFilter)) {
match = true;
}
return match; return match;
} }