Commit 1a7e2f39 authored by Donovan Watteau's avatar Donovan Watteau
Browse files

Merge branch 'master' into 'centreon-19.04_patch_cache-invalidation'

Resynchro des dernières modifs de master dans la branche centreon-19.04_patch_cache-invalidation

See merge request !9
parents 4f9552ba ce323a50
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
# connector-centreon-engine : module (Event Broker) Centreon 19.04 pour Canopsis
## Description
Ce dépôt contient un module Event Broker pour l'envoi d'évènements de Centreon à Canopsis.
Ce dépôt contient un module Broker Centreon pour l'envoi d'évènements à Canopsis. Il est écrit en C++, et des modules pré-compilés sont disponibles pour certains environnements.
Veuillez vous reporter à [la documentation officielle du connecteur Centreon](https://doc.canopsis.net/guide-connecteurs/Supervision/Centreon/) pour en savoir plus (installation, utilisation…).
Ce module vient s'ajouter dans une instance Centreon existante, et doit ensuite être configuré depuis l'interface web de Centreon afin de rediriger le trafic vers Canopsis.
## Procédures avancées
**Pré-requis réseau :** la transmission de flux réseau doit être permise entre Centreon et Canopsis (port 5672 par défaut).
## Installation d'un module pré-compilé
### Récupération du module
Clôner le dépôt Git contenant le module (**note :** activer votre proxy HTTP si nécessaire) :
```shell
# Installation de Git sur Debian / Ubuntu
$ sudo apt-get install git-core
# Installation de Git sur Red Hat / CentOS
$ sudo yum install git-core
# Clône du dépôt
$ git clone https://VOTRE-UTILISATEUR-GITLAB-ICI@git.canopsis.net/canopsis-connectors/connector-centreon-engine.git
$ git checkout remotes/origin/centreon-18.10
$ cd connector-centreon-engine
```
### Installation du module
Des modules pré-compilés sont disponibles dans le répertoire `precompiled/` de ce dépôt Git.
Il faut, pour cela, connaître votre environnement (CentOS 6, CentOS 7…) et votre version du Centreon Broker sur le système cible :
```shell
$ cat /etc/centos-release
CentOS Linux release 7.4.1708 (Core)
$ cbd -v
[1513786864] info: Centreon Broker 3.0.11
```
Dans cet exemple, on est sur une CentOS 7 avec un Centreon Broker (CBD) 3.0.11. Le module qui nous intéresse est donc `precompiled/Centos7/85-amqp-cbd-3.0.11.so`.
Il faut ensuite l'envoyer dans le répertoire d'installation des modules Centreon (attention : le nom `85-amqp.so` est attendu en destination) :
```shell
# À adapter en fonction du système cible !
$ sudo cp precompiled/Centos7/85-amqp-cbd-3.0.11.so /usr/share/centreon/lib/centreon-broker/85-amqp.so
```
### Installation de l'extension web
Il faut ensuite ajouter l'extension `centreon-extension/connector-centreon-canopsis` présente dans ce dépôt Git dans l'installation Centreon, afin de pouvoir finaliser l'installation du module.
```shell
$ sudo cp -r centreon-extension/connector-centreon-canopsis/ /usr/share/centreon/www/modules/
$ sudo chown -R apache:apache /usr/share/centreon/www/modules/connector-centreon-canopsis/
```
On peut alors installer le module depuis les menus suivants de l'interface web Centreon (Administration > Extensions > Modules > connector-centreon-canopsis et cliquer sur le bouton Action, sur la droite du tableau) :
![Installation du module depuis l'interface web : étape 1](doc/screenshots/webextension_install.png)
Puis, valider l'installation de ce module en cliquant sur « Install Module » :
![Installation du module depuis l'interface web : étape 2](doc/screenshots/webextension_install2.png)
## Configuration du module
### Configuration
**Attention :** la transmission de flux réseau entre Centreon et Canopsis doit être permise sur vos équipements réseau (port 5672 par défaut, à ajuster en fonction de votre configuration Canopsis/Centreon).
Aller dans Configuration > Pollers > Broker Configuration > central-broker-master.
![Configuration du module AMQP Canopsis : étape 1](doc/screenshots/module_parameters.png)
Puis, dans la nouvelle page qui apparaît, aller dans l'onglet Output, choisir le module « AMQP - Canopsis AMQP bus » dans le menu déroulant, et cliquer sur le bouton « Add ».
![Configuration du module AMQP Canopsis : étape 2](doc/screenshots/module_parameters2.png)
Des options de configuration « Canopsis AMQP bus » apparaissent alors en bas de page. Il faut alors renseigner les informations de connexion à l'instance AMQP Canopsis voulue (adresse, port, identifiants, nom de l'Exchange et du Virtual Host...). Valider ces changements avec le bouton « Save ».
![Configuration du module AMQP Canopsis : étape 3](doc/screenshots/module_parameters3.png)
### Redémarrage
**Attention :** les redémarrages suivants occasionnent une interruption de service le temps du redémarrage du Broker et des Engines Centron.
On redémarre ensuite le service pour s'assurer du bon chargement de la nouvelle configuration. Pour cela, aller dans Configuration > Pollers > cocher les éléments concernés > cliquer sur « Export configuration ».
![Redémarrage du service : étape 1](doc/screenshots/module_restart1.png)
Sur la nouvelle page qui s'affiche, il faut ensuite cocher les cases « Move Export Files » et « Restart Monitoring Engine », puis choisir la méthode « Restart » dans le menu déroulant, et enfin cliquer sur le bouton « Export ».
![Redémarrage du service : étape 2](doc/screenshots/module_restart2.png)
**ATTENTION :** Il faut bien faire un `restart` et non pas un simple `reload` ! Sans quoi vous risquez des problèmes de cohérence sur les évènements échangés avec Canopsis.
## Aller plus loin
[Compilation manuelle du module](doc/build_process.md) : peut être nécessaire s'il n'existe pas de binaire pré-compilé pour votre environnement.
Pour Centreon ≥ 18, une branche de test `centreon-18.10` a été créée sur ce dépôt Git.
[Procédure de compilation manuelle du module](doc/build_process.md) : ce dépôt contient déjà des modules pré-compilés pour les versions les plus courantes de Centreon. Cette procédure permet de connaître la procédure de compilation, en cas de besoin.
......@@ -12,7 +12,7 @@ Elle doit donc être réalisée sur un environnement de compilation identique au
* **Pour CentOS 7 :** une CentOS ≥ 7.4 officielle (depuis [www.centos.org](https://www.centos.org)) est suffisante.
Installer les dépendances suivantes, nécessaires pour les compilations qui vont suivre :
```shell
```sh
sudo yum install bzip2 autoconf automake binutils bison gcc gcc-c++ gettext libtool make patch cmake qt-devel gnutls gnutls-devel rrdtool rrdtool-devel git redhat-lsb-core
```
......@@ -21,7 +21,7 @@ sudo yum install bzip2 autoconf automake binutils bison gcc gcc-c++ gettext libt
> **Information :** il est généralement préférable d'embarquer une version statique de Boost, afin de faciliter la maintenance. La compatibilité Boost a en effet tendance à se casser régulièrement lors des mises à jour de paquets, si l'on prend la version du système.
On compile donc une version statique de Boost dans `$HOME/cbd/boost_static`. Compter quelques minutes seulement, car on ne compile qu'une petite partie de Boost (`system`, `chrono` et `date_time`).
```shell
```sh
mkdir -p $HOME/cbd
cd $HOME/cbd && wget https://dl.bintray.com/boostorg/release/1.65.1/source/boost_1_65_1.tar.bz2 && tar xjf boost_1_65_1.tar.bz2 && cd boost_1_65_1
./bootstrap.sh && ./b2 variant=release link=static cxxflags=-fPIC cflags=-fPIC linkflags=-fPIC --with-chrono --with-date_time --with-system --prefix=$HOME/cbd/boost_static -j4 install
......@@ -29,17 +29,15 @@ cd $HOME/cbd && wget https://dl.bintray.com/boostorg/release/1.65.1/source/boost
## Récupération des sources de connector-centreon-engine
Récupérer les sources de connector-centreon-engine de Canopsis, et se positionner sur le branche `amqp-feature` :
```shell
# Note : les accès sont "External@2017"
cd $HOME/cbd && git clone https://external@git.canopsis.net/canopsis-connectors/connector-centreon-engine.git
cd connector-centreon-engine && git checkout centreon-19.04
Récupérer les sources de connector-centreon-engine de Canopsis :
```sh
cd $HOME/cbd && git clone https://git.canopsis.net/canopsis-connectors/connector-centreon-engine.git
```
## Préparation des sources de Centreon Broker
On doit d'abord déterminer la version de Centreon Broker que l'on cible :
```shell
```sh
cbd -v
```
......@@ -49,22 +47,22 @@ info: Centreon Broker 3.0.14
```
Dans notre cas, il s'agit donc de Centreon Broker 3.0.14 :
```shell
```sh
export CBVER=3.0.14
```
Récupérer les sources de cette version :
```shell
```sh
cd $HOME/cbd && wget https://github.com/centreon/centreon-broker/archive/$CBVER.tar.gz && tar xzf $CBVER.tar.gz
```
Inclure les sources de notre connecteur dans celles de Centreon Broker :
```shell
```sh
cp -ru $HOME/cbd/connector-centreon-engine/build/ $HOME/cbd/connector-centreon-engine/src/amqp/ $HOME/cbd/centreon-broker-$CBVER
```
Éditer les fichiers de compilation de Centreon Broker :
```shell
```sh
vi centreon-broker-$CBVER/build/CMakeLists.txt
```
......@@ -91,7 +89,7 @@ endif()
## Compilation du module
Compiler notre module AMQP dans Centreon Broker, en forçant l'utilisation de la bibliothèque statique de Boost qui a été compilée plus tôt :
```shell
```sh
cd $HOME/cbd/centreon-broker-$CBVER/build && cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DBoost_INCLUDE_DIR=$HOME/cbd/boost_static/include -DWITH_MODULE_LUA=OFF
make -j3 85-amqp
```
......
......@@ -71,6 +71,7 @@ static std::string memoryLeakDetector() {
#if defined(CENTREON_BROKER_VERSION_MAJOR)
#if (CENTREON_BROKER_VERSION_MAJOR >= 3)
template<typename T>
static const unsigned int &get_poller_id(T const &evt) {
return evt.poller_id;
......
......@@ -17,7 +17,7 @@
*/
#include "com/centreon/broker/amqp/amqp_instance_controller.hh"
#include <com/centreon/broker/amqp/amqp_utils.hh>
#include "com/centreon/broker/amqp/amqp_utils.hh"
using namespace com::centreon::broker;
using namespace com::centreon::broker::amqp;
......
......@@ -18,7 +18,7 @@
#include "com/centreon/broker/amqp/amqp_service.hh"
#include "com/centreon/broker/logging/logging.hh"
#include <com/centreon/broker/amqp/amqp_utils.hh>
#include "com/centreon/broker/amqp/amqp_utils.hh"
using namespace com::centreon::broker;
using namespace com::centreon::broker::amqp;
......@@ -192,4 +192,4 @@ void service::_internal_copy(service const &other) {
// neb::service_check info dump
_command_line = other._command_line;
return;
}
\ No newline at end of file
}
......@@ -27,8 +27,8 @@
// Exception include block
#if (CENTREON_BROKER_VERSION_MAJOR >= 3)
#include "com/centreon/broker/exceptions/msg.hh"
#if (CENTREON_BROKER_VERSION_PATCH < 6)
#include "com/centreon/broker/exceptions/shutdown.hh"
#if (CENTREON_BROKER_VERSION_MAJOR == 3 && CENTREON_BROKER_VERSION_PATCH < 6)
#include "com/centreon/broker/io/exceptions/shutdown.hh"
#else
#include "com/centreon/broker/exceptions/shutdown.hh"
#endif
......@@ -1639,7 +1639,7 @@ ReadType stream::read(
time_t deadline) {
(void) deadline;
d.clear();
#if (CENTREON_BROKER_VERSION_PATCH > 6)
#if (CENTREON_BROKER_VERSION_MAJOR == 3 && CENTREON_BROKER_VERSION_PATCH < 6)
throw (io::exceptions::shutdown(true, false)
<< "AMQP: attempt to read from a AMQP stream (not supported yet)");
#else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment