Merge branch '2.8.x' into FeatureServiceConfiguration

centreon · Aug 7, 2017 · 45d979d · 45d979d
2 parents 7621465 + c766d13
commit 45d979d
Show file tree

Hide file tree

Showing 18 changed files with 536 additions and 21 deletions.
diff --git a/behat.yml b/behat.yml
@@ -268,3 +268,8 @@ default:
       paths: [ %paths.base%/features/ServiceConfiguration.feature ]
       contexts:
       - ServiceConfigurationContext
+
+    host_group_service_configuration:
+      paths: [ %paths.base%/features/HostGroupServiceConfiguration.feature ]
+      contexts:
+      - HostGroupServiceConfigurationContext
diff --git a/doc/en/api/clapi/objects/hosts.rst b/doc/en/api/clapi/objects/hosts.rst
@@ -125,8 +125,6 @@ check_freshness	                     Enables check freshness
 
 check_period	                     Check period
 
-checks_enabled	                     Whether or not checks are enabled
-
 contact_additive_inheritance         Enables contact additive inheritance
 
 cg_additive_inheritance              Enables contactgroup additive inheritance

diff --git a/doc/en/api/clapi/objects/services.rst b/doc/en/api/clapi/objects/services.rst
@@ -171,8 +171,6 @@ first_notification_delay         First notification delay in seconds
 
 recovery_notification_delay      Recovery notification delay
 
-parallelize_checks	         *1* when parallelize checks are enabled, *0* otherwise
-
 obsess_over_service	         *1* when obsess over service is enabled, *0* otherwise
 
 check_freshness	                 *1* when check freshness is enabled, *0* otherwise
@@ -183,8 +181,6 @@ event_handler_enabled	         *1* when event handler is enabled, *0* otherwise
 
 flap_detection_enabled	         *1* when flap detection is enabled, *0* otherwise
 
-process_perf_data	         *1* when process performance data is enabled, *0* otherwise
-
 retain_status_information	 *1* when status information is retained, *0* otherwise
 
 retain_nonstatus_information	 *1* when non status information is retained, *0* otherwise

diff --git a/doc/en/release_notes/centreon-2.7/centreon-2.7.12.rst b/doc/en/release_notes/centreon-2.7/centreon-2.7.12.rst
@@ -0,0 +1,23 @@
+###############
+Centreon 2.7.12
+###############
+
+The 2.7.12 release for Centreon Web is now available for `download <https://download.centreon.com>`_.
+The full release notes for 2.7.12 follow.
+
+******
+Notice
+******
+
+If you are upgrading from a version prior to 2.7.0, make sure to go through all the release notes available
+`here <http://documentation.centreon.com/docs/centreon/en/latest/release_notes/index.html>`_.
+
+Bug Fixes
+=========
+
+* [CLAPI] Several bugs on HG / CG when export is filtered #5297 PR #5320
+* [CLAPI] fix clapi ldap contact import
+* Unable to load public custom view - No Layout... #5449
+* Impossible to acknowledge several object from custom views #5420
+* Security: avoid external command shell injection in comment
+
diff --git a/doc/en/release_notes/centreon-2.7/index.rst b/doc/en/release_notes/centreon-2.7/index.rst
@@ -18,3 +18,5 @@ Please find here the release notes dedicated to the last 2.7.x version of Centre
     centreon-2.7.8
     centreon-2.7.9
     centreon-2.7.10
+    centreon-2.7.11
+    centreon-2.7.12
diff --git a/doc/fr/api/clapi/objects/hosts.rst b/doc/fr/api/clapi/objects/hosts.rst
@@ -125,8 +125,6 @@ check_freshness	                     Enables check freshness
 
 check_period	                     Check period
 
-checks_enabled	                     Whether or not checks are enabled
-
 contact_additive_inheritance         Enables contact additive inheritance
 
 cg_additive_inheritance              Enables contactgroup additive inheritance

diff --git a/doc/fr/api/clapi/objects/services.rst b/doc/fr/api/clapi/objects/services.rst
@@ -169,8 +169,6 @@ notification_options             Status linked to notifications
 
 first_notification_delay           First notification delay in seconds
 
-parallelize_checks	         *1* when parallelize checks are enabled, *0* otherwise
-
 obsess_over_service	         *1* when obsess over service is enabled, *0* otherwise
 
 check_freshness	                 *1* when check freshness is enabled, *0* otherwise
@@ -181,8 +179,6 @@ event_handler_enabled	         *1* when event handler is enabled, *0* otherwise
 
 flap_detection_enabled	         *1* when flap detection is enabled, *0* otherwise
 
-process_perf_data	         *1* when process performance data is enabled, *0* otherwise
-
 retain_status_information	 *1* when status information is retained, *0* otherwise
 
 retain_nonstatus_information	 *1* when non status information is retained, *0* otherwise

diff --git a/doc/fr/release_notes/centreon-2.7/centreon-2.7.12.rst b/doc/fr/release_notes/centreon-2.7/centreon-2.7.12.rst
@@ -0,0 +1,23 @@
+###############
+Centreon 2.7.12
+###############
+
+The 2.7.12 release for Centreon Web is now available for `download <https://download.centreon.com>`_.
+The full release notes for 2.7.12 follow.
+
+******
+Notice
+******
+
+If you are upgrading from a version prior to 2.7.0, make sure to go through all the release notes available
+`here <http://documentation.centreon.com/docs/centreon/en/latest/release_notes/index.html>`_.
+
+Bug Fixes
+=========
+
+* [CLAPI] Several bugs on HG / CG when export is filtered #5297 PR #5320
+* [CLAPI] fix clapi ldap contact import
+* Unable to load public custom view - No Layout... #5449
+* Impossible to acknowledge several object from custom views #5420
+* Security: avoid external command shell injection in comment
+
diff --git a/doc/fr/release_notes/centreon-2.7/index.rst b/doc/fr/release_notes/centreon-2.7/index.rst
@@ -18,3 +18,5 @@ Please find here the release notes dedicated to the last 2.7.x version of Centre
     centreon-2.7.8
     centreon-2.7.9
     centreon-2.7.10
+    centreon-2.7.11
+    centreon-2.7.12
diff --git a/features/HostGroupServiceConfiguration.feature b/features/HostGroupServiceConfiguration.feature
@@ -0,0 +1,20 @@
+Feature: Edit a host group service
+    As a Centreon user
+    I want to manipulate a service
+    To see if all simples manipulations work
+
+    Background:
+        Given I am logged in a Centreon server
+        And a service is configured
+
+    Scenario: Change the properties of a host group service
+        When I change the properties of a host group service
+        Then the properties are updated
+
+    Scenario: Duplicate one existing host group service
+        When I duplicate a host group service
+        Then the new host group service has the same properties
+
+    Scenario: Delete one existing host group service
+        When I delete a host group service
+        Then the deleted host group service is not displayed in the list
diff --git a/features/bootstrap/ACLActionsAccessContext.php b/features/bootstrap/ACLActionsAccessContext.php
@@ -22,9 +22,7 @@ class ACLActionsAccessContext extends CentreonContext
     private $adminContactGroup = array(
         'name' => 'adminContactGroupName',
         'alias' => 'adminContactGroupAlias',
-        'contacts' => array(
-            'adminUserName'
-        ),
+        'contacts' => 'adminUserName'
     );
 
     private $nonAdminUser = array(