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

Implement support for using functions in custom attributes

Browse Source 
refs #7564
This commit is contained in:
Gunnar Beutner 2015-01-27 13:40:05 +01:00
parent c36d785f9f
commit fb44744680
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/3-monitoring-basics.md
View File

@ -1732,6 +1732,7 @@ There are several ways of using custom attributes with [apply rules](3-monitorin
[boolean](15-language-reference.md#boolean-literals)) for expression conditions (`assign where`, `ignore where`) [boolean](15-language-reference.md#boolean-literals)) for expression conditions (`assign where`, `ignore where`)
* As [array](15-language-reference.md#array) or [dictionary](15-language-reference.md#dictionary) attribute with nested values * As [array](15-language-reference.md#array) or [dictionary](15-language-reference.md#dictionary) attribute with nested values
(e.g. dictionaries in dictionaries) in [apply for](3-monitoring-basics.md#using-apply-for) rules. (e.g. dictionaries in dictionaries) in [apply for](3-monitoring-basics.md#using-apply-for) rules.
* As a [function object](#functions)
Features like [DB IDO](3-monitoring-basics.md#db-ido), Livestatus(#setting-up-livestatus) or StatusData(#status-data) Features like [DB IDO](3-monitoring-basics.md#db-ido), Livestatus(#setting-up-livestatus) or StatusData(#status-data)
dump this column as encoded JSON string, and set `is_json` resp. `cv_is_json` to `1`. dump this column as encoded JSON string, and set `is_json` resp. `cv_is_json` to `1`.

19
lib/icinga/macroprocessor.cpp
View File

@ -25,6 +25,7 @@
#include "base/logger.hpp" #include "base/logger.hpp"
#include "base/context.hpp" #include "base/context.hpp"
#include "base/dynamicobject.hpp" #include "base/dynamicobject.hpp"
#include "base/scriptframe.hpp"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/algorithm/string/split.hpp> #include <boost/algorithm/string/split.hpp>
#include <boost/algorithm/string/join.hpp> #include <boost/algorithm/string/join.hpp>
@ -166,6 +167,8 @@ Value MacroProcessor::InternalResolveMacros(const String& str, const ResolverLis
size_t offset, pos_first, pos_second; size_t offset, pos_first, pos_second;
offset = 0; offset = 0;
Dictionary::Ptr resolvers_this;
String result = str; String result = str;
while ((pos_first = result.FindFirstOf("$", offset)) != String::NPos) { while ((pos_first = result.FindFirstOf("$", offset)) != String::NPos) {
pos_second = result.FindFirstOf("$", pos_first + 1); pos_second = result.FindFirstOf("$", pos_first + 1);
@ -194,6 +197,22 @@ Value MacroProcessor::InternalResolveMacros(const String& str, const ResolverLis
found = true; found = true;
} }
if (resolved_macro.IsObjectType<Function>()) {
Function::Ptr func = resolved_macro;
if (!resolvers_this) {
resolvers_this = new Dictionary();
BOOST_FOREACH(const ResolverSpec& resolver, resolvers) {
resolvers_this->Set(resolver.first, resolver.second);
}
}
ScriptFrame frame(resolvers_this);
std::vector<Value> args;
resolved_macro = func->Invoke(args);
}
if (!found) { if (!found) {
if (!missingMacro) if (!missingMacro)
Log(LogWarning, "MacroProcessor") Log(LogWarning, "MacroProcessor")