[icinga-checkins] icinga.org: icingaweb2/feature/organize-headings-7976: Disable Livestatus as backend

git at icinga.org git at icinga.org
Mon Feb 23 14:30:37 CET 2015


Module: icingaweb2
Branch: feature/organize-headings-7976
Commit: e72de8dfe1456cbb50852d8b7910e0013cab3aaa
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=e72de8dfe1456cbb50852d8b7910e0013cab3aaa

Author: Eric Lippmann <eric.lippmann at netways.de>
Date:   Fri Feb 20 11:23:31 2015 +0100

Disable Livestatus as backend

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

refs #8254

---

 .../application/forms/Config/BackendConfigForm.php  |   19 ++++++++++++++-----
 .../application/forms/Setup/BackendPage.php         |    2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
index e0f8e3e..265ab33 100644
--- a/modules/monitoring/application/forms/Config/BackendConfigForm.php
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -43,8 +43,11 @@ class BackendConfigForm extends ConfigForm
     {
         $resources = array();
         foreach ($resourceConfig as $name => $resource) {
-            if ($resource->type === 'db' || $resource->type === 'livestatus') {
-                $resources[$resource->type === 'db' ? 'ido' : 'livestatus'][$name] = $name;
+//            if ($resource->type === 'db' || $resource->type === 'livestatus') {
+//                $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);
 
+        if ($resourceType === 'livestatus') {
+            throw new ConfigurationError(
+                'We\'ve disabled livestatus support for now because it\'s not feature complete yet'
+            );
+        }
+
         $resourceTypes = array();
         if ($resourceType === 'ido' || array_key_exists('ido', $this->resources)) {
             $resourceTypes['ido'] = 'IDO Backend';
         }
-        if ($resourceType === 'livestatus' || array_key_exists('livestatus', $this->resources)) {
-            $resourceTypes['livestatus'] = 'Livestatus';
-        }
+//        if ($resourceType === 'livestatus' || array_key_exists('livestatus', $this->resources)) {
+//            $resourceTypes['livestatus'] = 'Livestatus';
+//        }
 
         $this->addElement(
             'checkbox',
diff --git a/modules/monitoring/application/forms/Setup/BackendPage.php b/modules/monitoring/application/forms/Setup/BackendPage.php
index d8d4c7f..f2df42a 100644
--- a/modules/monitoring/application/forms/Setup/BackendPage.php
+++ b/modules/monitoring/application/forms/Setup/BackendPage.php
@@ -51,7 +51,7 @@ class BackendPage extends Form
         if (Platform::hasMysqlSupport() || Platform::hasPostgresqlSupport()) {
             $resourceTypes['ido'] = 'IDO';
         }
-        $resourceTypes['livestatus'] = 'Livestatus';
+        // $resourceTypes['livestatus'] = 'Livestatus';
 
         $this->addElement(
             'select',



More information about the icinga-checkins mailing list