config: Rename Service::servicegroups to Service::groups.

diff --git a/lib/icinga/icinga-type.conf b/lib/icinga/icinga-type.conf
index c819a34c3a6c0494620c82876dbebb74d137fab8..37a75557745022140eccdc38dc4faf88922d76ef 100644 (file)
--- a/lib/icinga/icinga-type.conf
+++ b/lib/icinga/icinga-type.conf
@@ -86,8 +86,7 @@ type Service {
        %attribute array "host_dependencies" {
                %attribute name(Host) "*"
        },
-       %attribute array "service_
-       dependencies" {
+       %attribute array "service_dependencies" {
                %attribute dictionary "*" {
                        %require "host",
                        %attribute name(Host) "host",
@@ -96,7 +95,7 @@ type Service {
                        %attribute string "service"
                }
        },
-       %attribute array "servicegroups" {
+       %attribute array "groups" {
                %attribute name(ServiceGroup) "*"
        },
 

diff --git a/lib/icinga/service.h b/lib/icinga/service.h
index 65986f68ca86070d1568ff7ba424b2faa35b5969..2bb1dbfbb9e8939a817bbb1108d52be5935ce4f5 100644 (file)
--- a/lib/icinga/service.h
+++ b/lib/icinga/service.h
@@ -345,7 +345,7 @@ private:
        Dictionary::Ptr m_Macros;
        Array::Ptr m_HostDependencies;
        Array::Ptr m_ServiceDependencies;
-       Array::Ptr m_ServiceGroups;
+       Array::Ptr m_Groups;
        String m_ShortName;
        Value m_Acknowledgement;
        Value m_AcknowledgementExpiry;