tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-27 15:44:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Icinga DB Check: rename keys in heartbeat stream

Browse Source 
In both C++ and Go, the keys are only used as constant strings, so namespacing
them just adds clutter for the `general:*` keys, therefore remove it.
This commit is contained in:
Julian Brost 2022-06-24 14:27:21 +02:00
parent dbc8995fc3
commit 2810350bc0
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/icingadb/icingadbchecktask.cpp
View File

@ -165,19 +165,19 @@ void IcingadbCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckR
IcingaDB::AddKvsToMap(heartbeatMessage->Get(1), heartbeatData); IcingaDB::AddKvsToMap(heartbeatMessage->Get(1), heartbeatData);
String version = heartbeatData.at("general:version"); String version = heartbeatData.at("version");
auto icingadbNow (Convert::ToLong(heartbeatData.at("general:time")) / 1000.0 + (redisNow - heartbeatTime)); auto icingadbNow (Convert::ToLong(heartbeatData.at("time")) / 1000.0 + (redisNow - heartbeatTime));
auto icingadbStartTime (Convert::ToLong(heartbeatData.at("general:start-time")) / 1000.0); auto icingadbStartTime (Convert::ToLong(heartbeatData.at("start-time")) / 1000.0);
String errMsg (heartbeatData.at("general:err")); String errMsg (heartbeatData.at("error"));
auto errSince (Convert::ToLong(heartbeatData.at("general:err-since")) / 1000.0); auto errSince (Convert::ToLong(heartbeatData.at("error-since")) / 1000.0);
String perfdataFromRedis = heartbeatData.at("general:performance-data"); String perfdataFromRedis = heartbeatData.at("performance-data");
auto heartbeatLastReceived (Convert::ToLong(heartbeatData.at("heartbeat:last-received")) / 1000.0); auto heartbeatLastReceived (Convert::ToLong(heartbeatData.at("last-heartbeat-received")) / 1000.0);
bool weResponsible = Convert::ToLong(heartbeatData.at("ha:responsible")); bool weResponsible = Convert::ToLong(heartbeatData.at("ha-responsible"));
auto weResponsibleTs (Convert::ToLong(heartbeatData.at("ha:responsible-ts")) / 1000.0); auto weResponsibleTs (Convert::ToLong(heartbeatData.at("ha-responsible-ts")) / 1000.0);
bool otherResponsible = Convert::ToLong(heartbeatData.at("ha:other-responsible")); bool otherResponsible = Convert::ToLong(heartbeatData.at("ha-other-responsible"));
auto syncOngoingSince (Convert::ToLong(heartbeatData.at("sync:ongoing-since")) / 1000.0); auto syncOngoingSince (Convert::ToLong(heartbeatData.at("sync-ongoing-since")) / 1000.0);
auto syncSuccessWhen (Convert::ToLong(heartbeatData.at("sync:success-finish")) / 1000.0); auto syncSuccessWhen (Convert::ToLong(heartbeatData.at("sync-success-finish")) / 1000.0);
auto syncSuccessTook (Convert::ToLong(heartbeatData.at("sync:success-duration")) / 1000.0); auto syncSuccessTook (Convert::ToLong(heartbeatData.at("sync-success-duration")) / 1000.0);
std::ostringstream i2okmsgs, idbokmsgs, warnmsgs, critmsgs; std::ostringstream i2okmsgs, idbokmsgs, warnmsgs, critmsgs;
Array::Ptr perfdata = new Array(); Array::Ptr perfdata = new Array();