ido_mysql, livestatus: Use Application::GetVersion().

diff --git a/components/db_ido_mysql/idomysqlconnection.cpp b/components/db_ido_mysql/idomysqlconnection.cpp
index 6ce43320c5eb01a83330313c46820cb6cf4cb4c8..54911f7eb6fb1faaf29073a904d4138d25b41d32 100644 (file)
--- a/components/db_ido_mysql/idomysqlconnection.cpp
+++ b/components/db_ido_mysql/idomysqlconnection.cpp
@@ -156,7 +156,8 @@ void IdoMysqlConnection::ReconnectTimerHandler(void)
                /* record connection */
                Query("INSERT INTO " + GetTablePrefix() + "conninfo " +
                    "(instance_id, connect_time, last_checkin_time, agent_name, agent_version, connect_type, data_start_time) VALUES ("
-                   + Convert::ToString(static_cast<long>(m_InstanceID)) + ", NOW(), NOW(), 'icinga2 db_ido_mysql', '2.0', '" + (reconnect ? "RECONNECT" : "INITIAL") + "', NOW())");
+                   + Convert::ToString(static_cast<long>(m_InstanceID)) + ", NOW(), NOW(), 'icinga2 db_ido_mysql', " + Application::GetVersion()
+                   + ", '" + (reconnect ? "RECONNECT" : "INITIAL") + "', NOW())");
 
                /* clear config tables for the initial config dump */
                ClearConfigTables();

diff --git a/components/livestatus/statustable.cpp b/components/livestatus/statustable.cpp
index 7f264b5f36236e61dc21adc9806e314c5b8f7e29..c95cdba64acddd58f79f266df57a2a5d329e3739 100644 (file)
--- a/components/livestatus/statustable.cpp
+++ b/components/livestatus/statustable.cpp
@@ -154,12 +154,12 @@ Value StatusTable::NumServicesAccessor(const Value& row)
 
 Value StatusTable::ProgramVersionAccessor(const Value& row)
 {
-       return "2.0";
+       return Application::GetVersion();
 }
 
 Value StatusTable::LivestatusVersionAccessor(const Value& row)
 {
-       return "2.0";
+       return Application::GetVersion();
 }
 
 Value StatusTable::LivestatusActiveConnectionsAccessor(const Value& row)