[icinga-checkins] icinga.org: icinga2/master: Renamed 'alias' property to 'display_name'.

git at icinga.org git at icinga.org
Wed Feb 13 19:32:59 CET 2013


Module: icinga2
Branch: master
Commit: 2118e4b4909292be5348ee26095e99d3a587678a
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=2118e4b4909292be5348ee26095e99d3a587678a

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Wed Feb 13 19:32:44 2013 +0100

Renamed 'alias' property to 'display_name'.

---

 lib/icinga/host.cpp         |    4 ++--
 lib/icinga/hostgroup.cpp    |    2 +-
 lib/icinga/service.cpp      |    2 +-
 lib/icinga/servicegroup.cpp |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp
index 4014c60..0269c8b 100644
--- a/lib/icinga/host.cpp
+++ b/lib/icinga/host.cpp
@@ -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);
diff --git a/lib/icinga/hostgroup.cpp b/lib/icinga/hostgroup.cpp
index 1e692e6..7cb5d7d 100644
--- a/lib/icinga/hostgroup.cpp
+++ b/lib/icinga/hostgroup.cpp
@@ -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;
diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp
index 26719f0..3a88eb9 100644
--- a/lib/icinga/service.cpp
+++ b/lib/icinga/service.cpp
@@ -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;
diff --git a/lib/icinga/servicegroup.cpp b/lib/icinga/servicegroup.cpp
index bba8789..e63c134 100644
--- a/lib/icinga/servicegroup.cpp
+++ b/lib/icinga/servicegroup.cpp
@@ -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;





More information about the icinga-checkins mailing list