Merge branch 'bugfix/hot-all-hostgroups-are-shown-10316'

fixes #10316

library/Icinga/Data/Db/DbQuery.php

@@ -3,7 +3,9 @@
 
 namespace Icinga\Data\Db;
 
+use Exception;
 use Zend_Db_Select;
+use Icinga\Application\Logger;
 use Icinga\Data\Filter\FilterAnd;
 use Icinga\Data\Filter\FilterChain;
 use Icinga\Data\Filter\FilterNot;
@@ -382,8 +384,13 @@ class DbQuery extends SimpleQuery
      */
     public function __toString()
     {
+        try {
             $select = (string) $this->getSelectQuery();
             return $this->getIsSubQuery() ? ('(' . $select . ')') : $select;
+        } catch (Exception $e) {
+            Logger::debug('Failed to render DbQuery. An error occured: %s', $e);
+            return '';
+        }
     }
 
     /**

library/Icinga/Data/PivotTable.php

@@ -226,6 +226,7 @@ class PivotTable implements Sortable
     {
         if ($this->xAxisQuery === null) {
             $this->xAxisQuery = clone $this->baseQuery;
+            $this->xAxisQuery->clearGroupingRules();
             $xAxisHeader = $this->getXAxisHeader();
             $columns = array($this->xAxisColumn, $xAxisHeader);
             $this->xAxisQuery->group(array_unique($columns)); // xAxisColumn and header may be the same column
@@ -253,6 +254,7 @@ class PivotTable implements Sortable
     {
         if ($this->yAxisQuery === null) {
             $this->yAxisQuery = clone $this->baseQuery;
+            $this->yAxisQuery->clearGroupingRules();
             $yAxisHeader = $this->getYAxisHeader();
             $columns = array($this->yAxisColumn, $yAxisHeader);
             $this->yAxisQuery->group(array_unique($columns)); // yAxisColumn and header may be the same column
@@ -345,13 +347,19 @@ class PivotTable implements Sortable
         ) {
             $xAxis = $this->queryXAxis()->fetchPairs();
             $yAxis = $this->queryYAxis()->fetchPairs();
+            $xAxisKeys = array_keys($xAxis);
+            $yAxisKeys = array_keys($yAxis);
         } else {
             if ($this->xAxisFilter !== null) {
                 $xAxis = $this->queryXAxis()->fetchPairs();
-                $yAxis = $this->queryYAxis()->where($this->xAxisColumn, $xAxis)->fetchPairs();
+                $xAxisKeys = array_keys($xAxis);
+                $yAxis = $this->queryYAxis()->where($this->xAxisColumn, $xAxisKeys)->fetchPairs();
+                $yAxisKeys = array_keys($yAxis);
             } else { // $this->yAxisFilter !== null
                 $yAxis = $this->queryYAxis()->fetchPairs();
-                $xAxis = $this->queryXAxis()->where($this->yAxisColumn, $yAxis)->fetchPairs();
+                $yAxisKeys = array_keys($yAxis);
+                $xAxis = $this->queryXAxis()->where($this->yAxisColumn, $yAxisKeys)->fetchPairs();
+                $xAxisKeys = array_keys($xAxis);
             }
         }
         $pivotData = array();
@@ -360,8 +368,6 @@ class PivotTable implements Sortable
             'rows'  => $yAxis
         );
         if (! empty($xAxis) && ! empty($yAxis)) {
-            $xAxisKeys = array_keys($xAxis);
-            $yAxisKeys = array_keys($yAxis);
             $this->baseQuery
                 ->where($this->xAxisColumn, $xAxisKeys)
                 ->where($this->yAxisColumn, $yAxisKeys);

modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php

@@ -3,8 +3,6 @@
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
-use AppendIterator;
-use ArrayIterator;
 use Zend_Db_Expr;
 use Icinga\Application\Icinga;
 use Icinga\Application\Logger;
@@ -14,8 +12,8 @@ use Icinga\Data\Filter\FilterExpression;
 use Icinga\Exception\IcingaException;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Exception\QueryException;
-use Icinga\Module\Monitoring\Data\ColumnFilterIterator;
 use Icinga\Web\Session;
+use Icinga\Module\Monitoring\Data\ColumnFilterIterator;
 
 /**
  * Base class for Ido Queries
@@ -122,7 +120,7 @@ abstract class IdoQuery extends DbQuery
     protected $joinedVirtualTables = array();
 
     /**
-     * Unresolved order columns
+     * List of column aliases used for sorting the result
      *
      * @var array
      */
@@ -445,7 +443,7 @@ abstract class IdoQuery extends DbQuery
             return $this;
         }
 
-        $this->orderColumns[$alias] = $alias;
+        $this->orderColumns[] = $alias;
         return parent::order($column, $dir);
     }
 
@@ -548,16 +546,17 @@ abstract class IdoQuery extends DbQuery
     /**
      * Return true if an field contains an explicit timestamp
      *
-     * @param  String $field    The field to test for containing an timestamp
+     * @param   string  $field      The field to test for containing an timestamp
+     *
      * @return  bool                True when the field represents an timestamp
      */
     public function isTimestamp($field)
     {
-        $mapped = $this->getMappedField($field);
+        if ($this->isCustomVar($field)) {
-        if ($mapped === null) {
+            return false;
-            return stripos($field, 'UNIX_TIMESTAMP') !== false;
         }
-        return stripos($mapped, 'UNIX_TIMESTAMP') !== false;
+
+        return stripos($this->getMappedField($field) ?: $field, 'UNIX_TIMESTAMP') !== false;
     }
 
     /**
@@ -992,17 +991,73 @@ abstract class IdoQuery extends DbQuery
         return $this;
     }
 
+    public function clearGroupingRules()
+    {
+        $this->groupBase = array();
+        $this->groupOrigin = array();
+        return $this;
+    }
+
     /**
-     * Handle grouping for special columns, e.g. when the column sources more than one table
+     * Register the GROUP BY columns required for the given alias
      *
-     * @param   string  $column         Column
+     * @param   string  $alias              The alias to register columns for
-     * @param   array   $groupColumns   GROUP BY list
+     * @param   string  $table              The table the given alias is associated with
-     * @param   array   $groupedTables  Already grouped tables
+     * @param   array   $groupedColumns     The grouping columns registered so far
-     *
+     * @param   array   $groupedTables      The tables for which columns were registered so far
-     * @return  bool    Whether the column was handled
      */
-    protected function handleGroupColumn($column, &$groupColumns, &$groupedTables) {
+    protected function registerGroupColumns($alias, $table, array &$groupedColumns, array &$groupedTables)
-        return false;
+    {
+        switch ($table) {
+            case 'checktimeperiods':
+                $groupedColumns[] = 'ctp.timeperiod_id';
+                break;
+            case 'contacts':
+                $groupedColumns[] = 'co.object_id';
+                $groupedColumns[] = 'c.contact_id';
+                break;
+            case 'hostobjects':
+                $groupedColumns[] = 'ho.object_id';
+                break;
+            case 'hosts':
+                $groupedColumns[] = 'h.host_id';
+                break;
+            case 'hostgroups':
+                $groupedColumns[] = 'hgo.object_id';
+                $groupedColumns[] = 'hg.hostgroup_id';
+                break;
+            case 'hoststatus':
+                $groupedColumns[] = 'hs.hoststatus_id';
+                break;
+            case 'instances':
+                $groupedColumns[] = 'i.instance_id';
+                break;
+            case 'servicegroups':
+                $groupedColumns[] = 'sgo.object_id';
+                $groupedColumns[] = 'sg.servicegroup_id';
+                break;
+            case 'serviceobjects':
+                $groupedColumns[] = 'so.object_id';
+                break;
+            case 'serviceproblemsummary':
+                $groupedColumns[] = 'sps.unhandled_services_count';
+                break;
+            case 'services':
+                $groupedColumns[] = 'so.object_id';
+                $groupedColumns[] = 's.service_id';
+                break;
+            case 'servicestatus':
+                $groupedColumns[] = 'ss.servicestatus_id';
+                break;
+            case 'timeperiods':
+                $groupedColumns[] = 'ht.timeperiod_id';
+                $groupedColumns[] = 'st.timeperiod_id';
+                break;
+            default:
+                return;
+        }
+
+        $groupedTables[$table] = true;
     }
 
     /**
@@ -1014,82 +1069,38 @@ abstract class IdoQuery extends DbQuery
         if (! is_array($group)) {
             $group = array($group);
         }
-        foreach ($this->groupOrigin as $table) {
+
-            if ($this->hasJoinedVirtualTable($table)) {
+        $joinedOrigins = array_filter($this->groupOrigin, array($this, 'hasJoinedVirtualTable'));
-                $groupedTables = array();
+        if (empty($joinedOrigins)) {
-                foreach ($this->groupBase as $table => $columns) {
-                    foreach ($columns as $column) {
-                        $group[] = $column;
-                    }
-                    $groupedTables[$table] = true;
-                }
-                if ($this->getDatasource()->getDbType() !== 'pgsql') {
             return $group;
         }
-                $columnIterator = new AppendIterator();
+
-                $columnIterator->append(new ColumnFilterIterator($this->columns));
+        $groupedTables = array();
-                $columnIterator->append(new ArrayIterator($this->orderColumns));
+        foreach ($this->groupBase as $baseTable => $aliasedPks) {
-                foreach ($columnIterator as $alias => $column) {
+            $groupedTables[$baseTable] = true;
-                    $alias = $this->hasAliasName($alias) ? $alias : $this->customAliasToAlias($alias);
+            foreach ($aliasedPks as $aliasedPk) {
-                    if ($this->handleGroupColumn($alias, $group, $groupedTables) === true) {
+                $group[] = $aliasedPk;
-                        continue;
             }
-                    $tableName = $this->aliasToTableName($alias);
-                    if (isset($groupedTables[$tableName])) {
-                        continue;
-                    }
-                    switch ($tableName) {
-                        case 'checktimeperiods':
-                            $group[] = 'ctp.timeperiod_id';
-                            break;
-                        case 'contacts':
-                            $group[] = 'co.object_id';
-                            $group[] = 'c.contact_id';
-                            break;
-                        case 'hostobjects':
-                            $group[] = 'ho.object_id';
-                            break;
-                        case 'hosts':
-                            $group[] = 'h.host_id';
-                            break;
-                        case 'hostgroups':
-                            $group[] = 'hgo.object_id';
-                            $group[] = 'hg.hostgroup_id';
-                            break;
-                        case 'hoststatus':
-                            $group[] = 'hs.hoststatus_id';
-                            break;
-                        case 'instances':
-                            $group[] = 'i.instance_id';
-                            break;
-                        case 'servicegroups':
-                            $group[] = 'sgo.object_id';
-                            $group[] = 'sg.servicegroup_id';
-                            break;
-                        case 'serviceobjects':
-                            $group[] = 'so.object_id';
-                            break;
-                        case 'serviceproblemsummary':
-                            $group[] = 'sps.unhandled_services_count';
-                            break;
-                        case 'services':
-                            $group[] = 'so.object_id';
-                            $group[] = 's.service_id';
-                            break;
-                        case 'servicestatus':
-                            $group[] = 'ss.servicestatus_id';
-                            break;
-                        case 'timeperiods':
-                            $group[] = 'ht.timeperiod_id';
-                            $group[] = 'st.timeperiod_id';
-                            break;
-                        default:
-                            continue 2;
-                    }
-                    $groupedTables[$tableName] = true;
         }
 
-                break;
+        foreach (new ColumnFilterIterator($this->columns) as $desiredAlias => $desiredColumn) {
+            $alias = is_string($desiredAlias) ? $this->customAliasToAlias($desiredAlias) : $desiredColumn;
+            $table = $this->aliasToTableName($alias);
+            if ($table && !isset($groupedTables[$table]) && (
+                in_array($table, $joinedOrigins, true) || $this->getDatasource()->getDbType() === 'pgsql')
+            ) {
+                $this->registerGroupColumns($alias, $table, $group, $groupedTables);
+            }
+        }
+
+        if (! empty($group) && $this->getDatasource()->getDbType() === 'pgsql') {
+            foreach (new ColumnFilterIterator($this->orderColumns) as $alias) {
+                $table = $this->aliasToTableName($alias);
+                if ($table && !isset($groupedTables[$table])
+                    && !in_array($this->getMappedField($alias), $this->columns, true)
+                ) {
+                    $this->registerGroupColumns($alias, $table, $group, $groupedTables);
+                }
             }
         }
 

modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php

@@ -21,7 +21,7 @@ class ServicecommenthistoryQuery extends IdoQuery
     /**
      * {@inheritdoc}
      */
-    protected $groupOrigin = array('hostgroups', 'services');
+    protected $groupOrigin = array('hostgroups', 'servicegroups', 'services');
 
     /**
      * {@inheritdoc}

modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php

@@ -413,22 +413,20 @@ class ServicestatusQuery extends IdoQuery
     /**
      * {@inheritdoc}
      */
-    protected function handleGroupColumn($column, &$groupColumns, &$groupedTables)
+    protected function registerGroupColumns($alias, $table, array &$groupedColumns, array &$groupedTables)
     {
-        switch ($column) {
+        if ($alias === 'service_handled' || $alias === 'service_severity' || $alias === 'service_unhandled') {
-            case 'service_handled':
-            case 'service_severity':
-            case 'service_unhandled':
             if (! isset($groupedTables['hoststatus'])) {
-                    $groupColumns[] = 'hs.hoststatus_id';
+                $groupedColumns[] = 'hs.hoststatus_id';
                 $groupedTables['hoststatus'] = true;
             }
+
             if (! isset($groupedTables['servicestatus'])) {
-                    $groupColumns[] = 'ss.servicestatus_id';
+                $groupedColumns[] = 'ss.servicestatus_id';
                 $groupedTables['servicestatus'] = true;
             }
-                return true;
+        } else {
-        }
+            parent::registerGroupColumns($alias, $table, $groupedColumns, $groupedTables);
-        return false;
+        }
     }
 }