Remove dead code from old modified attributes

refs #9851

diff --git a/lib/compat/statusdatawriter.cpp b/lib/compat/statusdatawriter.cpp
index 8f71cefccd8ee27ab9fb36793bc2b1f171a1ad90..c0a21c03c929c623ce62fc5984a4e2bfd02d1df6 100644 (file)
--- a/lib/compat/statusdatawriter.cpp
+++ b/lib/compat/statusdatawriter.cpp
@@ -396,7 +396,6 @@ void StatusDataWriter::DumpCheckableStatusAttrs(std::ostream& fp, const Checkabl
              "\t" "last_notification=" << CompatUtility::GetCheckableNotificationLastNotification(checkable) << "\n"
              "\t" "next_notification=" << CompatUtility::GetCheckableNotificationNextNotification(checkable) << "\n"
              "\t" "current_notification_number=" << CompatUtility::GetCheckableNotificationNotificationNumber(checkable) << "\n"
-             "\t" "modified_attributes=" << checkable->GetModifiedAttributes() << "\n"
              "\t" "is_reachable=" << CompatUtility::GetCheckableIsReachable(checkable) << "\n";
 }
 

diff --git a/lib/db_ido/dbobject.cpp b/lib/db_ido/dbobject.cpp
index c1aebbcb913ff3d5f66952b99aabb138a054e7be..6a6f11201faac53dbc3170cc7d99e9da878207ee 100644 (file)
--- a/lib/db_ido/dbobject.cpp
+++ b/lib/db_ido/dbobject.cpp
@@ -181,18 +181,11 @@ void DbObject::SendVarsConfigUpdate(void)
                        } else
                                value = kv.second;
 
-                       int overridden = custom_var_object->IsVarOverridden(kv.first) ? 1 : 0;
-
-                       Log(LogDebug, "DbObject")
-                           << "object customvar key: '" << kv.first << "' value: '" << kv.second
-                           << "' overridden: " << overridden;
-
                        Dictionary::Ptr fields = new Dictionary();
                        fields->Set("varname", kv.first);
                        fields->Set("varvalue", value);
                        fields->Set("is_json", is_json);
                        fields->Set("config_type", 1);
-                       fields->Set("has_been_modified", overridden);
                        fields->Set("object_id", obj);
                        fields->Set("instance_id", 0); /* DbConnection class fills in real ID */
 
@@ -242,17 +235,10 @@ void DbObject::SendVarsStatusUpdate(void)
                        } else
                                value = kv.second;
 
-                       int overridden = custom_var_object->IsVarOverridden(kv.first) ? 1 : 0;
-
-                       Log(LogDebug, "DbObject")
-                           << "object customvar key: '" << kv.first << "' value: '" << kv.second
-                           << "' overridden: " << overridden;
-
                        Dictionary::Ptr fields = new Dictionary();
                        fields->Set("varname", kv.first);
                        fields->Set("varvalue", value);
                        fields->Set("is_json", is_json);
-                       fields->Set("has_been_modified", overridden);
                        fields->Set("status_update_time", DbValue::FromTimestamp(Utility::GetTime()));
                        fields->Set("object_id", obj);
                        fields->Set("instance_id", 0); /* DbConnection class fills in real ID */

diff --git a/lib/db_ido/hostdbobject.cpp b/lib/db_ido/hostdbobject.cpp
index 919061c27398684468ba9a9bf41b09309c113f32..c49040c1190871abdc1f52e5080c54a7428adec5 100644 (file)
--- a/lib/db_ido/hostdbobject.cpp
+++ b/lib/db_ido/hostdbobject.cpp
@@ -163,7 +163,6 @@ Dictionary::Ptr HostDbObject::GetStatusFields(void) const
        fields->Set("failure_prediction_enabled", Empty);
        fields->Set("process_performance_data", CompatUtility::GetCheckableProcessPerformanceData(host));
        fields->Set("obsess_over_host", Empty);
-       fields->Set("modified_host_attributes", host->GetModifiedAttributes());
        fields->Set("event_handler", CompatUtility::GetCheckableEventHandler(host));
        fields->Set("check_command", CompatUtility::GetCheckableCheckCommand(host));
        fields->Set("normal_check_interval", CompatUtility::GetCheckableCheckInterval(host));

diff --git a/lib/db_ido/servicedbobject.cpp b/lib/db_ido/servicedbobject.cpp
index 3791d4632fda2b9a5d99b908a71fc93025e48c32..a9a640e6962e37616ddc480023a252e6dee8a2e2 100644 (file)
--- a/lib/db_ido/servicedbobject.cpp
+++ b/lib/db_ido/servicedbobject.cpp
@@ -162,7 +162,6 @@ Dictionary::Ptr ServiceDbObject::GetStatusFields(void) const
        fields->Set("normal_check_interval", CompatUtility::GetCheckableCheckInterval(service));
        fields->Set("retry_check_interval", CompatUtility::GetCheckableRetryInterval(service));
        fields->Set("check_timeperiod_object_id", service->GetCheckPeriod());
-       fields->Set("modified_service_attributes", service->GetModifiedAttributes());
        fields->Set("is_reachable", CompatUtility::GetCheckableIsReachable(service));
 
        return fields;

diff --git a/lib/db_ido/userdbobject.cpp b/lib/db_ido/userdbobject.cpp
index 5387e0bdb5b953e0a539d5d22873a20375268a2c..1e67a3e12315de48fb74fe61f29af971f1102cac 100644 (file)
--- a/lib/db_ido/userdbobject.cpp
+++ b/lib/db_ido/userdbobject.cpp
@@ -71,9 +71,6 @@ Dictionary::Ptr UserDbObject::GetStatusFields(void) const
        fields->Set("service_notifications_enabled", user->GetEnableNotifications());
        fields->Set("last_host_notification", DbValue::FromTimestamp(user->GetLastNotification()));
        fields->Set("last_service_notification", DbValue::FromTimestamp(user->GetLastNotification()));
-       fields->Set("modified_attributes", user->GetModifiedAttributes());
-       fields->Set("modified_host_attributes", Empty);
-       fields->Set("modified_service_attributes", Empty);
 
        return fields;
 }

diff --git a/lib/icinga/checkable.cpp b/lib/icinga/checkable.cpp
index 76f5863075e9ad6e22d7bad1b52148b9dc808507..fd985e995b171e6474c69b70aa387c1c0f12618d 100644 (file)
--- a/lib/icinga/checkable.cpp
+++ b/lib/icinga/checkable.cpp
@@ -139,18 +139,6 @@ void Checkable::ClearAcknowledgement(const MessageOrigin::Ptr& origin)
        OnAcknowledgementCleared(this, origin);
 }
 
-int Checkable::GetModifiedAttributes(void) const
-{
-       //TODO-MA
-       return 0;
-}
-
-void Checkable::SetModifiedAttributes(int flags, const MessageOrigin::Ptr& origin)
-{
-       //TODO-MA
-       return;
-}
-
 Endpoint::Ptr Checkable::GetCommandEndpoint(void) const
 {
        return Endpoint::GetByName(GetCommandEndpointRaw());

diff --git a/lib/icinga/checkable.hpp b/lib/icinga/checkable.hpp
index 31b9c2011d09a83d782196364d6e92633c306420..cf828af93793542c8ddc5de5617da776cd84ff4d 100644 (file)
--- a/lib/icinga/checkable.hpp
+++ b/lib/icinga/checkable.hpp
@@ -103,9 +103,6 @@ public:
        void ExecuteCheck();
        void ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrigin::Ptr& origin = MessageOrigin::Ptr());
 
-       virtual int GetModifiedAttributes(void) const override;
-       virtual void SetModifiedAttributes(int flags, const MessageOrigin::Ptr& origin = MessageOrigin::Ptr()) override;
-
        Endpoint::Ptr GetCommandEndpoint(void) const;
 
        bool IsCheckPending(void) const;

diff --git a/lib/icinga/command.cpp b/lib/icinga/command.cpp
index 8c656c1f0ce273e1f11f3cf19a2d417018363dea..e029322f5ffbf6bd2e08022121f5abc3b724a2d8 100644 (file)
--- a/lib/icinga/command.cpp
+++ b/lib/icinga/command.cpp
@@ -28,17 +28,6 @@ using namespace icinga;
 
 REGISTER_TYPE(Command);
 
-int Command::GetModifiedAttributes(void) const
-{
-       //TODO-MA
-       return 0;
-}
-
-void Command::SetModifiedAttributes(int flags, const MessageOrigin::Ptr& origin)
-{
-       //TODO-MA
-}
-
 void Command::Validate(int types, const ValidationUtils& utils)
 {
        ObjectImpl<Command>::Validate(types, utils);

diff --git a/lib/icinga/command.hpp b/lib/icinga/command.hpp
index 0df51562c9915ebd6fc789e1a918a23652d18611..9dc9723ab6162e70c7cb4c1d3f9251cfdc81f0c6 100644 (file)
--- a/lib/icinga/command.hpp
+++ b/lib/icinga/command.hpp
@@ -40,9 +40,6 @@ public:
        //virtual Dictionary::Ptr Execute(const Object::Ptr& context) = 0;
 
        virtual void Validate(int types, const ValidationUtils& utils) override;
-
-       int GetModifiedAttributes(void) const override;
-       void SetModifiedAttributes(int flags, const MessageOrigin::Ptr& origin = MessageOrigin::Ptr()) override;
 };
 
 }

diff --git a/lib/icinga/compatutility.cpp b/lib/icinga/compatutility.cpp
index 709d9d5f9c2de94bb21974fc797279548a4981d1..17cf23ca9918d2340288efc69dc5453a5431491c 100644 (file)
--- a/lib/icinga/compatutility.cpp
+++ b/lib/icinga/compatutility.cpp
@@ -388,62 +388,6 @@ String CompatUtility::GetCustomAttributeConfig(const CustomVarObject::Ptr& objec
        return vars->Get(name);
 }
 
-Array::Ptr CompatUtility::GetModifiedAttributesList(const CustomVarObject::Ptr& object)
-{
-       Array::Ptr mod_attr_list = new Array();
-
-       if (object->GetType() != ConfigType::GetByName("Host") &&
-           object->GetType() != ConfigType::GetByName("Service") &&
-           object->GetType() != ConfigType::GetByName("User") &&
-           object->GetType() != ConfigType::GetByName("CheckCommand") &&
-           object->GetType() != ConfigType::GetByName("EventCommand") &&
-           object->GetType() != ConfigType::GetByName("NotificationCommand"))
-               return mod_attr_list;
-
-       int flags = object->GetModifiedAttributes();
-
-       if ((flags & ModAttrNotificationsEnabled))
-               mod_attr_list->Add("notifications_enabled");
-
-       if ((flags & ModAttrActiveChecksEnabled))
-               mod_attr_list->Add("active_checks_enabled");
-
-       if ((flags & ModAttrPassiveChecksEnabled))
-               mod_attr_list->Add("passive_checks_enabled");
-
-       if ((flags & ModAttrFlapDetectionEnabled))
-               mod_attr_list->Add("flap_detection_enabled");
-
-       if ((flags & ModAttrEventHandlerEnabled))
-               mod_attr_list->Add("event_handler_enabled");
-
-       if ((flags & ModAttrPerformanceDataEnabled))
-               mod_attr_list->Add("performance_data_enabled");
-
-       if ((flags & ModAttrNormalCheckInterval))
-               mod_attr_list->Add("check_interval");
-
-       if ((flags & ModAttrRetryCheckInterval))
-               mod_attr_list->Add("retry_interval");
-
-       if ((flags & ModAttrEventHandlerCommand))
-               mod_attr_list->Add("event_handler_command");
-
-       if ((flags & ModAttrCheckCommand))
-               mod_attr_list->Add("check_command");
-
-       if ((flags & ModAttrMaxCheckAttempts))
-               mod_attr_list->Add("max_check_attemps");
-
-       if ((flags & ModAttrCheckTimeperiod))
-               mod_attr_list->Add("check_timeperiod");
-
-       if ((flags & ModAttrCustomVariable))
-               mod_attr_list->Add("custom_variable");
-
-       return mod_attr_list;
-}
-
 /* notifications */
 int CompatUtility::GetCheckableNotificationsEnabled(const Checkable::Ptr& checkable)
 {

diff --git a/lib/icinga/compatutility.hpp b/lib/icinga/compatutility.hpp
index d97b4673f402aaf8ba1e378d1a7104ea52f30230..b36dfcc86b28dee89f4c760534eba4c34a2b522a 100644 (file)
--- a/lib/icinga/compatutility.hpp
+++ b/lib/icinga/compatutility.hpp
@@ -82,8 +82,6 @@ public:
        static int GetCheckableInCheckPeriod(const Checkable::Ptr& checkable);
        static int GetCheckableInNotificationPeriod(const Checkable::Ptr& checkable);
 
-       static Array::Ptr GetModifiedAttributesList(const CustomVarObject::Ptr& object);
-
        /* notification */
        static int GetCheckableNotificationsEnabled(const Checkable::Ptr& checkable);
        static int GetCheckableNotificationLastNotification(const Checkable::Ptr& checkable);

diff --git a/lib/icinga/customvarobject.cpp b/lib/icinga/customvarobject.cpp
index a9deaa4f6ea30382ba2819fe3955acad57a9c697..267f23297ce35d216341017c2e1aae3dc71682bc 100644 (file)
--- a/lib/icinga/customvarobject.cpp
+++ b/lib/icinga/customvarobject.cpp
@@ -29,23 +29,6 @@ using namespace icinga;
 
 REGISTER_TYPE(CustomVarObject);
 
-int CustomVarObject::GetModifiedAttributes(void) const
-{
-       //TODO-MA
-       return 0;
-}
-
-void CustomVarObject::SetModifiedAttributes(int, const MessageOrigin::Ptr&)
-{
-       //TODO-MA
-}
-
-bool CustomVarObject::IsVarOverridden(const String& name) const
-{
-       //TODO: implement
-       return false;
-}
-
 void CustomVarObject::ValidateVars(const Dictionary::Ptr& value, const ValidationUtils& utils)
 {
        MacroProcessor::ValidateCustomVars(this, value);

diff --git a/lib/icinga/customvarobject.hpp b/lib/icinga/customvarobject.hpp
index 46dd59d17da82fa27d9f5288aff8fb02898141e4..fb5e4701a534ef6d6f82428a290f79a8bd5eb581 100644 (file)
--- a/lib/icinga/customvarobject.hpp
+++ b/lib/icinga/customvarobject.hpp
@@ -28,27 +28,6 @@
 namespace icinga
 {
 
-enum ModifiedAttributeType
-{
-       ModAttrNotificationsEnabled = 1,
-       ModAttrActiveChecksEnabled = 2,
-       ModAttrPassiveChecksEnabled = 4,
-       ModAttrEventHandlerEnabled = 8,
-       ModAttrFlapDetectionEnabled = 16,
-       ModAttrFailurePredictionEnabled = 32,
-       ModAttrPerformanceDataEnabled = 64,
-       ModAttrObsessiveHandlerEnabled = 128,
-       ModAttrEventHandlerCommand = 256,
-       ModAttrCheckCommand = 512,
-       ModAttrNormalCheckInterval = 1024,
-       ModAttrRetryCheckInterval = 2048,
-       ModAttrMaxCheckAttempts = 4096,
-       ModAttrFreshnessChecksEnabled = 8192,
-       ModAttrCheckTimeperiod = 16384,
-       ModAttrCustomVariable = 32768,
-       ModAttrNotificationTimeperiod = 65536
-};
-
 /**
  * An object with custom variable attribute.
  *
@@ -60,11 +39,6 @@ public:
        DECLARE_OBJECT(CustomVarObject);
 
        virtual void ValidateVars(const Dictionary::Ptr& value, const ValidationUtils& utils) override;
-
-       virtual int GetModifiedAttributes(void) const;
-       virtual void SetModifiedAttributes(int flags, const MessageOrigin::Ptr& origin = MessageOrigin::Ptr());
-
-       bool IsVarOverridden(const String& name) const;
 };
 
 }

diff --git a/lib/icinga/externalcommandprocessor.cpp b/lib/icinga/externalcommandprocessor.cpp
index 6561bc3608da6d7446877ce2a72b92dfe075c541..bb99d9da2cec3eaadba9611fc9d91feee982961a 100644 (file)
--- a/lib/icinga/externalcommandprocessor.cpp
+++ b/lib/icinga/externalcommandprocessor.cpp
@@ -257,12 +257,6 @@ void ExternalCommandProcessor::StaticInitialize(void)
        RegisterCommand("STOP_EXECUTING_SVC_CHECKS", &ExternalCommandProcessor::StopExecutingSvcChecks);
        RegisterCommand("START_EXECUTING_HOST_CHECKS", &ExternalCommandProcessor::StartExecutingHostChecks);
        RegisterCommand("STOP_EXECUTING_HOST_CHECKS", &ExternalCommandProcessor::StopExecutingHostChecks);
-       RegisterCommand("CHANGE_SVC_MODATTR", &ExternalCommandProcessor::ChangeSvcModattr, 3);
-       RegisterCommand("CHANGE_HOST_MODATTR", &ExternalCommandProcessor::ChangeHostModattr, 2);
-       RegisterCommand("CHANGE_USER_MODATTR", &ExternalCommandProcessor::ChangeUserModattr, 2);
-       RegisterCommand("CHANGE_CHECKCOMMAND_MODATTR", &ExternalCommandProcessor::ChangeCheckcommandModattr, 2);
-       RegisterCommand("CHANGE_EVENTCOMMAND_MODATTR", &ExternalCommandProcessor::ChangeEventcommandModattr, 2);
-       RegisterCommand("CHANGE_NOTIFICATIONCOMMAND_MODATTR", &ExternalCommandProcessor::ChangeNotificationcommandModattr, 2);
        RegisterCommand("CHANGE_NORMAL_SVC_CHECK_INTERVAL", &ExternalCommandProcessor::ChangeNormalSvcCheckInterval, 3);
        RegisterCommand("CHANGE_NORMAL_HOST_CHECK_INTERVAL", &ExternalCommandProcessor::ChangeNormalHostCheckInterval, 2);
        RegisterCommand("CHANGE_RETRY_SVC_CHECK_INTERVAL", &ExternalCommandProcessor::ChangeRetrySvcCheckInterval, 3);
@@ -1667,89 +1661,6 @@ void ExternalCommandProcessor::StopExecutingHostChecks(double, const std::vector
        IcingaApplication::GetInstance()->SetEnableHostChecks(false);
 }
 
-void ExternalCommandProcessor::ChangeSvcModattr(double, const std::vector<String>& arguments)
-{
-       Service::Ptr service = Service::GetByNamePair(arguments[0], arguments[1]);
-
-       if (!service)
-               BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot update modified attributes for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'"));
-
-       int modifiedAttributes = Convert::ToLong(arguments[2]);
-
-       Log(LogNotice, "ExternalCommandProcessor")
-           << "Updating modified attributes for service '" << arguments[1] << "'";
-
-       service->SetModifiedAttributes(modifiedAttributes);
-}
-
-void ExternalCommandProcessor::ChangeHostModattr(double, const std::vector<String>& arguments)
-{
-       Host::Ptr host = Host::GetByName(arguments[0]);
-
-       if (!host)
-               BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot update modified attributes for non-existent host '" + arguments[0] + "'"));
-
-       Log(LogNotice, "ExternalCommandProcessor")
-           << "Updating modified attributes for host '" << arguments[0] << "'";
-
-       int modifiedAttributes = Convert::ToLong(arguments[1]);
-
-       host->SetModifiedAttributes(modifiedAttributes);
-}
-
-void ExternalCommandProcessor::ChangeUserModattr(double, const std::vector<String>& arguments)
-{
-       User::Ptr user = User::GetByName(arguments[0]);
-
-       if (!user)
-               BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot update modified attributes for non-existent user '" + arguments[0] + "'"));
-
-       Log(LogNotice, "ExternalCommandProcessor")
-           << "Updating modified attributes for user '" << arguments[0] << "'";
-
-       int modifiedAttributes = Convert::ToLong(arguments[1]);
-
-       user->SetModifiedAttributes(modifiedAttributes);
-}
-
-void ExternalCommandProcessor::ChangeCheckcommandModattr(double, const std::vector<String>& arguments)
-{
-       CheckCommand::Ptr command = CheckCommand::GetByName(arguments[0]);
-
-       if (!command)
-               BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot update modified attributes for non-existent command '" + arguments[0] + "'"));
-
-       ChangeCommandModattrInternal(command, Convert::ToLong(arguments[1]));
-}
-
-void ExternalCommandProcessor::ChangeEventcommandModattr(double, const std::vector<String>& arguments)
-{
-       EventCommand::Ptr command = EventCommand::GetByName(arguments[0]);
-
-       if (!command)
-               BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot update modified attributes for non-existent command '" + arguments[0] + "'"));
-
-       ChangeCommandModattrInternal(command, Convert::ToLong(arguments[1]));
-}
-
-void ExternalCommandProcessor::ChangeNotificationcommandModattr(double, const std::vector<String>& arguments)
-{
-       NotificationCommand::Ptr command = NotificationCommand::GetByName(arguments[0]);
-
-       if (!command)
-               BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot update modified attributes for non-existent command '" + arguments[0] + "'"));
-
-       ChangeCommandModattrInternal(command, Convert::ToLong(arguments[1]));
-}
-
-void ExternalCommandProcessor::ChangeCommandModattrInternal(const Command::Ptr& command, int mod_attr)
-{
-       Log(LogNotice, "ExternalCommandProcessor")
-           << "Updating modified attributes for command '" << command->GetName() << "'";
-
-       command->SetModifiedAttributes(mod_attr);
-}
-
 void ExternalCommandProcessor::ChangeNormalSvcCheckInterval(double, const std::vector<String>& arguments)
 {
        Service::Ptr service = Service::GetByNamePair(arguments[0], arguments[1]);

diff --git a/lib/icinga/externalcommandprocessor.hpp b/lib/icinga/externalcommandprocessor.hpp
index 72072bf871f13925047a4dc841b868b88ac9c605..5204998887b902465fc29c02372a792b5aa961ef 100644 (file)
--- a/lib/icinga/externalcommandprocessor.hpp
+++ b/lib/icinga/externalcommandprocessor.hpp
@@ -127,13 +127,6 @@ private:
        static void StopExecutingSvcChecks(double time, const std::vector<String>& arguments);
        static void StartExecutingHostChecks(double time, const std::vector<String>& arguments);
        static void StopExecutingHostChecks(double time, const std::vector<String>& arguments);
-       static void ChangeSvcModattr(double time, const std::vector<String>& arguments);
-       static void ChangeHostModattr(double time, const std::vector<String>& arguments);
-
-       static void ChangeUserModattr(double time, const std::vector<String>& arguments);
-       static void ChangeCheckcommandModattr(double time, const std::vector<String>& arguments);
-       static void ChangeEventcommandModattr(double time, const std::vector<String>& arguments);
-       static void ChangeNotificationcommandModattr(double time, const std::vector<String>& arguments);
 
        static void ChangeNormalSvcCheckInterval(double time, const std::vector<String>& arguments);
        static void ChangeNormalHostCheckInterval(double time, const std::vector<String>& arguments);
@@ -168,7 +161,6 @@ private:
        static void DisableServicegroupSvcNotifications(double time, const std::vector<String>& arguments);
 
 private:
-       static void ChangeCommandModattrInternal(const Command::Ptr& command, int mod_attr);
        static void ChangeCustomCommandVarInternal(const Command::Ptr& command, const String& name, const Value& value);
 };
 

diff --git a/lib/icinga/user.cpp b/lib/icinga/user.cpp
index f8f1704952e04189fce1b964c9dc9342c3503a83..048109e6cedbec640c1eedbc8c2685ba6b389c9b 100644 (file)
--- a/lib/icinga/user.cpp
+++ b/lib/icinga/user.cpp
@@ -119,15 +119,3 @@ void User::ValidateTypes(const Array::Ptr& value, const ValidationUtils& utils)
                BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("types"), "Type filter is invalid."));
        }
 }
-
-int User::GetModifiedAttributes(void) const
-{
-       //TODO-MA
-       return 0;
-}
-
-void User::SetModifiedAttributes(int flags, const MessageOrigin::Ptr& origin)
-{
-       //TODO-MA
-       return;
-}

diff --git a/lib/icinga/user.hpp b/lib/icinga/user.hpp
index 40c7a7dc15abe043a4f8c8ebd93f51f8c1816276..e86f71e81086852f4dae529519103d72afd11abc 100644 (file)
--- a/lib/icinga/user.hpp
+++ b/lib/icinga/user.hpp
@@ -47,9 +47,6 @@ public:
        virtual void ValidateStates(const Array::Ptr& value, const ValidationUtils& utils) override;
        virtual void ValidateTypes(const Array::Ptr& value, const ValidationUtils& utils) override;
 
-       virtual int GetModifiedAttributes(void) const override;
-       virtual void SetModifiedAttributes(int flags, const MessageOrigin::Ptr& origin = MessageOrigin::Ptr()) override;
-
 protected:
        virtual void Stop(void) override;
 

diff --git a/lib/livestatus/commandstable.cpp b/lib/livestatus/commandstable.cpp
index f8e7c133e184d1800b8274bac913cdb8075c299f..1e86ebed7c500106d95fdea00cf1ec7aab259d86 100644 (file)
--- a/lib/livestatus/commandstable.cpp
+++ b/lib/livestatus/commandstable.cpp
@@ -44,8 +44,8 @@ void CommandsTable::AddColumns(Table *table, const String& prefix,
        table->AddColumn(prefix + "custom_variable_names", Column(&CommandsTable::CustomVariableNamesAccessor, objectAccessor));
        table->AddColumn(prefix + "custom_variable_values", Column(&CommandsTable::CustomVariableValuesAccessor, objectAccessor));
        table->AddColumn(prefix + "custom_variables", Column(&CommandsTable::CustomVariablesAccessor, objectAccessor));
-       table->AddColumn(prefix + "modified_attributes", Column(&CommandsTable::ModifiedAttributesAccessor, objectAccessor));
-       table->AddColumn(prefix + "modified_attributes_list", Column(&CommandsTable::ModifiedAttributesListAccessor, objectAccessor));
+       table->AddColumn(prefix + "modified_attributes", Column(&Table::ZeroAccessor, objectAccessor));
+       table->AddColumn(prefix + "modified_attributes_list", Column(&Table::ZeroAccessor, objectAccessor));
 }
 
 String CommandsTable::GetName(void) const
@@ -185,24 +185,3 @@ Value CommandsTable::CustomVariablesAccessor(const Value& row)
 
        return cv;
 }
-
-Value CommandsTable::ModifiedAttributesAccessor(const Value& row)
-{
-       Command::Ptr command = static_cast<Command::Ptr>(row);
-
-       if (!command)
-               return Empty;
-
-       /* not supported */
-       return command->GetModifiedAttributes();
-}
-
-Value CommandsTable::ModifiedAttributesListAccessor(const Value& row)
-{
-       Command::Ptr command = static_cast<Command::Ptr>(row);
-
-       if (!command)
-               return Empty;
-
-       return CompatUtility::GetModifiedAttributesList(command);
-}

diff --git a/lib/livestatus/commandstable.hpp b/lib/livestatus/commandstable.hpp
index 16ce7193e549c62c8edc6dc2c6155157ca59990d..789eaa46bb74c45b96f9809448466d56dca70b14 100644 (file)
--- a/lib/livestatus/commandstable.hpp
+++ b/lib/livestatus/commandstable.hpp
@@ -51,8 +51,6 @@ protected:
        static Value CustomVariableNamesAccessor(const Value& row);
        static Value CustomVariableValuesAccessor(const Value& row);
        static Value CustomVariablesAccessor(const Value& row);
-       static Value ModifiedAttributesAccessor(const Value& row);
-       static Value ModifiedAttributesListAccessor(const Value& row);
 };
 
 }

diff --git a/lib/livestatus/contactstable.cpp b/lib/livestatus/contactstable.cpp
index 490ca5e6868c5b4b033f65f4c8ddc1c5232144de..8b36a46c221e45ebbafb98c7683640f9694a25a5 100644 (file)
--- a/lib/livestatus/contactstable.cpp
+++ b/lib/livestatus/contactstable.cpp
@@ -52,8 +52,8 @@ void ContactsTable::AddColumns(Table *table, const String& prefix,
        table->AddColumn(prefix + "vars_variable_names", Column(&ContactsTable::CustomVariableNamesAccessor, objectAccessor));
        table->AddColumn(prefix + "vars_variable_values", Column(&ContactsTable::CustomVariableValuesAccessor, objectAccessor));
        table->AddColumn(prefix + "vars_variables", Column(&ContactsTable::CustomVariablesAccessor, objectAccessor));
-       table->AddColumn(prefix + "modified_attributes", Column(&ContactsTable::ModifiedAttributesAccessor, objectAccessor));
-       table->AddColumn(prefix + "modified_attributes_list", Column(&ContactsTable::ModifiedAttributesListAccessor, objectAccessor));
+       table->AddColumn(prefix + "modified_attributes", Column(&Table::ZeroAccessor, objectAccessor));
+       table->AddColumn(prefix + "modified_attributes_list", Column(&Table::ZeroAccessor, objectAccessor));
        table->AddColumn(prefix + "cv_is_json", Column(&ContactsTable::CVIsJsonAccessor, objectAccessor));
 
 }
@@ -316,24 +316,3 @@ Value ContactsTable::CVIsJsonAccessor(const Value& row)
 
        return cv_is_json;
 }
-
-Value ContactsTable::ModifiedAttributesAccessor(const Value& row)
-{
-       User::Ptr user = static_cast<User::Ptr>(row);
-
-       if (!user)
-               return Empty;
-
-       /* not supported */
-       return user->GetModifiedAttributes();
-}
-
-Value ContactsTable::ModifiedAttributesListAccessor(const Value& row)
-{
-       User::Ptr user = static_cast<User::Ptr>(row);
-
-       if (!user)
-               return Empty;
-
-       return CompatUtility::GetModifiedAttributesList(user);
-}

diff --git a/lib/livestatus/contactstable.hpp b/lib/livestatus/contactstable.hpp
index 7bcaa88d512fe7483e42c6d2d1312da36cb4439d..3aaaab1ec3b4690b5dafc977af1bebd36ebf0eb9 100644 (file)
--- a/lib/livestatus/contactstable.hpp
+++ b/lib/livestatus/contactstable.hpp
@@ -59,8 +59,6 @@ protected:
        static Value CustomVariableNamesAccessor(const Value& row);
        static Value CustomVariableValuesAccessor(const Value& row);
        static Value CustomVariablesAccessor(const Value& row);
-       static Value ModifiedAttributesAccessor(const Value& row);
-       static Value ModifiedAttributesListAccessor(const Value& row);
        static Value CVIsJsonAccessor(const Value& row);
 };
 

diff --git a/lib/livestatus/hoststable.cpp b/lib/livestatus/hoststable.cpp
index 02c028d79a4694805e854abdf9edf5cce7f8f4be..cd16f7906b17e6f5254e5ee63a1582ed672f1dc9 100644 (file)
--- a/lib/livestatus/hoststable.cpp
+++ b/lib/livestatus/hoststable.cpp
@@ -111,8 +111,8 @@ void HostsTable::AddColumns(Table *table, const String& prefix,
        table->AddColumn(prefix + "active_checks_enabled", Column(&HostsTable::ActiveChecksEnabledAccessor, objectAccessor));
        table->AddColumn(prefix + "check_options", Column(&HostsTable::CheckOptionsAccessor, objectAccessor));
        table->AddColumn(prefix + "obsess_over_host", Column(&Table::ZeroAccessor, objectAccessor));
-       table->AddColumn(prefix + "modified_attributes", Column(&HostsTable::ModifiedAttributesAccessor, objectAccessor));
-       table->AddColumn(prefix + "modified_attributes_list", Column(&HostsTable::ModifiedAttributesListAccessor, objectAccessor));
+       table->AddColumn(prefix + "modified_attributes", Column(&Table::ZeroAccessor, objectAccessor));
+       table->AddColumn(prefix + "modified_attributes_list", Column(&Table::ZeroAccessor, objectAccessor));
        table->AddColumn(prefix + "check_interval", Column(&HostsTable::CheckIntervalAccessor, objectAccessor));
        table->AddColumn(prefix + "retry_interval", Column(&HostsTable::RetryIntervalAccessor, objectAccessor));
        table->AddColumn(prefix + "notification_interval", Column(&HostsTable::NotificationIntervalAccessor, objectAccessor));
@@ -778,26 +778,6 @@ Value HostsTable::CheckOptionsAccessor(const Value&)
        return Empty;
 }
 
-Value HostsTable::ModifiedAttributesAccessor(const Value& row)
-{
-       Host::Ptr host = static_cast<Host::Ptr>(row);
-
-       if (!host)
-               return Empty;
-
-       return host->GetModifiedAttributes();
-}
-
-Value HostsTable::ModifiedAttributesListAccessor(const Value& row)
-{
-       Host::Ptr host = static_cast<Host::Ptr>(row);
-
-       if (!host)
-               return Empty;
-
-       return CompatUtility::GetModifiedAttributesList(host);
-}
-
 Value HostsTable::CheckIntervalAccessor(const Value& row)
 {
        Host::Ptr host = static_cast<Host::Ptr>(row);

diff --git a/lib/livestatus/hoststable.hpp b/lib/livestatus/hoststable.hpp
index ff376e1450793382458d8fbdbf6f6c10d1cbfbf3..884afbb3f79942292dc306faafb2d2c8d5d2ceee 100644 (file)
--- a/lib/livestatus/hoststable.hpp
+++ b/lib/livestatus/hoststable.hpp
@@ -101,8 +101,6 @@ protected:
        static Value ScheduledDowntimeDepthAccessor(const Value& row);
        static Value ActiveChecksEnabledAccessor(const Value& row);
        static Value CheckOptionsAccessor(const Value& row);
-       static Value ModifiedAttributesAccessor(const Value& row);
-       static Value ModifiedAttributesListAccessor(const Value& row);
        static Value CheckIntervalAccessor(const Value& row);
        static Value RetryIntervalAccessor(const Value& row);
        static Value NotificationIntervalAccessor(const Value& row);

diff --git a/lib/livestatus/servicestable.cpp b/lib/livestatus/servicestable.cpp
index 644240a946ab8f89fcb3b942db3593f53624aba0..32d471933d760701a1918c4a71c23c42e2c40ea0 100644 (file)
--- a/lib/livestatus/servicestable.cpp
+++ b/lib/livestatus/servicestable.cpp
@@ -108,8 +108,8 @@ void ServicesTable::AddColumns(Table *table, const String& prefix,
        table->AddColumn(prefix + "flap_detection_enabled", Column(&ServicesTable::FlapDetectionEnabledAccessor, objectAccessor));
        table->AddColumn(prefix + "check_freshness", Column(&ServicesTable::CheckFreshnessAccessor, objectAccessor));
        table->AddColumn(prefix + "obsess_over_service", Column(&Table::ZeroAccessor, objectAccessor));
-       table->AddColumn(prefix + "modified_attributes", Column(&ServicesTable::ModifiedAttributesAccessor, objectAccessor));
-       table->AddColumn(prefix + "modified_attributes_list", Column(&ServicesTable::ModifiedAttributesListAccessor, objectAccessor));
+       table->AddColumn(prefix + "modified_attributes", Column(&Table::ZeroAccessor, objectAccessor));
+       table->AddColumn(prefix + "modified_attributes_list", Column(&Table::ZeroAccessor, objectAccessor));
        table->AddColumn(prefix + "pnpgraph_present", Column(&Table::ZeroAccessor, objectAccessor));
        table->AddColumn(prefix + "staleness", Column(&ServicesTable::StalenessAccessor, objectAccessor));
        table->AddColumn(prefix + "check_interval", Column(&ServicesTable::CheckIntervalAccessor, objectAccessor));
@@ -806,26 +806,6 @@ Value ServicesTable::CheckFreshnessAccessor(const Value& row)
        return CompatUtility::GetCheckableFreshnessChecksEnabled(service);
 }
 
-Value ServicesTable::ModifiedAttributesAccessor(const Value& row)
-{
-       Service::Ptr service = static_cast<Service::Ptr>(row);
-
-       if (!service)
-               return Empty;
-
-       return service->GetModifiedAttributes();
-}
-
-Value ServicesTable::ModifiedAttributesListAccessor(const Value& row)
-{
-       Service::Ptr service = static_cast<Service::Ptr>(row);
-
-       if (!service)
-               return Empty;
-
-       return CompatUtility::GetModifiedAttributesList(service);
-}
-
 Value ServicesTable::StalenessAccessor(const Value& row)
 {
        Service::Ptr service = static_cast<Service::Ptr>(row);

diff --git a/lib/livestatus/servicestable.hpp b/lib/livestatus/servicestable.hpp
index 307698dc198cbd9c5dc12089e85e5ae16056a91f..ab8d5fbec42ea072cdd049c3328722d7a2437725 100644 (file)
--- a/lib/livestatus/servicestable.hpp
+++ b/lib/livestatus/servicestable.hpp
@@ -102,8 +102,6 @@ protected:
        static Value CheckOptionsAccessor(const Value& row);
        static Value FlapDetectionEnabledAccessor(const Value& row);
        static Value CheckFreshnessAccessor(const Value& row);
-       static Value ModifiedAttributesAccessor(const Value& row);
-       static Value ModifiedAttributesListAccessor(const Value& row);
        static Value StalenessAccessor(const Value& row);
        static Value CheckIntervalAccessor(const Value& row);
        static Value RetryIntervalAccessor(const Value& row);