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

DB IDO: Update Host/Service status on Acknowledgement Add/Clear.

Browse Source 
Refs #6051
This commit is contained in:
Michael Friedrich 2014-05-02 23:17:36 +02:00
parent dbe6a20fd2
commit 0c72228a0e
2 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
lib/db_ido/dbevents.cpp
View File

@ -47,6 +47,8 @@ void DbEvents::StaticInitialize(void)
Service::OnDowntimeAdded.connect(boost::bind(&DbEvents::AddDowntime, _1, _2)); Service::OnDowntimeAdded.connect(boost::bind(&DbEvents::AddDowntime, _1, _2));
Service::OnDowntimeRemoved.connect(boost::bind(&DbEvents::RemoveDowntime, _1, _2)); Service::OnDowntimeRemoved.connect(boost::bind(&DbEvents::RemoveDowntime, _1, _2));
Service::OnDowntimeTriggered.connect(boost::bind(&DbEvents::TriggerDowntime, _1, _2)); Service::OnDowntimeTriggered.connect(boost::bind(&DbEvents::TriggerDowntime, _1, _2));
Service::OnAcknowledgementSet.connect(boost::bind(&DbEvents::AddAcknowledgement, _1, _4));
Service::OnAcknowledgementCleared.connect(boost::bind(&DbEvents::RemoveAcknowledgement, _1));
/* History */ /* History */
Service::OnCommentAdded.connect(boost::bind(&DbEvents::AddCommentHistory, _1, _2)); Service::OnCommentAdded.connect(boost::bind(&DbEvents::AddCommentHistory, _1, _2));
@ -461,6 +463,51 @@ void DbEvents::AddAcknowledgementHistory(const Checkable::Ptr& checkable, const
DbObject::OnQuery(query1); DbObject::OnQuery(query1);
} }
void DbEvents::AddAcknowledgement(const Checkable::Ptr& checkable, AcknowledgementType type)
{
Log(LogDebug, "db_ido", "add acknowledgement for '" + checkable->GetName() + "'");
AddAcknowledgementInternal(checkable, type, true);
}
void DbEvents::RemoveAcknowledgement(const Checkable::Ptr& checkable)
{
Log(LogDebug, "db_ido", "remove acknowledgement for '" + checkable->GetName() + "'");
AddAcknowledgementInternal(checkable, AcknowledgementNone, false);
}
void DbEvents::AddAcknowledgementInternal(const Checkable::Ptr& checkable, AcknowledgementType type, bool add)
{
Host::Ptr host;
Service::Ptr service;
tie(host, service) = GetHostService(checkable);
DbQuery query1;
if (service)
query1.Table = "servicestatus";
else
query1.Table = "hoststatus";
query1.Type = DbQueryUpdate;
query1.Category = DbCatAcknowledgement;
Dictionary::Ptr fields1 = make_shared<Dictionary>();
fields1->Set("acknowledgement_type", type);
fields1->Set("problem_has_been_acknowledged", add ? 1 : 0);
query1.Fields = fields1;
query1.WhereCriteria = make_shared<Dictionary>();
if (service)
query1.WhereCriteria->Set("service_object_id", service);
else
query1.WhereCriteria->Set("host_object_id", host);
query1.WhereCriteria->Set("instance_id", 0); /* DbConnection class fills in real ID */
DbObject::OnQuery(query1);
}
/* notifications */ /* notifications */
void DbEvents::AddNotificationHistory(const Notification::Ptr& notification, const Checkable::Ptr& checkable, const std::set<User::Ptr>& users, NotificationType type, void DbEvents::AddNotificationHistory(const Notification::Ptr& notification, const Checkable::Ptr& checkable, const std::set<User::Ptr>& users, NotificationType type,
const CheckResult::Ptr& cr, const String& author, const String& text) const CheckResult::Ptr& cr, const String& author, const String& text)

4
lib/db_ido/dbevents.h
View File

@ -79,6 +79,10 @@ public:
static void RemoveDowntime(const Checkable::Ptr& checkable, const Downtime::Ptr& downtime); static void RemoveDowntime(const Checkable::Ptr& checkable, const Downtime::Ptr& downtime);
static void TriggerDowntime(const Checkable::Ptr& checkable, const Downtime::Ptr& downtime); static void TriggerDowntime(const Checkable::Ptr& checkable, const Downtime::Ptr& downtime);
static void AddAcknowledgement(const Checkable::Ptr& checkable, AcknowledgementType type);
static void RemoveAcknowledgement(const Checkable::Ptr& checkable);
static void AddAcknowledgementInternal(const Checkable::Ptr& checkable, AcknowledgementType type, bool add);
/* comment, downtime, acknowledgement history */ /* comment, downtime, acknowledgement history */
static void AddCommentHistory(const Checkable::Ptr& checkable, const Comment::Ptr& comment); static void AddCommentHistory(const Checkable::Ptr& checkable, const Comment::Ptr& comment);
static void AddDowntimeHistory(const Checkable::Ptr& checkable, const Downtime::Ptr& downtime); static void AddDowntimeHistory(const Checkable::Ptr& checkable, const Downtime::Ptr& downtime);