Merge branch 'develop' into MON-upgrade-cypress

centreon · Jun 6, 2024 · 775d9cd · 775d9cd
2 parents 1ca8022 + 73d1610
commit 775d9cd
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 56 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,54 +1,59 @@
-*.sh                    @centreon/owners-bash
-
-*.po                    @centreon/owners-doc
-*.md                    @centreon/owners-doc
-*.mdx                   @centreon/owners-doc
-
-**/config/              @centreon/owners-php
-**/composer.*           @centreon/owners-php
-**/tests/api/           @centreon/owners-php
-**/tests/php/           @centreon/owners-php
-**/tests/clapi_export/  @centreon/owners-php
-**/www/                 @centreon/owners-php
-**/tmpl/                @centreon/owners-php
-**/bin/                 @centreon/owners-php
-*.xml                   @centreon/owners-php
-**/phpstan.neon         @centreon/owners-php
-*.php                   @centreon/owners-php
-*.xsl                   @centreon/owners-php
-
-**/www/front_src/       @centreon/owners-react
-**/www/widgets/         @centreon/owners-react
-**/cypress/**           @centreon/owners-react
-centreon/cypress        @centreon/owners-react
-package.json            @centreon/owners-react
-package-lock.json       @centreon/owners-react
-webpack*                @centreon/owners-react
-babel.config.js         @centreon/owners-react
-tsconfig.json           @centreon/owners-react
-.prettierrc.js          @centreon/owners-react
-.eslint*                @centreon/owners-react
-.csslintrc              @centreon/owners-react
-*.ts                    @centreon/owners-react
-*.tsx                   @centreon/owners-react
-*.jsx                   @centreon/owners-react
-**/cypress/**           @centreon/owners-react
-
-*.pm                    @centreon/owners-perl
-*.pl                    @centreon/owners-perl
-
-**/tests/e2e/**         @centreon/owners-cypress-e2e
-**/cypress/e2e/**       @centreon/owners-cypress-e2e
-
-*.feature               @centreon/owners-gherkin
-
-*.py                    @centreon/owners-python
-
-.github/**              @centreon/owners-pipelines
-**/.project             @centreon/owners-pipelines
-**/selinux/             @centreon/owners-pipelines
-**/project/             @centreon/owners-pipelines
-**/packaging/           @centreon/owners-pipelines
-dependencies/**         @centreon/owners-pipelines
+*.sh                                    @centreon/owners-bash
+
+*.po                                    @centreon/owners-doc
+*.md                                    @centreon/owners-doc
+*.mdx                                   @centreon/owners-doc
+
+**/config/                              @centreon/owners-php
+**/composer.*                           @centreon/owners-php
+**/tests/api/                           @centreon/owners-php
+**/tests/php/                           @centreon/owners-php
+**/tests/clapi_export/                  @centreon/owners-php
+**/www/                                 @centreon/owners-php
+**/tmpl/                                @centreon/owners-php
+**/bin/                                 @centreon/owners-php
+*.xml                                   @centreon/owners-php
+**/phpstan.neon                         @centreon/owners-php
+*.php                                   @centreon/owners-php
+*.xsl                                   @centreon/owners-php
+
+**/www/front_src/                       @centreon/owners-react
+**/www/widgets/                         @centreon/owners-react
+**/cypress/**                           @centreon/owners-react
+centreon/cypress                        @centreon/owners-react
+package.json                            @centreon/owners-react
+package-lock.json                       @centreon/owners-react
+webpack*                                @centreon/owners-react
+babel.config.js                         @centreon/owners-react
+tsconfig.json                           @centreon/owners-react
+.prettierrc.js                          @centreon/owners-react
+.eslint*                                @centreon/owners-react
+.csslintrc                              @centreon/owners-react
+*.ts                                    @centreon/owners-react
+*.tsx                                   @centreon/owners-react
+*.jsx                                   @centreon/owners-react
+**/cypress/**                           @centreon/owners-react
+
+centreon-gorgone/                       @centreon/owners-perl
+centreon-gorgone/docs/                  @centreon/owners-doc
+centreon-gorgone/tests/                 @centreon/owners-robot-e2e
+
+centreon-gorgone/tests/robot/config/    @centreon/owners-perl
+*.pm                                    @centreon/owners-perl
+*.pl                                    @centreon/owners-perl
+
+**/tests/e2e/**                         @centreon/owners-cypress-e2e
+**/cypress/e2e/**                       @centreon/owners-cypress-e2e
+
+*.feature                               @centreon/owners-gherkin
+
+*.py                                    @centreon/owners-python
+
+.github/**                              @centreon/owners-pipelines
+**/.project                             @centreon/owners-pipelines
+**/selinux/                             @centreon/owners-pipelines
+**/project/                             @centreon/owners-pipelines
+**/packaging/                           @centreon/owners-pipelines
+dependencies/**                         @centreon/owners-pipelines
 
 **/config/features.json @centreon/release-management
diff --git a/.github/workflows/veracode-analysis.yml b/.github/workflows/veracode-analysis.yml
@@ -282,7 +282,7 @@ jobs:
           fail-on-cache-miss: true
 
       - name: Sandbox scan
-        uses: veracode/veracode-uploadandscan-action@f7e1fbf02c5c899fba9f12e3f537b62f2f1230e1 # master
+        uses: veracode/veracode-uploadandscan-action@f7e1fbf02c5c899fba9f12e3f537b62f2f1230e1 # master using 0.2.6
         continue-on-error: ${{ vars.VERACODE_CONTINUE_ON_ERROR == 'true' }}
         with:
           appname: "${{ inputs.module_name }}"

diff --git a/centreon/.veracode-exclusions b/centreon/.veracode-exclusions
@@ -6,6 +6,7 @@ node_modules
 www/include/common/javascript/marked.js
 www/include/common/javascript/jquery
 www/lib/wz_tooltip/wz_tooltip.js
+www/install/php
 www/install/sql
 www/include/Administration/parameters/backup/formBackup.js
 bin/changeRrdDsName.pl

diff --git a/centreon/www/front_src/src/Resources/ChecksIcon.tsx b/centreon/www/front_src/src/Resources/ChecksIcon.tsx
@@ -43,7 +43,7 @@ const ChecksIcon = ({
     return <Icon Component={SyncDisabledIcon} title={labelChecksDisabled} />;
   }
 
-  if (equals(has_passive_checks_enabled, false)) {
+  if (equals(has_active_checks_enabled, false)) {
     return (
       <Icon Component={SyncProblemIcon} title={labelOnlyPassiveChecksEnabled} />
     );

diff --git a/centreon/www/front_src/src/Resources/Graph/Performance/GraphActions.tsx b/centreon/www/front_src/src/Resources/Graph/Performance/GraphActions.tsx
@@ -19,7 +19,7 @@ import FederatedComponent from '../../../components/FederatedComponents';
 import { ResourceDetails } from '../../Details/models';
 import { TimelineEvent } from '../../Details/tabs/Timeline/models';
 import memoizeComponent from '../../memoizedComponent';
-import { Resource } from '../../models';
+import { Resource, ResourceType } from '../../models';
 import {
   labelAsDisplayed,
   labelCSV,
@@ -90,13 +90,17 @@ const GraphActions = ({
       date: end,
       formatString: 'X'
     });
+    const svcId =
+      resource?.type === ResourceType.metaservice
+        ? `_Module_Meta;meta_${resource?.id}`
+        : `${resource?.parent?.name};${resource?.name}`;
 
     const urlParameters = (): string => {
       const params = new URLSearchParams({
         end: endTimestamp,
         mode: '0',
         start: startTimestamp,
-        svc_id: `${resource?.parent?.name};${resource?.name}`
+        svc_id: svcId
       });
 
       return params.toString();