chore(release): merge release-21.10.next into 21.10.x

.github/CODEOWNERS

@@ -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

Jenkinsfile

@@ -461,6 +461,4 @@ try {
             "*COMMIT*: <https://github.com/centreon/centreon/commit/${source.COMMIT}|here> by ${source.COMMITTER}\n" +
             "*INFO*: ${e}"
   }
-
-  currentBuild.result = 'FAILURE'
 }

SECURITY_ACK.md

@@ -14,6 +14,7 @@ Centreon reserves the right to make final decisions regarding publishing acknowl
 
 <h3> 2022 </h3>
 
+* 2022/05/23 - Lucas Carmo and Daniel França Lima from [Hakaï Security](https://www.hakaioffensivesecurity.com/)
 * 2022/02/16 - Anonymous working with Trend Micro Zero Day Initiative
 
 <h3> 2021 </h3>

bin/registerServerTopology.sh

@@ -431,7 +431,7 @@ function request_to_remote() {
   fi
 
   # Prepare Remote Payload
-  REMOTE_PAYLOAD='{"isRemote":true,"platformName":"'"${CURRENT_NODE_NAME}"'","centralServerAddress":"'"${PARSED_URL[HOST]}"'","apiUsername":"'"${API_USERNAME}"'","apiCredentials":"'"${API_TARGET_PASSWORD}"'","apiScheme":"'"${PARSED_URL[SCHEME]}"'","apiPort":'"${PARSED_URL[PORT]}"',"apiPath":"'"${CENTREON_BASE_URI}"'",'"${PEER_VALIDATION}"
+  REMOTE_PAYLOAD='{"isRemote":true,"address":"'${PARSED_CURRENT_NODE_URL[HOST]}'","platformName":"'"${CURRENT_NODE_NAME}"'","centralServerAddress":"'"${PARSED_URL[HOST]}"'","apiUsername":"'"${API_USERNAME}"'","apiCredentials":"'"${API_TARGET_PASSWORD}"'","apiScheme":"'"${PARSED_URL[SCHEME]}"'","apiPort":'"${PARSED_URL[PORT]}"',"apiPath":"'"${CENTREON_BASE_URI}"'",'"${PEER_VALIDATION}"
   if [[ -n PROXY_PAYLOAD ]]; then
     REMOTE_PAYLOAD="${REMOTE_PAYLOAD}""${PROXY_PAYLOAD}"
   fi

composer.json

@@ -7,6 +7,9 @@
         "secure-http": false,
         "platform": {
             "php": "8.0"
+        },
+        "allow-plugins": {
+            "symfony/flex": true
         }
     },
     "require-dev": {
@@ -15,7 +18,7 @@
         "behat/mink": "dev-master#a534fe7dac9525e8e10ca68e737c3d7e5058ec83",
         "behat/mink-extension": "^2.3",
         "behat/mink-selenium2-driver": "^1.4",
-        "centreon/centreon-test-lib": "dev-master",
+        "centreon/centreon-test-lib": "21.10.x-dev",
         "phpstan/phpstan": "^0.12.59",
         "phpstan/phpstan-beberlei-assert": "^0.12",
         "phpunit/phpunit": "^9.5",
@@ -26,7 +29,7 @@
         "symfony/twig-bundle": "^4.4",
         "symfony/var-dumper": "4.4.*",
         "symfony/web-profiler-bundle": "^4.4",
-        "twig/twig": "^2.0",
+        "twig/twig": "2.*",
         "webmozart/assert": "^1.8",
         "zircote/swagger-php": "^3.0"
     },
@@ -51,7 +54,7 @@
         "phpdocumentor/reflection-docblock": "^5.2",
         "pimple/pimple": "^3.2",
         "sensio/framework-extra-bundle": "^5.3",
-        "smarty/smarty": "^3.1",
+        "smarty/smarty": "3.*",
         "smarty-gettext/smarty-gettext": "^1.6",
         "symfony/console": "4.4.*",
         "symfony/dotenv": "4.4.*",

config/json_validator/latest/Centreon/PlatformInformation/Update.json

@@ -10,6 +10,9 @@
     "isRemote": {
       "type": "boolean"
     },
+    "address": {
+      "type": "string"
+    },
     "centralServerAddress": {
       "type": "string"
     },

cron/centAcl.php

@@ -172,15 +172,15 @@
      * Remove data from old groups (deleted groups)
      */
     $aclGroupToDelete = "SELECT DISTINCT acl_group_id
-        FROM " . $centreonDbName . ".acl_groups WHERE acl_group_activate = '1'";
-    $aclGroupToDelete2 = "SELECT DISTINCT acl_group_id FROM " . $centreonDbName . ".acl_res_group_relations";
-    $pearDB->beginTransaction();
+        FROM `" . $centreonDbName . "`.acl_groups WHERE acl_group_activate = '1'";
+    $aclGroupToDelete2 = "SELECT DISTINCT acl_group_id FROM `" . $centreonDbName . "`.acl_res_group_relations";
+    $pearDBO->beginTransaction();
     try {
         $pearDBO->query("DELETE FROM centreon_acl WHERE group_id NOT IN (" . $aclGroupToDelete . ")");
         $pearDBO->query("DELETE FROM centreon_acl WHERE group_id NOT IN (" . $aclGroupToDelete2 . ")");
-        $pearDB->commit();
+        $pearDBO->commit();
     } catch (\PDOException $e) {
-        $pearDB->rollBack();
+        $pearDBO->rollBack();
         $centreonLog->insertLog(
             2,
             "CentACL CRON: failed to delete old groups relations"

doc/API/centreon-api-v21.10.yaml

@@ -5993,6 +5993,10 @@ components:
           type: boolean
           example: true
           description: "Platform is a remote server"
+        address:
+          type: string
+          example: "10.0.0.1"
+          description: "The address of the platform"
         centralServerAddress:
           type: string
           example: "192.168.0.1"

features/VirtualMetricHandle.feature

@@ -5,16 +5,16 @@ Feature: Virtual Metric Handle
 
     Background:
         Given I am logged in a Centreon server with configured metrics
-   
+
     Scenario: Create a virtual metric
         When I add a virtual metric
         Then all properties are saved
-        
+
     Scenario: Duplicate a virtual metric
         Given an existing virtual metric
         When I duplicate a virtual metric
         Then all properties are copied except the name
-        
+
     Scenario: Delete a virtual metric
         Given an existing virtual metric
         When I delete a virtual metric

features/bootstrap/VirtualMetricHandleContext.php

@@ -24,7 +24,8 @@ public function iAddAVirtualMetric()
         $this->page = new MetricsConfigurationPage($this);
         $this->page->setProperties(array(
             'name' => $this->vmName,
-            'linked-host_services' => $this->host . ' - ' . $this->hostService
+            'linked-host_services' => $this->host . ' - ' . $this->hostService,
+            'known_metrics' => $this->functionRPN,
         ));
         $this->page->setProperties(array('function' => $this->functionRPN));
         $this->page->save();

lang/es_ES.UTF-8/LC_MESSAGES/messages.po

@@ -9079,10 +9079,6 @@ msgstr "Compruebe si el servicio está parado"
 msgid "Preexec definition"
 msgstr "Definiendo el comando PREEXEC"
 
-#: centreon-web/www/include/configuration/configObject/traps/formTraps.php:360
-msgid "The same OID element already exists"
-msgstr "El mismo OID ya existe."
-
 #: centreon-web/www/include/configuration/configObject/traps/formTraps.php:368
 msgid "Advanced matching rules"
 msgstr "Reglas de correspondencia avanzadas"
@@ -14745,7 +14741,7 @@ msgid "Clear filter"
 msgstr ""
 
 msgid "Last check with OK status"
-msgstr "" 
+msgstr ""
 
 # msgid "Status type"
 # msgstr ""
@@ -14757,4 +14753,7 @@ msgstr ""
 # msgstr ""
 
 # msgid "Force active checks"
-# msgstr ""
+# msgstr ""
+
+#  msgid "Warning, maximum size exceeded for input '%s' (max: %d), it will be truncated upon saving"
+#  msgstr ""