Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/centreon/centreon into M…
Browse files Browse the repository at this point in the history
…ON-fix-unattended
  • Loading branch information
mushroomempires committed May 22, 2024
2 parents 374520e + c9e3a73 commit 32dfe70
Show file tree
Hide file tree
Showing 311 changed files with 1,205 additions and 2,786 deletions.
2 changes: 1 addition & 1 deletion .github/actions/cypress-e2e-testing/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ runs:
- name: Cypress end-to-end testing
uses: cypress-io/github-action@1b70233146622b69e789ccdd4f9452adc638d25a # v6.6.1
with:
command: pnpm run cypress:run --browser chromium --spec features/**/${{ inputs.feature_file_path }}
command: pnpm run cypress:run --browser electron --spec features/**/${{ inputs.feature_file_path }}
install: false
working-directory: ${{ inputs.module }}/tests/e2e
publish-summary: false
Expand Down
4 changes: 3 additions & 1 deletion .github/actions/veracode-create-jira-ticket/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,15 @@ runs:
- name: Check if ticket exists already
id: check_ticket
run: |
# Checking if an incident ticket already exists
check_if_ticket_exists=$( curl --request POST \
--url '${{ inputs.jira_base_url }}/rest/api/3/search' \
--user '${{ inputs.jira_user_email }}:${{ inputs.jira_api_token }}' \
--header 'Accept: application/json' \
--header 'Content-Type: application/json' \
--data '{
"fields": ["summary"],
"jql": "project = MON AND parentEpic = AT-268 AND issueType = Technical AND summary ~ \"PR-${{ github.event.pull_request.number }} incident on ${{ inputs.module_name }}\" AND resolution = unresolved",
"jql": "project = MON AND parentEpic = AT-268 AND issueType = Technical AND summary ~ \"PR-${{ github.event.pull_request.number }} incident\" AND component = \"${{ inputs.module_name }}\" AND resolution = unresolved ORDER BY key ASC",
"maxResults": 1
}' | jq .issues[0].key )
Expand All @@ -41,6 +42,7 @@ runs:
- name: Create Jira Issue
if: ${{ env.abort_ticket_creation != 'true' }}
run: |
# Creating a new incident ticket on Jira
DATA=$( cat <<-EOF
{
"fields": {
Expand Down
10 changes: 5 additions & 5 deletions centreon/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 11 additions & 3 deletions centreon/config/packages/Centreon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,17 @@ services:
arguments: ['%centreon_var_lib%', '%centreon_install_path%']
public: true

Core\Security\Vault\Infrastructure\Repository\FsWriteVaultConfigurationRepository:
arguments:
$configurationFile: '%vault_conf_path%'

Core\Security\Vault\Application\Repository\ReadVaultConfigurationRepositoryInterface:
class: Core\Security\Vault\Infrastructure\Repository\FsReadVaultConfigurationRepository
public: true
arguments:
$configurationFile: '%vault_conf_path%'


# Monitoring resources
_instanceof:
Core\Infrastructure\RealTime\Hypermedia\HypermediaProviderInterface:
Expand Down Expand Up @@ -467,9 +478,6 @@ services:
class: Core\Infrastructure\Common\Repository\MultiReadSessionRepository
public: true

Core\Security\Vault\Application\Repository\ReadVaultConfigurationRepositoryInterface:
class: Core\Security\Vault\Infrastructure\Repository\DbReadVaultConfigurationRepository
public: true

Utility\Interfaces\UUIDGeneratorInterface:
class: Utility\UUIDGenerator
Expand Down
1 change: 1 addition & 0 deletions centreon/config/services.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ parameters:
validation_path: "%env(_CENTREON_PATH_)%config/packages/validator"
centreon_path: "%env(_CENTREON_PATH_)%"
centreon_etc_path: "%env(_CENTREON_ETC_)%"
vault_conf_path: "%env(_CENTREON_PATH_)%config/vault/vault.yaml"
centreon_install_path: "%centreon_path%/www/install"
translation_path: "%centreon_path%/www/locale"
log_path: "%env(_CENTREON_LOG_)%"
Expand Down
Loading

0 comments on commit 32dfe70

Please sign in to comment.