Merge branch 'master' into bugfix/monitoring-list-dup-entries-7057

Icinga · Oct 8, 2014 · 4c23d98 · 4c23d98
2 parents afc97b1 + 1b23fd7
commit 4c23d98
Show file tree

Hide file tree

Showing 36 changed files with 57 additions and 3,988 deletions.
diff --git a/application/forms/Config/Resource/StatusdatResourceForm.php b/application/forms/Config/Resource/StatusdatResourceForm.php
diff --git a/application/forms/Config/ResourceConfigForm.php b/application/forms/Config/ResourceConfigForm.php
@@ -12,7 +12,6 @@
 use Icinga\Form\Config\Resource\FileResourceForm;
 use Icinga\Form\Config\Resource\LdapResourceForm;
 use Icinga\Form\Config\Resource\LivestatusResourceForm;
-use Icinga\Form\Config\Resource\StatusdatResourceForm;
 use Icinga\Application\Platform;
 use Icinga\Exception\ConfigurationError;
 
@@ -42,8 +41,6 @@ public function getResourceForm($type)
             return new LdapResourceForm();
         } elseif ($type === 'livestatus') {
             return new LivestatusResourceForm();
-        } elseif ($type === 'statusdat') {
-            return new StatusdatResourceForm();
         } elseif ($type === 'file') {
             return new FileResourceForm();
         } else {
@@ -214,7 +211,6 @@ public function createElements(array $formData)
 
         $resourceTypes = array(
             'file'          => t('File'),
-            'statusdat'     => 'Status.dat',
             'livestatus'    => 'Livestatus',
         );
         if ($resourceType === 'ldap' || Platform::extensionLoaded('ldap')) {

diff --git a/library/Icinga/Data/ResourceFactory.php b/library/Icinga/Data/ResourceFactory.php
@@ -10,7 +10,6 @@
 use Icinga\Exception\ConfigurationError;
 use Icinga\Data\Db\DbConnection;
 use Icinga\Protocol\Livestatus\Connection as LivestatusConnection;
-use Icinga\Protocol\Statusdat\Reader as StatusdatReader;
 use Icinga\Protocol\Ldap\Connection as LdapConnection;
 use Icinga\Protocol\File\FileReader;
 
@@ -102,7 +101,7 @@ private static function assertResourcesExist()
      *
      * @param Zend_Config $config                   The configuration for the created resource.
      *
-     * @return DbConnection|LdapConnection|LivestatusConnection|StatusdatReader An objects that can be used to access
+     * @return DbConnection|LdapConnection|LivestatusConnection An object that can be used to access
      *         the given resource. The returned class depends on the configuration property 'type'.
      * @throws ConfigurationError When an unsupported type is given
      */
@@ -115,9 +114,6 @@ public static function createResource(Zend_Config $config)
             case 'ldap':
                 $resource = new LdapConnection($config);
                 break;
-            case 'statusdat':
-                $resource = new StatusdatReader($config);
-                break;
             case 'livestatus':
                 $resource = new LivestatusConnection($config->socket);
                 break;
@@ -137,7 +133,7 @@ public static function createResource(Zend_Config $config)
      * Create a resource from name
      *
      * @param   string  $resourceName
-     * @return  DbConnection|LdapConnection|LivestatusConnection|StatusdatReader
+     * @return  DbConnection|LdapConnection|LivestatusConnection
      */
     public static function create($resourceName)
     {

diff --git a/library/Icinga/Protocol/Statusdat/Exception/ParsingException.php b/library/Icinga/Protocol/Statusdat/Exception/ParsingException.php
diff --git a/library/Icinga/Protocol/Statusdat/IReader.php b/library/Icinga/Protocol/Statusdat/IReader.php
diff --git a/library/Icinga/Protocol/Statusdat/ObjectContainer.php b/library/Icinga/Protocol/Statusdat/ObjectContainer.php