diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php index 54150dac2..22c7035d9 100644 --- a/modules/monitoring/application/controllers/AlertsummaryController.php +++ b/modules/monitoring/application/controllers/AlertsummaryController.php @@ -263,7 +263,7 @@ class Monitoring_AlertsummaryController extends Controller $interval = $this->getInterval(); $query = $this->backend->select()->from( - 'EventHistory', + 'eventHistory', array( 'host_name', 'service_description', @@ -275,8 +275,7 @@ class Monitoring_AlertsummaryController extends Controller 'output', 'type', 'host', - 'service', - 'service_host_name' + 'service' ) ); diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php index 370fad9af..1b87779ce 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php @@ -40,8 +40,7 @@ class EventHistoryQuery extends IdoQuery 'attempt' => 'eh.attempt', 'max_attempts' => 'eh.max_attempts', 'output' => 'eh.output', // we do not want long_output - 'type' => 'eh.type', - 'service_host_name' => 'eho.name1 COLLATE latin1_general_ci' + 'type' => 'eh.type' ), 'hostgroups' => array( 'hostgroup' => 'hgo.name1 COLLATE latin1_general_ci', diff --git a/modules/monitoring/library/Monitoring/DataView/EventHistory.php b/modules/monitoring/library/Monitoring/DataView/EventHistory.php index 8fcc4f35a..32eadd4ba 100644 --- a/modules/monitoring/library/Monitoring/DataView/EventHistory.php +++ b/modules/monitoring/library/Monitoring/DataView/EventHistory.php @@ -30,8 +30,7 @@ class EventHistory extends DataView 'output', 'type', 'host', - 'service', - 'service_host_name' + 'service' ); }