Prometheus power metrics

README.md

@@ -63,3 +63,11 @@ Copyright 2002-2024, OpenNebula Project, OpenNebula Systems (formerly C12G Labs)
 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.
+
+## Acknowledgements
+
+Some of the software features included in this repository have been made possible through the funding of the following innovation projects:
+
+- [SovereignEdge.Cognit](https://cognit.sovereignedge.eu/) (Grant Agreement 101092711), through the European Union’s Horizon Europe Research and Innovation Programme.
+- [ONEedge5G](https://opennebula.io/innovation/oneedge5g/) (Grant Agreement TSI-064200-2023-1), supported by the Spanish Ministry for Digital Transformation and Civil Service through the UNICO I+D 6G Program, co-funded by the European Union – NextGenerationEU through the Recovery and Resilience Facility (RRF).
+- [ONEnextgen](http://onenextgen.eu/) (Grant Agreement UNICO IPCEI-2023-003), supported by the Spanish Ministry for Digital Transformation and Civil Service through the UNICO IPCEI Program, co-funded by the European Union – NextGenerationEU through the Recovery and Resilience Facility (RRF).

include/Backups.h

@@ -175,6 +175,11 @@ class Backups
         config.replace("LAST_BACKUP_SIZE", size);
     }
 
+    void last_backup_format(const std::string& format)
+    {
+        config.replace("LAST_BACKUP_FORMAT", format);
+    }
+
     void last_increment_id(int id)
     {
         config.replace("LAST_INCREMENT_ID", id);
@@ -224,6 +229,15 @@ class Backups
         return sz;
     }
 
+    std::string last_backup_format() const
+    {
+        std::string fmt;
+
+        config.get("LAST_BACKUP_FORMAT", fmt);
+
+        return fmt;
+    }
+
     int last_increment_id() const
     {
         int id;
@@ -283,6 +297,8 @@ class Backups
 
         config.erase("LAST_BACKUP_ID");
         config.erase("LAST_BACKUP_SIZE");
+
+        config.erase("LAST_BACKUP_FORMAT");
     }
 
     /**

include/DocumentPool.h

@@ -61,10 +61,10 @@ class DocumentPool : public PoolSQL
                  int *                    oid,
                  std::string&             error_str)
     {
-        *oid = PoolSQL::allocate(
-                       new Document(-1, uid, gid, uname, gname, umask, type,
-                                    std::move(template_contents)),
-                       error_str);
+        Document doc {-1, uid, gid, uname, gname, umask, type,
+                      std::move(template_contents)};
+
+        *oid = PoolSQL::allocate(doc, error_str);
 
         return *oid;
     }

include/Driver.h

@@ -115,6 +115,14 @@ class Driver
         streamer.register_action(t, a);
     };
 
+    /**
+     *  Set a callback to be called when the driver is restarted and reconnects
+     */
+    void set_reconnect_callback(std::function<void()> callback)
+    {
+        reconnect_callback = callback;
+    }
+
 protected:
     Driver() = default;
 
@@ -161,6 +169,11 @@ class Driver
      */
     std::atomic<bool> terminate = {false};
 
+    /**
+     *  Reconnect callback, called when the driver restarts
+     */
+    std::function<void()> reconnect_callback;
+
     /**
      *  Starts the driver. This function creates a new process and sets up the
      *  communication pipes.
@@ -314,6 +327,12 @@ ::start_driver(std::string& error)
 
     rc = read(from_drv, (void *) buffer, sizeof(char) * 31);
 
+    if ( rc < 0 )
+    {
+        error = "Driver initialization failed, unable to read from driver\n";
+        return -1;
+    }
+
     buffer[rc]='\0';
 
     std::istringstream iss(buffer);
@@ -325,7 +344,7 @@ ::start_driver(std::string& error)
 
     if ( action != "INIT" || result != "SUCCESS" )
     {
-        error = "Driver initialization failed\n";
+        error = "Driver initialization failed, expected INIT SUCCESS message\n";
         return -1;
     }
 
@@ -352,6 +371,8 @@ ::start_listener()
             start_driver(error);
 
             streamer.fd(from_drv);
+
+            if (reconnect_callback) reconnect_callback();
         }
     });
 }

include/DriverManager.h

@@ -91,6 +91,12 @@ class DriverManager
 
     static Log::MessageType log_type(char type);
 
+    /**
+     *  Callback called when the driver is reconnected. Override this function
+     *  to perform any actions when the driver is reconnected
+     */
+    virtual void reconnected() {};
+
 private:
     std::map<std::string, std::unique_ptr<D>> drivers;
 
@@ -207,7 +213,10 @@ int DriverManager<D>::start(std::string& error)
 {
     for (auto& driver : drivers)
     {
+        driver.second->set_reconnect_callback(std::bind(&DriverManager<D>::reconnected, this));
+
         auto rc = driver.second->start(error);
+
         if (rc != 0)
         {
             NebulaLog::error("DrM", "Unable to start driver '" + driver.first

include/GroupPool.h

@@ -42,7 +42,7 @@ class GroupPool : public PoolSQL
     /**
      *  Identifier for the oneadmin group
      */
-    static const int ONEADMIN_ID;
+    static constexpr int ONEADMIN_ID = 0;
 
     /**
      *  Default name for the users group
@@ -52,7 +52,7 @@ class GroupPool : public PoolSQL
     /**
      *  Identifier for the user group
      */
-    static const int USERS_ID;
+    static constexpr int USERS_ID = 1;
 
     /* ---------------------------------------------------------------------- */
     /* Methods for DB management                                              */

include/HostShareCapacity.h

@@ -17,6 +17,7 @@
 #ifndef HOST_SHARE_CAPACITY_H_
 #define HOST_SHARE_CAPACITY_H_
 
+#include "Template.h"
 #include "Attribute.h"
 
 /* ------------------------------------------------------------------------ */
@@ -53,6 +54,48 @@ struct HostShareCapacity
     VectorAttribute * topology;
 
     std::vector<VectorAttribute *> nodes;
+
+    /**
+     *  Get the VM capacity from the template
+     *  @param vid the VM ID
+     *  @param tmpl the VM template. Warning: the HostShareCapacity use pointers to
+     *        the tmpl, so it must exist for the lifetime of the HostareCapacity
+     */
+    void set(int vid, Template& tmpl)
+    {
+        float fcpu;
+
+        pci.clear();
+        nodes.clear();
+
+        vmid = vid;
+
+        if ((tmpl.get("MEMORY", mem) == false) ||
+            (tmpl.get("CPU", fcpu) == false))
+        {
+            cpu = 0;
+            mem = 0;
+            disk = 0;
+
+            vcpu = 0;
+
+            return;
+        }
+
+        cpu = (int) (fcpu * 100); //%
+        mem = mem * 1024;  //Kb
+        disk = 0;
+
+        tmpl.get("VCPU", vcpu);
+
+        tmpl.get("PCI", pci);
+
+        tmpl.get("NUMA_NODE", nodes);
+
+        topology = tmpl.get("TOPOLOGY");
+
+        return;
+    }
 };
 
 #endif /*HOST_SHARE_CAPACITY_H_*/

include/InformationManager.h

@@ -87,6 +87,11 @@ class InformationManager : public DriverManager<Driver<im_msg_t>>
      */
     void raft_status(RaftManager::State raft);
 
+    /**
+     *  Called when the driver is reconnected
+     */
+    void reconnected() override;
+
 protected:
     /**
      *  Received undefined message -> print error

include/LibVirtDriver.h

@@ -46,15 +46,15 @@ class LibVirtDriver : public VirtualMachineManagerDriver
                           std::string& error) const override;
 
 private:
-    static const int CEPH_DEFAULT_PORT;
+    static constexpr int CEPH_DEFAULT_PORT = 6789;
 
-    static const int GLUSTER_DEFAULT_PORT;
+    static constexpr int GLUSTER_DEFAULT_PORT = 24007;
 
-    static const int ISCSI_DEFAULT_PORT;
+    static constexpr int ISCSI_DEFAULT_PORT = 3260;
 
-    static const int Q35_ROOT_DEFAULT_PORTS;
+    static constexpr int Q35_ROOT_DEFAULT_PORTS = 16;
 
-    static const char * XML_DOMAIN_RNG_PATH;
+    static constexpr auto XML_DOMAIN_RNG_PATH = "/schemas/libvirt/domain.rng";
 
     int deployment_description(const VirtualMachine * vm,
                                const std::string& fn) const override

include/NebulaLog.h

@@ -156,6 +156,11 @@ class NebulaLog
         return _log_type;
     };
 
+    static bool initialized()
+    {
+        return (logger != 0);
+    }
+
 private:
     NebulaLog() {};
 

include/NebulaService.h

@@ -150,7 +150,7 @@ class NebulaService
      */
     static std::string code_version()
     {
-        return "6.10.0"; // bump version
+        return "6.10.2"; // bump version
     }
 
     /**

include/NebulaUtil.h

@@ -23,6 +23,7 @@
 #include <set>
 #include <algorithm>
 #include <random>
+#include <regex>
 #include <mutex>
 
 #include <openssl/crypto.h>
@@ -141,12 +142,8 @@ namespace one_util
      *
      * @param st string to split
      * @param delim delimiter character
-     * @param clean_empty true to clean empty split parts.
-     *  Example for st "a::b:c"
-     *      clean_empty true will return ["a", "b", "c"]
-     *      clean_empty fase will return ["a", "", "b", "c"]
+     * @param parts where the result will be saved
      *
-     * @return a vector containing the resulting substrings
      */
     template <class T>
     void split(const std::string &st, char delim, std::vector<T> &parts)
@@ -176,6 +173,19 @@ namespace one_util
         }
     }
 
+    /**
+    * Splits a string, using the given delimiter
+    *
+    * @param st string to split
+    * @param delim delimiter character
+    * @param clean_empty true to clean empty split parts.
+    *  Example for st "a::b:c"
+    *      clean_empty true will return ["a", "b", "c"]
+    *      clean_empty fase will return ["a", "", "b", "c"]
+    *
+    * @return a vector containing the resulting substrings
+    */
+
     std::vector<std::string> split(const std::string& st, char delim,
                                    bool clean_empty = true);
 
@@ -364,6 +374,34 @@ namespace one_util
     template <>
     bool str_cast(const std::string& str, std::string& value);
 
+    /**
+     * Converts string into unsigned integer type
+     *  @param str Input string
+     *
+     *  @return Unsigned integer value on success, 0 on failure.
+     *  @note If value in string is greater than typename T can hold,
+     *        maximum possible value will be returned
+     */
+    template <typename T>
+    T string_to_unsigned(const std::string& str)
+    {
+        T value;
+
+        if (std::regex_search(str, std::regex("[^0-9]")))
+        {
+            return 0;
+        }
+
+        std::istringstream iss(str);
+        iss >> value;
+
+        if (iss.fail() || !iss.eof())
+        {
+            value = std::numeric_limits<T>::max();
+        }
+
+        return value;
+    }
 } // namespace one_util
 
 #endif /* _NEBULA_UTIL_H_ */

include/PoolSQL.h

@@ -43,7 +43,7 @@ class PoolSQL
      */
     PoolSQL(SqlDB * _db, const char * _table);
 
-    virtual ~PoolSQL();
+    virtual ~PoolSQL() = default;
 
     /**
      *  Allocates a new object, writting it in the pool database. No memory is
@@ -52,7 +52,7 @@ class PoolSQL
      *   @return the oid assigned to the object or -1 in case of failure
      */
     virtual int allocate(
-            PoolObjectSQL   *objsql,
+            PoolObjectSQL   &objsql,
             std::string&     error_str);
 
     /**

include/RequestManagerAllocateDB.h

@@ -47,9 +47,9 @@ class RequestManagerAllocateDB: public Request
             return;
         }
 
-        PoolObjectSQL * obj = create(xml);
+        auto obj = std::unique_ptr<PoolObjectSQL>(create(xml));
 
-        int rc = pool->allocate(obj, att.resp_msg);
+        int rc = pool->allocate(*obj, att.resp_msg);
 
         if (  rc == -1 )
         {