Merge branch '2.6.x' of http://git.centreon.com/centreon into 2.6.x

CHANGELOG

@@ -1,3 +1,27 @@
+## Centreon 2.6.1
+
+Bug fixes
+=========
+#5655: Changing Host Templates doesn't delete services
+#5925: Popup Dialogs (Acknowledge, Downtimes etc.) not working with Internet Explorer
+#6224: Special characters in LDAP are replaced by underscore
+#6358: It's possible to bypass ACLs on Event Logs page
+#6375: servicegroups empty into servicegroups.cfg but ok in DB
+#6377: PHP logs are too much verbose with PHP 5.4
+#6378: PHP logs are too much verbose with PHP 5.3
+#6383: Random severity on services
+#6390: Escalations with contact groups containing space
+#6391: Some traps are skipped
+#6396: Warning and critical threshold display in centreon graph
+#6399: Wrong condition in centreonLDAP.class.php
+#6410: Do not limit to 20 the number of trap rules or macro in host and services config pages
+
+Features
+========
+#6035: Removing Centreon Broker local module
+#6366: New option for Centreon Engine log
+#6392: Block choice of Nagios and NDO in installation processus
+
 ## Centreon 2.6.0
 
 Bug fixes

doc/en/conf.py

@@ -61,7 +61,7 @@
 # The short X.Y version.
 version = '2.6'
 # The full version, including alpha/beta/rc tags.
-release = '2.6.0'
+release = '2.6.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/en/guide_exploitation/02e.rst

@@ -158,6 +158,20 @@ The table below summarises the settings to add an LDAP server:
 .. note::
    Before any import, check the default settings proposed. If you have not selected a Model, you will need to define the search filters manually by filling in the fields.
 
+With Centos 6, it's possible to not check server certificate, follow procedure :
+
+Add the following line in file "/etc/openldap/ldap.conf" :
+
+::
+
+  TLS_REQCERT never
+
+Then restart Apache :
+
+::
+
+ /etc/init.d/httpd restart
+
 
 *******
 RRDTool

doc/en/index.rst

@@ -14,11 +14,11 @@ Contents:
    :maxdepth: 2
 
    release_notes/index
+   architecture/index
    installation/index
    upgrade/index
    user/index
    guide_exploitation/index
-   architecture/index
    faq/index
    extendcentreon/index
 

doc/en/user/01a.rst → doc/en/installation/01a.rst

@@ -1,52 +1,24 @@
 .. _firststepsces3:
 
-========================
-Get started with CES 3.1
-========================
-
-*********************
-Compared with CES 2.2
-*********************
-
-The following array compares CES 2.2 to CES 3.1 :
-
-+------------------------+----------------------------+
-|       CES 2.2          |         CES 3.1            | 
-+========================+============================+
-|       CentOS 5         |         CentOS 6.6         |
-+------------------------+----------------------------+
-| Centreon 2.4           |  Centreon 2.5.4            |
-+------------------------+----------------------------+
-| MySQL 5.1              |  MariaDB 5.5               |
-+------------------------+----------------------------+
-| Centreon Engine 1.2    |  Centreon Engine 1.4.8     |
-+------------------------+----------------------------+
-| Centreon Broker 2.1    |  Centreon Broker 2.7.0     |
-+------------------------+----------------------------+
-| N/A                    |  Centreon Connector 1.1.1  |
-+------------------------+----------------------------+
-
-The list of new features is available at the following addresses:
-
-*	`Forge Centreon <https://forge.centreon.com/projects/centreon/roadmap>`_
-*	`Forge Centreon Engine <https://forge.centreon.com/projects/centreon-engine/roadmap>`_
-*	`Forge Centreon Broker <https://forge.centreon.com/projects/centreon-broker/roadmap>`_
+=========
+Using CES
+=========
 
 Why choose Centreon Engine and Broker ?
-==================================================
+=======================================
 
 Performances
 ------------
-The tests carried out by the Centreon teams and some independent users show clearly that the Centreon Engine and Centreon Broker pair performs 8 to 9 times better than the Nagios/NDOUtils pair.
+The tests carried out by the Centreon teams and some independent users show clearly that the Centreon Engine and Centreon Broker pair performs 8 to 9 times better than the Nagios/NDOUtils pair. Therefore this version of CES no longer supports the installation of the Nagios/NDOUtils pair.
 
-Better  integration into Centreon
+
+Better integration into Centreon
 ---------------------------------
 The Centreon web interface is more and more oriented towards the use of Centreon Broker. Here are a few examples:
 
 * There is a configuration assistant for Centreon Broker
 * Display performance is greatly improved
 * Some selection filters are only available with the Centreon Broker
-* The next major version of Centreon will no longer support the Nagios / NDOUtils pair
 
 New features
 ------------
@@ -62,7 +34,7 @@ Several new features make their appearance with Centreon Broker:
 Prerequisites
 *************
 
-The table below gives the prerequisites for the installation of CES 3.1:
+The table below gives the prerequisites for the installation of CES 3.2:
 
 +------------------------+--------------------------+----------------+---------------+
 |  Number of Services    |  Number of pollers       | Central        | Poller        |
@@ -95,7 +67,7 @@ Installation
 Step 1 : Start
 ==============
 
-To install Centreon, start your server on the support (created from the ISO file) of the Centreon Enterprise Server.
+To install, start your server on the support (created from the ISO file) of the Centreon Enterprise Server.
 Start with the **Install or upgrade an existing system** option
 
 .. image :: /images/user/abootmenu.png
@@ -162,11 +134,11 @@ Select the partitioning options that suit you best. Then validate.
    :align: center
    :scale: 65%
 
-Step 4 : Components selection
-=============================
+Step 4 : Component selection
+============================
 
-Choose of the type of server
-----------------------------
+Choose the server type
+----------------------
 
 It is possible to choose different options in answer to the question: **Which server type would you like to install?**:
 
@@ -184,17 +156,6 @@ It is possible to choose different options in answer to the question: **Which se
 
 In our box, we shall choose the **Centreon Server with database** option.
 
-Choose the type of monitoring engine and broker
------------------------------------------------
-
-When choosing the monitoring engine and the broker, it is possible to choose between the Centreon Engine / Centreon Broker pair or the Nagios / NDOUtils pair.
-
-In our box, we shall choose the Centreon Engine and Centreon Broker option.
-
-.. image :: /images/user/abrokertoinstall.png
-   :align: center
-   :scale: 65%
-
 Once all these options have been selected, the installation starts.
 
 .. image :: /images/user/arpminstall.png
@@ -211,6 +172,8 @@ When the installation is finished, click on **Restart**.
 Configuration
 *************
 
+.. _installation_web_ces:
+
 Via the web interface
 =====================
 
@@ -341,15 +304,15 @@ Centreon web interface is made up of several menus, each menu has a specific fun
 
 *       The **Home** menu enables access to the first home screen after logging in. It summarises the general status of the supervision.
 *       The **Monitoring** menu contains the status of all the supervised elements in real and delayed time via the viewing of logs.
-*       The **Views** menu serves to view and configured the performances graphics for each element in the  information system.
+*       The **Views** menu serves to view and configure the performance graphics for each element in the  information system.
 *       The **Reporting** menu serves to view, intuitively (via diagrams), the evolution of the supervision on a given period.
 *	The **Configuration** menu serves to configure all monitored objects and the supervision infrastructure.
 *       The **Administration** menu serves to configure the Centreon web interface and to view the general status of the servers.
 
 Before going further
 ====================
 
-it is necessary update the CES 3.1 server. To do this:
+it is necessary update the CES 3.2 server. To do this:
 
  #.	Log in as a ‘root’ on the central server
  #.	Enter this command
@@ -359,3 +322,5 @@ it is necessary update the CES 3.1 server. To do this:
     yum -y update
 
 Allow the update to run fully and then restart the server in case of a kernel update.
+
+Start your configuration by clicking `here<configuration_start>>`.

doc/en/installation/downloads.rst

@@ -16,48 +16,12 @@ Open Source software supplied by Centreon is generally available in 3 formats:
 
 RPM packages are the best format to obtain our software. They are packaged by Centreon experts and relieve you of any concern over the installation process.
 
-If your platform does not support RPM packages, you should use archives containing the sources of stable versions of our software and install them manually. Manual compilation of some packages can be complex.
-
-The last format available is oriented for developers or beta-testers. No official help can be provided on these software versions considered to be in the process of development.
-
 .. note::
- Centreon recommends using the Centreon Enterprise Server packaged version. Installation is detailed in the chapter entitled: :ref:`First steps with CES 3.0<firststepsces3>`
-
-
-.. _download_web_src:
-
-************
-Centreon Web
-************
-
-Tarballs: `<http://www.centreon.com/Content-Download/download-centreon-stable-archive>`_
-
-git: `<http://git.centreon.com/centreon.git>`_
+ Centreon recommends using the Centreon Enterprise Server packaged version. Installation is detailed in the chapter entitled: :ref:`First steps with CES 3.2<firststepsces3>`
 
-***************
-Centreon Engine
-***************
-
-Tarballs: `<http://www.centreon.com/Content-Download/download-centreon-engine>`_
-
-git: `<http://git.centreon.com/centreon-engine>`_
-
-***************
-Centreon Broker
-***************
-
-Tarballs: `<http://www.centreon.com/Content-Download/download-centreon-broker>`_
-
-git: `<http://git.centreon.com/centreon-broker.git>`_
-
-***********************
-Centreon Connector Perl
-***********************
+If your platform does not support RPM packages, you should use archives containing the sources of stable versions of our software and install them manually. Manual compilation of some packages can be complex.
 
-git: `<http://git.centreon.com/centreon-connector>`_
+The last format available is oriented for developers or beta-testers. No official help can be provided on these software versions considered to be in the process of development.
 
-**********************
-Centreon Connector SSH
-**********************
+For downloading centreon sources, please refer to our `website <https://download.centreon.com>`.
 
-git : `<http://git.centreon.com/centreon-connector>`_

doc/en/installation/from_packages.rst

@@ -60,7 +60,7 @@ Perform the command:
 
 
 After this step you should connect to Centreon to finalise the installation process.
-This step is described :ref:`here <installation_web>`.
+This step is described :ref:`here <installation_web_ces>`.
 
 Installing a poller
 -------------------
@@ -93,3 +93,87 @@ Copy this key on the collector:
  ::
 
   $ ssh-copy-id centreon@your_poller_ip
+
+
+.. _installation_web:
+
+Web Installation
+================
+
+.. note::
+
+   Make sure that your Apache and MySQL servers are up and running before continuing.
+
+Open your favorite web browser and go to the address:
+
+ ::
+
+  http://SERVER_ADDRESS/centreon
+
+You should see the following page:
+
+.. image:: /_static/images/installation/setup_1.png
+   :align: center
+
+Click on the **Next** button:
+
+.. image:: /_static/images/installation/setup_2.png
+   :align: center
+
+If a package is missing install it and click on the **Refresh** button. Click on the **Next** button as soon as everything is **OK**:
+
+.. image:: /_static/images/installation/setup_3_1.png
+   :align: center
+
+Select your monitoring engine. Depending on the selection, the settings are different.
+
+For Centreon Engine:
+
+.. image:: /_static/images/installation/setup_3_2.png
+   :align: center
+
+Click on the **Next** button as soon as all the fields are filled.
+
+.. image:: /_static/images/installation/setup_4.png
+   :align: center
+
+Select your Stream Multiplexer. Depending on the selection, the settings are different.
+
+For Centreon Broker:
+
+.. image:: /_static/images/installation/setup_4_2.png
+   :align: center
+
+Click on the **Next** button when all parameters are filled.
+
+.. image:: /_static/images/installation/setup_5.png
+   :align: center
+
+Fill the form with your data. Be sure to remember your password. Click on the **next** button.
+
+
+.. image:: /_static/images/installation/setup_6.png
+   :align: center
+
+Fill the form with information about your database. Click on the **Next** button.
+
+.. image:: /_static/images/installation/setup_7.png
+   :align: center
+
+The database structure will be installed during this process. All must be validated by **OK**.
+
+.. note::
+
+ The installation process may ask you to change the settings of the MySQL server to **add innodb_file_per_table=1** in the configuration file.
+
+Click on the **Next** button.
+
+.. image:: /_static/images/installation/setup_8.png
+   :align: center
+
+The installation is now finished, click on the ``Finish`` button, you will be redirected to the login screen:
+
+.. image:: /images/user/aconnection.png
+   :align: center
+
+Enter your credentials to log in.