tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-31 01:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Disable Livestatus as backend

Browse Source 
Livestatus is not feature complete yet. This commit has to be reverted once we've fully implemented Livestatus support.

refs #8254
This commit is contained in:
Eric Lippmann 2015-02-20 11:23:31 +01:00
parent 2992bf3445
commit e72de8dfe1
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
modules/monitoring/application/forms/Config/BackendConfigForm.php
View File

@ -43,8 +43,11 @@ class BackendConfigForm extends ConfigForm
{ {
$resources = array(); $resources = array();
foreach ($resourceConfig as $name => $resource) { foreach ($resourceConfig as $name => $resource) {
if ($resource->type === 'db' || $resource->type === 'livestatus') { // if ($resource->type === 'db' || $resource->type === 'livestatus') {
$resources[$resource->type === 'db' ? 'ido' : 'livestatus'][$name] = $name; // $resources[$resource->type === 'db' ? 'ido' : 'livestatus'][$name] = $name;
// }
if ($resource->type === 'db') {
$resources['ido'][$name] = $name;
} }
} }
@ -183,13 +186,19 @@ class BackendConfigForm extends ConfigForm
{ {
$resourceType = isset($formData['type']) ? $formData['type'] : key($this->resources); $resourceType = isset($formData['type']) ? $formData['type'] : key($this->resources);
if ($resourceType === 'livestatus') {
throw new ConfigurationError(
'We\'ve disabled livestatus support for now because it\'s not feature complete yet'
);
}
$resourceTypes = array(); $resourceTypes = array();
if ($resourceType === 'ido' || array_key_exists('ido', $this->resources)) { if ($resourceType === 'ido' || array_key_exists('ido', $this->resources)) {
$resourceTypes['ido'] = 'IDO Backend'; $resourceTypes['ido'] = 'IDO Backend';
} }
if ($resourceType === 'livestatus' || array_key_exists('livestatus', $this->resources)) { // if ($resourceType === 'livestatus' || array_key_exists('livestatus', $this->resources)) {
$resourceTypes['livestatus'] = 'Livestatus'; // $resourceTypes['livestatus'] = 'Livestatus';
} // }
$this->addElement( $this->addElement(
'checkbox', 'checkbox',

2
modules/monitoring/application/forms/Setup/BackendPage.php
View File

@ -51,7 +51,7 @@ class BackendPage extends Form
if (Platform::hasMysqlSupport() || Platform::hasPostgresqlSupport()) { if (Platform::hasMysqlSupport() || Platform::hasPostgresqlSupport()) {
$resourceTypes['ido'] = 'IDO'; $resourceTypes['ido'] = 'IDO';
} }
$resourceTypes['livestatus'] = 'Livestatus'; // $resourceTypes['livestatus'] = 'Livestatus';
$this->addElement( $this->addElement(
'select', 'select',