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

Implement support for custom variables. 

Fixes #4344
This commit is contained in:
Gunnar Beutner 2013-07-01 13:46:50 +02:00
parent e28fba2a9c
commit 23c87f6eaf
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
components/compat/compatcomponent.cpp
View File

@ -25,6 +25,7 @@
#include "icinga/servicegroup.h" #include "icinga/servicegroup.h"
#include "base/dynamictype.h" #include "base/dynamictype.h"
#include "base/objectlock.h" #include "base/objectlock.h"
#include "base/convert.h"
#include "base/logger_fwd.h" #include "base/logger_fwd.h"
#include "base/exception.h" #include "base/exception.h"
#include "base/application.h" #include "base/application.h"
@ -328,6 +329,8 @@ void CompatComponent::DumpHostObject(std::ostream& fp, const Host::Ptr& host)
} }
DumpCustomAttributes(fp, host);
fp << "\t" << "}" << "\n" fp << "\t" << "}" << "\n"
<< "\n"; << "\n";
} }
@ -471,11 +474,14 @@ void CompatComponent::DumpServiceObject(std::ostream& fp, const Service::Ptr& se
<< "\t" << "passive_checks_enabled" << "\t" << (service->GetEnablePassiveChecks() ? 1 : 0) << "\n" << "\t" << "passive_checks_enabled" << "\t" << (service->GetEnablePassiveChecks() ? 1 : 0) << "\n"
<< "\t" << "notifications_enabled" << "\t" << (service->GetEnableNotifications() ? 1 : 0) << "\n" << "\t" << "notifications_enabled" << "\t" << (service->GetEnableNotifications() ? 1 : 0) << "\n"
<< "\t" << "notification_options" << "\t" << "u,w,c,r" << "\n" << "\t" << "notification_options" << "\t" << "u,w,c,r" << "\n"
<< "\t" << "notification_interval" << "\t" << notification_interval / 60.0 << "\n" << "\t" << "notification_interval" << "\t" << notification_interval / 60.0 << "\n";
<< "\t" << "}" << "\n"
<< "\n";
} }
DumpCustomAttributes(fp, service);
fp << "\t" << "}" << "\n"
<< "\n";
BOOST_FOREACH(const Service::Ptr& parent, service->GetParentServices()) { BOOST_FOREACH(const Service::Ptr& parent, service->GetParentServices()) {
Host::Ptr host = service->GetHost(); Host::Ptr host = service->GetHost();
@ -499,6 +505,27 @@ void CompatComponent::DumpServiceObject(std::ostream& fp, const Service::Ptr& se
} }
} }
void CompatComponent::DumpCustomAttributes(std::ostream& fp, const DynamicObject::Ptr& object)
{
Dictionary::Ptr custom = object->Get("custom");
if (!custom)
return;
ObjectLock olock(custom);
String key;
Value value;
BOOST_FOREACH(boost::tie(key, value), custom) {
fp << "\t";
if (key != "action_url" && key != "notes_url" && key != "icon_image" &&
key != "icon_image_alt" && key != "statusmap_image" && "2d_coords")
fp << "_";
fp << key << "\t" << Convert::ToString(value) << "\n";
}
}
/** /**
* Periodically writes the status.dat and objects.cache files. * Periodically writes the status.dat and objects.cache files.
*/ */

2
components/compat/compatcomponent.h
View File

@ -106,6 +106,8 @@ private:
void DumpServiceStatus(std::ostream& fp, const Service::Ptr& service); void DumpServiceStatus(std::ostream& fp, const Service::Ptr& service);
void DumpServiceObject(std::ostream& fp, const Service::Ptr& service); void DumpServiceObject(std::ostream& fp, const Service::Ptr& service);
void DumpCustomAttributes(std::ostream& fp, const DynamicObject::Ptr& object);
void StatusTimerHandler(void); void StatusTimerHandler(void);
}; };