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

Remove the built-in attributes notes_url and action_url.

This commit is contained in:
Gunnar Beutner 2013-07-01 13:54:38 +02:00
parent 4766e801a2
commit e2714525c9
5 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/compat/compatcomponent.cpp
View File

@ -603,9 +603,9 @@ void CompatComponent::StatusTimerHandler(void)
tempobjectfp << std::fixed;
tempobjectfp << "define hostgroup {" << "\n"
<< "\t" << "hostgroup_name" << "\t" << hg->GetName() << "\n"
<< "\t" << "notes_url" << "\t" << hg->GetNotesUrl() << "\n"
<< "\t" << "action_url" << "\t" << hg->GetActionUrl() << "\n";
<< "\t" << "hostgroup_name" << "\t" << hg->GetName() << "\n";
DumpCustomAttributes(tempobjectfp, hg);
tempobjectfp << "\t" << "members" << "\t";
DumpNameList(tempobjectfp, hg->GetMembers());
@ -636,9 +636,9 @@ void CompatComponent::StatusTimerHandler(void)
tempobjectfp << std::fixed;
tempobjectfp << "define servicegroup {" << "\n"
<< "\t" << "servicegroup_name" << "\t" << sg->GetName() << "\n"
<< "\t" << "notes_url" << "\t" << sg->GetNotesUrl() << "\n"
<< "\t" << "action_url" << "\t" << sg->GetActionUrl() << "\n";
<< "\t" << "servicegroup_name" << "\t" << sg->GetName() << "\n";
DumpCustomAttributes(tempobjectfp, sg);
tempobjectfp << "\t" << "members" << "\t";

12
lib/icinga/hostgroup.cpp
View File

@ -39,8 +39,6 @@ HostGroup::HostGroup(const Dictionary::Ptr& serializedUpdate)
: DynamicObject(serializedUpdate)
{
RegisterAttribute("display_name", Attribute_Config, &m_DisplayName);
RegisterAttribute("notes_url", Attribute_Config, &m_NotesUrl);
RegisterAttribute("action_url", Attribute_Config, &m_ActionUrl);
}
HostGroup::~HostGroup(void)
@ -63,16 +61,6 @@ String HostGroup::GetDisplayName(void) const
return GetName();
}
String HostGroup::GetNotesUrl(void) const
{
return m_NotesUrl;
}
String HostGroup::GetActionUrl(void) const
{
return m_ActionUrl;
}
HostGroup::Ptr HostGroup::GetByName(const String& name)
{
DynamicObject::Ptr configObject = DynamicObject::GetObject("HostGroup", name);

4
lib/icinga/hostgroup.h
View File

@ -45,8 +45,6 @@ public:
static HostGroup::Ptr GetByName(const String& name);
String GetDisplayName(void) const;
String GetNotesUrl(void) const;
String GetActionUrl(void) const;
std::set<Host::Ptr> GetMembers(void) const;
@ -57,8 +55,6 @@ protected:
private:
Attribute<String> m_DisplayName;
Attribute<String> m_NotesUrl;
Attribute<String> m_ActionUrl;
static void RefreshMembersCache(void);
};

12
lib/icinga/servicegroup.cpp
View File

@ -40,8 +40,6 @@ ServiceGroup::ServiceGroup(const Dictionary::Ptr& serializedUpdate)
: DynamicObject(serializedUpdate)
{
RegisterAttribute("display_name", Attribute_Config, &m_DisplayName);
RegisterAttribute("notes_url", Attribute_Config, &m_NotesUrl);
RegisterAttribute("action_url", Attribute_Config, &m_ActionUrl);
}
ServiceGroup::~ServiceGroup(void)
@ -64,16 +62,6 @@ String ServiceGroup::GetDisplayName(void) const
return GetName();
}
String ServiceGroup::GetNotesUrl(void) const
{
return m_NotesUrl;
}
String ServiceGroup::GetActionUrl(void) const
{
return m_ActionUrl;
}
ServiceGroup::Ptr ServiceGroup::GetByName(const String& name)
{
DynamicObject::Ptr configObject = DynamicObject::GetObject("ServiceGroup", name);

4
lib/icinga/servicegroup.h
View File

@ -45,8 +45,6 @@ public:
static ServiceGroup::Ptr GetByName(const String& name);
String GetDisplayName(void) const;
String GetNotesUrl(void) const;
String GetActionUrl(void) const;
std::set<Service::Ptr> GetMembers(void) const;
@ -57,8 +55,6 @@ protected:
private:
Attribute<String> m_DisplayName;
Attribute<String> m_NotesUrl;
Attribute<String> m_ActionUrl;
static void RefreshMembersCache(void);
};