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

Implement triggered downtime for services.

Browse Source 
Fixes #3583
This commit is contained in:
Gunnar Beutner 2013-01-31 13:57:14 +01:00
parent 24e2d1d3f2
commit 9862ab5324
4 changed files with 64 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/compat/compatcomponent.cpp
View File

@ -231,13 +231,10 @@ void CompatComponent::DumpDowntimes(ofstream& fp, const DynamicObject::Ptr& owne
fp << "servicedowntime {" << "\n" fp << "servicedowntime {" << "\n"
<< "\t" << "service_description=" << service->GetAlias() << "\n"; << "\t" << "service_description=" << service->GetAlias() << "\n";
String triggeredBy = downtime->Get("triggered_by"); Dictionary::Ptr triggeredByObj = DowntimeProcessor::GetDowntimeByID(downtime->Get("triggered_by"));
int triggeredByLegacy = 0; int triggeredByLegacy = 0;
if (!triggeredBy.IsEmpty()) { if (triggeredByObj)
Dictionary::Ptr triggeredByObj = DowntimeProcessor::GetDowntimeByID(triggeredBy);
if (triggeredByObj->Contains("legacy_id"))
triggeredByLegacy = triggeredByObj->Get("legacy_id"); triggeredByLegacy = triggeredByObj->Get("legacy_id");
}
fp << "\t" << "host_name=" << host->GetName() << "\n" fp << "\t" << "host_name=" << host->GetName() << "\n"
<< "\t" << "downtime_id=" << static_cast<String>(downtime->Get("legacy_id")) << "\n" << "\t" << "downtime_id=" << static_cast<String>(downtime->Get("legacy_id")) << "\n"

56
lib/icinga/downtimeprocessor.cpp
View File

@ -46,9 +46,19 @@ String DowntimeProcessor::AddDowntime(const DynamicObject::Ptr& owner,
downtime->Set("fixed", fixed); downtime->Set("fixed", fixed);
downtime->Set("duration", duration); downtime->Set("duration", duration);
downtime->Set("triggered_by", triggeredBy); downtime->Set("triggered_by", triggeredBy);
downtime->Set("triggers", boost::make_shared<Dictionary>());
downtime->Set("trigger_time", 0); downtime->Set("trigger_time", 0);
downtime->Set("legacy_id", m_NextDowntimeID++); downtime->Set("legacy_id", m_NextDowntimeID++);
if (!triggeredBy.IsEmpty()) {
DynamicObject::Ptr otherOwner = GetOwnerByDowntimeID(triggeredBy);
Dictionary::Ptr otherDowntimes = otherOwner->Get("downtimes");
Dictionary::Ptr otherDowntime = otherDowntimes->Get(triggeredBy);
Dictionary::Ptr triggers = otherDowntime->Get("triggers");
triggers->Set(triggeredBy, triggeredBy);
otherOwner->Touch("downtimes");
}
Dictionary::Ptr downtimes = owner->Get("downtimes"); Dictionary::Ptr downtimes = owner->Get("downtimes");
if (!downtimes) if (!downtimes)
@ -65,20 +75,60 @@ void DowntimeProcessor::RemoveDowntime(const String& id)
{ {
DynamicObject::Ptr owner = GetOwnerByDowntimeID(id); DynamicObject::Ptr owner = GetOwnerByDowntimeID(id);
if (!owner)
return;
Dictionary::Ptr downtimes = owner->Get("downtimes"); Dictionary::Ptr downtimes = owner->Get("downtimes");
if (downtimes) { if (!downtimes)
return;
downtimes->Remove(id); downtimes->Remove(id);
owner->Touch("downtimes"); owner->Touch("downtimes");
}
void DowntimeProcessor::TriggerDowntimes(const DynamicObject::Ptr& owner)
{
Dictionary::Ptr downtimes = owner->Get("downtimes");
if (!downtimes)
return;
String id;
BOOST_FOREACH(tie(id, tuples::ignore), downtimes) {
TriggerDowntime(id);
} }
} }
void DowntimeProcessor::TriggerDowntime(const String& id)
{
DynamicObject::Ptr owner = GetOwnerByDowntimeID(id);
Dictionary::Ptr downtime = GetDowntimeByID(id);
double now = Utility::GetTime();
if (now < downtime->Get("start_time") ||
now > downtime->Get("end_time"))
return;
if (downtime->Get("trigger_time") == 0)
downtime->Set("trigger_time", now);
Dictionary::Ptr triggers = downtime->Get("triggers");
String tid;
BOOST_FOREACH(tie(tid, tuples::ignore), triggers) {
TriggerDowntime(tid);
}
owner->Touch("downtimes");
}
String DowntimeProcessor::GetIDFromLegacyID(int id) String DowntimeProcessor::GetIDFromLegacyID(int id)
{ {
map<int, String>::iterator it = m_LegacyDowntimeCache.find(id); map<int, String>::iterator it = m_LegacyDowntimeCache.find(id);
if (it == m_LegacyDowntimeCache.end()) if (it == m_LegacyDowntimeCache.end())
throw_exception(invalid_argument("Invalid legacy downtime ID specified.")); return Empty;
return it->second; return it->second;
} }
@ -95,7 +145,7 @@ Dictionary::Ptr DowntimeProcessor::GetDowntimeByID(const String& id)
DynamicObject::Ptr owner = GetOwnerByDowntimeID(id); DynamicObject::Ptr owner = GetOwnerByDowntimeID(id);
if (!owner) if (!owner)
throw_exception(invalid_argument("Downtime ID does not exist.")); return Dictionary::Ptr();
Dictionary::Ptr downtimes = owner->Get("downtimes"); Dictionary::Ptr downtimes = owner->Get("downtimes");

3
lib/icinga/downtimeprocessor.h
View File

@ -40,6 +40,9 @@ public:
static void RemoveDowntime(const String& id); static void RemoveDowntime(const String& id);
static void TriggerDowntimes(const DynamicObject::Ptr& owner);
static void TriggerDowntime(const String& id);
static String GetIDFromLegacyID(int id); static String GetIDFromLegacyID(int id);
static DynamicObject::Ptr GetOwnerByDowntimeID(const String& id); static DynamicObject::Ptr GetOwnerByDowntimeID(const String& id);
static Dictionary::Ptr GetDowntimeByID(const String& id); static Dictionary::Ptr GetDowntimeByID(const String& id);

3
lib/icinga/service.cpp
View File

@ -564,6 +564,9 @@ void Service::ApplyCheckResult(const Dictionary::Ptr& cr)
} }
} }
} }
if (GetState() != StateOK)
DowntimeProcessor::TriggerDowntimes(GetSelf());
} }
ServiceState Service::StateFromString(const String& state) ServiceState Service::StateFromString(const String& state)