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

Icinga DB Check: read performance data string from Redis

Browse Source 
Use the already existing format to pass performance data to Icinga 2 rather
than some new JSON structure. Has the additional benefit of doing more things
in Go than in C++.
This commit is contained in:
Julian Brost 2022-06-24 12:27:07 +02:00 committed by Julian Brost
parent e4a36bc217
commit 44cbd04088
1 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/icingadb/icingadbchecktask.cpp
View File

@ -4,11 +4,11 @@
#include "icinga/host.hpp" #include "icinga/host.hpp"
#include "icinga/checkcommand.hpp" #include "icinga/checkcommand.hpp"
#include "icinga/macroprocessor.hpp" #include "icinga/macroprocessor.hpp"
#include "icinga/pluginutility.hpp"
#include "remote/apilistener.hpp" #include "remote/apilistener.hpp"
#include "remote/endpoint.hpp" #include "remote/endpoint.hpp"
#include "remote/zone.hpp" #include "remote/zone.hpp"
#include "base/function.hpp" #include "base/function.hpp"
#include "base/json.hpp"
#include "base/utility.hpp" #include "base/utility.hpp"
#include "base/perfdatavalue.hpp" #include "base/perfdatavalue.hpp"
#include "base/configtype.hpp" #include "base/configtype.hpp"
@ -170,7 +170,7 @@ void IcingadbCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckR
auto icingadbStartTime (Convert::ToLong(heartbeatData.at("general:start-time")) / 1000.0); auto icingadbStartTime (Convert::ToLong(heartbeatData.at("general:start-time")) / 1000.0);
String errMsg (heartbeatData.at("general:err")); String errMsg (heartbeatData.at("general:err"));
auto errSince (Convert::ToLong(heartbeatData.at("general:err-since")) / 1000.0); auto errSince (Convert::ToLong(heartbeatData.at("general:err-since")) / 1000.0);
Dictionary::Ptr goMetricsByCumulativity (JsonDecode(heartbeatData.at("go:metrics"))); String perfdataFromRedis = heartbeatData.at("general:performance-data");
auto heartbeatLastReceived (Convert::ToLong(heartbeatData.at("heartbeat:last-received")) / 1000.0); auto heartbeatLastReceived (Convert::ToLong(heartbeatData.at("heartbeat:last-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);
@ -361,33 +361,11 @@ void IcingadbCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckR
} }
{ {
static boost::regex wellNamedUnits (":(bytes|seconds)$"); Array::Ptr values = PluginUtility::SplitPerfdata(perfdataFromRedis);
ObjectLock lock (goMetricsByCumulativity); ObjectLock lock (values);
for (auto& kv : goMetricsByCumulativity) { for (auto& v : values) {
bool cumulative = kv.first == "cumulative"; perfdata->Add(PerfdataValue::Parse(v));
Dictionary::Ptr goMetricsPerCumulativity = kv.second;
ObjectLock lock (goMetricsPerCumulativity);
for (auto& kv : goMetricsPerCumulativity) {
std::string unit;
boost::smatch what;
if (boost::regex_search(kv.first.GetData(), what, wellNamedUnits)) {
unit = what[1];
}
bool counter = cumulative && unit.empty();
auto label ("go" + kv.first);
for (auto& c : label) {
if (!('a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' || '0' <= c && c <= '9')) {
c = '_';
}
}
perfdata->Add(new PerfdataValue(std::move(label), kv.second, counter, std::move(unit)));
}
} }
} }