Index: /trunk/controllers/servicegroups.php
===================================================================
--- /trunk/controllers/servicegroups.php (revision 82)
+++ /trunk/controllers/servicegroups.php (revision 86)
@@ -15,4 +15,7 @@
*/
+require_once("include/auth.php");
+require_once("plugins/npc/controllers/comments.php");
+
/**
* Servicegroups controller class
@@ -91,5 +94,5 @@
/**
- * getServiceStatusPortlet
+ * getServicegroupServiceStatus
*
* Returns service status counts by servicegroup.
@@ -97,5 +100,5 @@
* @return string json output
*/
- function getServiceStatusPortlet() {
+ function getServicegroupServiceStatus() {
// Initialize the output array
@@ -109,11 +112,6 @@
$results = $this->setupResultsArray();
- // Loop through the results array and build an ouput array
- // that includes a single record per servicegroup
- // and the number of crit, warn , ok services within
- // that servicegroup.
for ($i = 0; $i < count($results); $i++) {
$sg = $results[$i]['servicegroup_object_id'];
- $hostState = $this->getServicegroupMemberHoststatus($results[$i]['host_name']);
if(!isset($output[$sg])) {
$output[$sg] = array('critical' => 0,
@@ -172,9 +170,9 @@
if(!isset($temp[$sg][$host])) {
$temp[$sg][$host] = array('host_state' => $hostState,
- 'critical' => 0,
- 'warning' => 0,
- 'unknown' => 0,
- 'ok' => 0,
- 'pending' => 0);
+ 'critical' => 0,
+ 'warning' => 0,
+ 'unknown' => 0,
+ 'ok' => 0,
+ 'pending' => 0);
}
foreach ($results[$i] as $key => $val) {
@@ -230,13 +228,25 @@
function getServices() {
- $output = $this->setupResultsArray();
+ $results = $this->setupResultsArray();
+
+ $comments = new NpcCommentsController;
+
+ $services = $this->flattenArray($results);
+
+ for ($i = 0; $i < count($services); $i++) {
+ if ($services[$i]['problem_has_been_acknowledged']) {
+ $services[$i]['acknowledgement'] = $comments->getAck($services[$i]['service_object_id']);
+ }
+ // Add the last comment to the array
+ $services[$i]['comment'] = $comments->getLastComment($services[$i]['service_object_id']);
+ }
// Set the total number of records
- $this->numRecords = count($output);
+ $this->numRecords = count($services);
// Implement paging by slicing the ouput array
- $output = array_slice($output, $this->start, $this->limit);
-
- return($this->jsonOutput($output));
+ $services = array_slice($services, $this->start, $this->limit);
+
+ return($this->jsonOutput($services));
}
@@ -280,9 +290,7 @@
$q->select('i.instance_name,'
.'o1.name1 AS servicegroup_name,'
- .'ss.service_object_id,'
- .'ss.current_state,'
- .'ss.output,'
.'o2.name1 AS host_name,'
.'o2.name2 AS service_description,'
+ .'ss.*,'
.'sg.*')
->from('NpcServicegroups sg')
Index: /trunk/controllers/hostgroups.php
===================================================================
--- /trunk/controllers/hostgroups.php (revision 82)
+++ /trunk/controllers/hostgroups.php (revision 86)
@@ -38,4 +38,99 @@
/**
+ * getHostgroupHostStatus
+ *
+ * Returns host status counts by hostgroup.
+ *
+ * @return string json output
+ */
+ function getHostgroupHostStatus() {
+
+ // Initialize the output array
+ $output = array();
+
+ // Initialize the hosts array
+ $hosts = array();
+
+ $fields = array('hostgroup_object_id',
+ 'alias',
+ 'instance_id');
+
+ $results = $this->setupResultsArray();
+
+ for ($i = 0; $i < count($results); $i++) {
+ $hg = $results[$i]['hostgroup_object_id'];
+ if(!isset($output[$hg])) {
+ $output[$hg] = array('down' => 0,
+ 'unreachable' => 0,
+ 'up' => 0,
+ 'pending' => 0);
+ }
+ if (!isset($hosts[$hg][$results[$i]['host_name']])) {
+ $output[$hg][$this->hostState[$results[$i]['current_state']]]++;
+ $hosts[$hg][$results[$i]['host_name']] = 1;
+ }
+ foreach ($results[$i] as $key => $val) {
+ if (in_array($key, $fields)) {
+ $output[$hg][$key] = $val;
+ }
+ }
+ }
+
+ // Set the total number of records
+ $this->numRecords = count($output);
+
+ // Implement paging by slicing the ouput array
+ $output = array_slice($output, $this->start, $this->limit);
+
+ return($this->jsonOutput($output));
+ }
+
+ /**
+ * getHostgroupServiceStatus
+ *
+ * Returns service status counts by hostgroup.
+ *
+ * @return string json output
+ */
+ function getHostgroupServiceStatus() {
+
+ // Initialize the output array
+ $output = array();
+
+ $fields = array('hostgroup_object_id',
+ 'alias',
+ 'instance_id');
+
+ // Combine servicegroup/service/host etc. into a single record
+ $results = $this->setupResultsArray();
+
+ for ($i = 0; $i < count($results); $i++) {
+ $hg = $results[$i]['hostgroup_object_id'];
+ $ss = $this->getHostgroupMemberServiceStatus($results[$i]['host_object_id']);
+ if(!isset($output[$hg])) {
+ $output[$hg] = $ss;
+ } else {
+ foreach ($ss as $k => $v) {
+ $output[$hg][$k] = $output[$hg][$k] + $v;
+ }
+ }
+ foreach ($results[$i] as $key => $val) {
+ if (in_array($key, $fields)) {
+ $output[$hg][$key] = $val;
+ }
+ }
+ }
+
+ // Set the total number of records
+ $this->numRecords = count($output);
+
+ // Implement paging by slicing the ouput array
+ $output = array_slice($output, $this->start, $this->limit);
+
+ return($this->jsonOutput($output));
+ }
+
+
+ /**
* getOverview
*
@@ -58,8 +153,9 @@
$results = $this->setupResultsArray();
- // Loop through the results array and build an ouput array
- // that includes a single record per host within the hostgroup
- // and the number of crit, warn , ok services within
- // that hostgroup.
+ /* Loop through the results array and build an ouput array
+ * that includes a single record per host within the hostgroup
+ * and the number of crit, warn , ok services within
+ * that hostgroup.
+ */
for ($i = 0; $i < count($results); $i++) {
$hg = $results[$i]['hostgroup_object_id'];
Index: /trunk/controllers/layout.php
===================================================================
--- /trunk/controllers/layout.php (revision 84)
+++ /trunk/controllers/layout.php (revision 86)
@@ -93,4 +93,6 @@
+
+