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

Merge pull request #10359 from Icinga/do-not-publish-useless-stats

Browse Source 
IcingaDB: Don't publish useless data to Redis
This commit is contained in:
Yonas Habteab 2025-03-07 12:51:10 +01:00 committed by GitHub
commit 206d7cda1b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/icingadb/icingadb-stats.cpp
View File

@ -12,42 +12,15 @@ using namespace icinga;
Dictionary::Ptr IcingaDB::GetStats() Dictionary::Ptr IcingaDB::GetStats()
{ {
Dictionary::Ptr stats = new Dictionary();
//TODO: Figure out if more stats can be useful here.
Namespace::Ptr statsFunctions = ScriptGlobal::Get("StatsFunctions", &Empty);
if (!statsFunctions)
Dictionary::Ptr();
ObjectLock olock(statsFunctions);
for (auto& kv : statsFunctions)
{
Function::Ptr func = kv.second.Val;
if (!func)
BOOST_THROW_EXCEPTION(std::invalid_argument("Invalid status function name."));
Dictionary::Ptr status = new Dictionary(); Dictionary::Ptr status = new Dictionary();
Array::Ptr perfdata = new Array(); IcingaApplication::StatsFunc(status, nullptr);
func->Invoke({ status, perfdata });
stats->Set(kv.first, new Dictionary({
{ "status", status },
{ "perfdata", Serialize(perfdata, FAState) }
}));
}
typedef Dictionary::Ptr DP;
DP app = DP(DP(DP(stats->Get("IcingaApplication"))->Get("status"))->Get("icingaapplication"))->Get("app");
Dictionary::Ptr app(Dictionary::Ptr(status->Get("icingaapplication"))->Get("app"));
app->Set("program_start", TimestampToMilliseconds(Application::GetStartTime())); app->Set("program_start", TimestampToMilliseconds(Application::GetStartTime()));
auto localEndpoint (Endpoint::GetLocalEndpoint()); if (auto localEndpoint(Endpoint::GetLocalEndpoint()); localEndpoint) {
if (localEndpoint) {
app->Set("endpoint_id", GetObjectIdentifier(localEndpoint)); app->Set("endpoint_id", GetObjectIdentifier(localEndpoint));
} }
return stats; return new Dictionary{{ "IcingaApplication", new Dictionary{{"status", status}}}};
} }

2
lib/icingadb/icingadb.hpp
View File

@ -143,7 +143,7 @@ private:
Dictionary::Ptr SerializeState(const Checkable::Ptr& checkable); Dictionary::Ptr SerializeState(const Checkable::Ptr& checkable);
/* Stats */ /* Stats */
Dictionary::Ptr GetStats(); static Dictionary::Ptr GetStats();
/* utilities */ /* utilities */
static String FormatCheckSumBinary(const String& str); static String FormatCheckSumBinary(const String& str);