Skip to content

Commit

Permalink
chore(release):rebase dev-22.04.x on 22.04.x (#352)
Browse files Browse the repository at this point in the history
* Merge release-debian-22.04.0 into 22.04.x (#323)

* enh(broker/mysql_connection): unix socket is different on Debian or on centos7

REFS: MON-13926

* enh(debian/package): add a default config file for cbd on debian package

REFS: MON-13830

* enh(build/debian):clib.so on lib

REFS: MON-13782

* Add missing broker lib (#262)

* fix(jenkins): update jenkinsfile

* fix jenkinsfile

* fix jenkinsfile

* fix jenkinsfile

* fix jenkinsfile

* fix jenkinsfile

* bypass debian build dwz process

Co-authored-by: David Boucher <dboucher@centreon.com>
Co-authored-by: rem31 <73845199+rem31@users.noreply.github.com>
Co-authored-by: Luiz Costa <me@luizgustavo.pro.br>
Co-authored-by: Zakaria GUENNOUNE <zguennoune@centreon.com>

* chore(release): merge release 22.04.1 into 22.04.x (#349)

* 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)

#REFS: MON-13562
-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)

#REFS : MON-14198

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)

#REFS: MON-14198
-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>

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

REFS:MON-14166

* enh(build): protect variables + bash comparisons 22.04

* fix(raspbian): parse only first line of /etc/issue

Co-authored-by: tuntoja <58987095+tuntoja@users.noreply.github.com>
Co-authored-by: David Boucher <dboucher@centreon.com>
Co-authored-by: rem31 <73845199+rem31@users.noreply.github.com>
Co-authored-by: Luiz Costa <me@luizgustavo.pro.br>
Co-authored-by: Zakaria GUENNOUNE <zguennoune@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: omercier <32134301+omercier@users.noreply.github.com>
  • Loading branch information
9 people authored Sep 5, 2022
1 parent 9a797ae commit a6ac3df
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
5 changes: 3 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
*/
env.PROJECT='centreon-collect'
def serie = '22.04'
def maintenanceBranch = "${serie}.x"
def qaBranch = "dev-${serie}.x"
def maintenanceBranch = "master"
def qaBranch = "develop"
def buildBranch = env.BRANCH_NAME
env.REF_BRANCH = '${serie}.x'
if (env.CHANGE_BRANCH) {
Expand All @@ -22,6 +22,7 @@ if (env.BRANCH_NAME.startsWith('release-')) {
env.REPO = 'testing'
} else if ((env.BRANCH_NAME == env.REF_BRANCH) || (env.BRANCH_NAME == maintenanceBranch)) {
env.BUILD = 'REFERENCE'
env.REPO = 'testing'
} else if ((env.BRANCH_NAME == 'develop') || (env.BRANCH_NAME == qaBranch)) {
env.BUILD = 'QA'
env.REPO = 'unstable'
Expand Down
2 changes: 2 additions & 0 deletions ci/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,5 @@ override_dh_auto_build:
override_dh_auto_install:
cd build && \
make -j9 install DESTDIR=../debian/tmp-centreon-collect

override_dh_dwz:
2 changes: 1 addition & 1 deletion ci/release/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pipeline {
echo 'Releasing Centreon Collect'
loadCommonScripts()
withCredentials([string(credentialsId: 'download-token', variable: 'DOWNLOAD_TOKEN')]) {
sh './ci/release/collect-release.sh' "$DOWNLOAD_TOKEN"
sh './ci/release/collect-release.sh "$DOWNLOAD_TOKEN"'
}
}
}
Expand Down
1 change: 1 addition & 0 deletions engine/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ if(WITH_GROUP_ENGINE)
set(GROUP "${WITH_GROUP_ENGINE}")
else()
set(GROUP "root")

endif()

# Set startup script to auto if not define.
Expand Down

0 comments on commit a6ac3df

Please sign in to comment.