Merge pull request #3247 from mdetrano/feature/improve-eventgrid-performance-12732

Improve Event Grid performance

modules/monitoring/application/controllers/ListController.php

@@ -361,13 +361,16 @@ class ListController extends Controller
         );
         $orientationBox->applyRequest($this->getRequest());
 */
+        $objectType = $form->getValue('objecttype');
+        $from = $form->getValue('from');
         $query = $this->backend->select()->from(
-            'eventgrid',
+            'eventgrid' . $objectType,
             array('day', $form->getValue('state'))
         );
         $this->params->remove(array('objecttype', 'from', 'to', 'state', 'btn_submit'));
         $this->view->filter = Filter::fromQuerystring((string) $this->params);
         $query->applyFilter($this->view->filter);
+        $query->applyFilter(Filter::fromQuerystring('timestamp >= ' . $from));
         $this->applyRestriction('monitoring/filter/objects', $query);
         $this->view->summary = $query;
         $this->view->column = $form->getValue('state');

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

@@ -0,0 +1,16 @@
+<?php
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+class EventgridhostsQuery extends EventgridQuery
+{
+
+    /**
+     * Join history related columns and tables, hosts only
+     */
+    protected function joinHistory()
+    {
+        $this->fetchHistoryColumns = true;
+        $this->requireVirtualTable('hosts');
+    }
+}

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

@@ -0,0 +1,15 @@
+<?php
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+class EventgridservicesQuery extends EventgridQuery
+{
+    /**
+     * Join history related columns and tables, services only
+     */
+    protected function joinHistory()
+    {
+        $this->fetchHistoryColumns = true;
+        $this->requireVirtualTable('services');
+    }
+}

modules/monitoring/library/Monitoring/DataView/Eventgridhosts.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Icinga\Module\Monitoring\DataView;
+
+class Eventgridhosts extends Eventgrid
+{
+}

modules/monitoring/library/Monitoring/DataView/Eventgridservices.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Icinga\Module\Monitoring\DataView;
+
+class Eventgridservices extends Eventgrid
+{
+}