From 88c8d29ee62ad630d6e1c35f03d2f7a3ca9ea729 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Tue, 21 Jun 2022 15:34:23 +0200 Subject: [PATCH] Remove Icinga DB perfdata from Icinga check as the Icinga DB check already yields it. --- lib/icingadb/icingadb.cpp | 24 ------------------------ lib/icingadb/icingadb.hpp | 1 - 2 files changed, 25 deletions(-) diff --git a/lib/icingadb/icingadb.cpp b/lib/icingadb/icingadb.cpp index 21702f3a8..0d80d006e 100644 --- a/lib/icingadb/icingadb.cpp +++ b/lib/icingadb/icingadb.cpp @@ -29,8 +29,6 @@ std::mutex IcingaDB::m_EnvironmentIdInitMutex; REGISTER_TYPE(IcingaDB); -REGISTER_STATSFUNCTION(IcingaDB, &IcingaDB::StatsFunc); - IcingaDB::IcingaDB() : m_Rcon(nullptr) { @@ -42,28 +40,6 @@ IcingaDB::IcingaDB() m_PrefixConfigCheckSum = "icinga:checksum:"; } -/** - * Feature stats interface - * - * @param status Key value pairs for feature stats - */ -void IcingaDB::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata) -{ - DictionaryData nodes; - - for (auto& icingadb : ConfigType::GetObjectsByType()) { - auto historyBufferItems (icingadb->m_HistoryBulker.Size()); - - nodes.emplace_back(icingadb->GetName(), new Dictionary({ - { "history_buffer_items", historyBufferItems } - })); - - perfdata->Add(new PerfdataValue("icingadb_" + icingadb->GetName() + "_history_buffer_items", historyBufferItems)); - } - - status->Set("icingadb", new Dictionary(std::move(nodes))); -} - void IcingaDB::Validate(int types, const ValidationUtils& utils) { ObjectImpl::Validate(types, utils); diff --git a/lib/icingadb/icingadb.hpp b/lib/icingadb/icingadb.hpp index 9e5525193..e4c1be7e5 100644 --- a/lib/icingadb/icingadb.hpp +++ b/lib/icingadb/icingadb.hpp @@ -37,7 +37,6 @@ public: IcingaDB(); static void ConfigStaticInitialize(); - static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata); void Validate(int types, const ValidationUtils& utils) override; virtual void Start(bool runtimeCreated) override;