improve documentation

doc/en/installation/01a.rst

 .. _firststepsces3:
 
-=========
-Using CES
-=========
+==============
+Using Centreon
+==============
 
 ************
 Installation
@@ -256,4 +256,60 @@ it is necessary update the server. To do this:
 
 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>>`.
+.. _installation_ppm:
+
+*****************************
+Easy monitoring configuration
+*****************************
+
+Centreon is great in itself, highly versatile  and can be configured to
+fit the very specifics of your monitored infrastructure. However you
+might find useful to use Centreon IMP to get you started in minutes.
+Centreon IMP provides you Plugin Packs which are bundled configuration
+templates that highly reduce the time needed to properly monitor the
+most common services of your network.
+
+Centreon IMP needs the technical components Centreon License Manager
+and Centreon Plugin Pack Manager to work.
+
+Install packages
+----------------
+
+When using CES, installation of Centreon Plugin Pack Manager is very
+easy. You'll see that Centreon License Manager will be installed too
+as a dependency.
+
+::
+
+   $ yum install centreon-pp-manager
+
+Web install
+-----------
+
+Once the packages installed, you need to enable the module in Centreon.
+So get to the Administration -> Extensions -> Modules page.
+
+.. image:: /_static/images/installation/ppm_1.png
+   :align: center
+
+Install Centreon License Manager (dependency of Centreon Plugin Pack Manager) first.
+
+.. image:: /_static/images/installation/ppm_2.png
+   :align: center
+
+Then install Centreon Plugin Pack Manager itself.
+
+.. image:: /_static/images/installation/ppm_3.png
+   :align: center
+
+You're now ready to got to Administration -> Extensions -> Plugin packs -> Setup.
+You'll find there 6 free Plugin Packs to get you started. 5 more are
+available after free registration and 150+ if you subscribe to the IMP
+offer (more information on `our website <https://www.centreon.com>`_).
+
+.. image:: /_static/images/installation/ppm_4.png
+   :align: center
+
+You can continue to configure your monitoring with Centreon IMP by
+following :ref:`this guide <impconfiguration>`.
+

doc/en/installation/from_VM.rst

+.. _install_from_vm:
+
+========
+Using VM
+========
+
+You can download in Centreon web site, VM already installed.
+
+These VMs are in OVF format and have been tested for VMWare infrastructure. The following procedure have been done for VSphere Client in 5.1 version
+
+Import
+------
+
+The first step is to import the OVF FIle. To do that go in **File > Deploy OVF Template** and choose your file.
+You can then follow diffrents menus. Choices you made are linked to your VMWare configuration so it's difficult to be more specific.
+Just be noticed that best practice are to used **Thin Provision** to keep some spaces in disk.
+
+Connection
+----------
+
+The server has default password.
+
+To connect to the web UI use : **admin/centreon**. You can also connect to the server using SSH with the account : **root/centreon**
+
+.. note::
+
+    For security reasons, we highly recommand you to change this passwords after installation.
+
+Poller
+------
+
+Using Poller VM is nearly the same as central. You just have to exchange SSH keys and configure it on web interface.
+
+Exchange SSH keys
+=================
+
+On your central server:
+
+   ::
+
+    su - centreon
+    ssh-copy-id -i .ssh/id_rsa.pub centreon@IP_POLLER
+
+The password of the centreon user is **centreon**. It can be easyly changed using **passwd** command.
+
+On Web interface
+================
+
+#. In **Configuration > Poller > Pollers**, Activate Poller Template and replace IP_POLLER by the poller IP address.
+#. In **Configuration > Poller > Engine configuration**, Activate Poller-template
+#. In **Configuration > Poller > Broker configuration**, Activate Poller-template-module and in **Output** tab, replace IP_CENTRAL by the central IP address.
+
+Then you can configure and add ressources on your poller. The poller is operational !
+
+.. warning::
+
+    When you export your configuration for the first time, you have to choose "restart".
\ No newline at end of file

doc/en/installation/from_packages.rst

@@ -111,81 +111,125 @@ Copy this key on the collector:
 Web Installation
 ================
 
-.. note::
+The End of installation wizard of Centreon is displayed, click on **Next**.
 
-Make sure that your Apache and MySQL servers are up and running before continuing.
+.. image :: /images/user/acentreonwelcome.png
+   :align: center
+   :scale: 65%
 
-Open your favorite web browser and go to the address:
+The End of installation wizard of Centreon checks the availability of the modules, click on **Next**.
 
-::
+.. image :: /images/user/acentreoncheckmodules.png
+   :align: center
+   :scale: 65%
 
- http://SERVER_ADDRESS/centreon
+Click on **Next**.
 
-You should see the following page:
+.. image :: /images/user/amonitoringengine2.png
+   :align: center
+   :scale: 65%
+
+Click on **Next**.
 
-.. image:: /_static/images/installation/setup_1.png
+.. image :: /images/user/abrokerinfo2.png
    :align: center
+   :scale: 65%
 
-Click on the **Next** button:
+Define the data concerning the admin user, click on **Next**.
 
-.. image:: /_static/images/installation/setup_2.png
+.. image :: /images/user/aadmininfo.png
    :align: center
+   :scale: 65%
 
-If a package is missing install it and click on the **Refresh** button. Click on the **Next** button as soon as everything is **OK**:
+By default, the ‘localhost’ server is defined and the root password is empty. If you use a remote database server, these two data entries must be changed. In our box, we only need to define a password for the user accessing the Centreon databases, i.e. ‘Centreon’, click on **Next**.
 
-.. image:: /_static/images/installation/setup_3_1.png
+.. image :: /images/user/adbinfo.png
    :align: center
+   :scale: 65%
 
-Select your monitoring engine. Depending on the selection, the settings are different.
+If the following error message appears: **Add innodb_file_per_table=1 in my.cnf file under the [mysqld] section and restart MySQL Server.** Perform the following operation:
 
-For Centreon Engine:
+1.  Log-on to the ‘root’ user on your server
+2.  Modify this file 
 
-.. image:: /_static/images/installation/setup_3_2.png
-    :align: center
+::
 
-Click on the **Next** button as soon as all the fields are filled.
+  /etc/my.cnf
 
-.. image:: /_static/images/installation/setup_4.png
-    :align: center
+3.  Add these lines to the file
 
-Select your Stream Multiplexer. Depending on the selection, the settings are different.
+.. raw:: latex 
 
-For Centreon Broker:
+        \begin{lstlisting}
+  [mysqld] 
+  innodb_file_per_table=1
+        \end{lstlisting}
 
-.. image:: /_static/images/installation/setup_4_2.png
-    :align: center
+4.  Restart mysql service
+
+.. raw:: latex
+
+        \begin{lstlisting}
+  /etc/init.d/mysql restart
+        \end{lstlisting}
+
+5.  click on **Refresh**
 
-Click on the **Next** button when all parameters are filled.
+The End of installation wizard configures the databases, click on **Next**.
 
-.. image:: /_static/images/installation/setup_5.png
+.. image :: /images/user/adbconf.png
    :align: center
+   :scale: 65%
 
-Fill the form with your data. Be sure to remember your password. Click on the **next** button.
+The installation is finished, click on Finish.
 
-.. image:: /_static/images/installation/setup_6.png
+At this stage a publicity allows to know the latest Centreon . If your platform is connected to the Internet you have the latest information , if the information present in this version will be offered.
+
+.. image :: /images/user/aendinstall.png
    :align: center
+   :scale: 65%
 
-Fill the form with information about your database. Click on the **Next** button.
+You can now log in.
 
-.. image:: /_static/images/installation/setup_7.png
+.. image :: /images/user/aconnection.png
    :align: center
+   :scale: 65%
 
-The database structure will be installed during this process. All must be validated by **OK**.
+Start monitoring
+================
 
-.. 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.
+To start monitoring engine :
  
-Click on the **Next** button.
+ 1. On web interface, go to **Configuration** ==> **Monitoring engines**
+ 2. Leave the default options and click on **Export**
+ 3. Uncheck **Generate Configuration Files** and **Run monitoring engine debug (-v)**
+ 4. Check **Move Export Files** and **Restart Monitoring Engine**
+ 5. Click on **Export** again
+ 6.     Log into the ‘root’ user on your server
+ 7. Start Centreon Broker
 
-.. 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:
+  /etc/init.d/cbd start
 
-.. image:: /images/user/aconnection.png
+Monitoring is now working.
+
+Introduction to the web interface
+=================================
+
+
+Centreon web interface is made up of several menus, each menu has a specific function:
+
+.. image :: /images/user/amenu.png
    :align: center
 
-Enter your credentials to log in.
+|
+
+*       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 and performance graphics.
+*       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.
 
 
 .. _installation_ppm:

doc/en/installation/index.rst

@@ -20,4 +20,5 @@ Finally, you can install the platform.
     downloads
     01a
     from_packages
+    from_VM
     from_sources

doc/fr/installation/from_VM.rst

+.. _install_from_vm:
+
+================
+A partir des VMs
+================
+
+Deux Machines virtuelles pré-configurées sont disponibles sur le site de téléchargement de Centreon.
+
+Ces machines virtuelles sont disponibles au format OVF et sont validées pour des architectures VMWare. La procédure décrite ici a été validée sur la version 5.1 du client VSphere.
+
+Import
+------
+
+Il est dans un premier temps nécessaire d'importer le ficher OVF. Pour cela, sur le client VSphere allez dans le menu **File > Deploy OVF Template** et sélectionnez le ficher précedemment téléchargé.
+Il est alors nécessaire de suivre les différents menus. Les différents choix sont trés liés à l'infrastructure VMWare en place, il est difficile d'être rééllement spécifique dans cette documentation.
+Il est important de noter que les bonnes pratiques sont de choisir le mode **Thin Provision** qui vous permettra d'économiser de l'espace disque sur vos datastores.
+
+Connexion
+---------
+
+La machine est configurée avec des comptes par défaut.
+
+Vous pourrez donc vous connecter à l'interface web avec le compte : **admin/centreon**. Vous pourez aussi vous connecter en SSH avec le compte **root/centreon**
+
+.. note::
+
+    Pour des raisons de sécurité, il est recommandé de chnager ces deux mots de passe aprés l'installation
+
+
+Collecteur
+----------
+
+L'installation d'un collecteur de supervision (poller) est trés similaire à celle du central de supervision. Il est juste nécessaire d'ajouter à cette procédure l'échange des clefs SSH et la configuration sur l'interface Web.
+
+Echange des clefs SSH
+=====================
+
+Sur votre serveur central :
+
+   ::
+
+    su - centreon
+    ssh-copy-id -i .ssh/id_rsa.pub centreon@IP_POLLER
+
+le mot de passe de l'utilisateur centreon sur le collecteur est configuré par défaut à **centreon**. Il est fortement conseillé de la changer en utilisant la commande **passwd**.
+
+Configuration de l'interface Web
+================================
+
+#. Dans le menu **Configuration > Poller > Pollers**, activez le **Poller Template** et remplacez IP_POLLER par l'adresse IP de votre poller.
+#. Dans le menu **Configuration > Poller > Engine configuration**, activez **Poller-template**
+#. Dans le menu **Configuration > Poller > Broker configuration**, activez **Poller-template-module** et dans l'onglet **Output** remplacez **IP_CENTRAL** par l'adresse IP de votre serveur central.
+
+Vous pouvez maintenant ajouter des éléments à superviser sur votre collecteur, il est fonctionnel !
+
+.. warning::
+
+    La premiére fois que vous exportez la configuration, il sera nécessaire de choisir le choix restart.
\ No newline at end of file

doc/fr/installation/index.rst

@@ -21,4 +21,5 @@ Enfin, vous pourrez procéder à l'installation de la plate-forme.
    downloads
    01a
    from_packages
+   from_VM
    from_sources