Add support for 'Dependency Redundancy Groups'

application/controllers/SuggestController.php

@@ -356,6 +356,17 @@ protected function suggestDependencytemplates()
         return $this->fetchTemplateNames('icinga_dependency');
     }
 
+    protected function suggestDependencyRedundancyGroups()
+    {
+        $db = $this->db()->getDbAdapter();
+        $query = $db->select()
+            ->distinct()
+            ->from('icinga_dependency', 'redundancy_group')
+            ->where('redundancy_group IS NOT NULL')
+            ->order('redundancy_group');
+        return $db->fetchCol($query);
+    }
+
     protected function highlight($val, $search)
     {
         $search = ($search);

application/forms/IcingaDependencyForm.php

@@ -303,6 +303,20 @@ protected function addObjectsElement()
             }
         }
 
+        $redundancyGroup = $dependency->get('redundancy_group');
+        $this->addElement('text', 'redundancy_group', [
+            'label' => $this->translate('Redundancy Group'),
+            'description' => $this->translate(
+                'The dependency redundancy group. A name for a group of which'
+                . ' at least one single dependency must be fulfilled for the'
+                . ' whole dependency to be fulfilled.'
+            ),
+            'class' => "director-suggest",
+            'data-suggestion-context' => 'dependencyredundancygroups',
+            'required' => false,
+            'value' => $redundancyGroup
+        ]);
+
         $elements = ['parent_host', 'child_host', 'parent_service', 'child_service'];
         $this->addDisplayGroup($elements, 'related_objects', [
             'decorators' => [

library/Director/Objects/IcingaDependency.php

@@ -29,6 +29,7 @@ class IcingaDependency extends IcingaObject implements ExportInterface
         'ignore_soft_states'     => null,
         'period_id'              => null,
         'zone_id'                => null,
+        'redundancy_group'       => null,
         'assign_filter'          => null,
         'parent_service_by_name' => null,
     ];

library/Director/Web/Form/DirectorObjectForm.php

@@ -553,6 +553,7 @@ protected function groupMainProperties($importsFirst = false)
             'email',
             'pager',
             'enable_notifications',
+            'redundancy_group', //Dependencies
             'disable_checks', //Dependencies
             'disable_notifications',
             'ignore_soft_states',

schema/mysql-migrations/upgrade_188.sql

@@ -0,0 +1,6 @@
+ALTER TABLE icinga_dependency ADD COLUMN redundancy_group VARCHAR(255) DEFAULT NULL AFTER parent_service_by_name;
+ALTER TABLE branched_icinga_dependency ADD COLUMN redundancy_group VARCHAR(255) DEFAULT NULL AFTER parent_service_by_name;
+
+INSERT INTO director_schema_migration
+  (schema_version, migration_time)
+  VALUES (188, NOW());

schema/mysql.sql

@@ -1774,6 +1774,7 @@ CREATE TABLE icinga_dependency (
   zone_id INT(10) UNSIGNED DEFAULT NULL,
   assign_filter TEXT DEFAULT NULL,
   parent_service_by_name VARCHAR(255) DEFAULT NULL,
+  redundancy_group VARCHAR(255) DEFAULT NULL,
   PRIMARY KEY (id),
   UNIQUE INDEX uuid (uuid),
   CONSTRAINT icinga_dependency_parent_host
@@ -2431,6 +2432,7 @@ CREATE TABLE branched_icinga_dependency (
   zone VARCHAR(255) DEFAULT NULL,
   assign_filter TEXT DEFAULT NULL,
   parent_service_by_name VARCHAR(255) DEFAULT NULL,
+  redundancy_group VARCHAR(255) DEFAULT NULL,
 
   imports TEXT DEFAULT NULL,
   set_null TEXT DEFAULT NULL,
@@ -2446,4 +2448,4 @@ CREATE TABLE branched_icinga_dependency (
 
 INSERT INTO director_schema_migration
   (schema_version, migration_time)
-  VALUES (187, NOW());
+  VALUES (188, NOW());

schema/pgsql-migrations/upgrade_188.sql

@@ -0,0 +1,6 @@
+ALTER TABLE icinga_dependency ADD COLUMN redundancy_group character varying(255);
+ALTER TABLE branched_icinga_dependency ADD COLUMN redundancy_group character varying(255);
+
+INSERT INTO director_schema_migration
+  (schema_version, migration_time)
+  VALUES (188, NOW());

schema/pgsql.sql

@@ -2062,6 +2062,7 @@ CREATE TABLE icinga_dependency (
   zone_id integer DEFAULT NULL,
   assign_filter text DEFAULT NULL,
   parent_service_by_name character varying(255),
+  redundancy_group character varying(255),
   PRIMARY KEY (id),
   CONSTRAINT icinga_dependency_parent_host
     FOREIGN KEY (parent_host_id)
@@ -2768,6 +2769,7 @@ CREATE TABLE branched_icinga_dependency (
   zone_id integer DEFAULT NULL,
   assign_filter text DEFAULT NULL,
   parent_service_by_name character varying(255),
+  redundancy_group character varying(255),
 
   imports TEXT DEFAULT NULL,
   set_null TEXT DEFAULT NULL,
@@ -2785,4 +2787,4 @@ CREATE INDEX branched_dependency_search_object_name ON branched_icinga_dependenc
 
 INSERT INTO director_schema_migration
   (schema_version, migration_time)
-  VALUES (187, NOW());
+  VALUES (188, NOW());