From 4996f569fe26b53eab12e76d9b1ea5413b73a810 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 12 Jun 2015 14:42:49 +0200 Subject: [PATCH] monitoring: Ensure that views and queries are all named using the same scheme That's "SomesuperQuery" and not "SomeSuperQuery", according to most of the existing queries. --- modules/monitoring/application/clicommands/ListCommand.php | 2 +- .../application/controllers/AlertsummaryController.php | 2 +- .../monitoring/application/controllers/ListController.php | 6 +++--- .../monitoring/application/controllers/ShowController.php | 2 +- .../application/controllers/TacticalController.php | 2 +- .../application/controllers/TimelineController.php | 2 +- .../Query/{EventHistoryQuery.php => EventhistoryQuery.php} | 0 .../{StatusSummaryQuery.php => StatussummaryQuery.php} | 0 .../DataView/{EventHistory.php => Eventhistory.php} | 0 .../Monitoring/DataView/{HostStatus.php => Hoststatus.php} | 0 .../DataView/{ServiceStatus.php => Servicestatus.php} | 0 .../DataView/{StatusSummary.php => Statussummary.php} | 0 modules/monitoring/library/Monitoring/Object/Host.php | 4 ++-- modules/monitoring/library/Monitoring/Object/HostList.php | 2 +- .../library/Monitoring/Object/MonitoredObject.php | 2 +- modules/monitoring/library/Monitoring/Object/Service.php | 2 +- .../monitoring/library/Monitoring/Object/ServiceList.php | 2 +- .../Monitoring/Web/Controller/MonitoredObjectController.php | 2 +- .../Monitoring/Web/Menu/MonitoringMenuItemRenderer.php | 2 +- 19 files changed, 16 insertions(+), 16 deletions(-) rename modules/monitoring/library/Monitoring/Backend/Ido/Query/{EventHistoryQuery.php => EventhistoryQuery.php} (100%) rename modules/monitoring/library/Monitoring/Backend/Ido/Query/{StatusSummaryQuery.php => StatussummaryQuery.php} (100%) rename modules/monitoring/library/Monitoring/DataView/{EventHistory.php => Eventhistory.php} (100%) rename modules/monitoring/library/Monitoring/DataView/{HostStatus.php => Hoststatus.php} (100%) rename modules/monitoring/library/Monitoring/DataView/{ServiceStatus.php => Servicestatus.php} (100%) rename modules/monitoring/library/Monitoring/DataView/{StatusSummary.php => Statussummary.php} (100%) diff --git a/modules/monitoring/application/clicommands/ListCommand.php b/modules/monitoring/application/clicommands/ListCommand.php index 9fd892652..c3f4ab951 100644 --- a/modules/monitoring/application/clicommands/ListCommand.php +++ b/modules/monitoring/application/clicommands/ListCommand.php @@ -156,7 +156,7 @@ class ListCommand extends Command 'service_perfdata', 'service_last_state_change' ); - $query = $this->getQuery('serviceStatus', $columns) + $query = $this->getQuery('servicestatus', $columns) ->order('host_name'); echo $this->renderStatusQuery($query); } diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php index 1dc3b137b..41bbca96b 100644 --- a/modules/monitoring/application/controllers/AlertsummaryController.php +++ b/modules/monitoring/application/controllers/AlertsummaryController.php @@ -251,7 +251,7 @@ class Monitoring_AlertsummaryController extends Controller $interval = $this->getInterval(); $query = $this->backend->select()->from( - 'eventHistory', + 'eventhistory', array( 'timestamp' ) diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index 25f184308..fa8781006 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -180,7 +180,7 @@ class Monitoring_ListController extends Controller 'current_check_attempt' => 'service_current_check_attempt', 'max_check_attempts' => 'service_max_check_attempts' ), $this->addColumns()); - $query = $this->backend->select()->from('serviceStatus', $columns); + $query = $this->backend->select()->from('servicestatus', $columns); $this->filterQuery($query); $this->applyRestriction('monitoring/filter/objects', $query); $this->view->services = $query; @@ -567,7 +567,7 @@ class Monitoring_ListController extends Controller $this->translate('List event records') ); - $query = $this->backend->select()->from('eventHistory', array( + $query = $this->backend->select()->from('eventhistory', array( 'host_name', 'host_display_name', 'service_description', @@ -594,7 +594,7 @@ class Monitoring_ListController extends Controller { $this->addTitleTab('servicegrid', $this->translate('Service Grid'), $this->translate('Show the Service Grid')); $this->setAutorefreshInterval(15); - $query = $this->backend->select()->from('serviceStatus', array( + $query = $this->backend->select()->from('servicestatus', array( 'host_name', 'service_description', 'service_state', diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php index cf71c7d32..6c2c03c18 100644 --- a/modules/monitoring/application/controllers/ShowController.php +++ b/modules/monitoring/application/controllers/ShowController.php @@ -211,7 +211,7 @@ class Monitoring_ShowController extends Controller ) ); } - if ($this->backend->hasQuery('eventHistory')) { + if ($this->backend->hasQuery('eventhistory')) { $tabs->add( 'history', array( diff --git a/modules/monitoring/application/controllers/TacticalController.php b/modules/monitoring/application/controllers/TacticalController.php index 95440a309..fa2e7deec 100644 --- a/modules/monitoring/application/controllers/TacticalController.php +++ b/modules/monitoring/application/controllers/TacticalController.php @@ -21,7 +21,7 @@ class Monitoring_TacticalController extends MonitoringController ) )->extend(new DashboardAction())->activate('tactical_overview'); $stats = $this->backend->select()->from( - 'statusSummary', + 'statussummary', array( 'hosts_up', 'hosts_pending', diff --git a/modules/monitoring/application/controllers/TimelineController.php b/modules/monitoring/application/controllers/TimelineController.php index 6d313083f..24bc71f30 100644 --- a/modules/monitoring/application/controllers/TimelineController.php +++ b/modules/monitoring/application/controllers/TimelineController.php @@ -30,7 +30,7 @@ class Monitoring_TimelineController extends Controller $detailUrl = Url::fromPath('monitoring/list/eventhistory'); $timeline = new TimeLine( - $this->backend->select()->from('eventHistory', + $this->backend->select()->from('eventhistory', array( 'name' => 'type', 'time' => 'timestamp' diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventhistoryQuery.php similarity index 100% rename from modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php rename to modules/monitoring/library/Monitoring/Backend/Ido/Query/EventhistoryQuery.php diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatussummaryQuery.php similarity index 100% rename from modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php rename to modules/monitoring/library/Monitoring/Backend/Ido/Query/StatussummaryQuery.php diff --git a/modules/monitoring/library/Monitoring/DataView/EventHistory.php b/modules/monitoring/library/Monitoring/DataView/Eventhistory.php similarity index 100% rename from modules/monitoring/library/Monitoring/DataView/EventHistory.php rename to modules/monitoring/library/Monitoring/DataView/Eventhistory.php diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/Hoststatus.php similarity index 100% rename from modules/monitoring/library/Monitoring/DataView/HostStatus.php rename to modules/monitoring/library/Monitoring/DataView/Hoststatus.php diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php similarity index 100% rename from modules/monitoring/library/Monitoring/DataView/ServiceStatus.php rename to modules/monitoring/library/Monitoring/DataView/Servicestatus.php diff --git a/modules/monitoring/library/Monitoring/DataView/StatusSummary.php b/modules/monitoring/library/Monitoring/DataView/Statussummary.php similarity index 100% rename from modules/monitoring/library/Monitoring/DataView/StatusSummary.php rename to modules/monitoring/library/Monitoring/DataView/Statussummary.php diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php index dd9b4c0c1..4940ffdf1 100644 --- a/modules/monitoring/library/Monitoring/Object/Host.php +++ b/modules/monitoring/library/Monitoring/Object/Host.php @@ -137,7 +137,7 @@ class Host extends MonitoredObject if ($this->backend->getType() === 'livestatus') { $columns[] = 'host_contacts'; } - return $this->backend->select()->from('hostStatus', $columns) + return $this->backend->select()->from('hoststatus', $columns) ->where('host_name', $this->host); } @@ -149,7 +149,7 @@ class Host extends MonitoredObject public function fetchServices() { $services = array(); - foreach ($this->backend->select()->from('serviceStatus', array('service_description')) + foreach ($this->backend->select()->from('servicestatus', array('service_description')) ->where('host_name', $this->host) ->getQuery() ->fetchAll() as $service) { diff --git a/modules/monitoring/library/Monitoring/Object/HostList.php b/modules/monitoring/library/Monitoring/Object/HostList.php index e48fcc415..76b37dc7c 100644 --- a/modules/monitoring/library/Monitoring/Object/HostList.php +++ b/modules/monitoring/library/Monitoring/Object/HostList.php @@ -12,7 +12,7 @@ use Icinga\Util\String; */ class HostList extends ObjectList { - protected $dataViewName = 'hostStatus'; + protected $dataViewName = 'hoststatus'; protected $columns = array('host_name'); diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php index fc4ad7e32..08b348988 100644 --- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php +++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php @@ -449,7 +449,7 @@ abstract class MonitoredObject implements Filterable */ public function fetchEventhistory() { - $eventHistory = $this->backend->select()->from('eventHistory', array( + $eventHistory = $this->backend->select()->from('eventhistory', array( 'object_type', 'host_name', 'host_display_name', diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php index cb5615df1..855e62882 100644 --- a/modules/monitoring/library/Monitoring/Object/Service.php +++ b/modules/monitoring/library/Monitoring/Object/Service.php @@ -105,7 +105,7 @@ class Service extends MonitoredObject */ protected function getDataView() { - return $this->backend->select()->from('serviceStatus', array( + return $this->backend->select()->from('servicestatus', array( 'host_icon_image', 'host_icon_image_alt', 'host_acknowledged', diff --git a/modules/monitoring/library/Monitoring/Object/ServiceList.php b/modules/monitoring/library/Monitoring/Object/ServiceList.php index f96876666..8336a35a1 100644 --- a/modules/monitoring/library/Monitoring/Object/ServiceList.php +++ b/modules/monitoring/library/Monitoring/Object/ServiceList.php @@ -16,7 +16,7 @@ class ServiceList extends ObjectList protected $serviceStateSummary; - protected $dataViewName = 'serviceStatus'; + protected $dataViewName = 'servicestatus'; protected $columns = array('host_name', 'service_description'); diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php index 7ac509d7b..997a2b782 100644 --- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php +++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php @@ -181,7 +181,7 @@ abstract class MonitoredObjectController extends Controller ) ); } - if ($this->backend->hasQuery('eventHistory')) { + if ($this->backend->hasQuery('eventhistory')) { $tabs->add( 'history', array( diff --git a/modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php b/modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php index c32c155af..132012ba9 100644 --- a/modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php +++ b/modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php @@ -38,7 +38,7 @@ class MonitoringMenuItemRenderer extends MenuItemRenderer { if (self::$summary === null) { $summary = MonitoringBackend::instance()->select()->from( - 'statusSummary', + 'statussummary', array( 'hosts_down_unhandled', 'services_critical_unhandled'