From 94674e497db935102b9dd4965333db12df2742a8 Mon Sep 17 00:00:00 2001 From: tuntoja <58987095+tuntoja@users.noreply.github.com> Date: Fri, 22 Jul 2022 09:46:05 +0200 Subject: [PATCH] Merge release-21.10.next into 21.10.x (#240) * fix pipeline (#165) * enh(provider): easyvista - rename provider + proxy configuration (#171) * chore(php): manage php 8 compatibility (#172) Refs: MON-7343 * enh(chore): automate dependabot ticket creation (#174) * fix(chore): old dependabot's PR ticket creation (#175) * enh(chore): issueType, feature_team and issue description (#177) * align jenkinsfile * chore(install): update version to 21.10.0-beta.2 (#178) * chore(install): update version to 21.10.0-beta.2 * Update www/modules/centreon-open-tickets/conf.php Co-authored-by: Kevin Duret * chore(install): update version to 21.10.0-rc1 (#179) * chore(install): update version to 21.10.0-rc1 * Update www/modules/centreon-open-tickets/conf.php Co-authored-by: Kevin Duret * chore(install): update version to 21.10.0 (#180) * chore(ci): update qa branch of serie 21.10 (#182) * fix(lint): fix linting of const in easyvista provider * fix(chore): use github action env usage (#194) * fix(build): disable centos8 packaging * fix(chore): dependabot github automation (#196) * enable el8 build and packaging dev-21.10.x (#198) * enable el8 build and packaging dev-21.10.x * Update Jenkinsfile * providers: email provider title issue + bump phpmailer + code sanitize (#206) * fix(install): manage different name for database centreon_storage (#207) * fix(widget): display the state type for service and not for host (#208) * enh(provider): preselect if only 1 choice in list selection (#209) * enh(acknowledgement): use default options (#210) * enh(provider): manage phpmailer exception (#211) * enh(provider): can use user name in smarty popup (#212) * enh(widget): add duration filter (#213) * enh(provider): add schedule check option (#214) * fix(jira): update fields with new keys (#185) Refs: MON-12560 Co-authored-by: Kevin Duret * upgrade version to 21.10.1 Co-authored-by: Zakaria Guennoune <83596451+zguennoune02@users.noreply.github.com> Co-authored-by: qgarnier Co-authored-by: Kevin Duret Co-authored-by: sc979 <34628915+sc979@users.noreply.github.com> Co-authored-by: Zakaria Guennoune Co-authored-by: Adrien Morais Co-authored-by: ponchoh --- Jenkinsfile | 4 +- widgets/open-tickets/configs.xml | 1 + widgets/open-tickets/src/action.php | 9 +- widgets/open-tickets/src/index.php | 34 +- .../src/templates/acknowledge.ihtml | 6 +- www/modules/centreon-open-tickets/conf.php | 4 +- .../Abstract/AbstractProvider.class.php | 590 +- .../templates/conf_container1main.ihtml | 12 +- .../providers/Abstract/templates/group.ihtml | 4 +- .../BmcFootprints11Provider.class.php | 144 +- .../BmcItsm/BmcItsmProvider.class.php | 102 +- .../EasyvistaSoapProvider.class.php} | 130 +- .../templates/conf_container1extra.ihtml | 0 .../templates/conf_container2extra.ihtml | 0 .../providers/Glpi/GlpiProvider.class.php | 152 +- .../GlpiRestApi/GlpiRestApiProvider.class.php | 512 +- .../providers/Itop/ItopProvider.class.php | 245 +- .../providers/Jira/JiraProvider.class.php | 183 +- .../providers/Mail/MailProvider.class.php | 153 +- .../providers/Mail/library/Exception.php | 40 + .../providers/Mail/library/PHPMailer.php | 5071 +++++++++++++++++ .../Mail/library/class.phpmailer.php | 4013 ------------- .../providers/Otrs/OtrsProvider.class.php | 240 +- .../RequestTracker2Provider.class.php | 153 +- .../providers/Serena/SerenaProvider.class.php | 114 +- .../ServiceNow/ServiceNowProvider.class.php | 216 +- .../providers/Simple/SimpleProvider.class.php | 26 +- .../providers/register.php | 2 +- .../centreon-open-tickets/sql/install.sql | 16 +- .../centreon-open-tickets/sql/uninstall.sql | 6 +- .../upgrade/21.10.1/.gitignore | 0 .../views/rules/ajax/actions/serviceAck.php | 58 +- .../views/rules/ajax/actions/submitTicket.php | 72 +- .../views/rules/form.ihtml | 1 - .../views/rules/list.ihtml | 6 +- 35 files changed, 6841 insertions(+), 5478 deletions(-) rename www/modules/centreon-open-tickets/providers/{Easyvista/EasyvistaProvider.class.php => EasyvistaSoap/EasyvistaSoapProvider.class.php} (82%) rename www/modules/centreon-open-tickets/providers/{Easyvista => EasyvistaSoap}/templates/conf_container1extra.ihtml (100%) rename www/modules/centreon-open-tickets/providers/{Easyvista => EasyvistaSoap}/templates/conf_container2extra.ihtml (100%) create mode 100644 www/modules/centreon-open-tickets/providers/Mail/library/Exception.php create mode 100644 www/modules/centreon-open-tickets/providers/Mail/library/PHPMailer.php delete mode 100644 www/modules/centreon-open-tickets/providers/Mail/library/class.phpmailer.php create mode 100644 www/modules/centreon-open-tickets/upgrade/21.10.1/.gitignore diff --git a/Jenkinsfile b/Jenkinsfile index a7a01802..08ce38cf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,10 +5,10 @@ import groovy.json.JsonSlurper */ properties([buildDiscarder(logRotator(numToKeepStr: '50'))]) def serie = '21.10' -def maintenanceBranch = "${serie}.x" +def stableBranch = "${serie}.x" if (env.BRANCH_NAME.startsWith('release-')) { env.BUILD = 'RELEASE' -} else if ((env.BRANCH_NAME == 'master') || (env.BRANCH_NAME == maintenanceBranch)) { +} else if (env.BRANCH_NAME == stableBranch) { env.BUILD = 'REFERENCE' } else { env.BUILD = 'CI' diff --git a/widgets/open-tickets/configs.xml b/widgets/open-tickets/configs.xml index b7d0f953..0b9078bc 100644 --- a/widgets/open-tickets/configs.xml +++ b/widgets/open-tickets/configs.xml @@ -22,6 +22,7 @@ +