diff --git a/CHANGELOG b/CHANGELOG
index 6a6d8ebc8cb0b8fa588752341fd7ad180ee81909..470568fffaa914e203d3daa96a87b9cd149b16cc 100644
--- a/CHANGELOG
+++ b/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
diff --git a/doc/en/conf.py b/doc/en/conf.py
index 06115e90478b50daffa21b7336f0eeda50e4da76..730d418ce182e6456974426e5d6c5a3896a9b902 100644
--- a/doc/en/conf.py
+++ b/doc/en/conf.py
@@ -61,7 +61,7 @@ copyright = u'2015, Centreon'
# 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.
diff --git a/doc/en/guide_exploitation/02e.rst b/doc/en/guide_exploitation/02e.rst
index efee5f27c617a2944dffceb4ac1cce690d2a01d2..461e0f9db7b1ec36eca5b0599ef83d62c62ba64e 100644
--- a/doc/en/guide_exploitation/02e.rst
+++ b/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
diff --git a/doc/en/images/user/abootmenu.png b/doc/en/images/user/abootmenu.png
index 6b86609e4b7ad9c46b817fb2c6038ca420277d6e..9b99016dda276ff39d6dc219fc614cf8e299aefd 100644
Binary files a/doc/en/images/user/abootmenu.png and b/doc/en/images/user/abootmenu.png differ
diff --git a/doc/en/images/user/adisplayicon.png b/doc/en/images/user/adisplayicon.png
index 071d5414054a6e36f561851d7e025a3a9554643a..c41dcf1e682be980b67d409ae278cc93bf44b89a 100644
Binary files a/doc/en/images/user/adisplayicon.png and b/doc/en/images/user/adisplayicon.png differ
diff --git a/doc/en/images/user/arpminstall.png b/doc/en/images/user/arpminstall.png
index cf3e7055894666a6b301ceae91a619969ed8b508..e1b5375c635cb2d21bc9f148f70fd66e4369b714 100644
Binary files a/doc/en/images/user/arpminstall.png and b/doc/en/images/user/arpminstall.png differ
diff --git a/doc/en/index.rst b/doc/en/index.rst
index 0ffc50181250bc81a988601c98f4552a92c49a15..1bf23f250037f47eece04ee20b66e3da0dde40f8 100644
--- a/doc/en/index.rst
+++ b/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
diff --git a/doc/en/user/01a.rst b/doc/en/installation/01a.rst
similarity index 80%
rename from doc/en/user/01a.rst
rename to doc/en/installation/01a.rst
index 16333f3fcc0eaae31b3178635113d2cc1b574393..aff6cdfe45f261dfaea829d894ccf3e3bfdd2794 100644
--- a/doc/en/user/01a.rst
+++ b/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,7 +304,7 @@ 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.
@@ -349,7 +312,7 @@ Centreon web interface is made up of several menus, each menu has a specific fun
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>>`.
\ No newline at end of file
diff --git a/doc/en/installation/downloads.rst b/doc/en/installation/downloads.rst
index 24743ff861f5540c177029d22482e4bdc02cb756..173b46cd3ba0a183644f39a9c33fa639f2a40f16 100644
--- a/doc/en/installation/downloads.rst
+++ b/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>`_
diff --git a/doc/en/installation/from_packages.rst b/doc/en/installation/from_packages.rst
index 0dc59920129c073f67418d058668f088903d5d97..6875371db36d049fce4435746f177de4805565de 100644
--- a/doc/en/installation/from_packages.rst
+++ b/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.
\ No newline at end of file
diff --git a/doc/en/installation/from_sources.rst b/doc/en/installation/from_sources.rst
index 2a0f783086c5489fcbeecfa208767f3cc5d33c7e..2ff93a21930711c7b4d78ed56b77d95004143015 100644
--- a/doc/en/installation/from_sources.rst
+++ b/doc/en/installation/from_sources.rst
@@ -127,29 +127,27 @@ Save the file and restart Apache:
Monitoring engine
******************
-Centreon is compatible with the following software:
+Centreon is compatible with:
* :ref:`Centreon Engine <centreon-engine:user_installation_using_sources>`
-* `Nagios <http://nagios.sourceforge.net/docs/3_0/quickstart.html>`_
-Install one of these engines before continuing with the installation. Don’t forget to install the `Nagios plugins <http://nagios.sourceforge.net/docs/3_0/quickstart.html>`_.
+You can install it following the procedure in documentation. Don’t forget to install the `Nagios plugins <http://nagios.sourceforge.net/docs/3_0/quickstart.html>`_.
******************
Stream Multiplexer
******************
-Centreon is compatible with the following software:
+Centreon is compatible with:
* :ref:`Centreon Broker <centreon-broker:user_installation_using_sources>`
-* `NDOUtils <http://nagios.sourceforge.net/docs/ndoutils/NDOUtils.pdf>`_
-Install one of these Stream Multiplexers before continuing with the installation.
+Install this Stream Multiplexers before continuing with the installation.
********
Centreon
********
-Download the latest version of Centreon :ref:`here <download_web_src>`.
+Download the latest version of Centreon :ref:`here <https://download.centreon.com>`.
Shell Installation
@@ -183,7 +181,7 @@ If the Prerequisites installation step has been run successfully you should have
# Centreon (www.centreon.com) #
# Thanks for using Centreon #
# #
- # v2.5.0 #
+ # v2.6.1 #
# #
# infos@centreon.com #
# #
@@ -759,86 +757,6 @@ After saving the file, please don't forget to restart apache server.
The Mysql database server should be available to complete installation (locally or not). MariaDB is recommended.
+After this step you should connect to Centreon to finalise the installation process.
+This step is described :ref:`here <installation_web_ces>`.
-.. _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.
diff --git a/doc/en/installation/index.rst b/doc/en/installation/index.rst
index 04b954ca1151ce8edec4e1e24922e29684be94fc..e8765842a499594f8f2ee7c242226f729c89899c 100644
--- a/doc/en/installation/index.rst
+++ b/doc/en/installation/index.rst
@@ -8,5 +8,6 @@ Installation
:maxdepth: 2
downloads
+ 01a
from_packages
from_sources
diff --git a/doc/en/release_notes/centreon-2.6.1.rst b/doc/en/release_notes/centreon-2.6.1.rst
new file mode 100644
index 0000000000000000000000000000000000000000..d29711e21fa79a8015de9ff9d5378943645868dc
--- /dev/null
+++ b/doc/en/release_notes/centreon-2.6.1.rst
@@ -0,0 +1,39 @@
+==============
+Centreon 2.6.1
+==============
+
+
+******
+Notice
+******
+If you are upgrading from a version prior to 2.6.0, make sure to go through all the release notes available
+`here <http://documentation.centreon.com/docs/centreon/en/latest/release_notes/index.html>`_.
+
+
+*********
+CHANGELOG
+*********
+
+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
diff --git a/doc/en/upgrade/from_sources.rst b/doc/en/upgrade/from_sources.rst
index d38731d86128a7cf24cca38c6b542e883d17b6b3..62406d98076d7a9fcbaa88ca621b667a8892685f 100644
--- a/doc/en/upgrade/from_sources.rst
+++ b/doc/en/upgrade/from_sources.rst
@@ -40,7 +40,7 @@ go back to [Step 01] and install the prerequisites::
# Centreon (www.centreon.com) #
# Thanks for using Centreon #
# #
- # v2.5.0 #
+ # v2.6.0 #
# #
# infos@centreon.com #
# #
diff --git a/doc/en/user/configuration/10advanced_configuration/01macros.rst b/doc/en/user/configuration/10advanced_configuration/01macros.rst
index de6abc7b4db6a025bfc191f80324a072b54d4279..83eb1520416193fd58c355500397bb5d876c1eba 100644
--- a/doc/en/user/configuration/10advanced_configuration/01macros.rst
+++ b/doc/en/user/configuration/10advanced_configuration/01macros.rst
@@ -91,7 +91,7 @@ Environment macros (also called “to the demand” or “on demand” in Englis
They are complementary to standard macros. E.g.:
* The standard macro $CONTACTEMAIL$ makes reference to the e-mail address of the contact who uses the command of notification
-* The environment macro $CONTACTEMAIL:merethis$ returns the e-mail address of the user: “merethis”
+* The environment macro $CONTACTEMAIL:centreon$ returns the e-mail address of the user: “centreon”
The complete documentation on macros “on demand” is available at this address: `macro list <http://nagios.sourceforge.net/docs/3_0/macrolist.html>`_.
diff --git a/doc/en/user/index.rst b/doc/en/user/index.rst
index 5e2331dd39c15d36e88bb210dd498c427d98c8e0..4288843476be7af1622e6c7c4510f95e3aa73a66 100644
--- a/doc/en/user/index.rst
+++ b/doc/en/user/index.rst
@@ -1,3 +1,5 @@
+.. _configuration_start:
+
##########
User guide
##########
@@ -6,7 +8,6 @@ User guide
:maxdepth: 2
:glob:
- 01a
configuration/index
monitoring/index
graphic_management/index
diff --git a/doc/fr/conf.py b/doc/fr/conf.py
index 8fafb843c3d4bb4f7db2c7a6546ea032a9da2684..ea335e2224d8e425b640c85f5fb59437a914e2e1 100644
--- a/doc/fr/conf.py
+++ b/doc/fr/conf.py
@@ -61,7 +61,7 @@ copyright = u'2015, Centreon'
# 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.
diff --git a/doc/fr/faq/administration.rst b/doc/fr/faq/administration.rst
index 8de3a364df11a93c45668c53ce04412929e55bee..86101639722f31f622f42bf1f34fd6430240c9d8 100644
--- a/doc/fr/faq/administration.rst
+++ b/doc/fr/faq/administration.rst
@@ -44,36 +44,14 @@ Le processus qui écrit dans ce répertoire est soit **cdb** soit **centstorage*
Plugins
-------
-Est-ce que vos plugin génère correctement les données de performance ?
+Est-ce que vos plugins génèrent correctement les données de performance ?
Se référer à la :ref:`documentation officielle <centreon-engine:centengine_plugin_api>`
pour plus d'informations.
-Si vous utilisez NDOUtils
--------------------------
+Centreon Broker
+---------------
-Vérifier que le processus **centstorage** est en cours d'exécution :
-
-::
-
- $ /etc/init.d/centstorage status
- centstorage (pid 30276) is running...
-
-
-Le chemin d'accès vers **service-perfdata** de votre collecteur doit être
-correctement configuré dans le menu **Configuration ==> Centreon**
-
-De plus ce chemin d'accès doit correspondre avec celui utilisé par les sondes :
-
-::
-
- $ head -43 plugin_path/process-service-perfdata | tail -1
- PERFFILE="/var/log/centreon-engine/service-perfdata"
-
-
-Si vous utilisez Centreon Broker
---------------------------------
-
-Centreon Broker doit être configuré correctement. Se référer à la
+Centreon Broker doit être correctement configuré correctement. Se référer à la
:ref:`documentation de configuration <centreon_broker_wizards>` pour plus d'informations.
Le démon cbd rrd doit être en cours d'exécution :
diff --git a/doc/fr/guide_exploitation/02e.rst b/doc/fr/guide_exploitation/02e.rst
index ae7e22565517d05b92f4f8519f0d2fa03023a7ec..9ad38a82ae09d551e0fea0814bdd33d58cb950a9 100644
--- a/doc/fr/guide_exploitation/02e.rst
+++ b/doc/fr/guide_exploitation/02e.rst
@@ -157,6 +157,22 @@ Le tableau ci-dessous résume les différents paramètres à insérer pour ajout
.. note::
Avant tout import, vérifiez les paramètres par défaut proposés. Si vous n'avez sélectionné aucun modèle, vous devez définir manuellement les filtres de recherches en complétant les champs.
+
+Sous centos 6, on peut définir de ne pas vérifier le certificat serveur avec la procédure suivante:
+
+Ajouter la ligne suivante dans le fichier "/etc/openldap/ldap.conf":
+
+::
+
+ TLS_REQCERT never
+
+Puis redémarrez le serveur Apache :
+
+::
+
+ /etcInit.d/httpd restart
+
+
*******
RRDTool
*******
diff --git a/doc/fr/guide_utilisateur/configuration/10advanced_configuration/01macros.rst b/doc/fr/guide_utilisateur/configuration/10advanced_configuration/01macros.rst
index fff9fc8691e74afff29864d7b456e6f96ff9a43e..b07a2ec45916267cea7b2ad9fe884e2a88f364c7 100644
--- a/doc/fr/guide_utilisateur/configuration/10advanced_configuration/01macros.rst
+++ b/doc/fr/guide_utilisateur/configuration/10advanced_configuration/01macros.rst
@@ -99,7 +99,7 @@ Elles sont utilisées afin de pouvoir récupérer à un instant "t" la valeur d'
Elles sont complémentaires aux macros standards. Exemple :
* La macro standard $CONTACTEMAIL$ fait référence à l'adresse email du contact qui utilisera la commande de notification
-* La macro d'environnement $CONTACTEMAIL:merethis$ retournera l'adresse email de l'utilisateur "merethis"
+* La macro d'environnement $CONTACTEMAIL:centreon$ retournera l'adresse email de l'utilisateur "centreon"
La documentation complète des macros à la demande est disponible à cette adresse `Liste des macros <http://nagios.sourceforge.net/docs/3_0/macrolist.html>`_.
diff --git a/doc/fr/guide_utilisateur/index.rst b/doc/fr/guide_utilisateur/index.rst
index fa805436e6d5ebe70be4e7ad6b5c3c0bfaaf8cc9..9ca61d5f3a4953c188a4fb2fd509450fe9cad2db 100644
--- a/doc/fr/guide_utilisateur/index.rst
+++ b/doc/fr/guide_utilisateur/index.rst
@@ -1,3 +1,5 @@
+.. _configuration_start:
+
#################
Guide utilisateur
#################
@@ -6,7 +8,6 @@ Guide utilisateur
:maxdepth: 2
:glob:
- 01a
configuration/index
supervision/index
graphic_management/index
diff --git a/doc/fr/images/guide_utilisateur/abootmenu.png b/doc/fr/images/guide_utilisateur/abootmenu.png
index 85a70d78d5887327b8e5800f30a2645fe2936e08..9b99016dda276ff39d6dc219fc614cf8e299aefd 100644
Binary files a/doc/fr/images/guide_utilisateur/abootmenu.png and b/doc/fr/images/guide_utilisateur/abootmenu.png differ
diff --git a/doc/fr/images/guide_utilisateur/adisplayicon.png b/doc/fr/images/guide_utilisateur/adisplayicon.png
index c8e7e0cdb1199fd736841debd5f88aefaf361f86..c41dcf1e682be980b67d409ae278cc93bf44b89a 100644
Binary files a/doc/fr/images/guide_utilisateur/adisplayicon.png and b/doc/fr/images/guide_utilisateur/adisplayicon.png differ
diff --git a/doc/fr/images/guide_utilisateur/alanguage.png b/doc/fr/images/guide_utilisateur/alanguage.png
index 006ef0f6550c351052ff745d7bfd494a152e90a0..58303bbc90d497c1c0b755ace1c94e66dea25333 100644
Binary files a/doc/fr/images/guide_utilisateur/alanguage.png and b/doc/fr/images/guide_utilisateur/alanguage.png differ
diff --git a/doc/fr/images/guide_utilisateur/arpminstall.png b/doc/fr/images/guide_utilisateur/arpminstall.png
index 259bab169e25b1986960d18c56f96393471e7791..e1b5375c635cb2d21bc9f148f70fd66e4369b714 100644
Binary files a/doc/fr/images/guide_utilisateur/arpminstall.png and b/doc/fr/images/guide_utilisateur/arpminstall.png differ
diff --git a/doc/fr/index.rst b/doc/fr/index.rst
index fda89a3dd8e967b1a72e93c694dc160b1cc30884..1ff97c37df1e618a6810768beadd154232ddcd4a 100644
--- a/doc/fr/index.rst
+++ b/doc/fr/index.rst
@@ -16,6 +16,7 @@ Sommaire :
a_propos/index
release_notes/index
+ architecture/index
installation/index
upgrade/index
guide_utilisateur/index
diff --git a/doc/fr/guide_utilisateur/01a.rst b/doc/fr/installation/01a.rst
similarity index 85%
rename from doc/fr/guide_utilisateur/01a.rst
rename to doc/fr/installation/01a.rst
index b183f00ae7cf368ecb13e033482eb7b0d2a47023..38e7d42f1efae3845c96cd36407c942c1f1a3338 100644
--- a/doc/fr/guide_utilisateur/01a.rst
+++ b/doc/fr/installation/01a.rst
@@ -1,36 +1,8 @@
.. _firststepsces3:
-========================
-Premier pas avec CES 3.1
-========================
-
-*************************
-Comparaison avec CES 2.2
-*************************
-
-Le tableau suivant compare la version de CES 2.2 à la version de 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 Connecteur 1.1.1 |
-+------------------------+-----------------------------+
-
-La liste des nouvelles fonctionnalités est disponible aux adresses suivantes :
-
-* `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>`_
+===============
+A partir de CES
+===============
Pourquoi choisir Centreon Engine et Broker ?
============================================
@@ -38,7 +10,8 @@ Pourquoi choisir Centreon Engine et Broker ?
Performances
------------
Les différents tests effectués par les équipes de Centreon et quelques utilisateurs indépendants démontrent sans équivoque
-que le couple Centreon Engine et Centreon Broker est 8 à 9 fois plus performants que le couple Nagios/NDOUtils.
+que le couple Centreon Engine et Centreon Broker est 8 à 9 fois plus performants que le couple Nagios/NDOUtils.
+Ainsi cette version de CES ne propose plus l'installation du couple Nagios/NDOUtils pair.
Meilleure intégration à Centreon
--------------------------------
@@ -47,7 +20,6 @@ L'interface de Centreon est de plus en plus orientée vers l'utilisation du brok
* Il existe un assistant de configuration pour Centreon Broker
* Les performances d'affichage sont grandement améliorées
* Certains filtres de sélection ne sont disponibles qu'avec le broker, Centreon Broker
-* La prochaine version majeure de Centreon ne supportera plus le couple Nagios/NDOUtils
Nouvelles fonctionnalités
-------------------------
@@ -63,7 +35,7 @@ Plusieurs nouvelles fonctionnalités font leurs apparitions avec Centreon Broker
Prérequis
**********
-Le tableau ci-dessous donne les prérequis pour l'installation de CES 3.1 :
+Le tableau ci-dessous donne les prérequis pour l'installation de CES 3.2 :
+------------------------+--------------------------+-------------------------------+---------------------------------+
| Nombre de services | Architecture conseillée | Serveur central | Serveur(s) de collecte |
@@ -100,7 +72,7 @@ Installation
Etape 1 : Démarrage
====================
-Afin d'installer Centreon, démarrez votre serveur sur le support (créé à partir du fichier ISO) de Centreon Enterprise Server.
+Afin d'installer, démarrez votre serveur sur le support (créé à partir du fichier ISO) de Centreon Enterprise Server.
Démarrez avec l'option **Install or upgrade an existing system**
@@ -189,19 +161,6 @@ Il est possible de choisir différentes options à la question **Which server ty
* Poller server : Installe le serveur satellite (ordonnanceur et broker uniquement)
* Database server : Installe le serveur de base de données (utilisé en complément avec l'option **Central server without database**)
-Dans notre cas, nous allons choisir l'option **Centreon Server with database**.
-
-Choix de l'ordonnanceur et du broker
-------------------------------------
-
-Lors du choix de l'ordonnanceur et du broker, il est possible de choisir entre le couple Centreon Engine/Centreon Broker ou le couple Nagios/NDOUtils
-
-Dans notre cas, nous allons choisir l'option **Centreon Engine and Centreon Broker**.
-
-.. image :: /images/guide_utilisateur/abrokertoinstall.png
- :align: center
- :scale: 65%
-
Une fois toutes ces options choisies, l'installation démarre.
.. image :: /images/guide_utilisateur/arpminstall.png
@@ -218,6 +177,8 @@ Lorsque l'installation est terminée, cliquez sur **Redémarrer**.
Configuration
*************
+.. _installation_web_ces:
+
Via l'interface web
===================
@@ -371,7 +332,7 @@ L'interface web de Centreon est composée de plusieurs menus, chaque menu à une
Avant d'aller plus loin
=======================
-Avant d'aller plus loin, il est nécessaire de faire une mise à jour du serveur CES 3.1. Pour cela :
+Avant d'aller plus loin, il est nécessaire de faire une mise à jour du serveur CES 3.2. Pour cela :
#. Connectez-vous en tant que 'root' sur le serveur central
#. Tapez la commande
@@ -382,3 +343,5 @@ Avant d'aller plus loin, il est nécessaire de faire une mise à jour du serveur
Laissez la mise à jour se faire puis redémarrer le serveur dans le cas d'une mise à jour du noyau.
+
+Vous pouvez commencer la configuration en cliquant :ref:`ici<configuration_start>`.
diff --git a/doc/fr/installation/downloads.rst b/doc/fr/installation/downloads.rst
index af8e394ff6171123176b95f1a20f89d7b6944db4..ab1c67277ebce75b31e4ad6a233ccb235f25e9d2 100644
--- a/doc/fr/installation/downloads.rst
+++ b/doc/fr/installation/downloads.rst
@@ -23,47 +23,14 @@ utiliser les archives contenant les sources des versions stables de nos
logiciels et installer ces derniers manuellement.
La compilation manuelle de certains paquets peut être complexe.
+.. note::
+ Centreon recommande l'utilisation de la version packagée Centreon Enterprise Server. L'installation est détaillée au chapitre :ref:`Premier pas avec CES 3.2<firststepsces3>`
+
Le dernier format disponible est orienté pour les développeurs ou les
bêta-testeurs. Aucun support officiel ne pourra être délivré sur ces
versions logicielles considérées comme en cours de développement.
-.. note::
- Centreon recommande l'utilisation de la version packagée Centreon Enterprise Server. L'installation est détaillée au chapitre :ref:`Premier pas avec CES 3.0<firststepsces3>`
-
.. _download_web_src:
-************
-Centreon Web
-************
-
-Archives: `<http://www.centreon.com/Content-Download/download-centreon>`_
-
-git: `<http://git.centreon.com/centreon.git>`_
-
-***************
-Centreon Engine
-***************
-
-Archives: `<http://www.centreon.com/Content-Download/download-centreon-engine-centreon>`_
-
-git: `<http://git.centreon.com/centreon-engine>`_
-
-***************
-Centreon Broker
-***************
-
-Archives: `<http://www.centreon.com/Content-Download/download-centreon-broker-centreon>`_
-
-git: `<http://git.centreon.com/centreon-broker.git>`_
-
-***********************
-Centreon Connector Perl
-***********************
-
-git: `<http://git.centreon.com/centreon-connector>`_
-
-**********************
-Centreon Connector SSH
-**********************
+Vous pouvez télécharger les sources de nos produits `ici <https://download.centreon.com/>`_
-git : `<http://git.centreon.com/centreon-connector>`_
diff --git a/doc/fr/installation/from_packages.rst b/doc/fr/installation/from_packages.rst
index bfe90b7243308065d98b4ffe900f06a7f9a9410d..7856be2a061c8c9b6e6df4773060f6d4e78de902 100644
--- a/doc/fr/installation/from_packages.rst
+++ b/doc/fr/installation/from_packages.rst
@@ -1,8 +1,8 @@
.. _install_from_packages:
-====================
-A partir des paquets
-====================
+===================
+A partir des dépôts
+===================
Centreon fournit RPM pour ses produits au travers de la solution Centreon
Entreprise Server (CES) en version Open Sources et disponible gratuitement
@@ -58,6 +58,9 @@ Exécutez la commande :
$ yum install centreon-base-config-centreon-engine centreon
+
+Suivez la procédure d'installation web :ref:`ici <installation_web_ces>`.
+
Installer un collecteur
-----------------------
diff --git a/doc/fr/installation/from_sources.rst b/doc/fr/installation/from_sources.rst
index 707c772a79a0b0c091147e3ec4d698e692ba5a29..ea7bde9ff92ba8a8116f9e9bac0db80caa840682 100644
--- a/doc/fr/installation/from_sources.rst
+++ b/doc/fr/installation/from_sources.rst
@@ -141,30 +141,27 @@ Sauvegardez le fichier et redémarrez apache :
Moteur de supervision
*********************
-Centreon est compatible avec les logiciels suivants :
+Centreon est compatible avec :
* :ref:`Centreon Engine <centreon-engine:user_installation_using_sources>`
-* `Nagios <http://nagios.sourceforge.net/docs/3_0/quickstart.html>`_
-* `Icinga <http://docs.icinga.org/latest/en/>`_
-Installez un de ces moteurs avant de poursuivre l'installation. N'oubliez pas d'installer les `Plugins Nagios <http://nagios.sourceforge.net/docs/3_0/quickstart.html>`_.
+Installez ce moteur avant de poursuivre l'installation. N'oubliez pas d'installer les `Plugins Nagios <http://nagios.sourceforge.net/docs/3_0/quickstart.html>`_.
********************
Multiplexeur de flux
********************
-Centreon est compatible avec les logiciels suivants :
+Centreon est compatible avec :
* :ref:`Centreon Broker <centreon-broker:user_installation_using_sources>`
-* `NDOUtils <http://nagios.sourceforge.net/docs/ndoutils/NDOUtils.pdf>`_
-Installez un de ces multiplexeurs de flux avant de poursuivre l'installation.
+Installez ce multiplexeurs de flux avant de poursuivre l'installation.
********
Centreon
********
-Téléchargez la dernière version de Centreon :ref:`ici <download_web_src>`.
+Téléchargez la dernière version de Centreon `<https://download.centreon.com/>`_ .
Installation shell
==================
@@ -203,7 +200,7 @@ d'installation des prérequis :
# Centreon (www.centreon.com) #
# Thanks for using Centreon #
# #
- # v2.5.0 #
+ # v2.6.1 #
# #
# infos@centreon.com #
# #
@@ -763,85 +760,4 @@ Après avoir sauvegardé le fichier, n'oubliez pas de redémarrer le service apa
La base de données MySQL doit être disponible pour pouvoir continuer l'installation (localement ou non). Pour information nous recommandons MariaDB.
-
-.. _installation_web:
-
-Installation web
-================
-
-.. note::
-
- Vérifiez que les serveurs Apache et MySQL sont en cours d'exécution avant de poursuivre.
-
-Ouvrez votre navigateur web favori et rendez-vous à l'adresse :
-
- ::
-
- http://SERVER_ADDRESS/centreon
-
-Vous devriez voir la page suivante :
-
-.. image:: /images/installation/setup_1.png
- :align: center
-
-Cliquez sur le bouton **Next** :
-
-.. image:: /images/installation/setup_2.png
- :align: center
-
-S'il manque un paquet installez-le et cliquer sur le bouton **Refresh**. Cliquez sur le bouton **Next** dès que tout est **OK** :
-
-
-.. image:: /images/installation/setup_3_1.png
- :align: center
-
-Sélectionnez votre moteur de supervision. Suivant la sélection, le paramétrage est différent.
-
-Pour Centreon Engine :
-
-.. image:: /images/installation/setup_3_2.png
- :align: center
-
-Cliquez sur le bouton **Next** dès que tous les champs sont remplis.
-
-.. image:: /images/installation/setup_4.png
- :align: center
-
-Sélectionnez votre multiplexeur de flux. Suivant la sélection, le paramétrage est différent.
-
-Pour Centreon Broker :
-
-.. image:: /images/installation/setup_4_2.png
- :align: center
-
-Cliquez sur le bouton **Next** dès que tous les champs sont remplis.
-
-.. image:: /images/installation/setup_5.png
- :align: center
-
-Remplissez le formulaire avec vos informations. Soyez sûre de vous souvenir de votre mot de passe. Cliquez sur le bouton **Next**.
-
-.. image:: /images/installation/setup_6.png
- :align: center
-
-Remplissez le formulaire avec les informations concernant la base de données. Cliquez sur le bouton **Next**.
-
-.. image:: /images/installation/setup_7.png
- :align: center
-
-La structure des bases de données va être créée durant cette étape. Tous doit être validé par **OK**.
-
-.. note::
- Le processus d'installation peut vous demander de modifier le paramétrage du serveur MySQL pour ajouter **innodb_file_per_table=1** dans le fichier de configuration.
-
-Cliquez sur le bouton **Next**.
-
-.. image:: /images/installation/setup_8.png
- :align: center
-
-L'installation est maintenant terminée, cliquez sur le bouton **Next**, vous allez être redirigé vers la page de connexion :
-
-.. image:: /images/guide_utilisateur/aconnection.png
- :align: center
-
-Entrez votre pseudo et mot de passe pour vous connecter.
+Suivez la procédure d'installation web :ref:`ici <installation_web_ces>`.
diff --git a/doc/fr/installation/index.rst b/doc/fr/installation/index.rst
index ad5fa068fa7bc9cf679440abcf3a8d23f2624ce3..aa2282495f09ac0f84ca00c1048bfee445b3d5a7 100644
--- a/doc/fr/installation/index.rst
+++ b/doc/fr/installation/index.rst
@@ -8,5 +8,6 @@ Installation
:maxdepth: 2
downloads
+ 01a
from_packages
from_sources
diff --git a/doc/fr/release_notes/centreon-2.6.1.rst b/doc/fr/release_notes/centreon-2.6.1.rst
new file mode 100644
index 0000000000000000000000000000000000000000..d29711e21fa79a8015de9ff9d5378943645868dc
--- /dev/null
+++ b/doc/fr/release_notes/centreon-2.6.1.rst
@@ -0,0 +1,39 @@
+==============
+Centreon 2.6.1
+==============
+
+
+******
+Notice
+******
+If you are upgrading from a version prior to 2.6.0, make sure to go through all the release notes available
+`here <http://documentation.centreon.com/docs/centreon/en/latest/release_notes/index.html>`_.
+
+
+*********
+CHANGELOG
+*********
+
+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
diff --git a/doc/fr/release_notes/index.rst b/doc/fr/release_notes/index.rst
index 391268934b6c6d7be4f5147520f4f324fef9ed95..de1e8553011bb550ef6e3d85af7b4dae693d6913 100644
--- a/doc/fr/release_notes/index.rst
+++ b/doc/fr/release_notes/index.rst
@@ -1,5 +1,5 @@
################
-Note de versions
+Notes de version
################
Ce chapitre est une reprise sans traduction de la documentation anglaise.
diff --git a/doc/fr/upgrade/from_sources.rst b/doc/fr/upgrade/from_sources.rst
index 30e758c041048491ceb1029edf17acfb752108dc..0f9e3abb27d307057653819ad35b86d9415e0837 100644
--- a/doc/fr/upgrade/from_sources.rst
+++ b/doc/fr/upgrade/from_sources.rst
@@ -14,16 +14,19 @@ Installation shell
******************
Extraire le paquet :
+
::
$ tar xvfz centreon-2.x.x.tar.gz
Se déplacer de répertoire :
+
::
$ cd centreon-2.x.x
Exécuter le script :
+
::
$ ./install -u /etc/centreon
@@ -43,7 +46,7 @@ revenir à l'étape [Step 01] et installer les prérequis :
# Centreon (www.centreon.com) #
# Thanks for using Centreon #
# #
- # v2.5.0 #
+ # v2.6.0 #
# #
# infos@centreon.com #
# #
@@ -76,6 +79,7 @@ Choix des composants principaux
-------------------------------
Chargement des paramètres d'installation précédents :
+
::
Do you want to use the last Centreon install parameters ?
@@ -88,6 +92,7 @@ Chargement des paramètres d'installation précédents :
/etc/centreon/instCentWeb.conf
Sélectionner les composants à mettre à jour :
+
::
Do you want to install : Centreon Web Front
@@ -113,6 +118,7 @@ Mise à jour de l'interface web
De nouvelle informaitons sont nécessaires.
Le chemin vers les binaires de centreon :
+
::
------------------------------------------------------------------------
@@ -125,6 +131,7 @@ Le chemin vers les binaires de centreon :
Path /usr/local/centreon/bin OK
Le chemin de données supplémentaires pour Centreon Web :
+
::
Where is your Centreon data information directory
@@ -141,6 +148,7 @@ Le chemin de données supplémentaires pour Centreon Web :
Le groupe applicatif Centreon. Ce groupe est utilisé pour les droits
d'accès entre les applications Centreon :
+
::
What is the Centreon group ? [centreon]
@@ -152,6 +160,7 @@ d'accès entre les applications Centreon :
> y
L'utilisateur applicatif Centreon :
+
::
What is the Centreon user ? [centreon]
@@ -181,6 +190,7 @@ Le chemin vers les journaux. Par exmeple :
* Centeron Engine : */var/log/centreon-engine*
Le chemin vers les sondes de supervision :
+
::
Where is your monitoring plugins (libexec) directory ?
diff --git a/doc/fr/upgrade/index.rst b/doc/fr/upgrade/index.rst
index ecb4632ff0c394501a18c39925af37875ce5c2fa..43c62f956fda8542e599b60f3587001867a5441a 100644
--- a/doc/fr/upgrade/index.rst
+++ b/doc/fr/upgrade/index.rst
@@ -1,8 +1,8 @@
.. _upgrade:
-#######
-Upgrade
-#######
+###########
+Mise à jour
+###########
.. toctree::
diff --git a/install.sh b/install.sh
index 0c7ba14d121dfacb669ed8cba35befe4adf6868b..451af5e868ac5dbb1b7d8da08917344f1f9d9dfe 100755
--- a/install.sh
+++ b/install.sh
@@ -50,7 +50,7 @@
# -- on upgrade, overwrite existing ? backup ?
# Define centreon version
-version="2.6.0"
+version="2.6.1"
# Debug
#set -x
diff --git a/www/class/centreonGraph.class.php b/www/class/centreonGraph.class.php
index 3eca6359db8e84b8cb93be6fd47c852dc7dc7690..ddf56c445602cf874a9274d145e5531157e1ce68 100644
--- a/www/class/centreonGraph.class.php
+++ b/www/class/centreonGraph.class.php
@@ -875,41 +875,29 @@ class CentreonGraph {
return;
}
- $l_px = array( "8" => array("1000" => "Y", "1024" =>"Yi"), "7" => array("1000" => "Z", "1024" =>"Zi"), "6" => array("1000" => "E", "1024" =>"Ei"), "5" => array("1000" => "P", "1024" =>"Pi"), "4" => array("1000" => "T", "1024" =>"Ti"), "3" => array("1000" => "G", "1024" =>"Gi"), "2" => array("1000" => "M", "1024" =>"Mi"), "1" => array("1000" => "k", "1024" =>"Ki"), "0" => "", "-1" => "m", "-2" => "µ", "-3" => "n");
- $l_cpx = 0;
- $l_sign ="";
- // base : default [1000]
- if (isset($this->_RRDoptions["base"])) {
- $l_base = $this->_RRDoptions["base"];
- } else {
- $l_base = 1000;
- }
- // unit
- $l_unit = preg_replace("/^[YZEPTGMkKmµn]/", "", $l_unit);
-
- if ($l_value<0) {
- $l_sign = "-";
- $l_value *= -1;
- }
-
- if ($l_value<1) {
- do {
- $l_value *= $l_base;
- $l_cpx--;
- } while ($l_value < 1);
- } else {
+ if ($l_unit == 'B' || $l_unit == 'o' || $l_unit == 'b/s') {
+ if (isset($this->_RRDoptions["base"])) {
+ $l_base = $this->_RRDoptions["base"];
+ } else {
+ $l_base = 1000;
+ }
+
+ $l_px = array( "8" => array("1000" => "Y", "1024" =>"Yi"), "7" => array("1000" => "Z", "1024" =>"Zi"), "6" => array("1000" => "E", "1024" =>"Ei"), "5" => array("1000" => "P", "1024" =>"Pi"), "4" => array("1000" => "T", "1024" =>"Ti"), "3" => array("1000" => "G", "1024" =>"Gi"), "2" => array("1000" => "M", "1024" =>"Mi"), "1" => array("1000" => "K", "1024" =>"Ki"));
+ $l_sign ="";
+ if ($l_value < 0) {
+ $l_sign = "-";
+ $l_value *= -1;
+ }
+ $l_cpx = 0;
while ($l_value > $l_base) {
$l_value /= $l_base;
$l_cpx++;
}
- }
- if ($l_cpx > 0) {
$l_upx = $l_px[$l_cpx][$l_base];
- } else {
- $l_upx = $l_px[$l_cpx];
+ return $l_sign.sprintf("%.2f",$l_value).$l_upx.$l_unit;
}
- return $l_sign.sprintf("%.2f",$l_value).$l_upx.$l_unit;
+ return sprintf("%.2f", $l_value) . $l_unit;
}
/**
diff --git a/www/class/centreonLDAP.class.php b/www/class/centreonLDAP.class.php
index 03a3d1e9b2186ba74f9fe397803bfcc63ddaab9e..53f6feaa90c17e17dabae26dc95a07f909005a58 100644
--- a/www/class/centreonLDAP.class.php
+++ b/www/class/centreonLDAP.class.php
@@ -231,6 +231,18 @@ class CentreonLDAP {
public function getDs() {
return $this->_ds;
}
+
+ /**
+ * Transform user, group name for filter
+ *
+ * @param string $name the atrribute
+ * @return string The string changed
+ */
+ public function replaceFilter($name) {
+ $name = str_replace('(', "\\(", $name);
+ $name = str_replace(')', "\\)", $name);
+ return $name;
+ }
/**
* Get the dn for a user
@@ -243,7 +255,7 @@ class CentreonLDAP {
return false;
}
$this->_setErrorHandler();
- $filter = preg_replace('/%s/', $username, $this->_userSearchInfo['filter']);
+ $filter = preg_replace('/%s/', $this->replaceFilter($username), $this->_userSearchInfo['filter']);
$result = ldap_search($this->_ds, $this->_userSearchInfo['base_search'], $filter);
$entries = ldap_get_entries($this->_ds, $result);
restore_error_handler();
@@ -264,7 +276,7 @@ class CentreonLDAP {
return false;
}
$this->_setErrorHandler();
- $filter = preg_replace('/%s/', $group, $this->_groupSearchInfo['filter']);
+ $filter = preg_replace('/%s/', $this->replaceFilter($group), $this->_groupSearchInfo['filter']);
$result = ldap_search($this->_ds, $this->_groupSearchInfo['base_search'], $filter);
$entries = ldap_get_entries($this->_ds, $result);
restore_error_handler();
@@ -375,7 +387,7 @@ class CentreonLDAP {
return array();
}
$userdn = str_replace('\\', '\\\\', $userdn);
- $filter = '(&' . preg_replace('/%s/', '*', $this->_groupSearchInfo['filter']) . '(' . $this->_groupSearchInfo['member'] . '=' . $userdn . '))';
+ $filter = '(&' . preg_replace('/%s/', '*', $this->_groupSearchInfo['filter']) . '(' . $this->_groupSearchInfo['member'] . '=' . $this->replaceFilter($userdn) . '))';
$result = @ldap_search($this->_ds, $this->_groupSearchInfo['base_search'], $filter);
if (false === $result) {
//print ldap_error($this->_ds);
@@ -469,7 +481,7 @@ class CentreonLDAP {
$searchLimit = 0;
}
if (is_null($searchTimeout)) {
- $searchLimit = 0;
+ $searchTimeout = 0;
}
/* Display debug */
$this->_debug('LDAP Search : Base DN : ' . $basedn);
diff --git a/www/include/common/javascript/centreon/doClone.js b/www/include/common/javascript/centreon/doClone.js
index 485bc26a43489d6dc8ee93a22cd3c6af68dbaabb..b51cc6380c7c8e01a2c505b607f236b28e999364 100644
--- a/www/include/common/javascript/centreon/doClone.js
+++ b/www/include/common/javascript/centreon/doClone.js
@@ -8,6 +8,7 @@ jQuery(function() {
allowRemoveCurrent: true,
allowRemoveAll: true,
minFormsCount: 0,
+ maxFormsCount: 200,
iniFormsCount: jQuery("#clone-count-" + suffixid).data("clone-count-" + suffixid),
data: jQuery("#clone-values-" + suffixid).data("clone-values-" + suffixid)
});
diff --git a/www/include/configuration/configGenerate/genServiceGroups.php b/www/include/configuration/configGenerate/genServiceGroups.php
index 09381f48afa31d45f2559b0ff2366844a8de291f..34f94696677b94d789c7696b1de1d3bdad65f4e9 100644
--- a/www/include/configuration/configGenerate/genServiceGroups.php
+++ b/www/include/configuration/configGenerate/genServiceGroups.php
@@ -105,7 +105,7 @@ while ($serviceGroup = $DBRESULT->fetchRow()) {
// This is the same logic as the previous one except
// "FROM servicegroup_relation, service, host, host_service_relation, hostgroup_relation "
// "AND host.host_id = hostgroup_relation.host_host_id and host_service_relation.hostgroup_hg_id = hostgroup_relat ion.hostgroup_hg_id " .
- $DBRESULT2 =& $pearDB->query("SELECT service_description, service_id, host_name, host_id " .
+ $DBRESULT2 = $pearDB->query("SELECT service_description, service_id, host_name, host_id " .
"FROM servicegroup_relation, service, host, host_service_relation, hostgroup_relation " .
"WHERE servicegroup_relation.servicegroup_sg_id = '".$serviceGroup["sg_id"]."' " .
"AND service.service_id = servicegroup_relation.service_service_id " .
@@ -163,12 +163,29 @@ while ($serviceGroup = $DBRESULT->fetchRow()) {
}
$DBRESULT2->free();
unset($service);
- if ($strTemp)
+
+ /* ******************************************
+ * Generate service linked to servictemplates
+ */
+ $linkedToTpl = 0;
+ $DBRESULT2 = $pearDB->query("SELECT service_description, service_id " .
+ "FROM servicegroup_relation, service " .
+ "WHERE servicegroup_sg_id = '".$serviceGroup["sg_id"]."' " .
+ "AND service.service_id = servicegroup_relation.service_service_id " .
+ "AND service.service_activate = '1' AND service.service_register = '0'");
+ while ($service = $DBRESULT2->fetchRow()) {
+ $linkedToTpl++;
+ }
+ $DBRESULT2->free();
+ unset($service);
+
+ if ($strTemp) {
$strDef .= print_line("members", $strTemp);
+ }
$strDef .= "}\n\n";
$i++;
}
- if ($generated && $strTemp){
+ if (($generated && $strTemp) || $linkedToTpl) {
$str .= $strDef;
$generatedSG[$serviceGroup["sg_id"]] = $serviceGroup["sg_name"];
}
@@ -183,5 +200,3 @@ setFileMod($nagiosCFGPath.$tab['id']."/servicegroups.cfg");
$DBRESULT->free();
unset($str);
unset($i);
-
-?>
diff --git a/www/include/configuration/configGenerate/genServices.php b/www/include/configuration/configGenerate/genServices.php
index 263c4a37cf35ef3e966571ee67e0724d4a4e7979..c2826fc2a4cedefce4c6750c459cf051159c9b4d 100644
--- a/www/include/configuration/configGenerate/genServices.php
+++ b/www/include/configuration/configGenerate/genServices.php
@@ -209,6 +209,7 @@ if ($oreon->CentreonGMT->used() == 1) {
if (isset($critSCache[$service['service_id']])) {
$critDataTmp = $criticality->getData($critSCache[$service['service_id']], true);
if (!is_null($critDataTmp)) {
+ $strTMP .= print_line(";_CRITICALITY_NAME", $critDataTmp['name']);
$strTMP .= print_line("_CRITICALITY_LEVEL", $critDataTmp['level']);
$strTMP .= print_line("_CRITICALITY_ID", $critDataTmp['sc_id']);
}
@@ -216,16 +217,17 @@ if ($oreon->CentreonGMT->used() == 1) {
} else {
// Check if criticities is configured on service templates
$buff = $criticality->criticitiesConfigOnSTpl($service['service_template_model_stm_id']);
-
if ($buff == 0) {
// Get Criticities From hosts
global $critCacheName;
if (isset($critCacheName[$host_name])) {
$name = $critCacheName[$host_name]['name'];
+ $strTMP .= print_line(";_CRITICALITY_NAME", $critSData[$name]['name']);
$strTMP .= print_line("_CRITICALITY_LEVEL", $critSData[$name]['level']);
$strTMP .= print_line("_CRITICALITY_ID", $critSData[$name]['id']);
} else {
$tmp1 = $criticality->getHostTplCriticities($host_id, $critHTpl);
+ $strTMP .= print_line(";_CRITICALITY_NAME", $critSData[$tmp1['name']]['name']);
$strTMP .= print_line("_CRITICALITY_LEVEL", $critSData[$tmp1['name']]['level']);
$strTMP .= print_line("_CRITICALITY_ID", $critSData[$tmp1['name']]['id']);
}
@@ -502,6 +504,7 @@ if ($oreon->CentreonGMT->used() == 1) {
$i = 1;
$str = NULL;
while ($service = $DBRESULT->fetchRow()) {
+ $host_id = null;
$LinkedToHost = 0;
$strDef = "";
@@ -546,15 +549,19 @@ if ($oreon->CentreonGMT->used() == 1) {
*/
$strTMPTemp = NULL;
$tmpHostName = "";
- if (isset($serviceRelation[$service["service_id"]]["h"]))
+ if (isset($serviceRelation[$service["service_id"]]["h"])) {
foreach ($serviceRelation[$service["service_id"]]["h"] as $key => $value) {
$parent = true;
+ if (!isset($host_id)) {
+ $host_id = $key;
+ }
$strTMPTemp != NULL ? $strTMPTemp .= ", ".$value : $strTMPTemp = $value;
- if ($tmpHostName == ''){
+ if ($tmpHostName == '') {
$tmpHostName = $strTMPTemp;
}
$LinkedToHost++;
}
+ }
if ($strTMPTemp) {
$strTMP .= print_line("host_name", $strTMPTemp);
$hostNameTmp = $strTMPTemp;
@@ -578,6 +585,7 @@ if ($oreon->CentreonGMT->used() == 1) {
if (isset($critSCache[$service['service_id']])) {
$critDataTmp = $criticality->getData($critSCache[$service['service_id']], true);
if (!is_null($critDataTmp)) {
+ $strTMP .= print_line(";_CRITICALITY_NAME", $critDataTmp['name']);
$strTMP .= print_line("_CRITICALITY_LEVEL", $critDataTmp['level']);
$strTMP .= print_line("_CRITICALITY_ID", $critDataTmp['sc_id']);
}
@@ -590,10 +598,12 @@ if ($oreon->CentreonGMT->used() == 1) {
global $critCacheName;
if (isset($critCacheName[$tmpHostName])) {
$name = $critCacheName[$tmpHostName]['name'];
+ $strTMP .= print_line(";_CRITICALITY_NAME", $critSData[$name]['name']);
$strTMP .= print_line("_CRITICALITY_LEVEL", $critSData[$name]['level']);
$strTMP .= print_line("_CRITICALITY_ID", $critSData[$name]['id']);
} else {
$tmp1 = $criticality->getHostTplCriticities($host_id, $critHTpl);
+ $strTMP .= print_line(";_CRITICALITY_NAME", $critSData[$tmp1['name']]['name']);
$strTMP .= print_line("_CRITICALITY_LEVEL", $critSData[$tmp1['name']]['level']);
$strTMP .= print_line("_CRITICALITY_ID", $critSData[$tmp1['name']]['id']);
}
diff --git a/www/include/configuration/configNagios/DB-Func.php b/www/include/configuration/configNagios/DB-Func.php
index 54d5a92455b23ffd6d8d0e455d36c9ed9a49d033..2ae708c06510054f8b860264baa0b7f33dc38f3c 100644
--- a/www/include/configuration/configNagios/DB-Func.php
+++ b/www/include/configuration/configNagios/DB-Func.php
@@ -169,9 +169,9 @@
"`check_external_commands` , `command_check_interval` , `command_file` , `downtime_file` , `comment_file` , " .
"`lock_file` , `retain_state_information` , `state_retention_file` , `retention_update_interval` , " .
"`use_retained_program_state` , `use_retained_scheduling_info` , " .
- "`retained_contact_host_attribute_mask`, `retained_contact_service_attribute_mask`, `retained_process_host_attribute_mask`, " .
- "`retained_process_service_attribute_mask`, `retained_host_attribute_mask`, `retained_service_attribute_mask`, " .
- "`use_syslog` , `log_notifications` , " .
+ "`retained_contact_host_attribute_mask`, `retained_contact_service_attribute_mask`, `retained_process_host_attribute_mask`, " .
+ "`retained_process_service_attribute_mask`, `retained_host_attribute_mask`, `retained_service_attribute_mask`, " .
+ "`use_syslog` , `log_notifications` , " .
"`log_service_retries` , `log_host_retries` , `log_event_handlers` , `log_initial_states` , " .
"`log_external_commands` , `log_passive_checks` , `global_host_event_handler` , " .
"`global_service_event_handler` , `sleep_time` , `service_inter_check_delay_method` , " .
@@ -191,7 +191,7 @@
"`debug_level_opt`, `debug_verbosity` , `max_debug_file_size` , `daemon_dumps_core`, " .
"`enable_environment_macros` , `use_setpgid`, `use_regexp_matching` , `use_true_regexp_matching` , `admin_email` , `admin_pager` , `nagios_comment` , `nagios_activate`, " .
"`event_broker_options` , `enable_embedded_perl` , `use_embedded_perl_implicitly`, `translate_passive_host_checks`, " .
- "`passive_host_checks_are_soft`, `check_for_orphaned_hosts`, `external_command_buffer_slots`, `cfg_file`) ";
+ "`passive_host_checks_are_soft`, `check_for_orphaned_hosts`, `external_command_buffer_slots`, `cfg_file`, `log_pid`) ";
$rq .= "VALUES (";
$rq .= "NULL, ";
isset($ret["nagios_name"]) && $ret["nagios_name"] != NULL ? $rq .= "'".htmlentities($ret["nagios_name"], ENT_QUOTES, "UTF-8")."', " : $rq .= "NULL, ";
@@ -329,7 +329,8 @@
isset($ret["passive_host_checks_are_soft"]["passive_host_checks_are_soft"]) && $ret["passive_host_checks_are_soft"]["passive_host_checks_are_soft"] != 2 ? $rq .= "'".$ret["passive_host_checks_are_soft"]["passive_host_checks_are_soft"]."', " : $rq .= "'2', ";
isset($ret["check_for_orphaned_hosts"]["check_for_orphaned_hosts"]) && $ret["check_for_orphaned_hosts"]["check_for_orphaned_hosts"] != 2 ? $rq .= "'".$ret["check_for_orphaned_hosts"]["check_for_orphaned_hosts"]."', " : $rq .= "'2', ";
isset($ret["external_command_buffer_slots"]["external_command_buffer_slots"]) && $ret["external_command_buffer_slots"]["external_command_buffer_slots"] != 2 ? $rq .= "'".$ret["external_command_buffer_slots"]["external_command_buffer_slots"]."', " : $rq .= "'2', ";
- isset($ret["cfg_file"]) && $ret["cfg_file"] != NULL ? $rq .= "'".htmlentities($ret["cfg_file"], ENT_QUOTES, "UTF-8")."') " : $rq .= "NULL) ";
+ isset($ret["cfg_file"]) && $ret["cfg_file"] != NULL ? $rq .= "'".htmlentities($ret["cfg_file"], ENT_QUOTES, "UTF-8")."', " : $rq .= "NULL, ";
+ isset($ret["log_pid"]["log_pid"]) && $ret["log_pid"]["log_pid"] ? $rq .= "'1', " : $rq .= "'0')";
$DBRESULT = $pearDB->query($rq);
$DBRESULT = $pearDB->query("SELECT MAX(nagios_id) FROM cfg_nagios");
@@ -502,6 +503,7 @@
isset($ret["external_command_buffer_slots"]) && $ret["external_command_buffer_slots"]!= NULL ? $rq .= "external_command_buffer_slots = '".htmlentities($ret["external_command_buffer_slots"], ENT_QUOTES, "UTF-8")."', " : $rq .= " external_command_buffer_slots = NULL, ";
isset($ret["cfg_file"]) && $ret["cfg_file"] != NULL ? $rq .= "cfg_file = '".htmlentities($ret["cfg_file"], ENT_QUOTES, "UTF-8")."', " : $rq .= "cfg_file = NULL, ";
+ isset($ret["log_pid"]["log_pid"]) && $ret["log_pid"]["log_pid"] ? $rq .= "log_pid = '1', " : $rq .= "log_pid = '0', ";
$rq .= "nagios_activate = '".$ret["nagios_activate"]["nagios_activate"]."' ";
$rq .= "WHERE nagios_id = '".$nagios_id."'";
diff --git a/www/include/eventLogs/GetCSVLog.php b/www/include/eventLogs/GetCSVLog.php
index fbb0e975827a8cf017b5a1c03b7f8e81bad03ea0..21c257840ed6858c9e44f9cabe700d4b46ef4726 100644
--- a/www/include/eventLogs/GetCSVLog.php
+++ b/www/include/eventLogs/GetCSVLog.php
@@ -38,7 +38,7 @@ ini_set("display_errors", "Off");
/**
* Include configuration
*/
-include_once "/etc/centreon/@CENTREON_ETC@";
+include_once "@CENTREON_ETC@/centreon.conf.php";
/**
* Include Classes / Methods
diff --git a/www/include/eventLogs/GetXmlLog.php b/www/include/eventLogs/GetXmlLog.php
index c6796a5ecb4639359a20e539fd0f67a6a8ae5765..793bfd3f9d308abc70476f7b4d8d65b30dee317f 100644
--- a/www/include/eventLogs/GetXmlLog.php
+++ b/www/include/eventLogs/GetXmlLog.php
@@ -44,7 +44,7 @@ header('Content-Disposition: attachment; filename="eventLogs-' . time() . '.xml"
/** ****************************
* Include configurations files
*/
-include_once "/etc/centreon/@CENTREON_ETC@";
+include_once "@CENTREON_ETC@/centreon.conf.php";
/*
* Require Classes
diff --git a/www/include/monitoring/status/Common/commonJS.php b/www/include/monitoring/status/Common/commonJS.php
index e534c2b881ea1c115b128a4354412e92cd85f42a..59dd0f773c46ef4de81a36076634dad93fcae11f 100644
--- a/www/include/monitoring/status/Common/commonJS.php
+++ b/www/include/monitoring/status/Common/commonJS.php
@@ -107,6 +107,12 @@ if (navigator.appName.substring(0, 3) == "Net") {
}
document.onmousemove = position;
+/* Reset trim function in order to be compatible with IE */
+if (typeof String.prototype.trim !== 'function') {
+ String.prototype.trim = function() {
+ return this.replace(/^\s+|\s+$/g, '');
+ }
+}
/* Global event */
/* Graph */