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: Add object_id for logentries.

Browse Source 
see https://dev.icinga.org/issues/4754 for the extension.
This commit is contained in:
Michael Friedrich 2013-10-03 03:41:47 +02:00
parent bfa8cf789b
commit 732f07a83f
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/db_ido_mysql/schema/mysql.sql
View File

@ -819,6 +819,7 @@ CREATE TABLE IF NOT EXISTS icinga_logentries (
logentry_data TEXT character set latin1 default '', logentry_data TEXT character set latin1 default '',
realtime_data smallint default 0, realtime_data smallint default 0,
inferred_data_extracted smallint default 0, inferred_data_extracted smallint default 0,
object_id bigint unsigned default NULL,
PRIMARY KEY (logentry_id) PRIMARY KEY (logentry_id)
) ENGINE=InnoDB COMMENT='Historical record of log entries'; ) ENGINE=InnoDB COMMENT='Historical record of log entries';

8
lib/db_ido/servicedbobject.cpp
View File

@ -1256,7 +1256,7 @@ void ServiceDbObject::AddLogHistory(const Service::Ptr& service, String buffer,
fields1->Set("logentry_time", DbValue::FromTimestamp(entry_time)); fields1->Set("logentry_time", DbValue::FromTimestamp(entry_time));
fields1->Set("entry_time", DbValue::FromTimestamp(entry_time)); fields1->Set("entry_time", DbValue::FromTimestamp(entry_time));
fields1->Set("entry_time_usec", entry_time_usec); fields1->Set("entry_time_usec", entry_time_usec);
//fields1->Set("object_id", service); // not supported in 1.x see #4754 fields1->Set("object_id", service); // added in 1.10 see #4754
fields1->Set("logentry_type", type); fields1->Set("logentry_type", type);
fields1->Set("logentry_data", buffer); fields1->Set("logentry_data", buffer);
@ -1265,13 +1265,11 @@ void ServiceDbObject::AddLogHistory(const Service::Ptr& service, String buffer,
query1.Fields = fields1; query1.Fields = fields1;
OnQuery(query1); OnQuery(query1);
/*
if (host->GetCheckService() == service) { if (host->GetCheckService() == service) {
//fields1->Set("object_id", host); // not supported in 1.x see #4754 fields1->Set("object_id", host); // added in 1.10 see #4754
query1.Fields = fields1; query1.Fields = fields1;
OnQuery(query1); OnQuery(query1);
} }
*/
} }
/* flappinghistory */ /* flappinghistory */
@ -1466,4 +1464,4 @@ void ServiceDbObject::AddExternalCommandHistory(double time, const String& comma
query1.Fields = fields1; query1.Fields = fields1;
OnQuery(query1); OnQuery(query1);
} }