]> granicus.if.org Git - icinga2/commitdiff
Renamed 'alias' property to 'display_name'.
authorGunnar Beutner <gunnar.beutner@netways.de>
Wed, 13 Feb 2013 18:32:44 +0000 (19:32 +0100)
committerGunnar Beutner <gunnar.beutner@netways.de>
Wed, 13 Feb 2013 18:32:44 +0000 (19:32 +0100)
lib/icinga/host.cpp
lib/icinga/hostgroup.cpp
lib/icinga/service.cpp
lib/icinga/servicegroup.cpp

index 4014c609b698693a86f6047ff7cace8694b91853..0269c8b7cf2aba82a4f521b5cd0a1c68a850715e 100644 (file)
@@ -52,7 +52,7 @@ Host::~Host(void)
 
 String Host::GetDisplayName(void) const
 {
-       String value = Get("alias");
+       String value = Get("display_name");
        if (!value.IsEmpty())
                return value;
        else
@@ -213,7 +213,7 @@ void Host::UpdateSlaveServices(void)
                        builder->SetType("Service");
                        builder->SetName(name);
                        builder->AddExpression("host_name", OperatorSet, GetName());
-                       builder->AddExpression("alias", OperatorSet, svcname);
+                       builder->AddExpression("display_name", OperatorSet, svcname);
                        builder->AddExpression("short_name", OperatorSet, svcname);
 
                        CopyServiceAttributes<false>(this, builder);
index 1e692e6dcbce47343e069b189ea7f5783d910761..7cb5d7d740eb8f8cd173754a155efa56f33f2e0f 100644 (file)
@@ -32,7 +32,7 @@ HostGroup::HostGroup(const Dictionary::Ptr& properties)
 
 String HostGroup::GetDisplayName(void) const
 {
-       String value = Get("alias");
+       String value = Get("display_name");
 
        if (!value.IsEmpty())
                return value;
index 26719f0ed205c6ab6e7f15feb231b8741b696cd1..3a88eb9b87b01c329b2bf1eb7f863bd65fab01a0 100644 (file)
@@ -59,7 +59,7 @@ Service::~Service(void)
 
 String Service::GetDisplayName(void) const
 {
-       String value = Get("alias");
+       String value = Get("display_name");
 
        if (!value.IsEmpty())
                return value;
index bba8789efd51139e724c31f66cc43eb49d9e3da7..e63c134271b8ec3a0cc43366024da3c983fb7b4d 100644 (file)
@@ -32,7 +32,7 @@ ServiceGroup::ServiceGroup(const Dictionary::Ptr& properties)
 
 String ServiceGroup::GetDisplayName(void) const
 {
-       String value = Get("alias");
+       String value = Get("display_name");
 
        if (!value.IsEmpty())
                return value;