config: Rename Host::hostgroups to Host::groups.

diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp
index 65934d86785fd22db2a521ac28db687aa164ac42..7fa8daf5da2809b456b5f95f1bdbb0eb052ac952 100644 (file)
--- a/lib/icinga/host.cpp
+++ b/lib/icinga/host.cpp
@@ -93,7 +93,7 @@ String Host::GetDisplayName(void) const
 
 Array::Ptr Host::GetGroups(void) const
 {
-       return m_HostGroups;
+       return m_Groups;
 }
 
 Dictionary::Ptr Host::GetMacros(void) const
@@ -661,7 +661,7 @@ void Host::InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) con
 
        if (attributeTypes & Attribute_Config) {
                bag->Set("display_name", m_DisplayName);
-               bag->Set("hostgroups", m_HostGroups);
+               bag->Set("groups", m_Groups);
                bag->Set("macros", m_Macros);
                bag->Set("hostdependencies", m_HostDependencies);
                bag->Set("servicedependencies", m_ServiceDependencies);
@@ -677,7 +677,7 @@ void Host::InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes)
 
        if (attributeTypes & Attribute_Config) {
                m_DisplayName = bag->Get("display_name");
-               m_HostGroups = bag->Get("hostgroups");
+               m_Groups = bag->Get("groups");
                m_Macros = bag->Get("macros");
                m_HostDependencies = bag->Get("hostdependencies");
                m_ServiceDependencies = bag->Get("servicedependencies");

diff --git a/lib/icinga/host.h b/lib/icinga/host.h
index d5d464318810cdd420d5eecf50d20e784566e2bb..6c7250465c6ef0ae0ee3aa04be6974f0b9c4f165 100644 (file)
--- a/lib/icinga/host.h
+++ b/lib/icinga/host.h
@@ -132,7 +132,7 @@ protected:
 
 private:
        String m_DisplayName;
-       Array::Ptr m_HostGroups;
+       Array::Ptr m_Groups;
        Dictionary::Ptr m_Macros;
        Array::Ptr m_HostDependencies;
        Array::Ptr m_ServiceDependencies;

diff --git a/lib/icinga/icinga-type.conf b/lib/icinga/icinga-type.conf
index 4b278953af0cc91283504a8dfe8b8aa4bf5bb2a1..19170ef1a9ed08f5ea6dd16e030357090a677622 100644 (file)
--- a/lib/icinga/icinga-type.conf
+++ b/lib/icinga/icinga-type.conf
@@ -19,8 +19,8 @@
 
 type Host {
        %attribute string "display_name",
-       %attribute string "hostcheck",
-       %attribute array "hostgroups" {
+       %attribute string "check",
+       %attribute array "groups" {
                %attribute name(HostGroup) "*"
        },
        %attribute array "hostdependencies" {