Use hostgroup_name' instead of hostgroup' to filter hosts and services

refs #8613
Icinga · Apr 9, 2015 · e5eca97 · e5eca97
1 parent f7550f5
commit e5eca97
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -28,7 +28,7 @@
     </thead>
     <tbody>
     <?php foreach ($hostgroups as $h): ?>
-      <tr href="<?= $this->href('monitoring/list/hosts', array('hostgroup' => $h->hostgroup)) ?>">
+      <tr href="<?= $this->href('monitoring/list/hosts', array('hostgroup_name' => $h->hostgroup)) ?>">
        <?php if ($h->services_critical_last_state_change_unhandled): ?>
         <td class="state change critical unhandled">
           <strong><?= $this->translate('CRITICAL'); ?></strong>
@@ -82,15 +82,15 @@
           <?= $this->qlink(
             $h->hostgroup_alias,
             'monitoring/list/hosts',
-            array('hostgroup' => $h->hostgroup),
+            array('hostgroup_name' => $h->hostgroup),
             array('title' => sprintf($this->translate('List all hosts in the group "%s"'), $h->hostgroup_alias))
           ); ?>
         </td>
         <td class="total">
           <?= $this->qlink(
             $h->services_total,
             'monitoring/list/services',
-            array('hostgroup' => $h->hostgroup),
+            array('hostgroup_name' => $h->hostgroup),
             array('title' => sprintf(
                 $this->translate('List all services of all hosts in host group "%s"'),
                 $h->hostgroup_alias
@@ -104,9 +104,9 @@
               $h->services_ok,
               'monitoring/list/services',
               array(
-                'service_state' => 0,
-                'hostgroup'     => $h->hostgroup,
-                'sort'          => 'service_severity'
+                'service_state'     => 0,
+                'hostgroup_name'    => $h->hostgroup,
+                'sort'              => 'service_severity'
               ),
               array(
                 'title' => sprintf(
@@ -132,7 +132,7 @@
                 'service_acknowledged'  => 0,
                 'service_in_downtime'   => 0,
                 'host_problem'          => 0,
-                'hostgroup'             => $h->hostgroup,
+                'hostgroup_name'        => $h->hostgroup,
                 'sort'                  => 'service_severity'
               ),
               array(
@@ -156,7 +156,7 @@
                 array(
                   'service_state'     => 2,
                   'service_handled'   => 1,
-                  'hostgroup'         => $h->hostgroup,
+                  'hostgroup_name'    => $h->hostgroup,
                   'sort'              => 'service_severity'
                 ),
                 array(
@@ -186,7 +186,7 @@
                 'service_acknowledged'  => 0,
                 'service_in_downtime'   => 0,
                 'host_problem'          => 0,
-                'hostgroup'             => $h->hostgroup,
+                'hostgroup_name'        => $h->hostgroup,
                 'sort'                  => 'service_severity'
               ),
               array(
@@ -210,7 +210,7 @@
                 array(
                   'service_state'     => 3,
                   'service_handled'   => 1,
-                  'hostgroup'         => $h->hostgroup,
+                  'hostgroup_name'    => $h->hostgroup,
                   'sort'              => 'service_severity'
                 ),
                 array(
@@ -240,7 +240,7 @@
                 'service_acknowledged'  => 0,
                 'service_in_downtime'   => 0,
                 'host_problem'          => 0,
-                'hostgroup'             => $h->hostgroup,
+                'hostgroup_name'        => $h->hostgroup,
                 'sort'                  => 'service_severity'
               ),
               array(
@@ -264,7 +264,7 @@
                 array(
                   'service_state'     => 1,
                   'service_handled'   => 1,
-                  'hostgroup'         => $h->hostgroup,
+                  'hostgroup_name'    => $h->hostgroup,
                   'sort'              => 'service_severity'
                 ),
                 array(
@@ -290,9 +290,9 @@
               $h->services_pending,
               'monitoring/list/services',
               array(
-                'service_state' => 99,
-                'hostgroup'     => $h->hostgroup,
-                'sort'          => 'service_severity'
+                'service_state'     => 99,
+                'hostgroup_name'    => $h->hostgroup,
+                'sort'              => 'service_severity'
               ),
               array(
                 'title' => sprintf(

diff --git a/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml b/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
@@ -7,7 +7,7 @@ foreach ($object->hostgroups as $name => $alias) {
     $list[] = $this->qlink(
         $alias,
         'monitoring/list/hosts',
-        array('hostgroup' => $name),
+        array('hostgroup_name' => $name),
         array('title' => sprintf($this->translate('List all hosts in the group "%s"'), $alias))
     );
 }