Skip to content

Commit

Permalink
fix(engine): whitelist directory renamed in usr/share
Browse files Browse the repository at this point in the history
* enh(cmake/doc): cleanup and doc improved

* fix(engine): whitelist directory renamed in usr/share

REFS: MON-35089
  • Loading branch information
bouda1 authored Feb 28, 2024
1 parent de7b1b4 commit 5aac350
Show file tree
Hide file tree
Showing 4 changed files with 104 additions and 10 deletions.
16 changes: 8 additions & 8 deletions broker/bam/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
#
# Copyright 2011-2023 Centreon
#
# 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
# 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
# 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.
# 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.
#
# For more information : [email protected]
#
Expand Down
94 changes: 94 additions & 0 deletions broker/doc/broker-doc.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,99 @@
# Broker documentation {#mainpage}

## Table of content

* [Processing](#Processing)
* [Feeder](#Feeder)

* [BAM](#BAM)
* [Events in BAM](#EventsinBAM)
* [Impact BA](#ImpactBA)
* [Best BA](#BestBA)
* [Worst BA](#WorstBA)
* [Ratio Number BA](#RatioNumberBA)
* [Ratio Percent BA](#RatioPercentBA)


## Processing

There are two main classes in the broker Processing:

* **failover**: This is mainly used to get events from broker and send them to a
stream.
* **feeder**: This is mainly the reverse of a failover. Data are read from a stream
and published into broker. This class provides a mechanism of retention to
keep events until they are handled correctly.

### Feeder

A feeder has two roles:

1. The feeder can read events from its muxer. This is the case with a reverse
connections, the feeder gets its events from the broker engine through the
muxer and writes them to the stream client.

2. The feeder can also read events from its stream client. This is more usual.


#### Initialization

A feeder is created with a static function `feeder::create()`. This function:

* calls the constructor.
* starts the statistics timer
* starts its main loop.

The main loop runs with a thread pool managed by ASIO so don't expect to see
an std::thread somewhere.

A feeder is initialized with:

* name: name of the feeder.
* client: the stream to exchange events with.
* read\_filters: read filters, that is to say events allowed to be read by the
feeder. Events that don't obey to these filters are ignored and thrown away
by the feeder.
* write\_filters: same as read filters, but concerning writing.

After the construction, the feeder has its statistics started.
Statistics are handled by an ASIO timer, every 5s the handler `feeder::_stat_timer_handler()` is called.

Then, it is time for the feeder to start its main loop.
the `feeder::_read_from_muxer()` method is called and this last one will be called until the end of the feeder.

And there is a last loop to start, the one concerning stream reading. The feeder constructor calls `feeder::_start_read_from_stream_timer()` that starts a timer, each time its duration is reached, the `feeder::_read_from_stream_timer_handler()` method is called.

#### Reading the muxer

Let's describe a little more the `feeder::_read_from_muxer()` method and its mechanisms.

When called, this function:

* The feeder mutex is locked: then if a second call to this function call arrives, it will wait.
* creates a vector and initializes its size with the number of events in the muxer queue.
* if the state of the feeder is not set to running, the function execution is interrupted.
* the main loop of the method is then started here, it will be stopped on timeout, on a the feeder interruption or if there are no more events to read.
* this loop calls a `muxer::read()` asynchronous method. This method tries to fill the vector with as many events as it can store in it. If there is not suffisantly events, it keeps a callback so it will be ready to fill it again when new events will arrive. This method returns **true** if there are still events to send, otherwise it returns **false**.
* if some events have been retrieved, they are written to the feeder stream.
* Some checks on errors are made.
* The loop continues until one of its conditions is true.
* And if we have to continue, the function is post again to the ASIO mechanism.

#### Reading the stream

The method used here is `feeder::_read_from_stream_timer_handler()`.

While events are not null, they are pushed into a list.
Once this is done, this list is published to the muxer (specific muxer method used
for that `muxer::write(std::list<std::shared_ptr<io::data>>&)` and a new call to
`feeder::_start_read_from_stream_timer()` is made. And the loop starts again.

#### Concurrency

Events order is very important. So we can not make two calls to the `_read_from_muxer` method at the same time. It is almost the same when reading from the stream.

The easiest way was then to lock the feeder mutex

## BAM

There are five types of BA.
Expand Down
2 changes: 1 addition & 1 deletion engine/doc/engine-doc.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Whitelist (since 23.10)

In order to enforce security, user can add a whitelist to centreon-engine.
When the user add a file in /etc/centreon-engine-whitelist or in /usr/share/centreon-engine-whitelist, centengine only executes commands that match to the expressions given in these files.
When the user add a file in /etc/centreon-engine-whitelist or in /usr/share/centreon-engine/whitelist.conf.d, centengine only executes commands that match to the expressions given in these files.
Beware, Commands are checked after macros replacement by values, the entire line is checked, the script and his arguments.

### whitelist format
Expand Down
2 changes: 1 addition & 1 deletion engine/src/configuration/whitelist.cc
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,6 @@ whitelist& whitelist::instance() {

void whitelist::reload() {
static constexpr std::string_view directories[] = {
"/etc/centreon-engine-whitelist", "/usr/share/centreon-engine-whitelist"};
"/etc/centreon-engine-whitelist", "/usr/share/centreon-engine/whitelist.conf.d"};
_instance = std::make_unique<whitelist>(directories, directories + 2);
}

1 comment on commit 5aac350

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Robot Results

✅ Passed ❌ Failed ⏭️ Skipped Total Pass % ⏱️ Duration
27 2 0 29 93.10 0s

Failed Tests

Name Message ⏱️ Duration Suite
BEPB_HOST_DEPENDENCY No notification dependency from 2 to 1 with timeperiod 24x7 on 'ou' 0.000 s Bbdo-Protobuf
BDBU1 Central Broker not correctly stopped (coredump generated) 0.000 s Sql

Please sign in to comment.