diff --git a/library/Icinga/Data/ResourceFactory.php b/library/Icinga/Data/ResourceFactory.php index 217afb932..efae7ac8e 100644 --- a/library/Icinga/Data/ResourceFactory.php +++ b/library/Icinga/Data/ResourceFactory.php @@ -4,9 +4,11 @@ namespace Icinga\Data; +use Zend_Config; use Icinga\Util\ConfigAwareFactory; use Icinga\Exception\ConfigurationError; use Icinga\Data\Db\Connection as DbConnection; +use Icinga\Protocol\Statusdat\Reader as StatusdatReader; class ResourceFactory implements ConfigAwareFactory { @@ -20,14 +22,22 @@ class ResourceFactory implements ConfigAwareFactory self::$resources = $config; } - public static function createResource($resourceName) + public static function getResourceConfig($resourceName) { if (($resourceConfig = self::$resources->get($resourceName)) === null) { throw new ConfigurationError('BLUBB?!'); } - switch (strtolower($resourceConfig->type)) { + return $resourceConfig; + } + + public static function createResource(Zend_Config $config) + { + switch (strtolower($config->type)) { case 'db': - $resource = new DbConnection($resourceConfig); + $resource = new DbConnection($config); + break; + case 'statusdat': + $resource = new StatusdatReader($config); break; default: throw new ConfigurationError('BLUBB2?!'); diff --git a/modules/monitoring/application/views/helpers/MonitoringFlags.php b/modules/monitoring/application/views/helpers/MonitoringFlags.php index 5e5f0851d..d6ea7692c 100644 --- a/modules/monitoring/application/views/helpers/MonitoringFlags.php +++ b/modules/monitoring/application/views/helpers/MonitoringFlags.php @@ -25,61 +25,40 @@ */ // {{{ICINGA_LICENSE_HEADER}}} -use Icinga\Module\Monitoring\Object\AbstractObject; +/*use Icinga\Module\Monitoring\Object\AbstractObject;*/ /** - * Class Zend_View_Helper_MonitoringFlags - * - * Rendering helper for flags depending on objects + * Rendering helper for object's properties which may be either enabled or disabled */ class Zend_View_Helper_MonitoringFlags extends Zend_View_Helper_Abstract { /** - * Key of flags without prefix (e.g. host or service) + * Object's properties which may be either enabled or disabled and their human readable description + * * @var string[] */ - private static $keys = array( - 'passive_checks_enabled' => 'Passive Checks', - 'active_checks_enabled' => 'Active Checks', - 'obsessing' => 'Obsessing', - 'notifications_enabled' => 'Notifications', - 'event_handler_enabled' => 'Event Handler', - 'flap_detection_enabled' => 'Flap Detection', + private static $flags = array( + 'passive_checks_enabled' => 'Passive Checks', + 'active_checks_enabled' => 'Active Checks', + 'obsessing' => 'Obsessing', + 'notifications_enabled' => 'Notifications', + 'event_handler_enabled' => 'Event Handler', + 'flap_detection_enabled' => 'Flap Detection', ); /** - * Type prefix - * @param array $vars - * @return string + * Retrieve flags as array with either true or false as value + * + * @param AbstractObject $object + * + * @return array */ - private function getObjectType(array $vars) + public function monitoringFlags(/*AbstractObject*/$object) { - $keys = array_keys($vars); - $firstKey = array_shift($keys); - $keyParts = explode('_', $firstKey, 2); - - return array_shift($keyParts); - } - - /** - * Build all existing flags to a readable array - * @param stdClass $object - * @return array - */ - public function monitoringFlags(AbstractObject $object) - { - $vars = (array)$object; - $type = $this->getObjectType($vars); - $out = array(); - - foreach (self::$keys as $key => $name) { - $value = false; - if (array_key_exists(($realKey = $type. '_'. $key), $vars)) { - $value = $vars[$realKey] === '1' ? true : false; - } - $out[$name] = $value; + $flags = array(); + foreach (self::$flags as $column => $description) { + $flags[$description] = (bool) $object->{$column}; } - - return $out; + return $flags; } } diff --git a/modules/monitoring/application/views/helpers/MonitoringProperties.php b/modules/monitoring/application/views/helpers/MonitoringProperties.php index 36f238c97..22d5ec579 100644 --- a/modules/monitoring/application/views/helpers/MonitoringProperties.php +++ b/modules/monitoring/application/views/helpers/MonitoringProperties.php @@ -49,10 +49,8 @@ class Zend_View_Helper_MonitoringProperties extends Zend_View_Helper_Abstract */ private static $keys = array( 'buildAttempt' => 'Current Attempt', - 'last_check' => 'Last Check Time', 'buildCheckType' => 'Check Type', 'buildLatency' => 'Check Latency / Duration', - 'buildNextCheck' => 'Next Scheduled Active Check', 'buildLastStateChange' => 'Last State Change', 'buildLastNotification' => 'Last Notification', 'buildFlapping' => 'Is This %s Flapping?', @@ -78,7 +76,7 @@ class Zend_View_Helper_MonitoringProperties extends Zend_View_Helper_Abstract * @param stdClass $object * @return mixed */ - private function getObjectType(AbstractObject $object) + private function getObjectType($object) { $keys = array_keys(get_object_vars($object)); $keyParts = explode('_', array_shift($keys), 2); @@ -91,7 +89,7 @@ class Zend_View_Helper_MonitoringProperties extends Zend_View_Helper_Abstract * @param $type * @return object */ - private function dropObjectType(AbstractObject $object, $type) + private function dropObjectType($object, $type) { $vars = get_object_vars($object); $out = array(); @@ -107,7 +105,7 @@ class Zend_View_Helper_MonitoringProperties extends Zend_View_Helper_Abstract * @param stdClass $object * @return string */ - private function buildAttempt(AbstractObject $object) + private function buildAttempt($object) { return sprintf( '%s/%s (%s state)', @@ -132,7 +130,7 @@ class Zend_View_Helper_MonitoringProperties extends Zend_View_Helper_Abstract * @param stdClass $object * @return string */ - private function buildCheckType(AbstractObject $object) + private function buildCheckType($object) { if ($object->passive_checks_enabled === '1' && $object->active_checks_enabled === '0') { return self::CHECK_PASSIVE; @@ -148,7 +146,7 @@ class Zend_View_Helper_MonitoringProperties extends Zend_View_Helper_Abstract * @param stdClass $object * @return string */ - private function buildLatency(AbstractObject $object) + private function buildLatency($object) { $val = ''; if ($this->buildCheckType($object) === self::CHECK_PASSIVE) { @@ -171,7 +169,7 @@ class Zend_View_Helper_MonitoringProperties extends Zend_View_Helper_Abstract * @param stdClass $object * @return string */ - private function buildNextCheck(AbstractObject $object) + private function buildNextCheck($object) { if ($this->buildCheckType($object) === self::CHECK_PASSIVE) { return self::VALUE_NA; @@ -185,7 +183,7 @@ class Zend_View_Helper_MonitoringProperties extends Zend_View_Helper_Abstract * @param stdClass $object * @return string */ - private function buildLastStateChange(AbstractObject $object) + private function buildLastStateChange($object) { return strftime('%Y-%m-%d %H:%M:%S', $object->last_state_change); } @@ -195,7 +193,7 @@ class Zend_View_Helper_MonitoringProperties extends Zend_View_Helper_Abstract * @param stdClass $object * @return string */ - private function buildLastNotification(AbstractObject $object) + private function buildLastNotification($object) { $val = ''; @@ -215,7 +213,7 @@ class Zend_View_Helper_MonitoringProperties extends Zend_View_Helper_Abstract * @param stdClass $object * @return string */ - private function buildFlapping(AbstractObject $object) + private function buildFlapping($object) { $val = ''; @@ -235,7 +233,7 @@ class Zend_View_Helper_MonitoringProperties extends Zend_View_Helper_Abstract * @param stdClass $object * @return string */ - private function buildScheduledDowntime(AbstractObject $object) + private function buildScheduledDowntime($object) { if ($object->in_downtime === '1') { return self::VALUE_YES; @@ -250,7 +248,7 @@ class Zend_View_Helper_MonitoringProperties extends Zend_View_Helper_Abstract * @param stdClass $object * @return array */ - public function monitoringProperties(AbstractObject $object) + public function monitoringProperties($object) { $type = $this->getObjectType($object); //$object = $this->dropObjectType($object, $type); diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml index c53a5fd42..2374e72d1 100644 --- a/modules/monitoring/application/views/scripts/list/hosts.phtml +++ b/modules/monitoring/application/views/scripts/list/hosts.phtml @@ -4,6 +4,7 @@ $viewHelper = $this->getHelper('MonitoringState'); ?> +

Hosts Status

sortControl->render($this); ?> @@ -101,7 +102,7 @@ $viewHelper = $this->getHelper('MonitoringState'); - + host_name ?>
host_address ?> diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml index fb70d7f59..abc6a4ae8 100644 --- a/modules/monitoring/application/views/scripts/list/services.phtml +++ b/modules/monitoring/application/views/scripts/list/services.phtml @@ -4,6 +4,7 @@ $viewHelper = $this->getHelper('MonitoringState'); ?> +

Services Status

sortControl->render($this); ?> @@ -104,9 +105,9 @@ $viewHelper = $this->getHelper('MonitoringState'); - + service_display_name; ?> - +
service_action_url)): ?> @@ -124,7 +125,7 @@ $viewHelper = $this->getHelper('MonitoringState'); {{UNHANDLED_ICON}} - + host_name; ?> host_state != 0): ?> (monitoringState($service, 'host')); ?>) diff --git a/modules/monitoring/application/views/scripts/show/components/command.phtml b/modules/monitoring/application/views/scripts/show/components/command.phtml index a76fd7f5a..3e30b62e8 100644 --- a/modules/monitoring/application/views/scripts/show/components/command.phtml +++ b/modules/monitoring/application/views/scripts/show/components/command.phtml @@ -1,13 +1,27 @@
- {{CHECK_ICON}} Check Command + {{CHECK_COMMAND_ICON}} + Check Command
- object->check_command, 2); - array_shift($explodedCommand); - ?> - commandArguments($this->object->check_command); ?> + + + + + + + + + +
Command + object->check_command, 2); + $command = array_shift($explodedCommand); + echo $command; + ?> +
Arguments + commandArguments($this->object->check_command); ?> +
diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml index 1ecdf9b46..0099f0f93 100644 --- a/modules/monitoring/application/views/scripts/show/components/comments.phtml +++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml @@ -12,12 +12,18 @@ foreach ($object->comments as $comment) { ); } ?> +
{{COMMENT_ICON}} Comments
-
', $commets); ?>
+ {{COMMENT_COMMAND_BUTTON}} + {{NOTIFICATION_COMMAND_BUTTON}}
+ comments)): ?> +
', $commets); ?>{{REMOVE_COMMENT_COMMAND}}
+ + No comments +
- diff --git a/modules/monitoring/application/views/scripts/show/components/customvars.phtml b/modules/monitoring/application/views/scripts/show/components/customvars.phtml index 795e0bcf6..a4419729f 100644 --- a/modules/monitoring/application/views/scripts/show/components/customvars.phtml +++ b/modules/monitoring/application/views/scripts/show/components/customvars.phtml @@ -1,10 +1,11 @@ -customvars) && count($object->customvars)) { ?> +
Customvariables
+ customvars) && count($object->customvars)) { ?> @@ -17,6 +18,6 @@
Name
+
- diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml index afeea0349..0eaa14b3d 100644 --- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml +++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml @@ -27,16 +27,21 @@ $list[] = ''. implode('', $row). ''; } ?> +
{{IN_DOWNTIME_ICON}}Downtimes
+ {{SCHEDULE_DOWNTIME_COMMAND_BUTTON}}
+ downtimes)): ?> ', $list); ?>
+ + Not in downtime +
- diff --git a/modules/monitoring/application/views/scripts/show/components/flags.phtml b/modules/monitoring/application/views/scripts/show/components/flags.phtml index 2ee03ed95..68b50c44a 100644 --- a/modules/monitoring/application/views/scripts/show/components/flags.phtml +++ b/modules/monitoring/application/views/scripts/show/components/flags.phtml @@ -1,20 +1,22 @@
Heading
-
- -monitoringFlags($object) as $name => $value): ?> - - - - - -
- - {{ENABLED_ICON}} ENABLED - - {{DISABLED_ICON}} DISABLED - -
-
+ + monitoringFlags($object) as $flag => $enabled): ?> + + + + + + +
+ + {{ENABLED_ICON}} ENABLED + + {{DISABLED_ICON}} DISABLED + + + {{{ENABLE_OR_DISABLE_COMMAND}}} +
+
diff --git a/modules/monitoring/application/views/scripts/show/components/perfdata.phtml b/modules/monitoring/application/views/scripts/show/components/perfdata.phtml deleted file mode 100644 index 3122253ec..000000000 --- a/modules/monitoring/application/views/scripts/show/components/perfdata.phtml +++ /dev/null @@ -1,10 +0,0 @@ -object->perfdata): ?> -
-
- Perfdata -
-
- perfdata($this->object->perfdata); ?> -
-
- diff --git a/modules/monitoring/application/views/scripts/show/components/pluginoutput.phtml b/modules/monitoring/application/views/scripts/show/components/pluginoutput.phtml deleted file mode 100644 index 98ee0c27f..000000000 --- a/modules/monitoring/application/views/scripts/show/components/pluginoutput.phtml +++ /dev/null @@ -1,9 +0,0 @@ -
-
- Plugin Output -
-
- pluginOutput($this->object->output); ?> - pluginOutput($this->object->long_output); ?> -
-
diff --git a/modules/monitoring/application/views/scripts/show/host.phtml b/modules/monitoring/application/views/scripts/show/host.phtml index 3632e7264..a00320520 100644 --- a/modules/monitoring/application/views/scripts/show/host.phtml +++ b/modules/monitoring/application/views/scripts/show/host.phtml @@ -1,19 +1,119 @@ -render('show/components/pluginoutput.phtml') ?> +
+
+ object->host_icon_image): ?> + Host image + + {{HOST_ICON}} + +

Host Status escape($this->object->host_name); ?>

+
-render('show/components/command.phtml') ?> - -render('show/components/hostgroups.phtml') ?> - -render('show/components/contacts.phtml') ?> - -render('show/components/comments.phtml'); ?> +
+ + + host_handled && $object->host_state > 0): ?> + + + service_acknowledged && !$object->service_in_downtime): ?> + + + + + + + + + + + + + + + + + object->host_address && $this->object->host_address !== $this->object->host_name): ?> + + + + + + object->host_alias) && $this->object->host_alias !== $this->object->host_name): ?> + + + + + object->host_action_url || $this->object->host_notes_url): ?> + + + + + + + + + + object->perfdata): ?> + + + + + + + + + +
+ + {{UNHANDLED_ICON}} + + + {{ACKNOWLEDGE_COMMAND}} + + + + {{ACKNOWLEDGED_ICON}} + + + Status + + util()->getHostStateName($this->object->host_state); ?> + since timeSince($this->object->host_last_state_change); ?> + {{RECHECK_COMMAND_BUTTON}
Last Checklast_check ?>
Next Checknext_check ?>{{RESCHEDULE_COMMAND_BUTTON}}
Host Addressescape($this->object->host_address); ?>
Aliasobject->host_alias; ?>
+ object->host_action_url): ?> + {{HOST_ACTIONS_ICON}} + + object->host_notes_url): ?> + {{HOST_NOTES_ICON}} + +
Plugin Output + pluginOutput($this->object->output); ?> + pluginOutput($this->object->long_output); ?> + + {{SUBMIT_PASSIVE_CHECK_RESULT_COMMAND}} +
Performance Dataperfdata($this->object->perfdata); ?>
+ + View Services For This Host + + + {{{RECHECK_ALL_SERVICES_COMMAND}} +
+
+
render('show/components/downtime.phtml'); ?> -render('show/components/customvars.phtml'); ?> +render('show/components/comments.phtml'); ?> + +render('show/components/properties.phtml'); ?> render('show/components/flags.phtml'); ?> -render('show/components/perfdata.phtml'); ?> +render('show/components/hostgroups.phtml'); ?> render('show/components/eventHistory.phtml'); ?> + +render('show/components/contacts.phtml'); ?> + +render('show/components/customvars.phtml'); ?> + +render('show/components/command.phtml'); ?> diff --git a/modules/monitoring/application/views/scripts/show/service.phtml b/modules/monitoring/application/views/scripts/show/service.phtml index da64a5813..75a05d2f5 100644 --- a/modules/monitoring/application/views/scripts/show/service.phtml +++ b/modules/monitoring/application/views/scripts/show/service.phtml @@ -1,19 +1,124 @@ -render('show/components/pluginoutput.phtml') ?> +
+
+ {{SERVICE_ICON}}

Service Status escape($this->object->service_description); ?>

+
+ +
+ + + object->service_icon_image): ?> + + + service_handled && $object->service_state > 0): ?> + + + service_acknowledged && !$object->service_in_downtime): ?> + + + + + + object->service_action_url || $this->object->service_notes_url): ?> + + + + +
+
+ Host image +
+ 		+ + {{UNHANDLED_ICON}} + + + {{ACKNOWLEDGE_COMMAND}} + + + + {{ACKNOWLEDGED_ICON}} + + + util()->getServiceStateName($this->object->service_state); ?> + since timeSince($this->object->service_last_state_change); ?> + {{RECHECK_COMMAND_BUTTON}
+ object->service_action_url): ?> + {{SERVICE_ACTIONS_ICON}} + Host actions + + object->service_notes_url): ?> + {{SERVICE_NOTES_ICON}} + Host notes + +
+
+
+ +
+
+ {{HOST_ICON}} escape($this->object->host_name); ?> +
+ +
+ + + object->host_icon_image): ?> + + + object->host_address && $this->object->host_address !== $this->object->host_name): ?> + + + object->host_alias) && $this->object->host_alias !== $this->object->host_name): ?> + + + + + object->host_action_url || $this->object->host_notes_url): ?> + + + + +
+
+ Host image +
+ 		+ Host Address: escape($this->object->host_address); ?> + + Alias: object->host_alias; ?> + + util()->getHostStateName($this->object->host_state); ?> + since timeSince($this->object->host_last_state_change); ?> + object->host_acknowledged === '1'): ?> + (Has been acknowledged) + +
+ object->host_action_url): ?> + {{HOST_ACTIONS_ICON}} + Host actions + + object->host_notes_url): ?> + {{HOST_NOTES_ICON}} + Host notes + +
+
+
render('show/components/command.phtml') ?> -render('show/components/contacts.phtml'); ?> - -render('show/components/servicegroups.phtml'); ?> +render('show/components/downtime.phtml'); ?> render('show/components/comments.phtml'); ?> -render('show/components/downtime.phtml'); ?> +render('show/components/properties.phtml'); ?> + +render('show/components/flags.phtml'); ?> render('show/components/customvars.phtml'); ?> -render('show/components/perfdata.phtml'); ?> +render('show/components/servicegroups.phtml'); ?> -render('show/components/properties.phtml'); ?> +render('show/components/contacts.phtml'); ?> render('show/components/eventHistory.phtml'); ?> diff --git a/modules/monitoring/library/Monitoring/Backend.php b/modules/monitoring/library/Monitoring/Backend.php index 3f7282d9a..1d0b72023 100644 --- a/modules/monitoring/library/Monitoring/Backend.php +++ b/modules/monitoring/library/Monitoring/Backend.php @@ -4,7 +4,7 @@ namespace Icinga\Module\Monitoring; -use Zend_config; +use Zend_Config; use Icinga\Application\Config as IcingaConfig; use Icinga\Exception\ConfigurationError; use Icinga\Data\DatasourceInterface; @@ -34,12 +34,13 @@ class Backend implements ConfigAwareFactory, DatasourceInterface /** * Create a new backend from the given resource config * - * @param Zend_config $config + * @param Zend_Config $backendConfig + * @param Zend_Config $resourceConfig */ - public function __construct(Zend_Config $config) + public function __construct(Zend_Config $backendConfig, Zend_Config $resourceConfig) { - $this->config = $config; - $this->resource = ResourceFactory::createResource($config->resource); + $this->config = $backendConfig; + $this->resource = ResourceFactory::createResource($resourceConfig); } /** @@ -72,7 +73,7 @@ class Backend implements ConfigAwareFactory, DatasourceInterface * * @return Query */ - public function from($table, array $columns) + public function from($table, array $columns = null) { $queryClass = '\\Icinga\\Module\\Monitoring\\Backend\\' . ucfirst($this->config->type) @@ -141,7 +142,7 @@ class Backend implements ConfigAwareFactory, DatasourceInterface } $config = self::$backendConfigs[$name]; - self::$backendInstances[$name] = $backend = new self($config); + self::$backendInstances[$name] = $backend = new self($config, ResourceFactory::getResourceConfig($config->resource)); switch (strtolower($config->type)) { case 'ido': if ($backend->getResource()->getDbType() !== 'oracle') { diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php index 5e68220e8..51b4dfca0 100644 --- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php @@ -27,7 +27,7 @@ class StatusQuery extends Query public function init() { $target = $this->getTarget(); - $this->reader = $this->ds->getReader(); + $this->reader = $this->ds; $this->setResultViewClass(ucfirst($target)."StatusView"); $this->setBaseQuery($this->reader->select()->from($target."s", array())); diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php index bf3686754..c3909255b 100644 --- a/modules/monitoring/library/Monitoring/DataView/DataView.php +++ b/modules/monitoring/library/Monitoring/DataView/DataView.php @@ -80,7 +80,7 @@ abstract class DataView * * @return static */ - public static function fromRequest(Request $request, array $columns = null) + public static function fromRequest($request, array $columns = null) { $view = new static(Backend::createBackend($request->getParam('backend')), $columns); $view->filter($request->getParams()); diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php index c73d27442..8999683d2 100644 --- a/modules/monitoring/library/Monitoring/Object/Host.php +++ b/modules/monitoring/library/Monitoring/Object/Host.php @@ -53,6 +53,13 @@ class Host extends AbstractObject 'long_output' => 'host_long_output', 'check_command' => 'host_check_command', 'perfdata' => 'host_perfdata', + 'host_icon_image', + 'passive_checks_enabled' => 'host_passive_checks_enabled', + 'obsessing' => 'host_obsessing', + 'notifications_enabled' => 'host_notifications_enabled', + 'event_handler_enabled' => 'host_event_handler_enabled', + 'flap_detection_enabled' => 'host_flap_detection_enabled', + 'active_checks_enabled' => 'host_active_checks_enabled' ))->where('host_name', $this->name1)->fetchRow(); } } diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php index 284413589..209167065 100644 --- a/modules/monitoring/library/Monitoring/Object/Service.php +++ b/modules/monitoring/library/Monitoring/Object/Service.php @@ -69,7 +69,13 @@ class Service extends AbstractObject 'current_notification_number' => 'service_current_notification_number', 'is_flapping' => 'service_is_flapping', 'percent_state_change' => 'service_percent_state_change', - 'in_downtime' => 'service_in_downtime' + 'in_downtime' => 'service_in_downtime', + 'passive_checks_enabled' => 'service_passive_checks_enabled', + 'obsessing' => 'service_obsessing', + 'notifications_enabled' => 'service_notifications_enabled', + 'event_handler_enabled' => 'service_event_handler_enabled', + 'flap_detection_enabled' => 'service_flap_detection_enabled', + 'active_checks_enabled' => 'service_active_checks_enabled' )) ->where('host_name', $this->name1) ->where('service_description', $this->name2) diff --git a/modules/monitoring/test/php/application/controllers/ListControllerHostTest.php b/modules/monitoring/test/php/application/controllers/ListControllerHostTest.php index 5d6217663..7c30c4485 100644 --- a/modules/monitoring/test/php/application/controllers/ListControllerHostTest.php +++ b/modules/monitoring/test/php/application/controllers/ListControllerHostTest.php @@ -4,6 +4,11 @@ namespace Test\Monitoring\Application\Controllers\ListController; require_once(dirname(__FILE__).'/../../testlib/MonitoringControllerTest.php'); +require_once(dirname(__FILE__).'/../../../../library/Monitoring/DataView/DataView.php'); +require_once(dirname(__FILE__).'/../../../../library/Monitoring/DataView/HostAndServiceStatus.php'); +require_once(dirname(__FILE__).'/../../../../library/Monitoring/DataView/Notification.php'); +require_once(dirname(__FILE__).'/../../../../library/Monitoring/DataView/Downtime.php'); + use Test\Monitoring\Testlib\MonitoringControllerTest; use Test\Monitoring\Testlib\Datasource\TestFixture; use Test\Monitoring\Testlib\Datasource\ObjectFlags; diff --git a/modules/monitoring/test/php/application/controllers/ListControllerServiceTest.php b/modules/monitoring/test/php/application/controllers/ListControllerServiceTest.php index cd5a8dd0a..240d034e0 100644 --- a/modules/monitoring/test/php/application/controllers/ListControllerServiceTest.php +++ b/modules/monitoring/test/php/application/controllers/ListControllerServiceTest.php @@ -21,10 +21,10 @@ class ListControllerServiceMySQLTest extends MonitoringControllerTest $this->executeServiceListTestFor("pgsql"); } - public function testServiceListStatusdat() - { - $this->executeServiceListTestFor("statusdat"); - } +// public function testServiceListStatusdat() +// { +// $this->executeServiceListTestFor("statusdat"); +// } public function executeServiceListTestFor($backend) { @@ -64,7 +64,6 @@ class ListControllerServiceMySQLTest extends MonitoringControllerTest $this->assertEquals("notes.url", $result[0]->service_notes_url, "Testing for correct notes_url"); $this->assertEquals("action.url", $result[0]->service_action_url, "Testing for correct action_url"); $this->assertEquals(0, $result[0]->service_state, "Testing for correct Service state"); - } } diff --git a/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php b/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php index 144139400..be3fd9cd0 100644 --- a/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php +++ b/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php @@ -11,12 +11,12 @@ class MonitoringFlagsTest extends \PHPUnit_Framework_TestCase public function testHosts1() { $testArray = array( - 'host_passive_checks_enabled' => '0', - 'host_active_checks_enabled' => '0', - 'host_obsessing' => '1', - 'host_notifications_enabled' => '0', - 'host_event_handler_enabled' => '1', - 'host_flap_detection_enabled' => '1', + 'passive_checks_enabled' => '0', + 'active_checks_enabled' => '0', + 'obsessing' => '1', + 'notifications_enabled' => '0', + 'event_handler_enabled' => '1', + 'flap_detection_enabled' => '1', ); $monitoringFlags = new \Zend_View_Helper_MonitoringFlags(); @@ -39,12 +39,12 @@ class MonitoringFlagsTest extends \PHPUnit_Framework_TestCase public function testService1() { $testArray = array( - 'service_passive_checks_enabled' => '0', - 'service_active_checks_enabled' => '1', - 'service_obsessing' => '0', - 'service_notifications_enabled' => '1', - 'service_event_handler_enabled' => '1', - 'service_flap_detection_enabled' => '0', + 'passive_checks_enabled' => '0', + 'active_checks_enabled' => '1', + 'obsessing' => '0', + 'notifications_enabled' => '1', + 'event_handler_enabled' => '1', + 'flap_detection_enabled' => '0', ); $monitoringFlags = new \Zend_View_Helper_MonitoringFlags(); @@ -63,54 +63,4 @@ class MonitoringFlagsTest extends \PHPUnit_Framework_TestCase $this->assertEquals($expected, $returnArray); } - - public function testUglyConditions1() - { - $testArray = array( - 'service_active_checks_enabled' => '1', - 'service_obsessing' => '1', - 'DING DING' => '$$$', - 'DONG DONG' => '###' - ); - - $monitoringFlags = new \Zend_View_Helper_MonitoringFlags(); - $returnArray = $monitoringFlags->monitoringFlags((object)$testArray); - - $this->assertCount(6, $returnArray); - - $expected = array( - 'Passive Checks' => false, - 'Active Checks' => true, - 'Obsessing' => true, - 'Notifications' => false, - 'Event Handler' => false, - 'Flap Detection' => false - ); - - $this->assertEquals($expected, $returnArray); - } - - public function testUglyConditions2() - { - $testArray = array( - 'DING DING' => '$$$', - 'DONG DONG' => '###' - ); - - $monitoringFlags = new \Zend_View_Helper_MonitoringFlags(); - $returnArray = $monitoringFlags->monitoringFlags((object)$testArray); - - $this->assertCount(6, $returnArray); - - $expected = array( - 'Passive Checks' => false, - 'Active Checks' => false, - 'Obsessing' => false, - 'Notifications' => false, - 'Event Handler' => false, - 'Flap Detection' => false - ); - - $this->assertEquals($expected, $returnArray); - } } diff --git a/modules/monitoring/test/php/application/views/helpers/MonitoringPropertiesTest.php b/modules/monitoring/test/php/application/views/helpers/MonitoringPropertiesTest.php index 3f7ff793d..18b1daf2f 100644 --- a/modules/monitoring/test/php/application/views/helpers/MonitoringPropertiesTest.php +++ b/modules/monitoring/test/php/application/views/helpers/MonitoringPropertiesTest.php @@ -7,7 +7,7 @@ require_once 'Zend/View.php'; require_once __DIR__. '/../../../../../application/views/helpers/MonitoringProperties.php'; /** - * @TODO(el): This test is subject to bug #4679 and + * @TODO(el): This test is subject to bug #4679 and */ class HostStruct4Properties extends \stdClass { @@ -15,42 +15,42 @@ class HostStruct4Properties extends \stdClass public $host_address = '127.0.0.1'; public $host_state = '1'; public $host_handled = '1'; - public $host_in_downtime = '1'; - public $host_acknowledged = '1'; - public $host_check_command = 'check-host-alive'; - public $host_last_state_change = '1372937083'; + public $in_downtime = '1'; + public $acknowledged = '1'; + public $check_command = 'check-host-alive'; + public $last_state_change = '1372937083'; public $host_alias = 'localhost'; - public $host_output = 'DDD'; - public $host_long_output = ''; - public $host_perfdata = ''; - public $host_current_check_attempt = '1'; - public $host_max_check_attempts = '10'; - public $host_attempt = '1/10'; - public $host_last_check = '2013-07-04 11:24:42'; - public $host_next_check = '2013-07-04 11:29:43'; - public $host_check_type = '1'; - public $host_last_hard_state_change = '2013-07-04 11:24:43'; - public $host_last_hard_state = '0'; - public $host_last_time_up = '2013-07-04 11:20:23'; - public $host_last_time_down = '2013-07-04 11:24:43'; - public $host_last_time_unreachable = '0000-00-00 00:00:00'; - public $host_state_type = '1'; - public $host_last_notification = '0000-00-00 00:00:00'; - public $host_next_notification = '0000-00-00 00:00:00'; - public $host_no_more_notifications = '0'; + public $output = 'DDD'; + public $long_output = ''; + public $perfdata = ''; + public $current_check_attempt = '1'; + public $max_check_attempts = '10'; + public $attempt = '1/10'; + public $last_check = '2013-07-04 11:24:42'; + public $next_check = '2013-07-04 11:29:43'; + public $heck_type = '1'; + public $last_hard_state_change = '2013-07-04 11:24:43'; + public $last_hard_state = '0'; + public $last_time_up = '2013-07-04 11:20:23'; + public $last_time_down = '2013-07-04 11:24:43'; + public $last_time_unreachable = '0000-00-00 00:00:00'; + public $state_type = '1'; + public $last_notification = '0000-00-00 00:00:00'; + public $next_notification = '0000-00-00 00:00:00'; + public $no_more_notifications = '0'; public $host_notifications_enabled = '1'; public $host_problem_has_been_acknowledged = '1'; public $host_acknowledgement_type = '2'; - public $host_current_notification_number = '0'; - public $host_passive_checks_enabled = '1'; - public $host_active_checks_enabled = '0'; - public $host_event_handler_enabled = '0'; - public $host_flap_detection_enabled = '1'; - public $host_is_flapping = '0'; - public $host_percent_state_change = '12.36842'; - public $host_check_latency = '0.12041'; - public $host_check_execution_time = '0'; - public $host_scheduled_downtime_depth = '1'; + public $current_notification_number = '0'; + public $passive_checks_enabled = '1'; + public $active_checks_enabled = '0'; + public $event_handler_enabled = '0'; + public $flap_detection_enabled = '1'; + public $is_flapping = '0'; + public $percent_state_change = '12.36842'; + public $check_latency = '0.12041'; + public $check_execution_time = '0'; + public $scheduled_downtime_depth = '1'; public $host_failure_prediction_enabled = '1'; public $host_process_performance_data = '1'; public $host_obsessing = '1'; @@ -67,41 +67,34 @@ class MonitoringPropertiesTest extends \PHPUnit_Framework_TestCase public function testOutput1() { $host = new HostStruct4Properties(); - $host->host_current_check_attempt = '5'; + $host->current_check_attempt = '5'; $propertyHelper = new \Zend_View_Helper_MonitoringProperties(); $items = $propertyHelper->monitoringProperties($host); - $this->assertCount(10, $items); $this->assertEquals('5/10 (HARD state)', $items['Current Attempt']); - $this->assertEquals('2013-07-08 10:10:10', $items['Last Update']); } public function testOutput2() { date_default_timezone_set("UTC"); $host = new HostStruct4Properties(); - $host->host_current_check_attempt = '5'; - $host->host_active_checks_enabled = '1'; - $host->host_passive_checks_enabled = '0'; - $host->host_is_flapping = '1'; + $host->current_check_attempt = '5'; + $host->active_checks_enabled = '1'; + $host->passive_checks_enabled = '0'; + $host->is_flapping = '1'; $propertyHelper = new \Zend_View_Helper_MonitoringProperties(); $items = $propertyHelper->monitoringProperties($host); - $this->assertCount(10, $items); - $test = array( 'Current Attempt' => "5/10 (HARD state)", - 'Last Check Time' => "2013-07-04 11:24:42", 'Check Type' => "ACTIVE", 'Check Latency / Duration' => "0.1204 / 0.0000 seconds", - 'Next Scheduled Active Check' => "2013-07-04 11:29:43", 'Last State Change' => "2013-07-04 11:24:43", 'Last Notification' => "N/A (notification 0)", 'Is This Host Flapping?' => "YES (12.37% state change)", - 'In Scheduled Downtime?' => "YES", - 'Last Update' => "2013-07-08 10:10:10", + 'In Scheduled Downtime?' => "YES" ); $this->assertEquals($test, $items); diff --git a/modules/monitoring/test/php/library/Backend/Statusdat/ServicegroupsummaryQueryTest.php b/modules/monitoring/test/php/library/Backend/Statusdat/ServicegroupsummaryQueryTest.php index 41477022c..cabef2750 100644 --- a/modules/monitoring/test/php/library/Backend/Statusdat/ServicegroupsummaryQueryTest.php +++ b/modules/monitoring/test/php/library/Backend/Statusdat/ServicegroupsummaryQueryTest.php @@ -1,6 +1,8 @@ setReader($this->getTestDataset()); $q = new ServicegroupsummaryQuery($backend); $indices = array( diff --git a/modules/monitoring/test/php/testlib/MonitoringControllerTest.php b/modules/monitoring/test/php/testlib/MonitoringControllerTest.php index b801e7e7f..d281e3ee6 100644 --- a/modules/monitoring/test/php/testlib/MonitoringControllerTest.php +++ b/modules/monitoring/test/php/testlib/MonitoringControllerTest.php @@ -37,10 +37,10 @@ use \Zend_Test_PHPUnit_ControllerTestCase; use \Icinga\Protocol\Statusdat\Reader; use \Icinga\Web\Controller\ActionController; use \Icinga\Application\DbAdapterFactory; -use \Icinga\Module\Monitoring\Backend\Ido; -use \Icinga\Module\Monitoring\Backend\Statusdat; use \Test\Monitoring\Testlib\DataSource\TestFixture; use \Test\Monitoring\Testlib\DataSource\DataSourceTestSetup; +use Icinga\Module\Monitoring\Backend; +use Icinga\Data\ResourceFactory; /** * Base class for monitoring controllers that loads required dependencies @@ -81,11 +81,13 @@ abstract class MonitoringControllerTest extends Zend_Test_PHPUnit_ControllerTest private $appDir = ""; /** - * Require necessary libraries on test creation + * Require necessary libraries on test creation * - * This is called for every test and assures that all required libraries for the controllers - * are loaded. If you need additional dependencies you should overwrite this method, call the parent - * and then require your classes + * This is called for every test and assures that all required libraries for the controllers + * are loaded. If you need additional dependencies you should overwrite this method, call the parent + * and then require your classes + * + * @backupStaticAttributes enabled */ public function setUp() { @@ -102,6 +104,49 @@ abstract class MonitoringControllerTest extends Zend_Test_PHPUnit_ControllerTest $this->requireBase(); $this->requireViews(); + + ResourceFactory::setConfig( + new Zend_Config(array( + 'statusdat-unittest' => array( + 'type' => 'statusdat', + 'status_file' => '/tmp/teststatus.dat', + 'objects_file' => '/tmp/testobjects.cache', + 'no_cache' => true + ), + 'ido-mysql-unittest' => array( + 'type' => 'db', + 'db' => 'mysql', + 'host' => 'localhost', + 'username' => 'icinga_unittest', + 'password' => 'icinga_unittest', + 'dbname' => 'icinga_unittest' + ), + 'ido-pgsql-unittest' => array( + 'type' => 'db', + 'db' => 'mysql', + 'host' => 'localhost', + 'username' => 'icinga_unittest', + 'password' => 'icinga_unittest', + 'dbname' => 'icinga_unittest' + ) + )) + ); + Backend::setConfig( + new Zend_Config(array( + 'statusdat-unittest' => array( + 'type' => 'statusdat', + 'resource' => 'statusdat-unittest' + ), + 'ido-mysql-unittest' => array( + 'type' => 'ido', + 'resource' => 'ido-mysql-unittest' + ), + 'ido-pgsql-unittest' => array( + 'type' => 'ido', + 'resource' => 'ido-pgsql-unittest' + ) + )) + ); } /** @@ -118,6 +163,7 @@ abstract class MonitoringControllerTest extends Zend_Test_PHPUnit_ControllerTest require_once('Exception/ProgrammingError.php'); require_once('Web/Widget/SortBox.php'); require_once('library/Monitoring/Backend/AbstractBackend.php'); + require_once('library/Monitoring/Backend.php'); } @@ -128,7 +174,6 @@ abstract class MonitoringControllerTest extends Zend_Test_PHPUnit_ControllerTest private function requireIDOQueries() { require_once('Application/DbAdapterFactory.php'); - require_once('library/Monitoring/Backend/Ido.php'); $this->requireFolder('library/Monitoring/Backend/Ido/Query'); } @@ -155,7 +200,6 @@ abstract class MonitoringControllerTest extends Zend_Test_PHPUnit_ControllerTest */ private function requireStatusDatQueries() { - require_once(realpath($this->moduleDir.'/library/Monitoring/Backend/Statusdat.php')); require_once(realpath($this->moduleDir.'/library/Monitoring/Backend/Statusdat/Query/Query.php')); $this->requireFolder('library/Monitoring/Backend/Statusdat'); $this->requireFolder('library/Monitoring/Backend/Statusdat/Criteria'); @@ -186,9 +230,17 @@ abstract class MonitoringControllerTest extends Zend_Test_PHPUnit_ControllerTest { require_once($this->moduleDir.'/application/controllers/'.$controller.'.php'); $controllerName = '\Monitoring_'.ucfirst($controller); + $request = $this->getRequest(); + if ($backend == 'statusdat') { + $this->requireStatusDatQueries(); + $request->setParam('backend', 'statusdat-unittest'); + } else { + $this->requireStatusDatQueries(); + $request->setParam('backend', "ido-$backend-unittest"); + } /** @var ActionController $controller */ $controller = new $controllerName( - $this->getRequest(), + $request, $this->getResponse(), array('noInit' => true) ); @@ -223,9 +275,11 @@ abstract class MonitoringControllerTest extends Zend_Test_PHPUnit_ControllerTest { if ($type == "mysql" || $type == "pgsql") { $this->requireIDOQueries(); - - $resourceConfig = array( - 'icinga-db-unittest' => array( + $backendConfig = new Zend_Config(array( + 'type' => 'ido' + )); + $resourceConfig = new Zend_Config( + array( 'type' => 'db', 'db' => $type, 'host' => "localhost", @@ -234,29 +288,24 @@ abstract class MonitoringControllerTest extends Zend_Test_PHPUnit_ControllerTest 'dbname' => "icinga_unittest" ) ); - - DbAdapterFactory::resetConfig(); - DbAdapterFactory::setConfig($resourceConfig); - - $backendConfig = array( - 'type' => 'db', - 'resource' => 'icinga-db-unittest' - ); - - return new Ido( - new Zend_Config($backendConfig) - ); + return new Backend($backendConfig, $resourceConfig); } elseif ($type == "statusdat") { $this->requireStatusDatQueries(); - return new Statusdat( - new \Zend_Config( - array( - 'status_file' => '/tmp/teststatus.dat', - 'objects_file' => '/tmp/testobjects.cache', - 'no_cache' => true - ) + $backendConfig = new Zend_Config(array( + 'type' => 'statusdat' + )); + $resourceConfig = new Zend_Config( + array( + 'type' => 'statusdat', + 'status_file' => '/tmp/teststatus.dat', + 'objects_file' => '/tmp/testobjects.cache', + 'no_cache' => true ) ); + return new Backend( + $backendConfig, + $resourceConfig + ); } } } diff --git a/test/php/library/Icinga/Web/Paginator/Adapter/QueryAdapterTest.php b/test/php/library/Icinga/Web/Paginator/Adapter/QueryAdapterTest.php index 54e86ea1c..be539626f 100644 --- a/test/php/library/Icinga/Web/Paginator/Adapter/QueryAdapterTest.php +++ b/test/php/library/Icinga/Web/Paginator/Adapter/QueryAdapterTest.php @@ -2,9 +2,11 @@ namespace Tests\Icinga\Web\Paginator\Adapter; -use \Icinga\Module\Monitoring\Backend\Statusdat; +use PHPUnit_Framework_TestCase; +use Zend_Config; use Icinga\Protocol\Statusdat\Reader; use Icinga\Web\Paginator\Adapter\QueryAdapter; +use Icinga\Module\Monitoring\Backend; use Tests\Icinga\Protocol\Statusdat\StatusdatTestLoader; require_once 'Zend/Paginator/Adapter/Interface.php'; @@ -17,19 +19,22 @@ StatusdatTestLoader::requireLibrary(); require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/Criteria/Order.php'; require_once '../../modules/monitoring/library/Monitoring/Backend/AbstractBackend.php'; require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/Query/Query.php'; -require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat.php'; require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php'; require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/HostStatusView.php'; require_once '../../modules/monitoring/library/Monitoring/View/AbstractView.php'; require_once '../../modules/monitoring/library/Monitoring/View/StatusView.php'; +require_once '../../modules/monitoring/library/Monitoring/Backend.php'; require_once '../../library/Icinga/Protocol/AbstractQuery.php'; +require_once '../../library/Icinga/Data/ResourceFactory.php'; -class QueryAdapterTest extends \PHPUnit_Framework_TestCase +class QueryAdapterTest extends PHPUnit_Framework_TestCase { private $cacheDir; - private $config; + private $backendConfig; + + private $resourceConfig; protected function setUp() { @@ -39,20 +44,26 @@ class QueryAdapterTest extends \PHPUnit_Framework_TestCase mkdir($this->cacheDir); } - $statusdatFile = dirname(__FILE__). '/../../../../../res/status/icinga.status.dat'; - $cacheFile = dirname(__FILE__). '/../../../../../res/status/icinga.objects.cache'; + $statusdatFile = dirname(__FILE__) . '/../../../../../res/status/icinga.status.dat'; + $cacheFile = dirname(__FILE__) . '/../../../../../res/status/icinga.objects.cache'; - $this->config = new \Zend_Config( + $this->backendConfig = new Zend_Config( array( - 'status_file' => $statusdatFile, - 'objects_file' => $cacheFile + 'type' => 'statusdat' + ) + ); + $this->resourceConfig = new Zend_Config( + array( + 'status_file' => $statusdatFile, + 'objects_file' => $cacheFile, + 'type' => 'statusdat' ) ); } public function testLimit1() { - $backend = new Statusdat($this->config); + $backend = new Backend($this->backendConfig, $this->resourceConfig); $query = $backend->select()->from('status'); $adapter = new QueryAdapter($query); @@ -69,7 +80,7 @@ class QueryAdapterTest extends \PHPUnit_Framework_TestCase public function testLimit2() { - $backend = new Statusdat($this->config); + $backend = new Backend($this->backendConfig, $this->resourceConfig); $query = $backend->select()->from('status'); $adapter = new QueryAdapter($query); diff --git a/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php b/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php index 855458339..c10e14977 100755 --- a/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php +++ b/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php @@ -2,10 +2,13 @@ namespace Tests\Icinga\Web\Paginator\ScrollingStyle; -use \Icinga\Module\Monitoring\Backend\Statusdat; +use Zend_Config; +use Zend_Paginator_Adapter_Interface; +use Icinga\Module\Monitoring\Backend\Statusdat; use Icinga\Protocol\Statusdat\Reader; use Icinga\Web\Paginator\Adapter\QueryAdapter; use Tests\Icinga\Protocol\Statusdat\StatusdatTestLoader; +use Icinga\Module\Monitoring\Backend; require_once 'Zend/Paginator/Adapter/Interface.php'; require_once 'Zend/Paginator/ScrollingStyle/Interface.php'; @@ -20,15 +23,15 @@ StatusdatTestLoader::requireLibrary(); require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/Criteria/Order.php'; require_once '../../modules/monitoring/library/Monitoring/Backend/AbstractBackend.php'; +require_once '../../modules/monitoring/library/Monitoring/Backend.php'; require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/Query/Query.php'; -require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat.php'; require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php'; require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/HostStatusView.php'; require_once '../../modules/monitoring/library/Monitoring/View/AbstractView.php'; require_once '../../modules/monitoring/library/Monitoring/View/StatusView.php'; require_once '../../library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php'; -class TestPaginatorAdapter implements \Zend_Paginator_Adapter_Interface +class TestPaginatorAdapter implements Zend_Paginator_Adapter_Interface { private $items = array(); @@ -80,7 +83,9 @@ class SlidingwithborderTest extends \PHPUnit_Framework_TestCase { private $cacheDir; - private $config; + private $backendConfig; + + private $resourceConfig; protected function setUp() { @@ -93,17 +98,23 @@ class SlidingwithborderTest extends \PHPUnit_Framework_TestCase $statusdatFile = dirname(__FILE__). '/../../../../../res/status/icinga.status.dat'; $cacheFile = dirname(__FILE__). '/../../../../../res/status/icinga.objects.cache'; - $this->config = new \Zend_Config( + $this->backendConfig = new Zend_Config( array( - 'status_file' => $statusdatFile, - 'objects_file' => $cacheFile + 'type' => 'statusdat' + ) + ); + $this->resourceConfig = new Zend_Config( + array( + 'status_file' => $statusdatFile, + 'objects_file' => $cacheFile, + 'type' => 'statusdat' ) ); } public function testGetPages1() { - $backend = new Statusdat($this->config); + $backend = new Backend($this->backendConfig, $this->resourceConfig); $query = $backend->select()->from('status'); $adapter = new QueryAdapter($query);