From: Michael Friedrich Date: Wed, 15 Jun 2016 09:28:20 +0000 (+0200) Subject: DB IDO: Fix comment/downtime entry_time reset X-Git-Tag: v2.5.0~262 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=399ae42a8c742aed235b2be6617ef3a8b018df3b;p=icinga2 DB IDO: Fix comment/downtime entry_time reset fixes #11182 --- diff --git a/lib/icinga/comment.cpp b/lib/icinga/comment.cpp index fd98ae120..7b9165366 100644 --- a/lib/icinga/comment.cpp +++ b/lib/icinga/comment.cpp @@ -166,6 +166,7 @@ String Comment::AddComment(const Checkable::Ptr& checkable, CommentType entryTyp attrs->Set("text", text); attrs->Set("expire_time", expireTime); attrs->Set("entry_type", entryType); + attrs->Set("entry_time", Utility::GetTime()); Host::Ptr host; Service::Ptr service; diff --git a/lib/icinga/downtime.cpp b/lib/icinga/downtime.cpp index 66b6a635e..ee916c284 100644 --- a/lib/icinga/downtime.cpp +++ b/lib/icinga/downtime.cpp @@ -214,6 +214,7 @@ String Downtime::AddDowntime(const Checkable::Ptr& checkable, const String& auth attrs->Set("triggered_by", triggeredBy); attrs->Set("scheduled_by", scheduledBy); attrs->Set("config_owner", scheduledDowntime); + attrs->Set("entry_time", Utility::GetTime()); Host::Ptr host; Service::Ptr service; diff --git a/lib/icinga/downtime.ti b/lib/icinga/downtime.ti index 5c7a19bdd..29248cc16 100644 --- a/lib/icinga/downtime.ti +++ b/lib/icinga/downtime.ti @@ -66,7 +66,7 @@ class Downtime : ConfigObject < DowntimeNameComposer }}} }; - [state] double entry_time { + [config] double entry_time { default {{{ return Utility::GetTime(); }}} }; [config, required] String author;