Merge branch '2.8.x' of https://github.com/centreon/centreon into 2.8.x

centreon · May 22, 2017 · 6760a25 · 6760a25
2 parents f861ec2 + 5a966ba
commit 6760a25
Show file tree

Hide file tree

Showing 39 changed files with 72 additions and 493 deletions.
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/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
 
@@ -198,7 +198,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/contact.rst b/doc/en/configuration_guide/contact.rst
@@ -34,6 +34,8 @@ General information
 * The **Host / Service Notification Period** field serves to choose the time period in which notifications are sent.
 * The **Host / Service Notification Command** field serves to choose the notification command to a host or a service.
 
+.. _autologin:
+
 ***********************
 Centreon authentication
 ***********************

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/configuration_guide/poller/index.rst b/doc/en/configuration_guide/poller/index.rst
@@ -1,3 +1,5 @@
+.. _pollers_basic_conf:
+
 ======
 Poller
 ======

diff --git a/doc/en/developer/index.rst b/doc/en/developer/index.rst
@@ -7,4 +7,3 @@ Developer
 
    writemodule
    writewidget
-   develop-a-plugin.rst
diff --git a/doc/en/exploitation_guide/01customview.rst b/doc/en/exploitation_guide/01customview.rst
@@ -1,3 +1,5 @@
+.. _widgets_user_guide:
+
 ============
 Custom views
 ============

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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,3 @@ Developer

		writemodule
		writewidget
		develop-a-plugin.rst