From: Michael Friedrich <michael.friedrich@netways.de>
Date: Tue, 16 Jul 2013 11:26:16 +0000 (+0200)
Subject: livestatus: finish host|servicegroup table attributes
X-Git-Tag: v0.0.3~837
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2cc8ef17e1d5d2d44237dafeee3a077b1a569371;p=icinga2

livestatus: finish host|servicegroup table attributes

refs #4372
---

diff --git a/components/livestatus/hostgroupstable.cpp b/components/livestatus/hostgroupstable.cpp
index df7e2cbc6..9a7502830 100644
--- a/components/livestatus/hostgroupstable.cpp
+++ b/components/livestatus/hostgroupstable.cpp
@@ -127,8 +127,16 @@ Value HostGroupsTable::MembersAccessor(const Value& row)
 
 Value HostGroupsTable::MembersWithStateAccessor(const Value& row)
 {
-	/* TODO */
-	return Empty;
+	Array::Ptr members = boost::make_shared<Array>();
+
+	BOOST_FOREACH(const Host::Ptr& host, static_cast<HostGroup::Ptr>(row)->GetMembers()) {
+		Array::Ptr member_state = boost::make_shared<Array>();
+		member_state->Add(host->GetName());
+		member_state->Add(host->GetState());
+		members->Add(member_state);
+	}
+
+	return members;
 }
 
 Value HostGroupsTable::WorstHostStateAccessor(const Value& row)
diff --git a/components/livestatus/servicegroupstable.cpp b/components/livestatus/servicegroupstable.cpp
index 76346aa77..9aacdc89f 100644
--- a/components/livestatus/servicegroupstable.cpp
+++ b/components/livestatus/servicegroupstable.cpp
@@ -121,8 +121,18 @@ Value ServiceGroupsTable::MembersAccessor(const Value& row)
 
 Value ServiceGroupsTable::MembersWithStateAccessor(const Value& row)
 {
-	/* TODO */
-	return Empty;
+	Array::Ptr members = boost::make_shared<Array>();
+
+	BOOST_FOREACH(const Service::Ptr& service, static_cast<ServiceGroup::Ptr>(row)->GetMembers()) {
+		Array::Ptr host_svc = boost::make_shared<Array>();
+		host_svc->Add(service->GetHost()->GetName());
+		host_svc->Add(service->GetShortName());
+		host_svc->Add(service->GetHost()->GetState());
+		host_svc->Add(service->GetState());
+		members->Add(host_svc);
+	}
+
+	return members;
 }
 
 Value ServiceGroupsTable::WorstServiceStateAccessor(const Value& row)