Provide collected cluster stats via /v1/status

Author: Al2Klimov

lib/remote/statsreporter.cpp

@@ -22,6 +22,7 @@
 #include "base/function.hpp"
 #include "base/objectlock.hpp"
 #include "base/scriptglobal.hpp"
+#include "base/statsfunction.hpp"
 #include "base/value.hpp"
 #include "remote/apifunction.hpp"
 #include "remote/endpoint.hpp"
@@ -36,6 +37,8 @@ using namespace icinga;
 
 REGISTER_APIFUNCTION(ClusterStats, event, &StatsReporter::ClusterStatsAPIHandler);
 
+REGISTER_STATSFUNCTION(StatsReporter, &StatsReporter::StatsFunc);
+
 StatsReporter StatsReporter::m_Instance;
 
 StatsReporter::StatsReporter()
@@ -62,20 +65,7 @@ void StatsReporter::ReportStats()
 		for (auto& endpoint : zone->GetEndpoints()) {
 			for (auto& client : endpoint->GetClients()) {
 				if (!message) {
-					Dictionary::Ptr allStats = new Dictionary;
-
-					auto stats (GenerateStats());
-
-					if (stats)
-						allStats->Set(Endpoint::GetLocalEndpoint()->GetName(), stats);
-
-					{
-						boost::mutex::scoped_lock lock (m_Mutex);
-
-						for (auto& endpointStats : m_SecondaryStats) {
-							allStats->Set(endpointStats.first, endpointStats.second);
-						}
-					}
+					auto allStats (GenerateStats());
 
 					if (!allStats->GetLength())
 						return;
@@ -97,8 +87,11 @@ void StatsReporter::ReportStats()
 	}
 }
 
+static const String l_StatsReporterStatsFunctionName = "StatsReporter";
+
 Dictionary::Ptr StatsReporter::GenerateStats()
 {
+	auto allStats (new Dictionary);
 	Dictionary::Ptr statsFunctions = ScriptGlobal::Get("StatsFunctions", &Empty);
 
 	if (statsFunctions) {
@@ -109,14 +102,24 @@ Dictionary::Ptr StatsReporter::GenerateStats()
 			ObjectLock olock(statsFunctions);
 
 			for (const Dictionary::Pair &kv : statsFunctions) {
-				((Function::Ptr) kv.second)->Invoke({status, perfdata});
+				if (kv.first != l_StatsReporterStatsFunctionName) {
+					((Function::Ptr) kv.second)->Invoke({status, perfdata});
+				}
 			}
 		}
 
-		return status;
+		allStats->Set(Endpoint::GetLocalEndpoint()->GetName(), status);
+	}
+
+	{
+		boost::mutex::scoped_lock lock (m_Mutex);
+
+		for (auto& endpointStats : m_SecondaryStats) {
+			allStats->Set(endpointStats.first, endpointStats.second);
+		}
 	}
 
-	return nullptr;
+	return allStats;
 }
 
 Value StatsReporter::ClusterStatsAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params)
@@ -160,3 +163,8 @@ void StatsReporter::ClusterStatsHandler(const String& endpoint, const Dictionary
 	boost::mutex::scoped_lock lock (m_Mutex);
 	m_SecondaryStats[endpoint] = stats;
 }
+
+void StatsReporter::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata)
+{
+	status->Set("cluster", m_Instance.GenerateStats());
+}

lib/remote/statsreporter.hpp

@@ -20,6 +20,7 @@
 #ifndef STATSREPORTER_H
 #define STATSREPORTER_H
 
+#include "base/array.hpp"
 #include "base/dictionary.hpp"
 #include "base/string.hpp"
 #include "base/timer.hpp"
@@ -40,6 +41,7 @@ class StatsReporter
 {
 public:
 	static Value ClusterStatsAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params);
+	static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
 
 private:
 	StatsReporter();