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

fix(git): sync dev-21.04.x with 21.04.x #11526

Merged
merged 287 commits into from
Aug 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
287 commits
Select commit Hold shift + click to select a range
e423e72
feat(Resource-status): Add Performance page button (#10093)
jdelpierre Sep 7, 2021
ba674f0
(fix): change daemon name and init script (#10031)
pkriko Sep 7, 2021
6a77f8d
fix(configuration): set correct right for centreon.conf.php (#10095)
jeremyjaouen Sep 7, 2021
d854a30
add right for conf.pm in codebase (#10097)
jeremyjaouen Sep 8, 2021
77b363c
enh(openid): Implement client_secret_basic as token_endpoint_auth_met…
mayrstefan Sep 8, 2021
fc76e8d
enh(openid): Allow to use URLs for OpenId endpoints (#10084)
lpinsivy Sep 8, 2021
12125fd
fix(openid): fixed http method for userinfo endpoint - #10044 (#10085)
lpinsivy Sep 8, 2021
7335752
feat(Product Adoption): add user consent option to send plain or anon…
jeremyjaouen Sep 9, 2021
4d27191
update upgrade version
jeremyjaouen Sep 9, 2021
0c1577f
change upgrade version
jeremyjaouen Sep 9, 2021
9c7e7a0
chore(install):update to version 21.04.5 (#10102)
chgautier Sep 10, 2021
279044e
enh(secu): update security ack (#10114)
sc979 Sep 10, 2021
615ac1f
add Delete Cascade constraint between session and contact (#10111)
jeremyjaouen Sep 13, 2021
1d42c3f
Mon 10862 allow to do not defined redirect url (#10098)
lpinsivy Sep 14, 2021
7ed5698
enh(feature-switch): fully manage feature switch (#10101)
adr-mo Sep 14, 2021
2b98860
new workflow
zguennoune02 Sep 16, 2021
f8e4a8a
fix(downtime): fix downtime set with fr locale (#10145)
kduret Sep 20, 2021
2fd0997
fix(upgrade): increment php upgrade version 21.04 (#10130)
jeremyjaouen Sep 20, 2021
ab7106b
feat(Product Adoption): revert commit (#10137)
jeremyjaouen Sep 20, 2021
9928b6d
feat(Platform Adoption): Integrate Pendo to Centreon (#10140)
jeremyjaouen Sep 20, 2021
550f4f9
update version in api URI
jeremyjaouen Sep 20, 2021
f530037
fix(upgrade): invalid type for count value
jeremyjaouen Sep 20, 2021
032d6d9
fix(kb): $templates array must be returned in reverse order (#10066)
deividgdt Sep 20, 2021
1ef2b2e
Merge branch 'dev-21.04.x' of https://github.com/centreon/centreon in…
kduret Sep 20, 2021
ccf8773
fix(style): Coding style develop (#10149)
jeremyjaouen Sep 23, 2021
b37a42b
deliver package before docker creation for develop branches (#10156)
zguennoune02 Sep 22, 2021
4ca84d3
fix(secu) add fcts relative to csrf token validation
a-launois Sep 16, 2021
a6acca1
fix(secu) check csrf token validity when performing action in list pages
a-launois Sep 16, 2021
e2fc94a
fix(secu) check csrf token validity when performing action in list pages
a-launois Sep 16, 2021
1708638
fix(secu) check csrf token validity when performing action in list pages
a-launois Sep 16, 2021
9a6338d
fix(secu) check csrf token validity when performing action in list pages
a-launois Sep 16, 2021
a671027
fix(secu) check csrf token validity when performing action in list pages
a-launois Sep 16, 2021
957dd2e
fix(secu) check csrf token validity when performing action in list pages
a-launois Sep 16, 2021
2c03213
fix(secu) check csrf token validity when performing action in list pages
a-launois Sep 17, 2021
845a402
fix(secu) check csrf token validity when performing action in list pages
a-launois Sep 17, 2021
93779b8
fix(secu) check csrf token validity when performing action in list pages
a-launois Sep 17, 2021
0590a5a
fix(secu) check csrf token validity when performing action in list pages
a-launois Sep 17, 2021
c820bc2
fix(secu) check csrf token validity when performing action in list pages
a-launois Sep 17, 2021
acddcc7
fix(secu) add token to individual enable/disable action icon
a-launois Sep 20, 2021
e24f416
fix(secu) corrections following review comments
a-launois Sep 21, 2021
2253439
fix(secu) corrections following review comments
a-launois Sep 21, 2021
428f105
Update www/lib/HTML/QuickForm/HTML_QuickFormCustom.php
kduret Sep 21, 2021
d95f52e
fix(secu) modify token verification and deletion following code review
a-launois Sep 22, 2021
5586f9e
fix(conf/host) fix enable/disable action anchor (#10164)
a-launois Sep 24, 2021
391dcdc
enh(chore): automate dependabot ticket creation (#10169)
sc979 Sep 24, 2021
f6d0366
enh(chore) change action event trigger to create ticket (#10192)
sc979 Sep 24, 2021
90b00f6
Fix(UI): Fix negative Y scale and values (#10142)
Thebarda Sep 27, 2021
5e6b192
fix(clapi): downtime duration is not mandatory for fixed downtimes (#…
omercier Sep 24, 2021
e1f05a4
enh(dependabot): remove patch update (#10199)
sc979 Sep 27, 2021
81169b6
Implement feature switch
bdauria Sep 27, 2021
0ec97d2
Re-generate package-lock
bdauria Sep 27, 2021
09972dc
Fix build
bdauria Sep 28, 2021
b85fabe
chore(install): update to version 21.04.6 (#10203)
tuntoja Sep 28, 2021
15fb5b3
enh(ci): Fix reference build used for issue recording (#10207)
zguennoune02 Sep 28, 2021
68332c1
fix(chore): old dependabot's PR ticket creation (#10212)
sc979 Sep 29, 2021
2947973
fix(conf) check if contact's notifications are enabled when exporting…
a-launois Sep 29, 2021
f4b1c2a
Mon 10852 add tls common name on broker config for 21.04.x (#10196)
a-launois Sep 29, 2021
5152431
fix(sql) move sql update to new file for 21.04.7 (#10226)
a-launois Oct 5, 2021
c852fb4
fix(chore): ignore all non security related updates (#10232)
sc979 Oct 5, 2021
dee317f
fix(timeperiod): avoid js exception when saving timeperiod form (#10234)
kduret Oct 5, 2021
64eeea7
Fix performance graphs issue on Firefox (#10233)
Thebarda Oct 5, 2021
d1816c3
manage api doc delivery for reference build (#10240)
zguennoune02 Oct 5, 2021
258da30
fix(conf) move sql update from sql file to php script (#10244)
a-launois Oct 6, 2021
66d9857
fix(sec): upgrade nelmio cors bundle (21.04) (#10238)
kduret Oct 6, 2021
ea43d4c
fix(upgrade): check sql transaction before commit and rollback (#10250)
kduret Oct 6, 2021
11c9a86
Update axios and fix webpack config
bdauria Oct 6, 2021
91bdb10
Merge branch 'dev-21.04.x' of github.com:centreon/centreon into dev-2…
bdauria Oct 6, 2021
cf1fb99
fix(upgrade): avoid transaction when autocommit is done (#10256)
kduret Oct 7, 2021
7f7c7a4
enh(monitoring): avoid double INNER JOIN to handle ACLs (#10254)
adr-mo Oct 8, 2021
19acbcd
Mon 10989 fix side effect (#10258)
a-launois Oct 8, 2021
772f53f
Mon 6516 empty parameter in lua output broker conf (#10260)
a-launois Oct 11, 2021
2725ce2
enh(action): modify jira issueType and fields
sc979 Oct 11, 2021
ddeb5d7
fix(typo): correct function name (#10261)
lpinsivy Oct 12, 2021
20bd5c1
DEVOPS-519 Fix title of api doc (21.04) (#10283)
cg-tw Oct 12, 2021
831e15b
fix(customViews): list ldap groups when concerned by shared views (#1…
adr-mo Oct 13, 2021
bd472de
fix(ceip): we need id parameter for account array (#10262)
lpinsivy Oct 13, 2021
6e530ac
fix(conf/host) Preserves property values unchanged during a massive c…
callapa Oct 14, 2021
c69ccca
unattended: use latest c-release rpm by default
Nohzoh Oct 15, 2021
afc5903
Revert "unattended: use latest c-release rpm by default"
Nohzoh Oct 15, 2021
daedc1d
Mon 10852 add tls common name on broker config for 21.04.x (#10196)
a-launois Sep 29, 2021
bcb381e
fix(sql) move sql update to new file for 21.04.7 (#10226)
a-launois Oct 5, 2021
4417313
Revert "fix(sql) move sql update to new file for 21.04.7 (#10226)"
a-launois Oct 15, 2021
9c17a8c
Revert "Mon 10852 add tls common name on broker config for 21.04.x (#…
a-launois Oct 15, 2021
7af669e
unattended: use latest c-release rpm by default (#10308)
Nohzoh Oct 15, 2021
ded2261
enh(chore): issueType, feature_team and issue description
sc979 Oct 18, 2021
830cf24
enh(resource-status): performance optimizations (#10323)
adr-mo Oct 19, 2021
5c1701f
fix(resource): issue with servicegroup SQL request (#10331)
adr-mo Oct 20, 2021
583d5d3
fix(downtime): fix error for downtime on hostgroups (#10346)
adr-mo Oct 21, 2021
8e95575
fix(resource): conflict not correctly handled (#10351)
adr-mo Oct 21, 2021
0b3450c
fix(pendo): use api to get pendo information (#10349)
kduret Oct 21, 2021
1cf39fc
enh(conf/contact) Fixed PHP warning when adding a contact with a non-…
callapa Oct 21, 2021
26a4d36
fix(openid): fix error after Centreon update (#10344)
lpinsivy Oct 25, 2021
0d40007
fix(menu): remove orphan menus from API listing (#10352)
lpinsivy Oct 27, 2021
2174bf9
fix(conf/broker) bind sql values for inputs/outputs insert requests (…
a-launois Oct 27, 2021
fbf8433
fix(depedencies) Fix PHP warnings on dependencies (#10364)
callapa Oct 26, 2021
7308d44
fix(template) Delete the hard-coded name of the database (#10377)
callapa Nov 2, 2021
df40843
fix(downtime): display only started downtimes (#10325)
AssanDiomande Nov 3, 2021
40afc04
enh(core): enh gitignore (#10077)
ponchoh Nov 4, 2021
1724dba
fix(authentication): correct PHP error (#10390)
lpinsivy Nov 4, 2021
8a10b3f
fix(login): Fixed quotation mark (#10347)
AssanDiomande Nov 5, 2021
f26b8d3
fix(typology) : display submenu subsections for non admin users (#10389)
AssanDiomande Nov 5, 2021
11667a4
MON-6255-acl-dont-compute-when-services-added-by-clapi (#10392)
a-launois Nov 8, 2021
fd2e037
Fix(Poller): Poller adding issue fixed (#10400)
AssanDiomande Nov 9, 2021
1a70144
MON-11557-broker-conf-form-issues (#10401)
a-launois Nov 15, 2021
628e1b6
fix(sql): manage compatibility with mysql 8 on login (#10410)
kduret Nov 17, 2021
783791b
enh(chore): clear sonarQube analysis logs (#10413)
sc979 Nov 17, 2021
618449f
fix(chore): avoid flapping QG results (#10414)
sc979 Nov 17, 2021
d558c02
MON-11214-impossible-to-remove-some-parameters-in-host-conf (#10407)
a-launois Nov 18, 2021
9698e4d
fix(tooltips) remove previus commit modifications on wz_tooltip.js (#…
a-launois Nov 18, 2021
c05d5e2
fixed ldap configuration ID issue
AssanDiomande Nov 18, 2021
96ae7b9
fix(ci): fix api doc version in jenkinsfile (#10421)
kduret Nov 22, 2021
f3713ea
fix(conf): disable mod security rule 200003 (#10422)
kduret Nov 23, 2021
224159a
chore(install): update version to 21.04.9 (#10424)
chgautier Nov 24, 2021
267b951
fix(resource): correctly filter by hostgroup and servicegroup (#10434)
adr-mo Nov 24, 2021
297b031
Fix of the acknowledgment concerning the "sticky" option from APIv2 (…
callapa Nov 24, 2021
27042af
enh(CI): Integrate Lighthouse CI (#10399)
Thebarda Nov 24, 2021
f7f0855
Fix Jenkinsfile
Thebarda Nov 24, 2021
5984ba0
Specify build branch
Thebarda Nov 24, 2021
4027f88
Fix report dir on publishHTML
Thebarda Nov 24, 2021
c0086cc
Re-add version to report dir on publishHTML
Thebarda Nov 24, 2021
c1500b7
Mon 5666 anomaly service not renamed in graph listing (#10420)
a-launois Nov 26, 2021
5e53ce5
fix(resource): error when filering with ACL on monitoring server name…
adr-mo Nov 26, 2021
ca8cabd
fix(trap): fix trap export when a service is linked to multiple hosts…
AssanDiomande Nov 26, 2021
d57e359
fix(export): fix conf export fail because of centreontrapd (#9973)
tanguyvda Nov 26, 2021
56c32ed
chore(dependabot): remove conf (#10448)
sc979 Nov 29, 2021
e9d4969
Fix chart display on firefox (#10452)
Thebarda Dec 6, 2021
e0dfa8c
hide token in login debug file
AssanDiomande Dec 7, 2021
486122c
chore(install): update version to 21.04.10 (#10480)
tuntoja Dec 13, 2021
5df41e2
fix(log) : deleted old logger configuration (21.04) (#10501)
AssanDiomande Dec 21, 2021
957ad79
fix(resource): check name existance before updating filter (#10498)
adr-mo Dec 27, 2021
5046584
enh(stats) : add exception for modules statistics (22.04) (#10495)
AssanDiomande Dec 23, 2021
422eb45
enh(UI): Add The Watch to the footer (#10485)
Thebarda Dec 16, 2021
bfca192
fix(export): export the contact template that was no longer exported …
callapa Dec 10, 2021
3c49459
feat(api): truly return severity level for Hosts and Services (#10557)
adr-mo Jan 13, 2022
981d3eb
fix(test): fix acceptance tests and remove failOnError directive (#10…
kduret Jan 19, 2022
aedaa99
fix(test): fix broker configuration in acceptance tests (#10321)
kduret Oct 19, 2021
c3b9d05
fix(conf) fails to display php warnings/errors on conf export (#10561)
a-launois Jan 20, 2022
0b177f7
enh(resource): display only comments not deleted for ACK and DT (#10582)
adr-mo Jan 21, 2022
8b5e1b7
enh(resource): replace custom macros in external urls (#10580)
adr-mo Jan 24, 2022
0d3eb99
Fix eslint issue on App.tsx (#10588)
Jordan91 Jan 25, 2022
c571d9c
enh(autologin): verify that autologin is different than password (#10…
jeremyjaouen Jan 25, 2022
1e9666d
fix(build): disable centos8 packaging (#10606)
adr-mo Jan 31, 2022
0f7feb4
enh(resource): replace custom macros in external urls (#10580)
adr-mo Jan 24, 2022
727dc42
fix(logger): bad handle of the conflict
adr-mo Feb 1, 2022
d5b3a38
Remove tooltip for action_URL and displaying label on tooltip for No…
Jordan91 Feb 1, 2022
9824389
fix(api): bad conflict handled
adr-mo Feb 2, 2022
e7d0f47
Remove attribute unavailable in MUI V4
Jordan91 Feb 2, 2022
f2d6698
fix(generateImage): set upper_limit only if it is set (#10596)
adr-mo Feb 3, 2022
ff184c6
fix(chore): dependabot github automation (#10653)
sc979 Feb 2, 2022
b4a2104
chore(install): update version to 21.04.11 (#10664)
tuntoja Feb 4, 2022
5e74063
enh(stats) : improve centreon stats files (#10663)
AssanDiomande Feb 4, 2022
63b22f5
spelling update help.po (#10593)
melh-t Feb 4, 2022
5ed654d
fix(resource): do not display cancelled downtimes (#10666)
adr-mo Feb 4, 2022
458aa17
fix(reporting): sanitize inputs on init (#10594)
adr-mo Feb 7, 2022
dc831f7
enh(ldap): improve performance of ldap sync on login (#10690)
kduret Feb 9, 2022
0e67212
fix(conf) fix contact update when user is not admin (#10695)
a-launois Feb 10, 2022
4840b46
fix(conf) keep all acl groups when editing contact with non-admin use…
a-launois Feb 14, 2022
4ec7251
fix(serviceDetails): escape possible html tags in performance data
adr-mo Feb 14, 2022
34acaf8
fix(curves) Correction of some form errors and wrong characters displ…
callapa Feb 16, 2022
92e0d4c
enh(core): Add user flow (#10739)
Thebarda Feb 17, 2022
83baa22
:construction: fix(chore): exclude branch's job from analysis (#10741)
sc979 Feb 17, 2022
6648bea
fix(ui): Handle displaying TopCounter if user is not allowed (#10701)
Jordan91 Feb 18, 2022
99a1607
add set cookie (#10765)
jeremyjaouen Feb 23, 2022
14f94fc
fix(ci) : replace file_get_content by curl to disable allow_url_fopen…
AssanDiomande Feb 23, 2022
2887ffd
fix(kb): fix kb links in resource status (#10781)
kduret Feb 24, 2022
d1a80cf
fix(monitoring): hide password in command line when macro value conta…
kduret Feb 24, 2022
93c48a3
fix(secu): sanitize ACL group inputs (#10789)(#10791)(#10794)&(#10795)
sc979 Feb 25, 2022
44bed7f
fix(perf/curves) sanitize data (#10797)
a-launois Feb 25, 2022
a18b34f
fix(api): get correct method (#10763)
lpinsivy Feb 28, 2022
b261061
chore(install): update version to 21.04.12 (#10803)
tuntoja Feb 28, 2022
3ac70cb
enh(UI): PENDO - Add a unique identifier for css objects #10668
Jordan91 Mar 3, 2022
3abe42e
fix(poller): Fix the modification of the poller resources (#10812)
callapa Mar 4, 2022
7ab3f31
fix(secu) escape tabulation in command help display (#10807)
a-launois Mar 4, 2022
5f6b0da
fix(Security): Replace Math.random by Crypto API (#10824)
Thebarda Mar 8, 2022
d82dd12
enh(build): enable alma 8 (#10821)
lpinsivy Mar 8, 2022
a342955
enh(ceip): add IT-100 Edition (#10768)
lpinsivy Mar 9, 2022
27c052a
fix(conf/traps) fix SQL injection (#10832)
a-launois Mar 9, 2022
969ff04
fix(conf/traps) fix SQL injection (#10831)
a-launois Mar 9, 2022
8388828
update checkout centreon build
zguennoune02 Mar 10, 2022
68d0319
Mon 12129 identify cloud platform (#10829)
lpinsivy Mar 11, 2022
9ab93ff
fix(bug): Fix KB configuration (#10840)
lpinsivy Mar 11, 2022
eb8e75a
Fixed wrong path on classes called (#10842)
callapa Mar 11, 2022
97ce141
add-unstash-el8 (#10853)
tuntoja Mar 15, 2022
7f91843
fix(ldap): Fix SQL queries (#10857)
callapa Mar 15, 2022
ca465b5
Update Jenkinsfile
zguennoune02 Mar 17, 2022
1fd84d7
chore(CI): old file style (#10883)
sc979 Mar 21, 2022
6b22ff4
fix(poller): Fixed SQL and added access rights checking (#10841)
callapa Mar 21, 2022
a5b800d
remove duplication (#10882)
chgautier Mar 22, 2022
38815ae
chore(install): update to version 21.04.13 (#10892)
chgautier Mar 23, 2022
6d8a1cb
fix(form): Fix SQL Query null values (#10907)
jeremyjaouen Mar 28, 2022
0e61251
fix(resource): correctly display comments for DT and ACK (#10914)
adr-mo Apr 4, 2022
e6753cf
fix(perlcore): test conf.pm file present (#10913)
garnier-quentin Apr 4, 2022
9b8acbf
fix(install): fix el8 db user creation (#10834)
lpinsivy Apr 6, 2022
d151e1c
fix(acceptances): fix php acceptances tests (#10944)
adr-mo Apr 6, 2022
02bcce7
fix(build): update symfony/flex (#10949)
adr-mo Apr 7, 2022
cacee57
fix(broker/conf) change passwords in html forms (#10926)
a-launois Apr 7, 2022
6180df9
fix(api) update total in meta data for configuration/icons (#10956)
a-launois Apr 8, 2022
a0e06d9
enable select (#10918)
AssanDiomande Apr 11, 2022
81c5551
fix(UI): Centreon is slowed down (#10902)
Thebarda Apr 12, 2022
5e9b91c
fix eslint
Thebarda Apr 14, 2022
2dd299a
fix(UI): Handle ack and dt default options (#10998)
Jordan91 Apr 21, 2022
15f89b5
enh(api): return service state in host listing (#10999)
kduret Apr 25, 2022
32ebcd2
fix(sec): avoid sql injection in virtual metric form (#10997)
kduret Apr 25, 2022
dddc727
chore(install): update version to 21.04.14 (#11019)
chgautier Apr 25, 2022
5dd28cf
fix(resources): default values correctly sent to ack endpoint (#11022)
adr-mo Apr 25, 2022
2fe2f38
fix(tests): send full payload to acknowledgement endpoint (#11026)
adr-mo Apr 26, 2022
b28d080
fix(metrics): validate given thresholds as numeric (#11028)
kduret Apr 27, 2022
e7f6e56
fix(metrics): allow zero thresholds (#11031)
kduret Apr 27, 2022
495fb87
fix(install): avoid usage of chown and chmod on web install (#11025)
kduret Apr 27, 2022
ecb3ad3
fix(remote): incorrect sync when configuration becomes empty (#10512)
garnier-quentin Apr 28, 2022
890fff0
fix(remote-server): import task failed - optimize removed (#10698)
garnier-quentin Apr 28, 2022
6f9b218
fix(api): fix srvice_id field (#11050)
s-duret May 5, 2022
9072a9c
Sanitizing and binding queries in centreon user class
hyahiaoui-ext Apr 28, 2022
9d8ffc5
Sanitizing and binding ACL resources queries (#11043)
hyahiaoui-ext May 9, 2022
c9ff8ca
Sanitizing and binding "meta service" related queries (#11039)
hyahiaoui-ext May 11, 2022
36c2529
fix(conf) check path for plugin commands (#11081)
a-launois May 12, 2022
01f8457
fix(widgets): apply ACL filter when using poller listings (#11129)
adr-mo May 18, 2022
01a4623
Sanitizing and binding "hostgroups" queries (#11112)
hyahiaoui-ext May 20, 2022
00041d5
Sanitize and bind "nagios" queries (#11148)
hyahiaoui-ext May 27, 2022
5c8b41b
fix(widgets): display all pollers for user when no ACL filtering done…
adr-mo May 30, 2022
cc975e8
Sanitize and bind "ACL group" list queries (#11177)
hyahiaoui-ext Jun 1, 2022
61baa57
enh(dependencies): Update of some PHP libraries (#10743)
callapa Jun 1, 2022
d219c9a
chore(install): update version to 21.04.15 (#11171)
tuntoja Jun 2, 2022
40c8cc9
chore(doc): update security acknowledgement (#11191)
sc979 Jun 2, 2022
065b71b
fix(conf): fix substitution for host massive change (#11073)
s-duret Jun 2, 2022
bb7719e
Update Update-21.04.15.php (#11196)
tuntoja Jun 3, 2022
5adadad
Sanitize and bind "hosts" queries (#11127)
hyahiaoui-ext Jun 10, 2022
c591207
[Snyk] Sanitize and bind pollers queries File : DB-Func (#11197)
ataghzout Jun 13, 2022
a611183
[Snyk] Sanitizing Cantact (#11214)
ataghzout Jun 13, 2022
b127d20
Sanitize and bind "downtime" class queries (#11166)
hyahiaoui-ext Jun 13, 2022
fd29986
Sanitize and bind "escalations" queries (#11213)
hyahiaoui-ext Jun 13, 2022
4bd84a6
enh(install): improve error message when database access failure (#11…
kduret Jun 15, 2022
973254a
Update codeowners
bdauria Jun 16, 2022
1e49dad
fix partengine regex (#10952)
s-duret Jun 17, 2022
263b46b
Sanitizing and binding queries in "Updates" scripts (#11027)
hyahiaoui-ext Jun 22, 2022
979e6be
Sanitize and bind "timeperiod" configuration queries (#11233)
hyahiaoui-ext Jun 22, 2022
c1f0ad1
Sanitize and bind queries in virtual metrics configuration (#11257)
hyahiaoui-ext Jun 28, 2022
cd2b97f
fix(conf) fix sql in escalation conf (#11251) (#11315)
a-launois Jul 4, 2022
afe9e69
Sanitize and bind "service" related queries (#11156) (#11357)
jeremyjaouen Jul 11, 2022
19a229e
Clean formMyAccount old password saved in session (#11342) (#11360)
jeremyjaouen Jul 11, 2022
ac00c0f
fix(conf) fix broker conf name display in listing (#11372) (#11378)
a-launois Jul 13, 2022
98fd1aa
Snyk: Sanitize and bind ACL service dependency queries dev-21.04.x (#…
hyahiaoui-ext Jul 19, 2022
7f0d21e
Snyk: Sanitize and bind media sync queries (#11412) (#11420)
hyahiaoui-ext Jul 25, 2022
cf0e5a4
Snyk: Sanitize and bind Auth class queries 21.04.x (#11450)
hyahiaoui-ext Jul 28, 2022
35c71e1
Sanitized and bound queries (#11413) (#11445) (#11456) (#11457)
emabassi-ext Jul 29, 2022
aa363ae
enh(platform): Use API to select metrics in virtual metrics configura…
hyahiaoui-ext Jul 30, 2022
8c6bd87
Merge remote-tracking branch 'origin/dev-21.04.x-backup-2022-08-04' i…
kduret Aug 5, 2022
8304978
fix merge
kduret Aug 5, 2022
4c18fef
update pckage-lock.json
kduret Aug 5, 2022
7a245a9
fix jenkinsfile
kduret Aug 5, 2022
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
16 changes: 8 additions & 8 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/.github/ @centreon/centreon-ci
/.git* @centreon/centreon-ci
/.project @centreon/centreon-ci
/Jenkinsfile @centreon/centreon-ci
/selinux/ @centreon/centreon-ci
/project/ @centreon/centreon-ci
*.sh @centreon/centreon-ci
/.github/ @centreon/centreon-devops
/.git* @centreon/centreon-devops
/.project @centreon/centreon-devops
/Jenkinsfile @centreon/centreon-devops
/selinux/ @centreon/centreon-devops
/project/ @centreon/centreon-devops
*.sh @centreon/centreon-devops

*.po @ghost
*.po @centreon/centreon-documentation

/src/ @centreon/centreon-php
/config/ @centreon/centreon-php
Expand Down
33 changes: 3 additions & 30 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -206,14 +206,15 @@ try {
sh 'rm -rf output'
}
}

if ((currentBuild.result ?: 'SUCCESS') != 'SUCCESS') {
error("Unit test // packaging stage failure.");
}
}

stage("$DELIVERY_STAGE") {
node {
checkoutCentreonBuild(buildBranch)
checkoutCentreonBuild(buildBranch)
sh 'rm -rf output'
unstash 'tar-sources'
unstash 'api-doc'
Expand All @@ -225,7 +226,7 @@ try {
error('Delivery stage failure');
}
}

stage("$DOCKER_STAGE") {
def parallelSteps = [:]
def osBuilds = isStableBuild() ? ['centos7', 'alma8'] : ['centos7']
Expand All @@ -238,12 +239,6 @@ try {
}
}
}
//'Docker centos8': {
// node {
// checkoutCentreonBuild(buildBranch)
// sh "./centreon-build/jobs/web/${serie}/mon-web-bundle.sh centos8"
// }
//}
parallel parallelSteps
if ((currentBuild.result ?: 'SUCCESS') != 'SUCCESS') {
error('Bundle stage failure.');
Expand Down Expand Up @@ -289,27 +284,6 @@ try {
}
}
}

// TODO : add canary management in centreon-build
/*if ((env.BUILD == 'CI')) {
stage('Docker packaging with canary rpms') {
def parallelSteps = [:]
def osBuilds = isStableBuild() ? ['centos7', 'centos8'] : ['centos7']
for (x in osBuilds) {
def osBuild = x
parallelSteps[osBuild] = {
node {
checkoutCentreonBuild()
sh "./centreon-build/jobs/web/${serie}/mon-web-bundle.sh ${osBuild}"
}
}
}
}
parallel parallelSteps
if ((currentBuild.result ?: 'SUCCESS') != 'SUCCESS') {
error('API integration tests stage failure.');
}
}*/

stage('Acceptance tests') {
def parallelSteps = [:]
Expand Down Expand Up @@ -342,5 +316,4 @@ try {
"*COMMIT*: <https://github.com/centreon/centreon/commit/${source.COMMIT}|here> by ${source.COMMITTER}\n" +
"*INFO*: ${e}"
}

}
17 changes: 12 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
"secure-http": false,
"platform": {
"php": "7.3"
},
"allow-plugins": {
"pestphp/pest-plugin": true,
"symfony/flex": true
}
},
"require-dev": {
Expand All @@ -22,13 +26,12 @@
"centreon/centreon-test-lib": "21.04.x-dev",
"sensiolabs/security-checker": "^6.0",
"symfony/var-dumper": "4.4.*",
"symfony/profiler-pack": "^1.0",
"phpstan/phpstan": "^0.12.59",
"webmozart/assert": "^1.8",
"symfony/stopwatch": "^4.4",
"symfony/twig-bundle": "^4.4",
"symfony/web-profiler-bundle": "^4.4",
"twig/twig": "^2.0",
"twig/twig": "2.*",
"phpstan/phpstan-beberlei-assert": "^0.12"
},
"require": {
Expand All @@ -39,7 +42,7 @@
"symfony/filesystem": "4.4.*",
"symfony/finder": "4.4.*",
"openpsa/quickform": "3.3.*",
"smarty/smarty": "~2.6",
"smarty/smarty": "2.*",
"curl/curl" : "^1.5",
"ext-ctype": "*",
"ext-iconv": "*",
Expand All @@ -53,7 +56,6 @@
"symfony/security-bundle": "4.4.*",
"symfony/yaml": "4.4.*",
"symfony/options-resolver": "4.4.*",
"symfony/serializer-pack": "^1.0",
"symfony/maker-bundle": "^1.11",
"nelmio/cors-bundle": "^2.1",
"symfony/validator": "4.4.*",
Expand All @@ -66,7 +68,12 @@
"dragonmantank/cron-expression": "3.0.1",
"beberlei/assert": "v3.3.0",
"enshrined/svg-sanitize": "^0.14.0",
"symfony/monolog-bundle": "^3.7"
"symfony/monolog-bundle": "^3.7",
"doctrine/annotations": "^1.0",
"phpdocumentor/reflection-docblock": "^5.2",
"symfony/property-access": "4.4.*",
"symfony/property-info": "4.4.*",
"symfony/serializer": "4.4.*"
},
"autoload": {
"psr-4": {
Expand Down
Loading