MON-17012 metrics are copied in _metrics, tests/init_sql.sh can creat…

…e another database than centreon_storage

.github/scripts/collect-test-robot.sh

@@ -23,8 +23,10 @@ mysql -e "GRANT SELECT,UPDATE,DELETE,INSERT,CREATE,DROP,INDEX,ALTER,LOCK TABLES,
 mysql -e "CREATE USER IF NOT EXISTS 'root_centreon'@'localhost' IDENTIFIED BY 'centreon';"
 mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'root_centreon'@'localhost'"
 
+cat resources/centreon.sql | sed "s/DBNameConf/centreon/g" > /tmp/centreon.sql
+
 mysql -u centreon -pcentreon < resources/centreon_storage.sql
-mysql -u centreon -pcentreon < resources/centreon.sql
+mysql -u centreon -pcentreon < /tmp/centreon.sql
 
 echo "########################## Install centreon collect ###########################"
 

broker/unified_sql/inc/com/centreon/broker/unified_sql/stream.hh

@@ -234,7 +234,7 @@ class stream : public io::stream {
    * same metric is recevied two times, the new value can overwrite the old
    * one, that's why we store those values in a map. The filled table here is
    * 'metrics'. */
-  std::unordered_map<int32_t, metric_info*> _metrics;
+  std::unordered_map<int32_t, metric_info> _metrics;
 
   /* These queues are sent in bulk to the database. The insert/update is done
    * if the loop timeout is reached or if the queue size is greater than

broker/unified_sql/src/stream_storage.cc

@@ -272,7 +272,7 @@ void stream::_unified_sql_process_pb_service_status(
             {
               std::lock_guard<std::mutex> lck(_queues_m);
               _metrics[it_index_cache->second.metric_id] =
-                  &it_index_cache->second;
+                  it_index_cache->second;
             }
             log_v2::perfdata()->debug("new metric with metric_id={}",
                                       it_index_cache->second.metric_id);
@@ -665,7 +665,7 @@ void stream::_unified_sql_process_service_status(
             {
               std::lock_guard<std::mutex> lck(_queues_m);
               _metrics[it_index_cache->second.metric_id] =
-                  &it_index_cache->second;
+                  it_index_cache->second;
             }
             log_v2::perfdata()->debug("new metric with metric_id={}",
                                       it_index_cache->second.metric_id);
@@ -713,42 +713,42 @@ void stream::_unified_sql_process_service_status(
 }
 
 void stream::_update_metrics() {
-  std::unordered_map<int32_t, metric_info*> metrics;
+  std::unordered_map<int32_t, metric_info> metrics;
   {
     std::lock_guard<std::mutex> lck(_queues_m);
     std::swap(_metrics, metrics);
   }
 
   std::deque<std::string> m;
   for (auto it = metrics.begin(); it != metrics.end(); ++it) {
-    metric_info* metric = it->second;
+    const metric_info& metric = it->second;
     m.emplace_back(fmt::format(
-        "({},'{}',{},{},'{}',{},{},'{}',{},{},{})", metric->metric_id,
-        misc::string::escape(metric->unit_name,
+        "({},'{}',{},{},'{}',{},{},'{}',{},{},{})", metric.metric_id,
+        misc::string::escape(metric.unit_name,
                              get_metrics_col_size(metrics_unit_name)),
-        std::isnan(metric->warn) || std::isinf(metric->warn)
+        std::isnan(metric.warn) || std::isinf(metric.warn)
             ? "NULL"
-            : fmt::format("{}", metric->warn),
-        std::isnan(metric->warn_low) || std::isinf(metric->warn_low)
+            : fmt::format("{}", metric.warn),
+        std::isnan(metric.warn_low) || std::isinf(metric.warn_low)
             ? "NULL"
-            : fmt::format("{}", metric->warn_low),
-        metric->warn_mode ? "1" : "0",
-        std::isnan(metric->crit) || std::isinf(metric->crit)
+            : fmt::format("{}", metric.warn_low),
+        metric.warn_mode ? "1" : "0",
+        std::isnan(metric.crit) || std::isinf(metric.crit)
             ? "NULL"
-            : fmt::format("{}", metric->crit),
-        std::isnan(metric->crit_low) || std::isinf(metric->crit_low)
+            : fmt::format("{}", metric.crit),
+        std::isnan(metric.crit_low) || std::isinf(metric.crit_low)
             ? "NULL"
-            : fmt::format("{}", metric->crit_low),
-        metric->crit_mode ? "1" : "0",
-        std::isnan(metric->min) || std::isinf(metric->min)
+            : fmt::format("{}", metric.crit_low),
+        metric.crit_mode ? "1" : "0",
+        std::isnan(metric.min) || std::isinf(metric.min)
             ? "NULL"
-            : fmt::format("{}", metric->min),
-        std::isnan(metric->max) || std::isinf(metric->max)
+            : fmt::format("{}", metric.min),
+        std::isnan(metric.max) || std::isinf(metric.max)
             ? "NULL"
-            : fmt::format("{}", metric->max),
-        std::isnan(metric->value) || std::isinf(metric->value)
+            : fmt::format("{}", metric.max),
+        std::isnan(metric.value) || std::isinf(metric.value)
             ? "NULL"
-            : fmt::format("{}", metric->value)));
+            : fmt::format("{}", metric.value)));
   }
   if (!m.empty()) {
     std::string query(fmt::format(

resources/centreon.sql

@@ -1,6 +1,6 @@
-CREATE DATABASE IF NOT EXISTS `centreon`;
+CREATE DATABASE IF NOT EXISTS `DBNameConf`;
 
-USE centreon;
+USE DBNameConf;
 
 SET FOREIGN_KEY_CHECKS=0;
 

tests/init-sql-docker.sh

@@ -10,17 +10,33 @@ done
 DBUserRoot="root"
 DBPassRoot="centreon"
 
+DBStorage=$(awk '($1=="${DBName}") {print $2}' /scripts/tests/resources/db_variables.robot)
+DBConf=$(awk '($1=="${DBNameConf}") {print $2}' /scripts/tests/resources/db_variables.robot)
+
 cd /scripts
 
 #create users
 mysql --user="$DBUserRoot" --password="$DBPassRoot" -h 127.0.0.1 -e "grant all privileges ON *.* to 'centreon'@'%' identified by 'centreon'"
+mysql --user="$DBUserRoot" --password="$DBPassRoot" -h 127.0.0.1 -e "grant all privileges ON *.* to 'root_centreon'@'%' identified by 'centreon'"
 mysql --user="$DBUserRoot" --password="$DBPassRoot" -h 127.0.0.1 -e "flush privileges"
 #clean if use persistant storage
-mysql --user="$DBUserRoot" --password="$DBPassRoot" -h 127.0.0.1 -e "drop database if exists centreon"
-mysql --user="$DBUserRoot" --password="$DBPassRoot" -h 127.0.0.1 -e "drop database if exists centreon_storage"
+mysql --user="$DBUserRoot" --password="$DBPassRoot" -h 127.0.0.1 -e "drop database if exists " ${DBConf}
+mysql --user="$DBUserRoot" --password="$DBPassRoot" -h 127.0.0.1 -e "drop database if exists " ${DBStorage}
 #create databases
-mysql --user="$DBUserRoot" --password="$DBPassRoot" -h 127.0.0.1 < resources/centreon.sql
-mysql --user="$DBUserRoot" --password="$DBPassRoot" -h 127.0.0.1 < resources/centreon_storage.sql
+mysql --user="$DBUserRoot" --password="$DBPassRoot" -h 127.0.0.1 -e "drop database ${DBConf}"
+cat /scripts/resources/centreon.sql | sed "s/DBNameConf/${DBConf}/g" > /tmp/centreon.sql
+
+mysql --user="$DBUserRoot" --password="$DBPassRoot" -h 127.0.0.1 < /tmp/centreon.sql
+
+if [ $DBStorage != 'centreon_storage' ]
+then
+    \rm /tmp/centreon_storage.sql
+    cat /scripts/resources/centreon_storage.sql | sed "s/centreon_storage/${DBStorage}/g" > /tmp/centreon_storage.sql
+    mysql --user="$DBUserRoot" --password="$DBPassRoot" -h 127.0.0.1 < /tmp/centreon_storage.sql    
+else
+    mysql --user="$DBUserRoot" --password="$DBPassRoot" -h 127.0.0.1 < /scripts/resources/centreon_storage.sql
+fi
+
 #activate queries log
 mysql --user="$DBUserRoot" --password="$DBPassRoot" -h 127.0.0.1 -e "SET GLOBAL general_log=1;"
 mysql --user="$DBUserRoot" --password="$DBPassRoot" -h 127.0.0.1 -e "SET GLOBAL general_log_file='/scripts/tests/mariadb_log/mariadb.log';"

tests/init-sql.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
 
-DBUserRoot=$(awk '$1=="${DBUserRoot}" {print $2}' resources/db_variables.robot)
-DBPassRoot=$(awk '$1=="${DBPassRoot}" {print $2}' resources/db_variables.robot)
+DBUserRoot=$(awk '($1=="${DBUserRoot}") {print $2}' resources/db_variables.robot)
+DBPassRoot=$(awk '($1=="${DBPassRoot}") {print $2}' resources/db_variables.robot)
+DBStorage=$(awk '($1=="${DBName}") {print $2}' resources/db_variables.robot)
+DBConf=$(awk '($1=="${DBNameConf}") {print $2}' resources/db_variables.robot)
 
 if [ -z $DBUserRoot ] ; then
     DBUserRoot="root"
@@ -11,10 +13,28 @@ if [ -z $DBPassRoot ] ; then
     DBPassRoot="centreon"
 fi
 
-mysql --user="$DBUserRoot" -e "set password for 'root'@'localhost' = PASSWORD('$DBPassRoot')"
-mysql --user="$DBUserRoot" -e "GRANT ALL PRIVILEGES ON *.* TO '$DBUserRoot'@'localhost'"
-mysql --user="$DBUserRoot" -e "flush privileges"
+mysql -e "set password for '$DBUserRoot'@'localhost' = PASSWORD('$DBPassRoot')"
+mysql -e "GRANT ALL PRIVILEGES ON *.* TO '$DBUserRoot'@'localhost'"
+mysql -e "flush privileges"
+
+mysql --user="$DBUserRoot" --password="$DBPassRoot" -e "drop database ${DBConf}"
+cat ../resources/centreon.sql | sed "s/DBNameConf/${DBConf}/g" > /tmp/centreon.sql
+
+mysql --user="$DBUserRoot" --password="$DBPassRoot" < /tmp/centreon.sql
+
+if [ $DBStorage != 'centreon_storage' ]
+then
+    \rm /tmp/centreon_storage.sql
+    cat ../resources/centreon_storage.sql | sed "s/centreon_storage/${DBStorage}/g" > /tmp/centreon_storage.sql
+    mysql --user="$DBUserRoot" --password="$DBPassRoot" < /tmp/centreon_storage.sql    
+else
+    mysql --user="$DBUserRoot" --password="$DBPassRoot" < ../resources/centreon_storage.sql
+fi
+
+mkdir /tmp/mariadb_log
+chown mysql: /tmp/mariadb_log
+
+#activate queries log
+mysql --user="$DBUserRoot" --password="$DBPassRoot"  -e "SET GLOBAL general_log=1;"
+mysql --user="$DBUserRoot" --password="$DBPassRoot"  -e "SET GLOBAL general_log_file='/tmp/mariadb_log/mariadb.log';"
 
-mysql --user="$DBUserRoot" --password="$DBPassRoot" -e "drop database centreon"
-mysql --user="$DBUserRoot" --password="$DBPassRoot" < ../resources/centreon.sql
-mysql --user="$DBUserRoot" --password="$DBPassRoot" < ../resources/centreon_storage.sql