tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

StatusDataWriter: Encode custom attr arrays&dictionaries as json string 

refs #7560
This commit is contained in:
Michael Friedrich 2014-11-04 18:08:26 +01:00
parent eeb6facdac
commit c4ba3f6691
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/9-appendix.md
View File

@ -147,6 +147,8 @@ Icinga 2 specific extensions:
* host and service objects support 'check_source' (added in Classic UI 1.10.0) * host and service objects support 'check_source' (added in Classic UI 1.10.0)
* command objects support custom variables (added in Classic UI 1.11.2) * command objects support custom variables (added in Classic UI 1.11.2)
* host and service objects support 'is_reachable' (added in Classic UI 1.11.3) * host and service objects support 'is_reachable' (added in Classic UI 1.11.3)
* 2.2 adds custom attributes with arrays and dictionaries. They are dumped as JSON encoded string and `_is_json`
is set as additional custom variable in `objects.cache`.
### <a id="schema-db-ido"></a> DB IDO Schema ### <a id="schema-db-ido"></a> DB IDO Schema

13
lib/compat/statusdatawriter.cpp
View File

@ -30,6 +30,7 @@
#include "icinga/dependency.hpp" #include "icinga/dependency.hpp"
#include "base/dynamictype.hpp" #include "base/dynamictype.hpp"
#include "base/objectlock.hpp" #include "base/objectlock.hpp"
#include "base/json.hpp"
#include "base/convert.hpp" #include "base/convert.hpp"
#include "base/logger.hpp" #include "base/logger.hpp"
#include "base/exception.hpp" #include "base/exception.hpp"
@ -514,6 +515,8 @@ void StatusDataWriter::DumpCustomAttributes(std::ostream& fp, const CustomVarObj
if (!vars) if (!vars)
return; return;
bool is_json = false;
ObjectLock olock(vars); ObjectLock olock(vars);
BOOST_FOREACH(const Dictionary::Pair& kv, vars) { BOOST_FOREACH(const Dictionary::Pair& kv, vars) {
if (kv.first.IsEmpty()) if (kv.first.IsEmpty())
@ -521,9 +524,10 @@ void StatusDataWriter::DumpCustomAttributes(std::ostream& fp, const CustomVarObj
String value; String value;
if (kv.second.IsObjectType<Array>()) if (kv.second.IsObjectType<Array>() || kv.second.IsObjectType<Dictionary>()) {
value = Utility::Join(kv.second, ';'); value = JsonEncode(kv.second);
else is_json = true;
} else
value = kv.second; value = kv.second;
fp << "\t"; fp << "\t";
@ -533,6 +537,9 @@ void StatusDataWriter::DumpCustomAttributes(std::ostream& fp, const CustomVarObj
fp << kv.first << "\t" << value << "\n"; fp << kv.first << "\t" << value << "\n";
} }
if (is_json)
fp << "\t" "_is_json" "\t" "1" "\n";
} }
void StatusDataWriter::UpdateObjectsCache(void) void StatusDataWriter::UpdateObjectsCache(void)