From 7bf2e0703283c4805c33d4726dd96950fa09406d Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Tue, 5 Dec 2017 13:35:09 +0100 Subject: [PATCH] Move CompatUtility::GetCheckableProblemHasBeenAcknowledged() into feature specific dumps --- lib/compat/statusdatawriter.cpp | 6 +++--- lib/db_ido/hostdbobject.cpp | 2 +- lib/db_ido/servicedbobject.cpp | 2 +- lib/icinga/compatutility.cpp | 6 ------ lib/icinga/compatutility.hpp | 1 - 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/lib/compat/statusdatawriter.cpp b/lib/compat/statusdatawriter.cpp index d1f39811d..e5b41f03e 100644 --- a/lib/compat/statusdatawriter.cpp +++ b/lib/compat/statusdatawriter.cpp @@ -372,7 +372,7 @@ void StatusDataWriter::DumpCheckableStatusAttrs(std::ostream& fp, const Checkabl if (cr) { fp << "\t" << "check_source=" << cr->GetCheckSource() << "\n" - "\t" "last_check=" << static_cast(cr->GetScheduleEnd()) << "\n"; + "\t" "last_check=" << static_cast(cr->GetScheduleEnd()) << "\n"; } fp << "\t" << "next_check=" << static_cast(checkable->GetNextCheck()) << "\n" @@ -380,14 +380,14 @@ void StatusDataWriter::DumpCheckableStatusAttrs(std::ostream& fp, const Checkabl "\t" "max_attempts=" << checkable->GetMaxCheckAttempts() << "\n" "\t" "last_state_change=" << static_cast(checkable->GetLastStateChange()) << "\n" "\t" "last_hard_state_change=" << static_cast(checkable->GetLastHardStateChange()) << "\n" - "\t" "last_update=" << static_cast(time(nullptr)) << "\n" + "\t" "last_update=" << static_cast(time(NULL)) << "\n" "\t" "notifications_enabled=" << CompatUtility::GetCheckableNotificationsEnabled(checkable) << "\n" "\t" "active_checks_enabled=" << CompatUtility::GetCheckableActiveChecksEnabled(checkable) << "\n" "\t" "passive_checks_enabled=" << CompatUtility::GetCheckablePassiveChecksEnabled(checkable) << "\n" "\t" "flap_detection_enabled=" << CompatUtility::GetCheckableFlapDetectionEnabled(checkable) << "\n" "\t" "is_flapping=" << CompatUtility::GetCheckableIsFlapping(checkable) << "\n" "\t" "percent_state_change=" << CompatUtility::GetCheckablePercentStateChange(checkable) << "\n" - "\t" "problem_has_been_acknowledged=" << CompatUtility::GetCheckableProblemHasBeenAcknowledged(checkable) << "\n" + "\t" "problem_has_been_acknowledged=" << (checkable->GetAcknowledgement() != AcknowledgementNone ? 1 : 0) << "\n" "\t" "acknowledgement_type=" << CompatUtility::GetCheckableAcknowledgementType(checkable) << "\n" "\t" "acknowledgement_end_time=" << checkable->GetAcknowledgementExpiry() << "\n" "\t" "scheduled_downtime_depth=" << checkable->GetDowntimeDepth() << "\n" diff --git a/lib/db_ido/hostdbobject.cpp b/lib/db_ido/hostdbobject.cpp index dc9271416..b1477a3ee 100644 --- a/lib/db_ido/hostdbobject.cpp +++ b/lib/db_ido/hostdbobject.cpp @@ -153,7 +153,7 @@ Dictionary::Ptr HostDbObject::GetStatusFields() const fields->Set("next_notification", DbValue::FromTimestamp(CompatUtility::GetCheckableNotificationNextNotification(host))); fields->Set("no_more_notifications", Empty); fields->Set("notifications_enabled", CompatUtility::GetCheckableNotificationsEnabled(host)); - fields->Set("problem_has_been_acknowledged", CompatUtility::GetCheckableProblemHasBeenAcknowledged(host)); + fields->Set("problem_has_been_acknowledged", host->GetAcknowledgement() != AcknowledgementNone); fields->Set("acknowledgement_type", CompatUtility::GetCheckableAcknowledgementType(host)); fields->Set("current_notification_number", CompatUtility::GetCheckableNotificationNotificationNumber(host)); fields->Set("passive_checks_enabled", CompatUtility::GetCheckablePassiveChecksEnabled(host)); diff --git a/lib/db_ido/servicedbobject.cpp b/lib/db_ido/servicedbobject.cpp index 048122f13..3263f40f1 100644 --- a/lib/db_ido/servicedbobject.cpp +++ b/lib/db_ido/servicedbobject.cpp @@ -141,7 +141,7 @@ Dictionary::Ptr ServiceDbObject::GetStatusFields() const fields->Set("next_notification", DbValue::FromTimestamp(CompatUtility::GetCheckableNotificationNextNotification(service))); fields->Set("no_more_notifications", Empty); fields->Set("notifications_enabled", CompatUtility::GetCheckableNotificationsEnabled(service)); - fields->Set("problem_has_been_acknowledged", CompatUtility::GetCheckableProblemHasBeenAcknowledged(service)); + fields->Set("problem_has_been_acknowledged", service->GetAcknowledgement() != AcknowledgementNone); fields->Set("acknowledgement_type", CompatUtility::GetCheckableAcknowledgementType(service)); fields->Set("current_notification_number", CompatUtility::GetCheckableNotificationNotificationNumber(service)); fields->Set("passive_checks_enabled", CompatUtility::GetCheckablePassiveChecksEnabled(service)); diff --git a/lib/icinga/compatutility.cpp b/lib/icinga/compatutility.cpp index bea2dc1ec..52155ba34 100644 --- a/lib/icinga/compatutility.cpp +++ b/lib/icinga/compatutility.cpp @@ -207,12 +207,6 @@ int CompatUtility::GetCheckableHasBeenChecked(const Checkable::Ptr& checkable) return (checkable->GetLastCheckResult() ? 1 : 0); } - -int CompatUtility::GetCheckableProblemHasBeenAcknowledged(const Checkable::Ptr& checkable) -{ - return (checkable->GetAcknowledgement() != AcknowledgementNone ? 1 : 0); -} - int CompatUtility::GetCheckableAcknowledgementType(const Checkable::Ptr& checkable) { return static_cast(checkable->GetAcknowledgement()); diff --git a/lib/icinga/compatutility.hpp b/lib/icinga/compatutility.hpp index d6408534b..b2d77e358 100644 --- a/lib/icinga/compatutility.hpp +++ b/lib/icinga/compatutility.hpp @@ -55,7 +55,6 @@ public: static double GetCheckableRetryInterval(const Checkable::Ptr& checkable); static String GetCheckableCheckPeriod(const Checkable::Ptr& checkable); static int GetCheckableHasBeenChecked(const Checkable::Ptr& checkable); - static int GetCheckableProblemHasBeenAcknowledged(const Checkable::Ptr& checkable); static int GetCheckableAcknowledgementType(const Checkable::Ptr& checkable); static int GetCheckablePassiveChecksEnabled(const Checkable::Ptr& checkable); static int GetCheckableActiveChecksEnabled(const Checkable::Ptr& checkable);