Skip to content

Commit

Permalink
chore(release): merge release 22.04.1 into 22.04.x (#349)
Browse files Browse the repository at this point in the history
* enh(broker/mysql_connection): unix socket is different on Debian or on centos7

REFS: MON-13926

* Mon 13562 sonar atoi 22.04.x.new (#290)

* Mon 13562 sonar atoi (#277)

* enh(chore): update readme.md

* enh(sonar) : replace atoi/strtol/strtoull by abseil SimpleAtoi

* chore(readme) : update readme.md in tests

* enh(sonar): replace atoi/strtoull bu SimpleAtoi abseil

Co-authored-by: David Boucher <dboucher@centreon.com>

* chore(readme) : update readme

* cleanup(broker/mysql_result): false is better than 0 in this context

Co-authored-by: David Boucher <dboucher@centreon.com>

* enh(ccc): new grpc client

At the moment, we can execute:

ccc -p 31001   # to see what the server is
ccc -p 31001 -l  # to see the available methods

REFS: MON-13947

* fix(engine): when display_name is empty, it should be replaced by description or hostname

REFS: MON-13968

* enh(tests): database credentials configurable from resource.robot (#284) (#291)

* enh(tests): database credentials configurable from resource.robot

* enh(tests): remove console.log

* rror: no keyword Kill Broker found, almost works

* enh(tests): database credentials configurable from db_variables.robot

* fix(tests) : replace DBNAME_STORAGE by correct DBNAME

* fix(tests): remove personnal passwords and add str

* fix(tests): remove bad str in front of variables from .robot

* enh(tests): seems to work. Neet to change my credentials

* enh(tests): default passwords in db-variables.robot

* fix(engine): checkable::name() conflicted with host::name()

* Mon 13901 cbd multiargs 22.04.x (#293)

* enh(broker) : cbd with multiargs, robot test to do. Debug is unused

* robot tests still don't work

* enh(cbd) : robot tests for this ticket and update doc

* fix(tests): find log in timeout can read the first line

* fix(tests): 4 robot tests pass

* fix(tests): correct clang-format

* fix(cbd): main with better comments

* Mon 13562 sonar unsigned bitwise operator (#294) (#295)

* enh(sonar): avoid unsigned bitwise operator

* enh(gitignore): ignore database credentials in tests folder

* enh(tests): untrack db_variables.robot

* fix(tests): fix bad commit on Find in log with timeout

* fix(tests): restore db_variables.robot

* fix(tests): remove gitignore in tests folder

* enh(sonar): ignore postgresql in bam folder (#296) (#298)

A security issue easily fixable.

REFS: MON-13562

* enh(sonar): change reserved name to a non reserved one (#297) (#301)

* enh(sonar): change reserved name to a non reserved one

* enh(sonar): change exp to expr

* fix(tests): bad call on lambda

* fix(sonar): good lambda call on this file

* fix(broker/bam): downtimes on kpi can be more than one

* enh(tests/bam): test on bam and ignored downtimes on kpi implemented
* chore(doc): CHANGELOG updated
* doc(tests): README updated

REFS: MON-14091

* fix(broker): rebuild/remove graphs has come back

REFS: MON-14092

* enh(ccc): ccc is functional

* enh(tests/ccc): new tests added
* fix(ccc): info are output on stderr
* enh(ccc): help input messages added
* enh(ccc): help on functions works
* cleanup(ccc): comments added

REFS: MON-14191

* MON-14166 fix bbdo compression nego (#316)

REFS:MON-14166

* Mon 13562 sonar atoi external command (#302) (#318)

-replace atoi/strtoul by abseil::SimpleAtoi
-robot tests : BEATOI11, BEATOI12, BEATOI13, BEATOI21, BEATOI22, BEATOI23
-unit tests : SSHOptions in connectors/ssh/tests/options.cc

* fix(broker/engine): grpc api can be changed throught configuration. Otherwise it is fixed to localhost (#321)

REFS: MON-13904

* fix(broker/bam): detection of downtime end was bad (#319)

* fix(tests/bam): sometimes broker is too long to stop
* fix(tests/summary): new options -f and -s
* fix(conanfile): openssl updated

REFS: MON-14091

* fix(engine): bad rebase fixed here

* enh(sonar) : replace new by make_shared or make_unique (#322) (#326)

enh(sonar) : replace new by make_shared or make_unique when it's already a smart pointer

* fix(robot): fix robot BEATOI tests 22.04 (#325)

* fix(robot): fix robot BEATOI tests

* enh(robot) : tag atoi

* Mon 14198 sonar dynamic allocations (#327) (#328)

-replace str::dup by string or sabsl::stringview to avoid new and delete
-remove unused code in broker.cc
-fix clear broker logs so robot memory doesn't crash

* fix(broker/rebuild): error in sql query

REFS: MON-14092

* fix(broker/rebuild): creation date of rrd file too late

REFS: MON-14092

* fix(ci): update dockerfile centos7 for python38 (#337)

* fix(ci/debian): set shell to centreon-engine user (#334)

REFS: MON-14363

* fix(ci): issue with conan fixed

* fix(ci/scripts): conan bad path

* enh(engine/anomalydetection): Enable recheck for anomaly-detection services

REFS: MON-14158

* fix(ci/tests): dateutil missing for robot

* fix(ci): correct syntax

Co-authored-by: David Boucher <dboucher@centreon.com>
Co-authored-by: denliA <91119589+denliA@users.noreply.github.com>
Co-authored-by: jean-christophe81 <98889244+jean-christophe81@users.noreply.github.com>
Co-authored-by: rem31 <73845199+rem31@users.noreply.github.com>
Co-authored-by: Luiz Costa <me@luizgustavo.pro.br>
  • Loading branch information
6 people committed Nov 17, 2022
1 parent 8c123b1 commit da5ad15
Show file tree
Hide file tree
Showing 5 changed files with 219 additions and 4 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

## 22.04.2

### ccc

First version of ccc. Here is a client that can connect to broker or engine
through the gRPC server. Its goal is then to execute available methods on
these interfaces. At the moment, it checks the connection, tells if it was
established on engine or broker and is also able to list available methods.

### Broker

#### Enhancements
Expand Down
4 changes: 1 addition & 3 deletions ci/docker/Dockerfile.collect-debian-bullseye
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:bullseye
RUN apt-get -y update && \
apt-get -y install cmake \
apt-get -y install cmake \
curl \
gcc \
g++ \
Expand Down Expand Up @@ -36,5 +36,3 @@ COPY conanfile.txt .
RUN cat conanfile.txt
RUN conan install . -s compiler.cppstd=14 -s compiler.libcxx=libstdc++11 --build='missing'
WORKDIR /src


38 changes: 38 additions & 0 deletions ci/scripts/debian-collect/centreon-engine.postinst
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#!/bin/sh

if [ "$1" = "configure" ] ; then
if [ ! "$(getent passwd centreon-engine)" ]; then
adduser --system --group --home /var/lib/centreon-engine --shell /bin/bash --no-create-home centreon-engine
fi
if [ "$(getent passwd centreon)" ]; then
usermod -a -G centreon-engine centreon
usermod -a -G centreon centreon-engine
fi
if [ "$(getent passwd centreon-broker)" ]; then
usermod -a -G centreon-engine centreon-broker
fi
if [ "$(getent passwd centreon-gorgone)" ]; then
usermod -a -G centreon-engine centreon-gorgone
usermod -a -G centreon-gorgone centreon-engine
fi
if [ "$(getent passwd www-data)" ]; then
usermod -a -G centreon-engine www-data
fi
if [ "$(getent passwd nagios)" ]; then
usermod -a -G centreon-engine nagios
fi
chown -vR centreon-engine:centreon-engine \
/etc/centreon-engine \
/var/lib/centreon-engine \
/var/log/centreon-engine
chmod -vR g+w \
/etc/centreon-engine \
/var/lib/centreon-engine \
/var/log/centreon-engine

mv /usr/share/centreon-engine/extra/centreonengine_integrate_centreon_engine2centreon.sh /usr/share/centreon-engine/extra/integrate_centreon_engine2centreon.sh
chmod 0755 /usr/share/centreon-engine/extra/integrate_centreon_engine2centreon.sh
chown root:root /usr/share/centreon-engine/extra/integrate_centreon_engine2centreon.sh
fi

exit 0
170 changes: 170 additions & 0 deletions ci/scripts/debian-collect/control
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
Source: centreon-collect
Section: net
Priority: optional
Maintainer: Luiz Costa <me@luizgustavo.pro.br>
Build-Depends: debhelper-compat (=12),
gcc,
g++,
cmake,
pkg-config,
libmariadb3,
librrd-dev,
libgnutls28-dev,
ninja-build,
liblua5.3-dev,
python3,
python3-pip,
libperl-dev,
libgcrypt20-dev
Standards-Version: 4.5.0
Homepage: https://wwww.centreon.com

Package: centreon-clib
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Centreon Clib is a common library for all Centreon products
written in C/C++.

Package: centreon-clib-dev
Architecture: any
Depends:
centreon-clib (>= ${centreon:version}~),
${misc:Depends},
${shlibs:Depends}
Description: Centreon Clib is a common library for all Centreon products
written in C/C++.

Package: centreon-engine
Architecture: any
Depends:
centreon-clib (>= ${centreon:version}~),
centreon-common (>= ${centreon:version}~),
monitoring-plugins-basic,
${misc:Depends},
${shlibs:Depends}
Description: Centreon Engine is a monitoring engine, compatible with Nagios
configuration, designed to monitor hosts and services on your network.

Package: centreon-engine-dev
Architecture: any
Depends:
centreon-clib-dev (>= ${centreon:version}~),
centreon-common (>= ${centreon:version}~),
${misc:Depends},
${shlibs:Depends}
Description: Centreon Engine devel provide include files to develop Centreon Engine
Modules or Centreon Engine Connector.

Package: centreon-engine-extcommands
Architecture: any
Depends:
centreon-engine (>= ${centreon:version}~),
${misc:Depends},
${shlibs:Depends}
Description: Centreon Engine External Commands allow to other applications to send
command into the daemon. External applications can submit commands by
writing to the command file, which is periodically processed by the
engine daemon.

Package: centreon-connector-perl
Architecture: any
Depends:
centreon-engine (>= ${centreon:version}~),
${misc:Depends},
${shlibs:Depends}
Description: Centreon Connector Perl provide embedded perl for Centreon Engine
a monitoring engine.

Package: centreon-connector-ssh
Architecture: any
Depends:
centreon-engine (>= ${centreon:version}~),
${misc:Depends},
${shlibs:Depends}
Description: Centreon Connector SSH provide persistante connection between checks.

Package: centreon-connector
Architecture: any
Depends:
centreon-connector-perl (>= ${centreon:version}~),
centreon-connector-ssh (>= ${centreon:version}~),
${misc:Depends},
${shlibs:Depends}
Description: Centreon Connector provide a monitoring tools, compatible with
Centreon-Engine configuration, designed to monitor and manage system.

Package: centreon-broker
Architecture: any
Depends:
centreon-clib (>= ${centreon:version}~),
centreon-engine (>= ${centreon:version}~),
centreon-broker-core (>= ${centreon:version}~),
centreon-broker-cbmod (>= ${centreon:version}~),
centreon-broker-storage (>= ${centreon:version}~),
${misc:Depends},
${shlibs:Depends}
Description: Centreon Broker is a Centreon Engine/Nagios module that report events in
one or multiple databases.

Package: centreon-broker-core
Architecture: any
Depends:
centreon-broker (>= ${centreon:version}~),
${misc:Depends},
${shlibs:Depends}
Description: core holds Centreon Broker's default modules.

Package: centreon-broker-cbmod
Architecture: any
Depends:
centreon-engine (>= ${centreon:version}~),
centreon-broker-core (>= ${centreon:version}~),
${misc:Depends},
${shlibs:Depends}
Description: This module can be loaded by Centreon Engine.

Package: centreon-broker-dev
Architecture: any
Depends:
centreon-broker-core (>= ${centreon:version}~),
${misc:Depends},
${shlibs:Depends}
Description: Centreon Broker development files.
Include files needed to develop a module for Centreon Broker.

Package: centreon-broker-storage
Architecture: any
Depends:
centreon-broker-core (>= ${centreon:version}~),
${misc:Depends},
${shlibs:Depends}
Description: Storage holds Centreon Broker's prefdata storage.

Package: centreon-broker-influxdb
Architecture: any
Depends:
centreon-broker-core (>= ${centreon:version}~),
centreon-broker-storage (>= ${centreon:version}~),
${misc:Depends},
${shlibs:Depends}
Description: This module of Centreon Broker allows you to write performance data
generated by plugins (run themselves by Centreon Engine) to an InfluxDB database.

Package: centreon-broker-graphite
Architecture: any
Depends:
centreon-broker-core (>= ${centreon:version}~),
centreon-broker-storage (>= ${centreon:version}~),
${misc:Depends},
${shlibs:Depends}
Description: This module of Centreon Broker allows you to write performance data
generated by plugins (run themselves by Centreon Engine) to a Graphite database.

Package: centreon-collect-client
Architecture: any
Depends:
centreon-broker (>= ${centreon:version}~),
centreon-engine (>= ${centreon:version}~),
${misc:Depends},
${shlibs:Depends}
Description: gRPC client to connect to Centreon Broker or Centreon Engine.
4 changes: 3 additions & 1 deletion engine/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,9 @@ if(WITH_GROUP_ENGINE)
set(GROUP "${WITH_GROUP_ENGINE}")
else()
set(GROUP "root")
endif ()

endif()


# Set startup script to auto if not define.
if(NOT WITH_STARTUP_SCRIPT)
Expand Down

0 comments on commit da5ad15

Please sign in to comment.