jben94 · jben94 · Oct 4, 2017 · Sep 20, 2017 · Sep 21, 2017 · Sep 25, 2017
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -114,11 +114,11 @@ try {
     }
   }
 
-  stage('Acceptance tests') {
+  stage('Critical tests') {
     parallel 'centos6': {
       node {
         sh 'cd /opt/centreon-build && git pull && cd -'
-        sh '/opt/centreon-build/jobs/web/3.5/mon-web-acceptance.sh centos6'
+        sh '/opt/centreon-build/jobs/web/3.5/mon-web-acceptance.sh centos6 @critical'
         step([
           $class: 'XUnitBuilder',
           thresholds: [
@@ -133,7 +133,7 @@ try {
     'centos7': {
       node {
         sh 'cd /opt/centreon-build && git pull && cd -'
-        sh '/opt/centreon-build/jobs/web/3.5/mon-web-acceptance.sh centos7'
+        sh '/opt/centreon-build/jobs/web/3.5/mon-web-acceptance.sh centos7 @critical'
         step([
           $class: 'XUnitBuilder',
           thresholds: [
@@ -146,11 +146,47 @@ try {
       }
     }
     if ((currentBuild.result ?: 'SUCCESS') != 'SUCCESS') {
-      error('Acceptance tests stage failure.');
+      error('Critical tests stage failure.');
     }
   }
 
   if (env.BRANCH_NAME == 'master') {
+    stage('Acceptance tests') {
+      parallel 'centos6': {
+        node {
+          sh 'cd /opt/centreon-build && git pull && cd -'
+          sh '/opt/centreon-build/jobs/web/3.5/mon-web-acceptance.sh centos6 ~@critical'
+          step([
+            $class: 'XUnitBuilder',
+            thresholds: [
+              [$class: 'FailedThreshold', failureThreshold: '0'],
+              [$class: 'SkippedThreshold', failureThreshold: '0']
+            ],
+            tools: [[$class: 'JUnitType', pattern: 'xunit-reports/**/*.xml']]
+          ])
+          archiveArtifacts allowEmptyArchive: true, artifacts: 'acceptance-logs/*.txt, acceptance-logs/*.png'
+        }
+      },
+      'centos7': {
+        node {
+          sh 'cd /opt/centreon-build && git pull && cd -'
+          sh '/opt/centreon-build/jobs/web/3.5/mon-web-acceptance.sh centos7 ~@critical'
+          step([
+            $class: 'XUnitBuilder',
+            thresholds: [
+              [$class: 'FailedThreshold', failureThreshold: '0'],
+              [$class: 'SkippedThreshold', failureThreshold: '0']
+            ],
+            tools: [[$class: 'JUnitType', pattern: 'xunit-reports/**/*.xml']]
+          ])
+          archiveArtifacts allowEmptyArchive: true, artifacts: 'acceptance-logs/*.txt, acceptance-logs/*.png'
+        }
+      }
+      if ((currentBuild.result ?: 'SUCCESS') != 'SUCCESS') {
+        error('Critical tests stage failure.');
+      }
+    }
+
     stage('Delivery') {
       node {
         sh 'cd /opt/centreon-build && git pull && cd -'
@@ -168,7 +204,7 @@ try {
     build job: 'des-mbi-bundle-centos7', wait: false
   }
 } catch(e) {
-  if (env.BRANCH_NAME == 'master') {
+  if (env.BRANCH_NAME == 'master' && !(${e} =~ /^.+FlowInterruptedException$/)) {
     slackSend channel: "#monitoring-metrology",
         color: "#F30031",
         message: "*FAILURE*: `CENTREON WEB` <${env.BUILD_URL}|build #${env.BUILD_NUMBER}> on branch ${env.BRANCH_NAME}\n" +

diff --git a/cron/centreon-backup.pl b/cron/centreon-backup.pl
@@ -728,7 +728,8 @@ ()
 	################
 	# Make archive #
 	################
-    `cd $TEMP_DIR && cd .. && $BIN_TAR -czf $BACKUP_DIR/$today-central.tar.gz backup`;
+        my $dir = basename($TEMP_DIR);
+        `cd $TEMP_DIR && cd .. && $BIN_TAR -czf $BACKUP_DIR/$today-central.tar.gz $dir`;
 	if ($? ne 0) {
 		print STDERR "Unable to make tar of backup\n";
 	}
@@ -901,10 +902,11 @@ ()
         print STDERR "No ssh keys for Centreon Engine\n";
     }
 
-	##################
-	# Make archives #
-	#################
-	`cd $TEMP_DIR && cd .. && $BIN_TAR -czf $BACKUP_DIR/$today-centreon-engine.tar.gz backup`;
+    ##################
+    # Make archives #
+    #################
+    my $dir = basename($TEMP_DIR);
+    `cd $TEMP_DIR && cd .. && $BIN_TAR -czf $BACKUP_DIR/$today-centreon-engine.tar.gz $dir`;
     if ($? ne 0) {
         print STDERR "Unable to make tar of backup\n";
     }

diff --git a/doc/en/administration_guide/02e.rst b/doc/en/administration_guide/02e.rst
@@ -1,4 +1,5 @@
 .. _centreon_parameters:
+
 ===============================================
 Administration options of the Centreon platform
 ===============================================

diff --git a/doc/en/exploitation_guide/03stats.rst → doc/en/administration_guide/03stats.rst b/doc/en/exploitation_guide/03stats.rst → doc/en/administration_guide/03stats.rst
diff --git a/doc/en/administration_guide/backup.rst b/doc/en/administration_guide/backup.rst
@@ -59,7 +59,7 @@ This part covers the configuration of centreon-backup.
 The following window is displayed:
 
 .. image:: /images/guide_exploitation/backup.png
-:align: center
+    :align: center
 
 * **Backup enabled** Enable/Disable backup
 * **Backup directory** Directory where backup will be stored
@@ -79,18 +79,16 @@ The following window is displayed:
 * **Remote directory** Remote directory for SCP export
 
 .. warning::
-
     **Temporary directory** can not be a folder of **Backup directory**.
 
-
 **********************************
 Restore of Centreon central server
 **********************************
 
 Restore process is divided in two main steps:
 
-*   Re-install the Centreon platform following the installation documentation. Do not forget to upgrade system.
-*   Restore Centreon-Engines configuration files and Centreon databases
+* Re-install the Centreon platform following the installation documentation. Do not forget to upgrade system.
+* Restore Centreon-Engines configuration files and Centreon databases
 
 Configurations file restore
 ===========================
@@ -120,13 +118,13 @@ Once Centreon server reinstalled (**same Centreon version**), unzip centreon and
     # gzip -d YYYY-MM-DD-centreon_storage.sql.gz
     # mysql centreon_storage < YYYY-MM-DD-centreon_storage.sql
 
-.. note::
-Password is stored in configuration files previously restored. For example **$mysql_passwd** field in file "/etc/centreon/conf.pm".
+This may take a while due to the size of "centreon_storage" databases.
 
-Chis may take a while due to the size of "centreon_storage" databases.
+.. note::
+    Password is stored in configuration files previously restored. For example **$mysql_passwd** field in file "/etc/centreon/conf.pm".
 
 .. note::
-The default configuration does not define any password for mysql root user. That's why we can connect to database using only command "mysql".
+    The default configuration does not define any password for mysql root user. That's why we can connect to database using only command "mysql".
 
 SSH keys restore
 ================
@@ -150,7 +148,7 @@ Connection test from central to poller::
 Answer "Yes" to the ask question. This is about add poller print on the central server.
 
 .. note::
-You have to do this operations only if you work with a distributed environment.
+    You have to do this operations only if you work with a distributed environment.
 
 Plugins restore
 ===============
@@ -189,7 +187,7 @@ In case you're using NRPE or NSCA agents, you have to reinstall and then restore
     # cp  nsca.cfg /etc/centreon-engine/
 
 .. note::
-You have to do this only if you're using the monitoring agents.
+    You have to do this only if you're using the monitoring agents.
 
 Generate Centreon-Engine configuration files within centreon
 ============================================================

diff --git a/doc/en/administration_guide/index.rst b/doc/en/administration_guide/index.rst
@@ -8,17 +8,16 @@ Administration
    :maxdepth: 2
    :glob:
 
-   02a
    02b
    02c
    02d
    02e
    02f
-   02g
    02h
    02i
    02j
    02k
    02l
    backup
    partitioning/index
+   03stats
diff --git a/doc/en/administration_guide/partitioning/index.rst b/doc/en/administration_guide/partitioning/index.rst
@@ -68,6 +68,5 @@ Contents:
 .. toctree::
    :maxdepth: 2
 
-   prerequisite/index
    user/index
 
diff --git a/doc/en/api/clapi/objects/acl_menu.rst b/doc/en/api/clapi/objects/acl_menu.rst
@@ -125,29 +125,31 @@ If you want to grant in Read/Write, Read Only or revoke menus in an ACL Menu rul
 
 Let's assume that you would like to grant full access to the [Monitoring] menu in your ACL Menu rule:::
 
-  [root@centreon ~]# ./centreon -u admin -p centreon -o ACLMENU -a grantrw -v "ACL Menu test;Monitoring"
+  [root@centreon ~]# ./centreon -u admin -p centreon -o ACLMENU -a grantrw -v "ACL Menu test;1;Monitoring"
 
 Then, you would like to grant access to the [Home] > [Poller statistics] menu:::
 
-  [root@centreon ~]# ./centreon -u admin -p centreon -o ACLMENU -a grantrw -v "ACL Menu test;Home;Poller statistics"
+  [root@centreon ~]# ./centreon -u admin -p centreon -o ACLMENU -a grantrw -v "ACL Menu test;1;Home;Poller statistics"
 
 Then, you would like to grant access in read only to the [Configuration] > [Hosts] menu:::
 
-  [root@centreon ~]# ./centreon -u admin -p centreon -o ACLMENU -a grantro -v "ACL Menu test;Configuration;Hosts"
+  [root@centreon ~]# ./centreon -u admin -p centreon -o ACLMENU -a grantro -v "ACL Menu test;1;Configuration;Hosts"
 
 Then, you decide to revoke access from [Monitoring] > [Event Logs]:::
 
-  [root@centreon ~]# ./centreon -u admin -p centreon -o ACLMENU -a revoke -v "ACL Menu test;Monitoring;Event Logs" 
+  [root@centreon ~]# ./centreon -u admin -p centreon -o ACLMENU -a revoke -v "ACL Menu test;1;Monitoring;Event Logs"
 
 
 Arguments are composed of the following columns:
 
 ======= ============================
 Order	Column description
 ======= ============================
-1	Name of ACL menu rule
+1	    Name of ACL menu rule
+
+2       Grant/revoke children menus
 
-2	Menu name to grant/revoke
+3	    Menu name to grant/revoke
 
-n	Possible sub menu name
+n	    Possible sub menu name
 ======= ============================
diff --git a/doc/en/api/clapi/objects/engine_cfg.rst b/doc/en/api/clapi/objects/engine_cfg.rst
@@ -29,8 +29,7 @@ Order	Description
 3	Instance that is linked to centreon-engine.cfg
 
 4	Comments regarding the configuration file
-======= ==============================================
-
+======= ===============================================
 
 Add
 ---

diff --git a/doc/en/api/clapi/objects/index.rst b/doc/en/api/clapi/objects/index.rst
@@ -10,23 +10,20 @@ Object management
    acl_menu
    acl_resource
    broker_cfg
-   cgi_cfg
    commands
    contacts
    contact_templates
    contact_groups
    dependencies
    downtimes
+   engine_cfg
    host_templates
    hosts
    host_categories
    host_groups
    host_group_services
    instances
    ldap_servers
-   nagios_cfg
-   ndo2db_cfg
-   ndomod_cfg
    resource_cfg
    service_templates
    services

diff --git a/doc/en/api/clapi/objects/service_templates.rst b/doc/en/api/clapi/objects/service_templates.rst
@@ -150,7 +150,7 @@ first_notification_delay           First notification delay in seconds
 
 recovery_notification_delay        Recovery notification delay
 
-parallelize_checks	           1 when parallelize checks are enabled, 0 otherwise
+parallelize_check	           1 when parallelize checks are enabled, 0 otherwise
 
 obsess_over_service	           1 when obsess over service is enabled, 0 otherwise
 
@@ -194,7 +194,7 @@ service_notification_options       Notification options (w,u,c,r,f,s)
 .. note::
   You need to generate your configuration file and restart monitoring engine in order to apply changes.
 
-.. _addhosttemplate-and-sethosttemplate
+.. _addhosttemplate-and-sethosttemplate:
 
 Addhosttemplate and Sethosttemplate
 -----------------------------------

diff --git a/doc/en/api/restApi/index.rst b/doc/en/api/restApi/index.rst
diff --git a/doc/en/configuration_guide/advanced_configuration/macros.rst b/doc/en/configuration_guide/advanced_configuration/macros.rst
@@ -36,6 +36,7 @@ There are several advantages to using customised macros instead of arguments:
 * The function of the macro is defined in its name. The macro $_HOSTMOTDEPASSEINTRANET$ is easier to read than $ARG1$
 * The macros inherit models of hosts and of services, the hence it is possible to modify a single macro for a host or a service. On the other hand, the arguments all need to be redefined if a single argument is changed
 * The number of arguments is limited to 32, unlike customised macros which are unlimited
+
 A macro of a host is used to define a variable that is specific to the host and which will not change regardless of the service questioned: host connection identifiers, a port of connection to a particular service, an SNMP community, etc.
 A macro of a service is used more to define settings specific to a service: a WARNING / CRITICAL threshold, a partition to be questioned, etc.
 

diff --git a/doc/en/configuration_guide/advanced_configuration/metaservices.rst b/doc/en/configuration_guide/advanced_configuration/metaservices.rst
@@ -102,6 +102,7 @@ If you have chosen the option **Service list**, in the screen containing all the
 * The **Host** field serves to select the host to which the service to be selected belongs.
 * The **Service** field serves to choose the service (first list) as well as the metric in this service (second list).
 * The **Status** and **Comment** fields serve to enable / disable or comment on the indicator.
+
 3.      Repeat the operation until you have added all the indicators necessary for the calculation of the meta-service.
 
 .. note::

diff --git a/doc/en/configuration_guide/category.rst b/doc/en/configuration_guide/category.rst
@@ -28,6 +28,8 @@ To add a category of hosts:
 * The **Level** and **Icon** fields define a criticality level and an associated icon respectively.
 * The **Status** and **Comment** fields allow us to enable or disable the category of host and to comment on it.
 
+.. _servicecategory:
+
 **********************
 Categories of services
 **********************

diff --git a/doc/en/configuration_guide/imp/index.rst b/doc/en/configuration_guide/imp/index.rst
@@ -113,7 +113,7 @@ Your account is now available. You can link your Centreon platform.
 
 .. image:: /_static/images/configuration/website/create_account_05.png
     :width: 1000 px
-	:align: center
+    :align: center
 
 2. Link your Centreon platform
 ------------------------------

diff --git a/doc/en/configuration_guide/poller/03wizards.rst b/doc/en/configuration_guide/poller/03wizards.rst
@@ -42,9 +42,6 @@ Configuration of a poller for a distributed architecture
    :align: center
    :alt: Schema distributed monitoring
 
-.. note::
-   :alt: Schema distributed monitoring
-
 #. Choose **Simple poller**
 #. Enter a name for the configuration
 #. Select  a poller

diff --git a/doc/en/exploitation_guide/general/index.rst b/doc/en/exploitation_guide/general/index.rst
@@ -1,5 +1,3 @@
-.. _configuration_start:
-
 #######
 General
 #######

diff --git a/doc/en/exploitation_guide/monitoring/index.rst b/doc/en/exploitation_guide/monitoring/index.rst
diff --git a/doc/en/extendcentreon/index.rst b/doc/en/extendcentreon/index.rst
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,17 +8,16 @@ Administration @@
        :maxdepth: 2
        :glob:
-a
 b
 c
 d
 e
 f
-g
 h
 i
 j
 k
 l
        backup
        partitioning/index
+stats