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

Remove name and return value for stats functions

Browse Source 
fixes #6171
This commit is contained in:
Michael Friedrich 2015-02-07 22:36:17 +01:00
parent 9ce061a8c4
commit ea2ac81003
38 changed files with 50 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/base/filelogger.cpp
View File

@ -29,7 +29,7 @@ REGISTER_TYPE(FileLogger);
REGISTER_STATSFUNCTION(FileLoggerStats, &FileLogger::StatsFunc);
Value FileLogger::StatsFunc(Dictionary::Ptr& status, Array::Ptr&)
void FileLogger::StatsFunc(Dictionary::Ptr& status, Array::Ptr&)
{
Dictionary::Ptr nodes = new Dictionary();
@ -38,8 +38,6 @@ Value FileLogger::StatsFunc(Dictionary::Ptr& status, Array::Ptr&)
}
status->Set("filelogger", nodes);
return 0;
}
/**

2
lib/base/filelogger.hpp
View File

@ -37,7 +37,7 @@ public:
DECLARE_OBJECT(FileLogger);
DECLARE_OBJECTNAME(FileLogger);
static Value StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata);
static void StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata);
virtual void Start(void);

4
lib/base/statsfunction.cpp
View File

@ -27,9 +27,9 @@ StatsFunction::StatsFunction(const Callback& function)
: m_Callback(function)
{ }
Value StatsFunction::Invoke(Dictionary::Ptr& status, Array::Ptr& perfdata)
void StatsFunction::Invoke(Dictionary::Ptr& status, Array::Ptr& perfdata)
{
return m_Callback(status, perfdata);
m_Callback(status, perfdata);
}
StatsFunctionRegistry *StatsFunctionRegistry::GetInstance(void)

4
lib/base/statsfunction.hpp
View File

@ -40,11 +40,11 @@ class I2_BASE_API StatsFunction : public Object
public:
DECLARE_PTR_TYPEDEFS(StatsFunction);
typedef boost::function<Value (Dictionary::Ptr& status, Array::Ptr& perfdata)> Callback;
typedef boost::function<void (Dictionary::Ptr& status, Array::Ptr& perfdata)> Callback;
StatsFunction(const Callback& function);
Value Invoke(Dictionary::Ptr& status, Array::Ptr& perfdata);
void Invoke(Dictionary::Ptr& status, Array::Ptr& perfdata);
private:
Callback m_Callback;

4
lib/base/sysloglogger.cpp
View File

@ -28,7 +28,7 @@ REGISTER_TYPE(SyslogLogger);
REGISTER_STATSFUNCTION(SyslogLoggerStats, &SyslogLogger::StatsFunc);
Value SyslogLogger::StatsFunc(Dictionary::Ptr& status, Array::Ptr&)
void SyslogLogger::StatsFunc(Dictionary::Ptr& status, Array::Ptr&)
{
Dictionary::Ptr nodes = new Dictionary();
@ -37,8 +37,6 @@ Value SyslogLogger::StatsFunc(Dictionary::Ptr& status, Array::Ptr&)
}
status->Set("sysloglogger", nodes);
return 0;
}
/**

2
lib/base/sysloglogger.hpp
View File

@ -38,7 +38,7 @@ public:
DECLARE_OBJECT(SyslogLogger);
DECLARE_OBJECTNAME(SyslogLogger);
static Value StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata);
static void StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata);
protected:
virtual void ProcessLogEntry(const LogEntry& entry);

4
lib/checker/checkercomponent.cpp
View File

@ -37,7 +37,7 @@ REGISTER_TYPE(CheckerComponent);
REGISTER_STATSFUNCTION(CheckerComponentStats, &CheckerComponent::StatsFunc);
Value CheckerComponent::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata)
void CheckerComponent::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata)
{
Dictionary::Ptr nodes = new Dictionary();
@ -57,8 +57,6 @@ Value CheckerComponent::StatsFunc(const Dictionary::Ptr& status, const Array::Pt
}
status->Set("checkercomponent", nodes);
return 0;
}
void CheckerComponent::OnConfigLoaded(void)

2
lib/checker/checkercomponent.hpp
View File

@ -72,7 +72,7 @@ public:
virtual void Start(void);
virtual void Stop(void);
static Value StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
unsigned long GetIdleCheckables(void);
unsigned long GetPendingCheckables(void);

4
lib/compat/checkresultreader.cpp
View File

@ -38,7 +38,7 @@ REGISTER_TYPE(CheckResultReader);
REGISTER_STATSFUNCTION(CheckResultReaderStats, &CheckResultReader::StatsFunc);
Value CheckResultReader::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
void CheckResultReader::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
{
Dictionary::Ptr nodes = new Dictionary();
@ -47,8 +47,6 @@ Value CheckResultReader::StatsFunc(const Dictionary::Ptr& status, const Array::P
}
status->Set("checkresultreader", nodes);
return 0;
}
/**

2
lib/compat/checkresultreader.hpp
View File

@ -38,7 +38,7 @@ public:
DECLARE_OBJECT(CheckResultReader);
DECLARE_OBJECTNAME(CheckResultReader);
static Value StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
protected:
virtual void Start(void);

4
lib/compat/compatlogger.cpp
View File

@ -44,7 +44,7 @@ REGISTER_SCRIPTFUNCTION(ValidateRotationMethod, &CompatLogger::ValidateRotationM
REGISTER_STATSFUNCTION(CompatLoggerStats, &CompatLogger::StatsFunc);
Value CompatLogger::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
void CompatLogger::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
{
Dictionary::Ptr nodes = new Dictionary();
@ -53,8 +53,6 @@ Value CompatLogger::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
}
status->Set("compatlogger", nodes);
return 0;
}
/**

2
lib/compat/compatlogger.hpp
View File

@ -39,7 +39,7 @@ public:
DECLARE_OBJECT(CompatLogger);
DECLARE_OBJECTNAME(CompatLogger);
static Value StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
static void ValidateRotationMethod(const String& location, const CompatLogger::Ptr& object);

4
lib/compat/externalcommandlistener.cpp
View File

@ -31,7 +31,7 @@ REGISTER_TYPE(ExternalCommandListener);
REGISTER_STATSFUNCTION(ExternalCommandListenerStats, &ExternalCommandListener::StatsFunc);
Value ExternalCommandListener::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
void ExternalCommandListener::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
{
Dictionary::Ptr nodes = new Dictionary();
@ -40,8 +40,6 @@ Value ExternalCommandListener::StatsFunc(const Dictionary::Ptr& status, const Ar
}
status->Set("externalcommandlistener", nodes);
return 0;
}
/**

2
lib/compat/externalcommandlistener.hpp
View File

@ -39,7 +39,7 @@ public:
DECLARE_OBJECT(ExternalCommandListener);
DECLARE_OBJECTNAME(ExternalCommandListener);
static Value StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
protected:
virtual void Start(void);

4
lib/compat/statusdatawriter.cpp
View File

@ -49,7 +49,7 @@ REGISTER_TYPE(StatusDataWriter);
REGISTER_STATSFUNCTION(StatusDataWriterStats, &StatusDataWriter::StatsFunc);
Value StatusDataWriter::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
void StatusDataWriter::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
{
Dictionary::Ptr nodes = new Dictionary();
@ -58,8 +58,6 @@ Value StatusDataWriter::StatsFunc(const Dictionary::Ptr& status, const Array::Pt
}
status->Set("statusdatawriter", nodes);
return 0;
}
/**

2
lib/compat/statusdatawriter.hpp
View File

@ -44,7 +44,7 @@ public:
DECLARE_OBJECT(StatusDataWriter);
DECLARE_OBJECTNAME(StatusDataWriter);
static Value StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
protected:
virtual void Start(void);

4
lib/db_ido_mysql/idomysqlconnection.cpp
View File

@ -43,7 +43,7 @@ IdoMysqlConnection::IdoMysqlConnection(void)
: m_QueryQueue(500000), m_Connected(false)
{ }
Value IdoMysqlConnection::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata)
void IdoMysqlConnection::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata)
{
Dictionary::Ptr nodes = new Dictionary();
@ -61,8 +61,6 @@ Value IdoMysqlConnection::StatsFunc(const Dictionary::Ptr& status, const Array::
}
status->Set("idomysqlconnection", nodes);
return 0;
}
void IdoMysqlConnection::Resume(void)

2
lib/db_ido_mysql/idomysqlconnection.hpp
View File

@ -44,7 +44,7 @@ public:
IdoMysqlConnection(void);
static Value StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
protected:
virtual void Resume(void);

4
lib/db_ido_pgsql/idopgsqlconnection.cpp
View File

@ -45,7 +45,7 @@ IdoPgsqlConnection::IdoPgsqlConnection(void)
: m_QueryQueue(500000), m_Connection(NULL)
{ }
Value IdoPgsqlConnection::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata)
void IdoPgsqlConnection::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata)
{
Dictionary::Ptr nodes = new Dictionary();
@ -63,8 +63,6 @@ Value IdoPgsqlConnection::StatsFunc(const Dictionary::Ptr& status, const Array::
}
status->Set("idopgsqlconnection", nodes);
return 0;
}
void IdoPgsqlConnection::Resume(void)

4
lib/db_ido_pgsql/idopgsqlconnection.hpp
View File

@ -43,8 +43,8 @@ public:
DECLARE_OBJECTNAME(IdoPgsqlConnection);
IdoPgsqlConnection(void);
static Value StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
protected:
virtual void Resume(void);

3
lib/icinga/cib.cpp
View File

@ -244,14 +244,13 @@ std::pair<Dictionary::Ptr, Array::Ptr> CIB::GetFeatureStats(void)
Array::Ptr perfdata = new Array();
String name;
Value ret;
BOOST_FOREACH(tie(name, boost::tuples::ignore), StatsFunctionRegistry::GetInstance()->GetItems()) {
StatsFunction::Ptr func = StatsFunctionRegistry::GetInstance()->GetItem(name);
if (!func)
BOOST_THROW_EXCEPTION(std::invalid_argument("Function '" + name + "' does not exist."));
ret = func->Invoke(status, perfdata);
func->Invoke(status, perfdata);
}
return std::make_pair(status, perfdata);

4
lib/icinga/icingaapplication.cpp
View File

@ -63,7 +63,7 @@ void IcingaApplication::StaticInitialize(void)
REGISTER_STATSFUNCTION(IcingaApplicationStats, &IcingaApplication::StatsFunc);
Value IcingaApplication::StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata)
void IcingaApplication::StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata)
{
Dictionary::Ptr nodes = new Dictionary();
@ -84,8 +84,6 @@ Value IcingaApplication::StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata
}
status->Set("icingaapplication", nodes);
return 0;
}
/**

2
lib/icinga/icingaapplication.hpp
View File

@ -42,7 +42,7 @@ public:
int Main(void);
static Value StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata);
static void StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata);
static IcingaApplication::Ptr GetInstance(void);

4
lib/icinga/icingastatuswriter.cpp
View File

@ -35,7 +35,7 @@ REGISTER_TYPE(IcingaStatusWriter);
REGISTER_STATSFUNCTION(IcingaStatusWriterStats, &IcingaStatusWriter::StatsFunc);
Value IcingaStatusWriter::StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata)
void IcingaStatusWriter::StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata)
{
Dictionary::Ptr nodes = new Dictionary();
@ -44,8 +44,6 @@ Value IcingaStatusWriter::StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdat
}
status->Set("icingastatuswriter", nodes);
return 0;
}
/**

2
lib/icinga/icingastatuswriter.hpp
View File

@ -35,7 +35,7 @@ public:
DECLARE_OBJECT(IcingaStatusWriter);
DECLARE_OBJECTNAME(IcingaStatusWriter);
static Value StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata);
static void StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata);
static Dictionary::Ptr GetStatusData(void);
protected:

4
lib/livestatus/livestatuslistener.cpp
View File

@ -43,7 +43,7 @@ static boost::mutex l_ComponentMutex;
REGISTER_STATSFUNCTION(LivestatusListenerStats, &LivestatusListener::StatsFunc);
Value LivestatusListener::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata)
void LivestatusListener::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata)
{
Dictionary::Ptr nodes = new Dictionary();
@ -57,8 +57,6 @@ Value LivestatusListener::StatsFunc(const Dictionary::Ptr& status, const Array::
}
status->Set("livestatuslistener", nodes);
return 0;
}
/**

2
lib/livestatus/livestatuslistener.hpp
View File

@ -39,7 +39,7 @@ public:
DECLARE_OBJECT(LivestatusListener);
DECLARE_OBJECTNAME(LivestatusListener);
static Value StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
static int GetClientsConnected(void);
static int GetConnections(void);

4
lib/notification/notificationcomponent.cpp
View File

@ -34,7 +34,7 @@ REGISTER_TYPE(NotificationComponent);
REGISTER_STATSFUNCTION(NotificationComponentStats, &NotificationComponent::StatsFunc);
Value NotificationComponent::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
void NotificationComponent::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
{
Dictionary::Ptr nodes = new Dictionary();
@ -43,8 +43,6 @@ Value NotificationComponent::StatsFunc(const Dictionary::Ptr& status, const Arra
}
status->Set("notificationcomponent", nodes);
return 0;
}
/**

2
lib/notification/notificationcomponent.hpp
View File

@ -37,7 +37,7 @@ public:
DECLARE_OBJECT(NotificationComponent);
DECLARE_OBJECTNAME(NotificationComponent);
static Value StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
virtual void Start(void);

14
lib/perfdata/gelfwriter.hpp
View File

@ -46,16 +46,16 @@ protected:
private:
Stream::Ptr m_Stream;
Timer::Ptr m_ReconnectTimer;
void CheckResultHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr);
void NotificationToUserHandler(const Notification::Ptr& notification, const Checkable::Ptr& checkable,
const User::Ptr& user, NotificationType notification_type, CheckResult::Ptr const& cr,
const String& author, const String& comment_text, const String& command_name);
String ComposeGelfMessage(const Dictionary::Ptr& fields, const String& source);
void StateChangeHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, StateType type);
void SendLogMessage(const String& gelf);
void NotificationToUserHandler(const Notification::Ptr& notification, const Checkable::Ptr& checkable,
const User::Ptr& user, NotificationType notification_type, CheckResult::Ptr const& cr,
const String& author, const String& comment_text, const String& command_name);
String ComposeGelfMessage(const Dictionary::Ptr& fields, const String& source);
void StateChangeHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, StateType type);
void SendLogMessage(const String& gelf);
void ReconnectTimerHandler(void);
};

4
lib/perfdata/graphitewriter.cpp
View File

@ -46,7 +46,7 @@ REGISTER_TYPE(GraphiteWriter);
REGISTER_STATSFUNCTION(GraphiteWriterStats, &GraphiteWriter::StatsFunc);
Value GraphiteWriter::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
void GraphiteWriter::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
{
Dictionary::Ptr nodes = new Dictionary();
@ -55,8 +55,6 @@ Value GraphiteWriter::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&
}
status->Set("graphitewriter", nodes);
return 0;
}
void GraphiteWriter::Start(void)

4
lib/perfdata/graphitewriter.hpp
View File

@ -41,14 +41,14 @@ public:
DECLARE_OBJECT(GraphiteWriter);
DECLARE_OBJECTNAME(GraphiteWriter);
static Value StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
protected:
virtual void Start(void);
private:
Stream::Ptr m_Stream;
Timer::Ptr m_ReconnectTimer;
void CheckResultHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr);

4
lib/perfdata/opentsdbwriter.cpp
View File

@ -46,7 +46,7 @@ REGISTER_TYPE(OpenTsdbWriter);
REGISTER_STATSFUNCTION(OpenTsdbWriterStats, &OpenTsdbWriter::StatsFunc);
Value OpenTsdbWriter::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
void OpenTsdbWriter::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
{
Dictionary::Ptr nodes = new Dictionary();
@ -55,8 +55,6 @@ Value OpenTsdbWriter::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&
}
status->Set("opentsdbwriter", nodes);
return 0;
}
void OpenTsdbWriter::Start(void)

4
lib/perfdata/opentsdbwriter.hpp
View File

@ -41,14 +41,14 @@ public:
DECLARE_OBJECT(OpenTsdbWriter);
DECLARE_OBJECTNAME(OpenTsdbWriter);
static Value StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
protected:
virtual void Start(void);
private:
Stream::Ptr m_Stream;
Timer::Ptr m_ReconnectTimer;
void CheckResultHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr);

4
lib/perfdata/perfdatawriter.cpp
View File

@ -36,7 +36,7 @@ REGISTER_TYPE(PerfdataWriter);
REGISTER_STATSFUNCTION(PerfdataWriterStats, &PerfdataWriter::StatsFunc);
Value PerfdataWriter::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
void PerfdataWriter::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
{
Dictionary::Ptr nodes = new Dictionary();
@ -45,8 +45,6 @@ Value PerfdataWriter::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&
}
status->Set("perfdatawriter", nodes);
return 0;
}
void PerfdataWriter::Start(void)

2
lib/perfdata/perfdatawriter.hpp
View File

@ -40,7 +40,7 @@ public:
DECLARE_OBJECT(PerfdataWriter);
DECLARE_OBJECTNAME(PerfdataWriter);
static Value StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
protected:
virtual void Start(void);

6
lib/remote/apilistener.cpp
View File

@ -747,7 +747,7 @@ void ApiListener::ReplayLog(const ApiClient::Ptr& client)
}
}
Value ApiListener::StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata)
void ApiListener::StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata)
{
Dictionary::Ptr nodes = new Dictionary();
std::pair<Dictionary::Ptr, Dictionary::Ptr> stats;
@ -755,7 +755,7 @@ Value ApiListener::StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata)
ApiListener::Ptr listener = ApiListener::GetInstance();
if (!listener)
return 0;
return;
stats = listener->GetStatus();
@ -764,8 +764,6 @@ Value ApiListener::StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata)
perfdata->Add("'api_" + kv.first + "'=" + Convert::ToString(kv.second));
status->Set("api", stats.first);
return 0;
}
std::pair<Dictionary::Ptr, Dictionary::Ptr> ApiListener::GetStatus(void)

2
lib/remote/apilistener.hpp
View File

@ -59,7 +59,7 @@ public:
void SyncSendMessage(const Endpoint::Ptr& endpoint, const Dictionary::Ptr& message);
void RelayMessage(const MessageOrigin& origin, const DynamicObject::Ptr& secobj, const Dictionary::Ptr& message, bool log);
static Value StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata);
static void StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata);
std::pair<Dictionary::Ptr, Dictionary::Ptr> GetStatus(void);
void AddAnonymousClient(const ApiClient::Ptr& aclient);