centreon · jean-christophe81 · Jun 25, 2024 · Jun 14, 2024
@@ -29,6 +29,7 @@ dnf --best install -y cmake \
     openssh-server \
     mariadb-server \
     mariadb \
+    mariadb-connector-c-devel \
     gnutls-devel \
     libgcrypt-devel \
     lua-devel \

@@ -21,6 +21,7 @@ apt-get -y install git \
     mariadb-server \
     openssh-server \
     libmariadb3 \
+    libmariadb-dev \
     librrd-dev \
     libgnutls28-dev \
     liblua5.3-dev \

@@ -17,6 +17,7 @@ apt-get -y install git \
     mariadb-server \
     openssh-server \
     libmariadb3 \
+    libmariadb-dev \
     librrd-dev \
     libgnutls28-dev \
     liblua5.3-dev \

@@ -25,6 +25,7 @@ dnf --best install -y cmake \
     gdb \
     gettext \
     git \
+    mariadb-connector-c-devel \
     ninja-build \
     openssh-server \
     mysql-server \

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

@@ -21,6 +21,7 @@ apt-get -y install cmake \
     mariadb-server \
     openssh-server \
     libmariadb3 \
+    libmariadb-dev \
     librrd-dev \
     libgnutls28-dev \
     liblua5.3-dev \

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

@@ -66,20 +66,24 @@ endif()
 if(OS_DISTRIBUTOR STREQUAL "Debian" OR OS_DISTRIBUTOR STREQUAL "Ubuntu")
   message(STATUS "deb based os")
   add_definitions("-DMYSQL_SOCKET=\"/var/run/mysqld/mysqld.sock\"")
+  add_definitions("-DDEFAULT_MARIADB_EXTENSION_DIR=\"/usr/lib/x86_64-linux-gnu/libmariadb3/plugin\"")
 elseif(OS_DISTRIBUTOR STREQUAL "CentOS" OR OS_DISTRIBUTOR STREQUAL "RedHat")
   message(STATUS "rpm based os")
   add_definitions("-DMYSQL_SOCKET=\"/var/lib/mysql/mysql.sock\"")
+  add_definitions("-DDEFAULT_MARIADB_EXTENSION_DIR=\"/usr/lib64/mariadb/plugin\"")
 else()
   message(STATUS "other os: ${OS_DISTRIBUTOR}")
-  add_definitions("-DMYSQL_SOCKET=/tmp/mysql.sock")
+  add_definitions("-DMYSQL_SOCKET=\"/tmp/mysql.sock\"")
+  add_definitions("-DDEFAULT_MARIADB_EXTENSION_DIR=\"/usr/lib/x86_64-linux-gnu/libmariadb3/plugin\"")
 endif()
 
 include_directories(
   "${PROJECT_SOURCE_DIR}/core/inc"
   "${PROJECT_SOURCE_DIR}/neb/inc"
   "${CMAKE_SOURCE_DIR}/engine/inc"
   "${PROJECT_SOURCE_DIR}/core/multiplexing/inc"
-  "${PROJECT_SOURCE_DIR}/core/sql/inc")
+  "${PROJECT_SOURCE_DIR}/core/sql/inc"
+  "${MARIADB_INCLUDE_DIRS}")
 set(INC_DIR "${PROJECT_SOURCE_DIR}/core/inc/com/centreon/broker")
 set(SRC_DIR "${PROJECT_SOURCE_DIR}/core/src")
 set(TEST_DIR "${PROJECT_SOURCE_DIR}/core/test")

@@ -75,6 +75,9 @@ class database_config {
   int get_connections_count() const;
   unsigned get_max_commit_delay() const;
   unsigned get_category() const;
+  const std::string& get_extension_directory() const {
+    return _extension_directory;
+  }
 
   void set_type(std::string const& type);
   void set_host(std::string const& host);
@@ -87,6 +90,9 @@ class database_config {
   void set_queries_per_transaction(int qpt);
   void set_check_replication(bool check_replication);
   void set_category(unsigned category);
+  void set_extension_directory(std::string const& extension_directory) {
+    _extension_directory = extension_directory;
+  }
 
   database_config auto_commit_conf() const;
 
@@ -105,6 +111,8 @@ class database_config {
   int _connections_count;
   unsigned _max_commit_delay;
   unsigned _category;
+  // where mariadb will find extension such as caching_sha2_password.so
+  std::string _extension_directory;
 };
 
 std::ostream& operator<<(std::ostream& s, const database_config cfg);

@@ -19,7 +19,7 @@
 #ifndef CCB_MYSQL_BIND_BASE_HH
 #define CCB_MYSQL_BIND_BASE_HH
 
-#include <mysql/mysql.h>
+#include <mysql.h>
 
 namespace com::centreon::broker {
 

@@ -19,8 +19,9 @@
 #ifndef CCB_DATABASE_MYSQL_COLUMN_HH
 #define CCB_DATABASE_MYSQL_COLUMN_HH
 
+#include <mysql.h>
+
 #include <fmt/format.h>
-#include <mysql/mysql.h>
 #include <cmath>
 
 namespace com::centreon::broker {

@@ -85,6 +85,7 @@ class mysql_connection {
   const std::string _pwd;
   const std::string _name;
   const int _port;
+  const std::string _extension_directory;
   const unsigned _max_second_commit_delay;
   time_t _last_commit;
   std::atomic<connection_state> _state;

@@ -36,7 +36,8 @@ std::ostream& operator<<(std::ostream& s, const database_config cfg) {
   s << " queries per transaction:" << cfg.get_queries_per_transaction()
     << " check replication:" << cfg.get_check_replication()
     << " connection count:" << cfg.get_connections_count()
-    << " max commit delay:" << cfg.get_max_commit_delay() << 's';
+    << " max commit delay:" << cfg.get_max_commit_delay() << 's'
+    << " extension_directory" << cfg.get_extension_directory();
   return s;
 }
 
@@ -49,7 +50,8 @@ database_config::database_config()
     : _queries_per_transaction(1),
       _check_replication(true),
       _connections_count(1),
-      _category(SHARED) {}
+      _category(SHARED),
+      _extension_directory(DEFAULT_MARIADB_EXTENSION_DIR) {}
 
 /**
  *  Constructor.
@@ -90,14 +92,16 @@ database_config::database_config(const std::string& type,
       _check_replication(check_replication),
       _connections_count(connections_count),
       _max_commit_delay(max_commit_delay),
-      _category(SHARED) {}
+      _category(SHARED),
+      _extension_directory(DEFAULT_MARIADB_EXTENSION_DIR) {}
 
 /**
  *  Build a database configuration from a configuration set.
  *
  *  @param[in] cfg  Endpoint configuration.
  */
-database_config::database_config(config::endpoint const& cfg) {
+database_config::database_config(config::endpoint const& cfg)
+    : _extension_directory(DEFAULT_MARIADB_EXTENSION_DIR) {
   std::map<std::string, std::string>::const_iterator it, end;
   end = cfg.params.end();
 
@@ -212,6 +216,11 @@ database_config::database_config(config::endpoint const& cfg) {
     }
   } else
     _max_commit_delay = 5;
+
+  it = cfg.params.find("extension_directory");
+  if (it != end) {
+    _extension_directory = it->second;
+  }
 }
 
 /**
@@ -557,6 +566,7 @@ void database_config::_internal_copy(database_config const& other) {
   _check_replication = other._check_replication;
   _connections_count = other._connections_count;
   _max_commit_delay = other._max_commit_delay;
+  _extension_directory = other._extension_directory;
 }
 
 /**

@@ -15,7 +15,7 @@
  *
  * For more information : [email protected]
  */
-#include <mysql/errmsg.h>
+#include <errmsg.h>
 
 #include "com/centreon/broker/config/applier/init.hh"
 #include "com/centreon/broker/misc/misc.hh"
@@ -190,6 +190,9 @@ bool mysql_connection::_try_to_reconnect() {
   uint32_t timeout = 10;
   mysql_options(_conn, MYSQL_OPT_CONNECT_TIMEOUT, &timeout);
 
+  mysql_optionsv(_conn, MYSQL_PLUGIN_DIR,
+                 (const void*)_extension_directory.c_str());
+
   if (!mysql_real_connect(_conn, _host.c_str(), _user.c_str(), _pwd.c_str(),
                           _name.c_str(), _port,
                           (_socket == "" ? nullptr : _socket.c_str()),
@@ -830,6 +833,9 @@ void mysql_connection::_run() {
     uint32_t timeout = 10;
     mysql_options(_conn, MYSQL_OPT_CONNECT_TIMEOUT, &timeout);
 
+    mysql_optionsv(_conn, MYSQL_PLUGIN_DIR,
+                   (const void*)_extension_directory.c_str());
+
     while (config::applier::mode != config::applier::finished &&
            !mysql_real_connect(_conn, _host.c_str(), _user.c_str(),
                                _pwd.c_str(), _name.c_str(), _port,
@@ -1076,6 +1082,7 @@ mysql_connection::mysql_connection(
       _pwd(db_cfg.get_password()),
       _name(db_cfg.get_name()),
       _port(db_cfg.get_port()),
+      _extension_directory(db_cfg.get_extension_directory()),
       _max_second_commit_delay(db_cfg.get_max_commit_delay()),
       _last_commit(db_cfg.get_queries_per_transaction() > 1
                        ? 0

@@ -43,6 +43,7 @@ overrides:
       - centreon-clib = ${VERSION}-${RELEASE}${DIST}
       - centreon-broker = ${VERSION}-${RELEASE}${DIST}
       - gnutls >= 3.6.0
+      - mariadb-connector-c >= 3.1.10
     conflicts:
       - centreon-broker-storage
       - centreon-broker-core-devel
@@ -59,6 +60,7 @@ overrides:
       - centreon-broker (= ${VERSION}-${RELEASE}${DIST})
       - libgnutls30
       - libssl1.1 | libssl3
+      - libmariadb3
       - zlib1g
     conflicts:
       - centreon-broker-storage

@@ -1,7 +1,6 @@
 [mysqld]
 #mariadb conf optimized for a 16Gb ram machine
 port            = 3306
-default-authentication-plugin=mysql_native_password
 
 max_heap_table_size=1G
 open_files_limit = 32000

@@ -6,7 +6,6 @@
         "cxx17"
       ]
     },
-    "libmariadb",
     "libssh2",
     "curl",
     "fmt",
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ @@
             "cxx17"
           ]
         },
-        "libmariadb",
         "libssh2",
         "curl",
         "fmt",
@@ Expand Down @@