Skip to content
This repository has been archived by the owner on Dec 13, 2022. It is now read-only.

enh(remote-server): enable https for 18.10.x #7536

Merged
merged 36 commits into from
May 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
453109c
enh(remote-server): Add possibility to use HTTP/HTTPS from RS to CC
lpinsivy Mar 28, 2019
aec5448
fix(remote-server): remove duplicated line
lpinsivy Mar 29, 2019
cd1ee83
enh(remote-server): Add new options to enable a Remote Server
lpinsivy Apr 11, 2019
219feb5
enh(doc): explain new options to enable a Remote Server
lpinsivy Apr 11, 2019
a7b97f9
enh(RestHttp): add possibility to disable SSL certificate validation
lpinsivy Mar 29, 2019
86986e4
enh(remote-server): Add fields in form to configure HTTP method and T…
lpinsivy Mar 29, 2019
1493c4c
enh(remote-server): update DB schema to configure HTTP method and TCP…
lpinsivy Mar 29, 2019
e7d5878
enh(remote-server): export more information about distant server in e…
lpinsivy Mar 29, 2019
d2cce6f
enh(remote-server): allows to configure https, tcp port and disable S…
lpinsivy Mar 29, 2019
f32a833
enh(Remore-server): add tooltips help in poller form
lpinsivy Apr 1, 2019
e85f74d
fix(unit-test): correct size of line
lpinsivy Apr 1, 2019
9b4281d
fix(install/upgrade): correct default value for remote_servers
lpinsivy Apr 1, 2019
6c44fc5
fix(remote-server): correct SQL request for add RS wizard
lpinsivy Apr 1, 2019
0a76a8f
fix(remote-server): correct typo var name
lpinsivy Apr 1, 2019
132c066
enh(remote-server): improve wizard to connect to RS using HTTPS
lpinsivy Apr 11, 2019
625b217
enh(centreonRestHTTP): allow to disable proxy
lpinsivy Apr 11, 2019
0a173e4
enh(remote-server): do not use configured proxy to comminucate to RS
lpinsivy Apr 11, 2019
1954a36
fix(checkStyle): fix warnings and errors
lpinsivy Apr 11, 2019
9b19b5d
fix(remote-server): add missing argument in pingMaster function
lpinsivy Apr 12, 2019
813575d
fix(remote-server): correct url + add try/catch
lpinsivy Apr 15, 2019
86dddaf
enh(remote-server): improve documentation to create a remote server
lpinsivy Apr 15, 2019
fc6feb3
fix(checkstyle): move at the end arguments with default values
lpinsivy Apr 15, 2019
76a1e51
fix(sql): correct SQL request
lpinsivy May 3, 2019
bdc842a
enh(doc): improve Remote Server documentation
lpinsivy May 3, 2019
dbac9fd
fix(doc): correct wizard to add a RS
lpinsivy May 13, 2019
49208e4
fix(doc): Add restart cbd after first export of configuration of RS
lpinsivy May 13, 2019
ea4b8b9
fix(remote-server): add no_proxy var in task definition
lpinsivy May 14, 2019
f7a5dbb
enh(remote-server): add translation
lpinsivy May 15, 2019
d04e193
fix(style): add feedback from sc979
lpinsivy May 15, 2019
20337de
fix(typo): correct typo in help
lpinsivy May 15, 2019
54c2336
enh(doc): add Remote Server flows in documentation
lpinsivy May 16, 2019
4b722ff
enh(remote-server): option to do not use proxy to contact Central server
lpinsivy May 24, 2019
16b5d26
fix(remote-server): change method to get params to call RS
lpinsivy May 24, 2019
b9629b2
fix(remote-server): communication with create form
lpinsivy May 27, 2019
11ab601
fix(remote-server): correct SQL request
lpinsivy May 27, 2019
d974865
fix(doc): correct typo
lpinsivy May 29, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions doc/en/administration_guide/poller/enable_remote.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,31 @@ Enabling the Remote Server option

Connect to your **Remoter Server** and execute following command::

# /usr/share/centreon/bin/centreon -u admin -p centreon -a enableRemote -o CentreonRemoteServer -v @IP_CENTREON_CENTRAL
# /usr/share/centreon/bin/centreon -u admin -p centreon -a enableRemote -o CentreonRemoteServer -v '@IP_CENTREON_CENTRAL;<not check SSL CA on Central>;<HTTP method>;<TCP port>;<not check SSL CA on Remote>;<no proxy to call Central>'

Replace **@IP_CENTREON_CENTRAL** by the IP of the Centreon server seen by the
poller. You can define multiple IP address using a coma as separator.

.. note::
Replace **@IP_CENTREON_CENTRAL** by the IP of the Centreon server seen by the poller.
You can define multiple IP address using a coma as separator.
* To use HTTPS, replace **@IP_CENTREON_CENTRAL** by
**https://@IP_CENTREON_CENTRAL**.
* To use non default port, replace **@IP_CENTREON_CENTRAL** by
**@IP_CENTREON_CENTRAL:<port>**.

For the **<not check SSL CA on Central>** option you can put **1** to do not
check the SS CA on the Centreon Central Server if HTTPS is enabled, or put **0**.

The **<HTTP method>** is to define how the Centreon Central server can contact
the Remote server: HTTP or HTTPS.

The **<TCP port>** is to define on wich TCP port the entreon Central server can
contact the Remote server.

For the **<not check SSL CA on Remote>** option you can put **1** to do not
check the SS CA on the Remote server if HTTPS is enabled, or put **0**.

For the **<no proxy to call Central>** option you can put **1** to do not
use HTTP(S) proxy to contact the Centreon Central server.

This command will enable **Remote Server** mode::

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
Using Centreon el7 ISO
======================

.. note::
During this procedure it is recommended to select **Central with database**
option.

.. include:: ../../installation/common/install_iso.rst

.. include:: ../../installation/common/web_install.rst
Expand Down
31 changes: 24 additions & 7 deletions doc/en/administration_guide/poller/wizard_add_remote.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,32 @@ Select **Add a Centreon Remote Server** and click on **Next**:
.. image:: /images/poller/wizard_add_remote_1.png
:align: center

If you define a new server, select the **Manual input** option and fill in the form:
If you enabled the **Remote Server** option when installing your server,
select the option **Select a Remote Server**, then select your server and fill in
the form:

.. image:: /images/poller/wizard_add_remote_2a.png
:align: center

If you enabled the **Remote Server** option when installing your server,
select the option **Select a Remote Server**, then select your server and fill in
the form:
Otherwise, select the **Manual input** option and fill in the form:

.. image:: /images/poller/wizard_add_remote_2b.png
:align: center

.. note::
The **Database username** and **Database password** are the credentials defined
during the installation of the Remote Server.
The **Database username** and **Database password** are the credentials defined
during the installation of the Remote Server.

The **Server IP address** field is of the following form:
[(http|https)://]@IP[:(port)]. If your Remote Server is only available on HTTPS, it
is mandatory to define the HTTP method and the TCP port is this one is not the
default one.

The **Do not check SSL certificate validation** option allows to connect
to the Remote Server using self-signed SSL certificate.

The **Do not use configured proxy tp connect to this server** allows to
connect to the Remote Server without using the proxy configuration of the
Centreon Central server.

Click on **Next**.

Expand All @@ -44,6 +55,12 @@ The wizard will configure your new server:
.. image:: /images/poller/wizard_add_remote_4.png
:align: center


Once the configuration is exported, restart the Centreon Broker process on the
Remote Server using the following command: ::

# systemctl restart cbd

The Remote Server is now configured:

.. image:: /images/poller/wizard_add_remote_5.png
Expand Down
Binary file modified doc/en/images/poller/wizard_add_remote_2a.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/en/images/poller/wizard_add_remote_2b.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 21 additions & 15 deletions doc/en/installation/architecture/network.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,27 @@ Tables of network flows to integrate monitoring platform to IT
Tables of monitoring flows
**************************

+-------------------+----------------------------------+------------+-----------+----------------------------------+
| From | To | Protocol | Port | Application |
+===================+==================================+============+===========+==================================+
| Central server | Poller | SSH | TCP 22 | Export of Centreon configuration |
+-------------------+----------------------------------+------------+-----------+----------------------------------+
| Poller | Central server | BBDO | TCP 5669 | Transfer of collected data |
+-------------------+----------------------------------+------------+-----------+----------------------------------+
| Poller | Network equipment, servers, etc. | SNMP | UDP 161 | Monitoring |
+-------------------+----------------------------------+------------+-----------+----------------------------------+
| Network equipment | Poller | Trap SNMP | UDP 162 | Monitoring |
+-------------------+----------------------------------+------------+-----------+----------------------------------+
| Poller | Servers | NRPE | TCP 5666 | Monitoring |
+-------------------+----------------------------------+------------+-----------+----------------------------------+
| Poller | Servers | NSClient++ | TCP 12489 | Monitoring |
+-------------------+----------------------------------+------------+-----------+----------------------------------+
+-------------------+----------------------------------+------------+--------------+-------------------------------------------+
| From | To | Protocol | Port | Application |
+===================+==================================+============+==============+===========================================+
| Central server | Poller | SSH | TCP 22 | Export of Centreon configuration |
+-------------------+----------------------------------+------------+--------------+-------------------------------------------+
| Central server | Remote Server | HTTP(S) | TCP 80 (443) | Export of Remote Server configuration |
+-------------------+----------------------------------+------------+--------------+-------------------------------------------+
| Poller | Central server | BBDO | TCP 5669 | Transfer of collected data |
+-------------------+----------------------------------+------------+--------------+-------------------------------------------+
| Poller | Network equipment, servers, etc. | SNMP | UDP 161 | Monitoring |
+-------------------+----------------------------------+------------+--------------+-------------------------------------------+
| Network equipment | Poller | Trap SNMP | UDP 162 | Monitoring |
+-------------------+----------------------------------+------------+--------------+-------------------------------------------+
| Poller | Servers | NRPE | TCP 5666 | Monitoring |
+-------------------+----------------------------------+------------+--------------+-------------------------------------------+
| Poller | Servers | NSClient++ | TCP 12489 | Monitoring |
+-------------------+----------------------------------+------------+--------------+-------------------------------------------+
| Central server | Remote Server | HTTP(S) | TCP 80 (443) | Export of Centreon configuration |
+-------------------+----------------------------------+------------+--------------+-------------------------------------------+
| Remote Server | Central server | HTTP(S) | TCP 80 (443) | Activation of Remote Server functionality |
+-------------------+----------------------------------+------------+--------------+-------------------------------------------+

.. note::
If the Centreon server is a poller too, do not forget to open monitoring flows.
Expand Down
25 changes: 23 additions & 2 deletions doc/fr/administration_guide/poller/enable_remote.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,32 @@ Activer l'option Remote Server
Connectez-vous à votre serveur ayant la fonction **Remote Server** et exécutez
la commande suivante ::

# /usr/share/centreon/bin/centreon -u admin -p centreon -a enableRemote -o CentreonRemoteServer -v @IP_CENTREON_CENTRAL
# /usr/share/centreon/bin/centreon -u admin -p centreon -a enableRemote -o CentreonRemoteServer -v '@IP_CENTREON_CENTRAL;<not check SSL CA on Central>;<HTTP method>;<TCP port>;<not check SSL CA on Remote>;<no proxy to call Central>'

.. note::
Remplacez **@IP_CENTREON_CENTRAL** par l'IP du serveur Centreon vu par le collecteur.
Vous pouvez définir plusieurs adresse IP en utilisant la virgule comme séparateur.
Vous pouvez définir plusieurs adresses IP en utilisant la virgule comme séparateur.

.. note::
* Pour utiliser HTTPS, remplacez **@IP_CENTREON_CENTRAL** par
**https://@IP_CENTREON_CENTRAL**.
* Pour utilsier un autre port TCP, remplacez **@IP_CENTREON_CENTRAL** par
**@IP_CENTREON_CENTRAL:<port>**.

Pour ne pas contrôler le certificat SSL sur le serveur Centreon Central,
mettre à **1** l'option **<not check SSL CA on Central>**, sinon **0**.

L'option **<HTTP method>** permet de définir la méthode de connexion pour
contacter le Remote Server : HTTP ou HTTPS.

L'option **<TCP port>** permet de définir sur quel port TCP communiquer avec le
Remote Server.

Pour ne pas contrôler le certificat SSL sur le Remote server, mettre à **1**
l'option **<not check SSL CA on Central>**, sinon **0**.

Pour ne pas utiliser le proxy pour contacter le serveur Centreon Central,
mettre à **1** l'option **<no proxy to call Central>**, sinon **0**.

Cette commande va activer le mode **Remote Server** ::

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
A partir de l'ISO Centreon el7
==============================

.. note::
Lors de cette procédure, il est préférable de sélectionner l'option :
**Central with database**.

.. include:: ../../installation/common/install_iso.rst

.. include:: ../../installation/common/web_install.rst
Expand Down
31 changes: 23 additions & 8 deletions doc/fr/administration_guide/poller/wizard_add_remote.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,32 @@ Sélectionnez **Add a Centreon Remote Server** et cliquez sur **Next** :
.. image:: /images/poller/wizard_add_remote_1.png
:align: center

Si vous souhaitez ajouter un nouveau serveur, sélectionnez l'option **Manual input**
et saisissez les informations demandées.
Si vous avez activé votre serveur en suivant la documentation, sélectionnez
l'option **Select a Remote Server**. Dans la liste déroulante sélectionnez
votre serveur, puis saisissez les informations demandées :

.. image:: /images/poller/wizard_add_remote_2a.png
:align: center

Si vous avez déjà activé l'option **Remote Server** durant l'installation de
votre serveur, sélectionnez l'option **Select a Remote Server** et sélectionnez
votre serveur dans la liste puis complétez les informations demandées.
Sinon, sélectionnez l'option **Create new Remote Server**
et saisissez les informations demandées.

.. image:: /images/poller/wizard_add_remote_2b.png
:align: center

.. note::
Les champs **Database user** et **Database password** sont les accès aux bases
de données Centreon définis durant l'installation de votre Remote Server.
Les champs **Database user** et **Database password** sont les accès aux bases
de données Centreon définis durant l'installation de votre Remote Server.

Le champ **Server IP address** est de la forme : [(http|https)://]@IP[:(port)].
Si votre Remote Server est accessible en HTTPS, il est nécessaire de préciser
la méthode d'accès et le port si celui-ci n'est pas par défaut.

L'option **Do not check SSL certificate validation** permet de contacter le
Remote Server si celui-ci possède un certificat SSL auto-signé.

L'option **Do not use configured proxy tp connect to this server** permet
de de contacter le Remote Server en n'utilisant pas la configuration
du proxy configurée sur le serveur Centreon Central.

Cliquez sur **Next** :

Expand All @@ -47,6 +57,11 @@ L'assistant va configurer votre nouveau serveur :
.. image:: /images/poller/wizard_add_remote_4.png
:align: center

Une fois la configuration exportée, redémarrez le processus Centreon Broker
sur le Remote Server via la commande suivante : ::

# systemctl restart cbd

Le Remote Server est maintenant configuré :

.. image:: /images/poller/wizard_add_remote_5.png
Expand Down
Binary file modified doc/fr/images/poller/wizard_add_remote_2a.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/fr/images/poller/wizard_add_remote_2b.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 19 additions & 15 deletions doc/fr/installation/architecture/network.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,25 @@ Tableaux des flux d'intégration de la plate-forme de supervision dans le SI
Tableau des flux de la supervision
**********************************

+--------------------+------------------------------------+------------+-----------+-------------------------------------------------+
| Depuis | Vers | Protocole | Port | Application |
+====================+====================================+============+===========+=================================================+
| Central serveur | Collecteur | SSH | TCP 22 | Export des configurations Centreon |
+--------------------+------------------------------------+------------+-----------+-------------------------------------------------+
| Collecteur | Central serveur | BBDO | TCP 5669 | Transfert des données de supervision collectées |
+--------------------+------------------------------------+------------+-----------+-------------------------------------------------+
| Collecteur | Equipements réseau, serveurs, etc. | SNMP | UDP 161 | Supervision |
+--------------------+------------------------------------+------------+-----------+-------------------------------------------------+
| Equipements réseau | Collecteur | Trap SNMP | UDP 162 | Supervision |
+--------------------+------------------------------------+------------+-----------+-------------------------------------------------+
| Collecteur | Servers | NRPE | TCP 5666 | Supervision |
+--------------------+------------------------------------+------------+-----------+-------------------------------------------------+
| Collecteur | Servers | NSClient++ | TCP 12489 | Supervision |
+--------------------+------------------------------------+------------+-----------+-------------------------------------------------+
+--------------------+------------------------------------+------------+---------------+-------------------------------------------------+
| Depuis | Vers | Protocole | Port | Application |
+====================+====================================+============+===============+=================================================+
| Central serveur | Collecteur | SSH | TCP 22 | Export des configurations Centreon |
+--------------------+------------------------------------+------------+---------------+-------------------------------------------------+
| Central serveur | Remote Server | HTTP(S) | TCP 80 (443) | Export des configurations Remote Server |
+--------------------+------------------------------------+------------+---------------+-------------------------------------------------+
| Collecteur | Central serveur | BBDO | TCP 5669 | Transfert des données de supervision collectées |
+--------------------+------------------------------------+------------+---------------+-------------------------------------------------+
| Collecteur | Equipements réseau, serveurs, etc. | SNMP | UDP 161 | Supervision |
+--------------------+------------------------------------+------------+---------------+-------------------------------------------------+
| Equipements réseau | Collecteur | Trap SNMP | UDP 162 | Supervision |
+--------------------+------------------------------------+------------+---------------+-------------------------------------------------+
| Collecteur | Servers | NRPE | TCP 5666 | Supervision |
+--------------------+------------------------------------+------------+---------------+-------------------------------------------------+
| Collecteur | Servers | NSClient++ | TCP 12489 | Supervision |
+--------------------+------------------------------------+------------+---------------+-------------------------------------------------+
| Remote Server | Central serveur | HTTP(S) | TCP 80 (443) | Activation de la fonctionnalité Remote Server |
+--------------------+------------------------------------+------------+---------------+-------------------------------------------------+

.. note::
Dans le cas où le serveur central Centreon fait office de collecteur,
Expand Down
2 changes: 1 addition & 1 deletion doc/fr/installation/common/install_packages.rst
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ fonctionnera PAS: ::
Fuseau horaire PHP
------------------

La timezone par défaut de PHP doit être configurée. Executer la commande suivante : ::
La timezone par défaut de PHP doit être configurée. Exécuter la commande suivante : ::

# echo "date.timezone = Europe/Paris" > /etc/opt/rh/rh-php71/php.d/php-timezone.ini

Expand Down
2 changes: 1 addition & 1 deletion doc/fr/installation/common/post_install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ plupart des services de votre réseau.
Centreon IMP nécessite les composants techniques Centreon License
Manager et Centreon Plugin Pack Manager pour fonctionner.

Si vous n'avez pas installé les modules durant l'instalaltion de Centreon,
Si vous n'avez pas installé les modules durant l'installation de Centreon,
Rendez-vous au menu **Administration > Extensions > Modules**.

Clicquez sur le bouton **Install/Upgrade all** et validez l'action :
Expand Down
17 changes: 17 additions & 0 deletions lang/es_ES.UTF-8/LC_MESSAGES/help.po
Original file line number Diff line number Diff line change
Expand Up @@ -4296,3 +4296,20 @@ msgstr "Método de recarga de la configuración: reiniciar, recargar o comando e
#: centreon-web/www/include/configuration/configGenerate/help.php:8
msgid "Run the commands that are defined in the poller configuration page (Configuration > Centreon > Poller > Post-Restart command)."
msgstr "Ejecuta el comando definido en la configuración del recopilador (Configuración> Centreon> Poller> Comando posterior al reinicio)."

msgid ""
"What kind of method is needed to reach the Remote Server, HTTP or HTTPS?"
msgstr ""

msgid "On which TCP port is listening the Remote Server?"
msgstr ""

msgid ""
"If checked, it won't check the validity of the SSL certificate of the Remote Server."
msgstr ""
""

msgid "If checked, it won't use the proxy configured in "
"'Administration > Parameters > Centreon UI' to connect to the Remote Server."
msgstr ""
""
Loading