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

DB IDO: Drop obsolete icinga_node column. 

Fixes #5730
This commit is contained in:
Michael Friedrich 2014-03-08 14:44:58 +01:00
parent e8aa87d372
commit 3885885aac
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/db_ido/servicedbobject.cpp
View File

@ -403,7 +403,6 @@ void ServiceDbObject::AddCommentByType(const DynamicObject::Ptr& object, const C
query1.Table = "comments";
} else {
query1.Table = "commenthistory";
fields1->Set("icinga_node", IcingaApplication::GetInstance()->GetNodeName());
}
query1.Type = DbQueryInsert;
query1.Category = DbCatComment;
@ -569,7 +568,6 @@ void ServiceDbObject::AddDowntimeByType(const DynamicObject::Ptr& object, const
query1.Table = "scheduleddowntime";
} else {
query1.Table = "downtimehistory";
fields1->Set("icinga_node", IcingaApplication::GetInstance()->GetNodeName());
}
query1.Type = DbQueryInsert;
query1.Category = DbCatDowntime;
@ -746,7 +744,6 @@ void ServiceDbObject::AddAcknowledgementHistory(const Service::Ptr& service, con
fields1->Set("comment_data", comment);
fields1->Set("is_sticky", type == AcknowledgementSticky ? 1 : 0);
fields1->Set("end_time", DbValue::FromTimestamp(end_time));
fields1->Set("icinga_node", IcingaApplication::GetInstance()->GetNodeName());
fields1->Set("instance_id", 0); /* DbConnection class fills in real ID */
query1.Fields = fields1;
@ -797,7 +794,6 @@ void ServiceDbObject::AddNotificationHistory(const Notification::Ptr& notificati
fields1->Set("escalated", 0);
fields1->Set("contacts_notified", static_cast<long>(users.size()));
fields1->Set("icinga_node", IcingaApplication::GetInstance()->GetNodeName());
fields1->Set("instance_id", 0); /* DbConnection class fills in real ID */
query1.Fields = fields1;
@ -869,7 +865,6 @@ void ServiceDbObject::AddStateChangeHistory(const Service::Ptr& service, const C
fields1->Set("check_source", cr->GetCheckSource());
}
fields1->Set("icinga_node", IcingaApplication::GetInstance()->GetNodeName());
fields1->Set("instance_id", 0); /* DbConnection class fills in real ID */
query1.Fields = fields1;
@ -1172,7 +1167,6 @@ void ServiceDbObject::AddLogHistory(const Service::Ptr& service, String buffer,
fields1->Set("object_id", service); // added in 1.10 see #4754
fields1->Set("logentry_type", type);
fields1->Set("logentry_data", buffer);
fields1->Set("icinga_node", IcingaApplication::GetInstance()->GetNodeName());
fields1->Set("instance_id", 0); /* DbConnection class fills in real ID */
@ -1229,7 +1223,6 @@ void ServiceDbObject::AddFlappingHistory(const Service::Ptr& service, FlappingSt
fields1->Set("percent_state_change", service->GetFlappingCurrent());
fields1->Set("low_threshold", service->GetFlappingThreshold());
fields1->Set("high_threshold", service->GetFlappingThreshold());
fields1->Set("icinga_node", IcingaApplication::GetInstance()->GetNodeName());
fields1->Set("instance_id", 0); /* DbConnection class fills in real ID */
@ -1288,7 +1281,6 @@ void ServiceDbObject::AddServiceCheckHistory(const Service::Ptr& service, const
fields1->Set("output", CompatUtility::GetCheckResultOutput(cr));
fields1->Set("long_output", CompatUtility::GetCheckResultLongOutput(cr));
fields1->Set("perfdata", CompatUtility::GetCheckResultPerfdata(cr));
fields1->Set("icinga_node", IcingaApplication::GetInstance()->GetNodeName());
fields1->Set("instance_id", 0); /* DbConnection class fills in real ID */
fields1->Set("service_object_id", service);
@ -1336,7 +1328,6 @@ void ServiceDbObject::AddEventHandlerHistory(const Service::Ptr& service)
fields1->Set("end_time", DbValue::FromTimestamp(time_bag.first));
fields1->Set("end_time_usec", time_bag.second);
fields1->Set("command_object_id", service->GetEventCommand());
fields1->Set("icinga_node", IcingaApplication::GetInstance()->GetNodeName());
fields1->Set("instance_id", 0); /* DbConnection class fills in real ID */
@ -1370,7 +1361,6 @@ void ServiceDbObject::AddExternalCommandHistory(double time, const String& comma
fields1->Set("command_type", CompatUtility::MapExternalCommandType(command));
fields1->Set("command_name", command);
fields1->Set("command_args", boost::algorithm::join(arguments, ";"));
fields1->Set("icinga_node", IcingaApplication::GetInstance()->GetNodeName());
fields1->Set("instance_id", 0); /* DbConnection class fills in real ID */