MON-139731 Centreon next 24.04 (Jira release #19964#) (#1497)

centreon · Jul 17, 2024 · 372b8d5 · 372b8d5
2 parents cfbfde0 + ae543e2
commit 372b8d5
Show file tree

Hide file tree

Showing 72 changed files with 1,623 additions and 1,202 deletions.
diff --git a/.github/actions/release/action.yml b/.github/actions/release/action.yml
@@ -25,6 +25,8 @@ runs:
   steps:
     - name: Checkout sources
       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      with:
+        fetch-depth: 0
 
     - name: Get released versions for components
       run: |
@@ -185,6 +187,7 @@ runs:
         JIRA_RELEASE_NAME=""
         JIRA_PROJECT_ID="${{ inputs.jira_project_id }}"
         JIRA_RELEASE_RELEASED="false"
+        JIRA_RELEASE_ID="$(git log |grep -E "Centreon\ next.*\#[0-9]{5,}\#\)" |grep -o -P "(?<=#)[0-9]{5,}(?=#)" |head -n 1)"
 
         # Create JIRA version for each released component
         echo "Creating JIRA releases."
@@ -194,7 +197,7 @@ runs:
             # Build JSON with release information for JIRA API
             JIRA_RELEASE_DATA=$(jq -nc \
               --arg archived "$JIRA_RELEASE_ARCHIVED" \
-              --arg description "$TAG" \
+              --arg description "$JIRA_RELEASE_ID $TAG" \
               --arg releaseDate "$JIRA_RELEASE_DATE" \
               --arg name "$TAG" \
               --arg projectId "$JIRA_PROJECT_ID" \

diff --git a/.github/docker/Dockerfile.centreon-collect-alma9 b/.github/docker/Dockerfile.centreon-collect-alma9
@@ -29,6 +29,7 @@ dnf --best install -y cmake \
     openssh-server \
     mariadb-server \
     mariadb \
+    mariadb-connector-c-devel \
     gnutls-devel \
     libgcrypt-devel \
     lua-devel \

diff --git a/.github/docker/Dockerfile.centreon-collect-debian-bookworm b/.github/docker/Dockerfile.centreon-collect-debian-bookworm
@@ -21,6 +21,7 @@ apt-get -y install git \
     mariadb-server \
     openssh-server \
     libmariadb3 \
+    libmariadb-dev \
     librrd-dev \
     libgnutls28-dev \
     liblua5.3-dev \

diff --git a/.github/docker/Dockerfile.centreon-collect-debian-bullseye b/.github/docker/Dockerfile.centreon-collect-debian-bullseye
@@ -17,6 +17,7 @@ apt-get -y install git \
     mariadb-server \
     openssh-server \
     libmariadb3 \
+    libmariadb-dev \
     librrd-dev \
     libgnutls28-dev \
     liblua5.3-dev \

diff --git a/.github/docker/Dockerfile.centreon-collect-mysql-alma9 b/.github/docker/Dockerfile.centreon-collect-mysql-alma9
@@ -25,6 +25,7 @@ dnf --best install -y cmake \
     gdb \
     gettext \
     git \
+    mariadb-connector-c-devel \
     ninja-build \
     openssh-server \
     mysql-server \

diff --git a/.github/docker/Dockerfile.centreon-collect-mysql-alma9-test b/.github/docker/Dockerfile.centreon-collect-mysql-alma9-test
@@ -20,6 +20,7 @@ dnf --best install -y gcc \
     gdb \
     git \
     openssh-server \
+    mariadb-connector-c \
     mysql-server \
     mysql \
     gnutls \
@@ -42,8 +43,8 @@ dnf clean all
 
 echo "install robot and dependencies"
 
-pip3 install -U robotframework robotframework-databaselibrary robotframework-httpctrl robotframework-examples pymysql python-dateutil psutil
-pip3 install grpcio grpcio_tools py-cpuinfo cython unqlite gitpython boto3 robotframework-requests
+pip3 install -U robotframework robotframework-databaselibrary robotframework-httpctrl robotframework-examples pymysql python-dateutil psutil 
+pip3 install grpcio grpcio_tools py-cpuinfo cython unqlite gitpython boto3 robotframework-requests cryptography
 
 cd /tmp/collect
 

diff --git a/.github/docker/Dockerfile.centreon-collect-ubuntu-jammy b/.github/docker/Dockerfile.centreon-collect-ubuntu-jammy
@@ -21,6 +21,7 @@ apt-get -y install cmake \
     mariadb-server \
     openssh-server \
     libmariadb3 \
+    libmariadb-dev \
     librrd-dev \
     libgnutls28-dev \
     liblua5.3-dev \

diff --git a/.github/scripts/collect-prepare-test-robot.sh b/.github/scripts/collect-prepare-test-robot.sh
@@ -30,8 +30,8 @@ if [ $database_type == 'mysql' ]; then
     sleep 5
     echo "########################### Init centreon database ############################"
 
-    mysql -e "CREATE USER IF NOT EXISTS 'centreon'@'localhost' IDENTIFIED WITH mysql_native_password BY 'centreon'"
-    mysql -e "CREATE USER IF NOT EXISTS 'root_centreon'@'localhost' IDENTIFIED WITH mysql_native_password BY 'centreon'"
+    mysql -e "CREATE USER IF NOT EXISTS 'centreon'@'localhost' IDENTIFIED BY 'centreon'"
+    mysql -e "CREATE USER IF NOT EXISTS 'root_centreon'@'localhost' IDENTIFIED BY 'centreon'"
 else
     echo "########################### Start MariaDB ######################################"
     if [ "$distrib" = "ALMALINUX" ]; then

diff --git a/.github/workflows/centreon-collect.yml b/.github/workflows/centreon-collect.yml
@@ -26,6 +26,7 @@ on:
       - vcpkg/**
       - "!.veracode-exclusions"
       - "!veracode.json"
+      - "!**/test/**"
   push:
     branches:
       - develop
@@ -51,6 +52,7 @@ on:
       - vcpkg/**
       - "!.veracode-exclusions"
       - "!veracode.json"
+      - "!**/test/**"
 
 jobs:
   get-version:

diff --git a/.github/workflows/get-version.yml b/.github/workflows/get-version.yml
@@ -101,6 +101,11 @@ jobs:
               echo "release_cloud=1" >> $GITHUB_OUTPUT
               echo "release_type=$GITHUB_RELEASE_TYPE" >> $GITHUB_OUTPUT
               ;;
+            dev-[2-9][0-9].[0-9][0-9].x)
+              echo "release=`date +%s`.`echo ${{ github.sha }} | cut -c -7`" >> $GITHUB_OUTPUT
+              echo "release_cloud=0" >> $GITHUB_OUTPUT
+              echo "release_type=$GITHUB_RELEASE_TYPE" >> $GITHUB_OUTPUT
+              ;;
             release* | hotfix*)
             # Handle workflow_dispatch run triggers and run a dispatch ONLY for cloud release
               GITHUB_RELEASE_BRANCH_BASE_REF_NAME="$(gh pr view $BRANCHNAME -q .baseRefName --json headRefName,baseRefName,state)"

diff --git a/.github/workflows/veracode-analysis.yml b/.github/workflows/veracode-analysis.yml
@@ -169,7 +169,7 @@ jobs:
           key: "${{ inputs.module_name }}-${{ github.sha }}-${{ github.run_id }}-veracode-binary"
 
       - name: Sandbox scan
-        uses: veracode/veracode-uploadandscan-action@f7e1fbf02c5c899fba9f12e3f537b62f2f1230e1 # master using 0.2.6
+        uses: veracode/veracode-uploadandscan-action@f7e1fbf02c5c899fba9f12e3f537b62f2f1230e1 # 0.2.7
         continue-on-error: ${{ vars.VERACODE_CONTINUE_ON_ERROR == 'true' }}
         with:
           appname: "${{ inputs.module_name }}"

diff --git a/.version b/.version
@@ -1,2 +1,2 @@
 MAJOR=24.04
-MINOR=2
+MINOR=3
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -135,7 +135,7 @@ endif()
 # Version.
 set(COLLECT_MAJOR 24)
 set(COLLECT_MINOR 04)
-set(COLLECT_PATCH 2)
+set(COLLECT_PATCH 3)
 set(COLLECT_VERSION "${COLLECT_MAJOR}.${COLLECT_MINOR}.${COLLECT_PATCH}")
 add_definitions(-DCENTREON_CONNECTOR_VERSION=\"${COLLECT_VERSION}\")
 

diff --git a/bbdo/bam/dimension_ba_event.cc b/bbdo/bam/dimension_ba_event.cc
@@ -1,20 +1,20 @@
 /**
-* Copyright 2014-2015 Centreon
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*
-* For more information : contact@centreon.com
-*/
+ * Copyright 2014-2015 Centreon
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * For more information : contact@centreon.com
+ */
 
 #include "bbdo/bam/dimension_ba_event.hh"
 
@@ -102,14 +102,14 @@ mapping::entry const dimension_ba_event::entries[] = {
     mapping::entry(&bam::dimension_ba_event::ba_id,
                    "ba_id",
                    mapping::entry::invalid_on_zero),
-    mapping::entry(
-        &bam::dimension_ba_event::ba_name,
-        "ba_name",
-        get_mod_bam_reporting_ba_col_size(mod_bam_reporting_ba_ba_name)),
-    mapping::entry(
-        &bam::dimension_ba_event::ba_description,
-        "ba_description",
-        get_mod_bam_reporting_ba_col_size(mod_bam_reporting_ba_ba_description)),
+    mapping::entry(&bam::dimension_ba_event::ba_name,
+                   "ba_name",
+                   get_centreon_storage_mod_bam_reporting_ba_col_size(
+                       centreon_storage_mod_bam_reporting_ba_ba_name)),
+    mapping::entry(&bam::dimension_ba_event::ba_description,
+                   "ba_description",
+                   get_centreon_storage_mod_bam_reporting_ba_col_size(
+                       centreon_storage_mod_bam_reporting_ba_ba_description)),
     mapping::entry(&bam::dimension_ba_event::sla_month_percent_crit,
                    "sla_month_percent_crit"),
     mapping::entry(&bam::dimension_ba_event::sla_month_percent_warn,

diff --git a/bbdo/bam/dimension_bv_event.cc b/bbdo/bam/dimension_bv_event.cc
@@ -1,20 +1,20 @@
 /**
-* Copyright 2014-2015 Centreon
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*
-* For more information : contact@centreon.com
-*/
+ * Copyright 2014-2015 Centreon
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * For more information : contact@centreon.com
+ */
 
 #include "bbdo/bam/dimension_bv_event.hh"
 
@@ -94,14 +94,14 @@ mapping::entry const dimension_bv_event::entries[] = {
     mapping::entry(&bam::dimension_bv_event::bv_id,
                    "bv_id",
                    mapping::entry::invalid_on_zero),
-    mapping::entry(
-        &bam::dimension_bv_event::bv_name,
-        "bv_name",
-        get_mod_bam_reporting_bv_col_size(mod_bam_reporting_bv_bv_name)),
-    mapping::entry(
-        &bam::dimension_bv_event::bv_description,
-        "bv_description",
-        get_mod_bam_reporting_bv_col_size(mod_bam_reporting_bv_bv_description)),
+    mapping::entry(&bam::dimension_bv_event::bv_name,
+                   "bv_name",
+                   get_centreon_storage_mod_bam_reporting_bv_col_size(
+                       centreon_storage_mod_bam_reporting_bv_bv_name)),
+    mapping::entry(&bam::dimension_bv_event::bv_description,
+                   "bv_description",
+                   get_centreon_storage_mod_bam_reporting_bv_col_size(
+                       centreon_storage_mod_bam_reporting_bv_bv_description)),
     mapping::entry()};
 
 // Operations.

diff --git a/bbdo/bam/dimension_kpi_event.cc b/bbdo/bam/dimension_kpi_event.cc
@@ -1,20 +1,20 @@
 /**
-* Copyright 2014-2015,2019-2021 Centreon
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*
-* For more information : contact@centreon.com
-*/
+ * Copyright 2014-2015,2019-2021 Centreon
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * For more information : contact@centreon.com
+ */
 
 #include "bbdo/bam/dimension_kpi_event.hh"
 
@@ -94,47 +94,49 @@ mapping::entry const dimension_kpi_event::entries[] = {
     mapping::entry(&bam::dimension_kpi_event::ba_id,
                    "ba_id",
                    mapping::entry::invalid_on_zero),
-    mapping::entry(
-        &bam::dimension_kpi_event::ba_name,
-        "ba_name",
-        get_mod_bam_reporting_kpi_col_size(mod_bam_reporting_kpi_ba_name)),
+    mapping::entry(&bam::dimension_kpi_event::ba_name,
+                   "ba_name",
+                   get_centreon_storage_mod_bam_reporting_kpi_col_size(
+                       centreon_storage_mod_bam_reporting_kpi_ba_name)),
     mapping::entry(&bam::dimension_kpi_event::host_id,
                    "host_id",
                    mapping::entry::invalid_on_zero),
-    mapping::entry(
-        &bam::dimension_kpi_event::host_name,
-        "host_name",
-        get_mod_bam_reporting_kpi_col_size(mod_bam_reporting_kpi_host_name)),
+    mapping::entry(&bam::dimension_kpi_event::host_name,
+                   "host_name",
+                   get_centreon_storage_mod_bam_reporting_kpi_col_size(
+                       centreon_storage_mod_bam_reporting_kpi_host_name)),
     mapping::entry(&bam::dimension_kpi_event::service_id,
                    "service_id",
                    mapping::entry::invalid_on_zero),
-    mapping::entry(&bam::dimension_kpi_event::service_description,
-                   "service_description",
-                   get_mod_bam_reporting_kpi_col_size(
-                       mod_bam_reporting_kpi_service_description)),
+    mapping::entry(
+        &bam::dimension_kpi_event::service_description,
+        "service_description",
+        get_centreon_storage_mod_bam_reporting_kpi_col_size(
+            centreon_storage_mod_bam_reporting_kpi_service_description)),
     mapping::entry(&bam::dimension_kpi_event::kpi_ba_id,
                    "kpi_ba_id",
                    mapping::entry::invalid_on_zero),
-    mapping::entry(
-        &bam::dimension_kpi_event::kpi_ba_name,
-        "kpi_ba_name",
-        get_mod_bam_reporting_kpi_col_size(mod_bam_reporting_kpi_kpi_ba_name)),
+    mapping::entry(&bam::dimension_kpi_event::kpi_ba_name,
+                   "kpi_ba_name",
+                   get_centreon_storage_mod_bam_reporting_kpi_col_size(
+                       centreon_storage_mod_bam_reporting_kpi_kpi_ba_name)),
     mapping::entry(&bam::dimension_kpi_event::meta_service_id,
                    "meta_service_id",
                    mapping::entry::invalid_on_zero),
-    mapping::entry(&bam::dimension_kpi_event::meta_service_name,
-                   "meta_service_name",
-                   get_mod_bam_reporting_kpi_col_size(
-                       mod_bam_reporting_kpi_meta_service_name),
-                   mapping::entry::invalid_on_zero),
+    mapping::entry(
+        &bam::dimension_kpi_event::meta_service_name,
+        "meta_service_name",
+        get_centreon_storage_mod_bam_reporting_kpi_col_size(
+            centreon_storage_mod_bam_reporting_kpi_meta_service_name),
+        mapping::entry::invalid_on_zero),
     mapping::entry(&bam::dimension_kpi_event::boolean_id,
                    "boolean_id",
                    mapping::entry::invalid_on_zero),
-    mapping::entry(
-        &bam::dimension_kpi_event::boolean_name,
-        "boolean_name",
-        get_mod_bam_reporting_kpi_col_size(mod_bam_reporting_kpi_boolean_name),
-        mapping::entry::invalid_on_zero),
+    mapping::entry(&bam::dimension_kpi_event::boolean_name,
+                   "boolean_name",
+                   get_centreon_storage_mod_bam_reporting_kpi_col_size(
+                       centreon_storage_mod_bam_reporting_kpi_boolean_name),
+                   mapping::entry::invalid_on_zero),
     mapping::entry(&bam::dimension_kpi_event::impact_warning, "impact_warning"),
     mapping::entry(&bam::dimension_kpi_event::impact_critical,
                    "impact_critical"),