tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GraphiteWriter: Add 'connected' to stats; fix reconnect exceptions

This commit is contained in:
Michael Friedrich 2017-06-06 19:50:37 +02:00
parent 26d69cfd36
commit f42b820007
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/perfdata/graphitewriter.cpp
View File

@ -67,6 +67,7 @@ void GraphiteWriter::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&
Dictionary::Ptr stats = new Dictionary(); Dictionary::Ptr stats = new Dictionary();
stats->Set("work_queue_items", workQueueItems); stats->Set("work_queue_items", workQueueItems);
stats->Set("work_queue_item_rate", workQueueItemRate); stats->Set("work_queue_item_rate", workQueueItemRate);
stats->Set("connected", graphitewriter->GetConnected());
nodes->Set(graphitewriter->GetName(), stats); nodes->Set(graphitewriter->GetName(), stats);
@ -94,7 +95,8 @@ void GraphiteWriter::Start(bool runtimeCreated)
m_ReconnectTimer->Start(); m_ReconnectTimer->Start();
m_ReconnectTimer->Reschedule(0); m_ReconnectTimer->Reschedule(0);
Service::OnNewCheckResult.connect(boost::bind(&GraphiteWriter::CheckResultHandler, this, _1, _2)); /* Register event handlers. */
Checkable::OnNewCheckResult.connect(boost::bind(&GraphiteWriter::CheckResultHandler, this, _1, _2));
} }
void GraphiteWriter::Stop(bool runtimeRemoved) void GraphiteWriter::Stop(bool runtimeRemoved)
@ -179,10 +181,10 @@ void GraphiteWriter::Disconnect(void)
void GraphiteWriter::CheckResultHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr) void GraphiteWriter::CheckResultHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr)
{ {
m_WorkQueue.Enqueue(boost::bind(&GraphiteWriter::InternalCheckResultHandler, this, checkable, cr)); m_WorkQueue.Enqueue(boost::bind(&GraphiteWriter::CheckResultHandlerInternal, this, checkable, cr));
} }
void GraphiteWriter::InternalCheckResultHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr) void GraphiteWriter::CheckResultHandlerInternal(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr)
{ {
AssertOnWorkQueue(); AssertOnWorkQueue();
@ -330,7 +332,7 @@ void GraphiteWriter::SendMetric(const String& prefix, const String& name, double
ObjectLock olock(this); ObjectLock olock(this);
if (!m_Stream) if (!GetConnected())
return; return;
try { try {
@ -339,7 +341,7 @@ void GraphiteWriter::SendMetric(const String& prefix, const String& name, double
Log(LogCritical, "GraphiteWriter") Log(LogCritical, "GraphiteWriter")
<< "Cannot write to TCP socket on host '" << GetHost() << "' port '" << GetPort() << "'."; << "Cannot write to TCP socket on host '" << GetHost() << "' port '" << GetPort() << "'.";
m_Stream.reset(); throw ex;
} }
} }

2
lib/perfdata/graphitewriter.hpp
View File

@ -61,7 +61,7 @@ private:
Timer::Ptr m_ReconnectTimer; Timer::Ptr m_ReconnectTimer;
void CheckResultHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr); void CheckResultHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr);
void InternalCheckResultHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr); void CheckResultHandlerInternal(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr);
void SendMetric(const String& prefix, const String& name, double value, double ts); void SendMetric(const String& prefix, const String& name, double value, double ts);
void SendPerfdata(const String& prefix, const CheckResult::Ptr& cr, double ts); void SendPerfdata(const String& prefix, const CheckResult::Ptr& cr, double ts);
static String EscapeMetric(const String& str, bool legacyMode = false); static String EscapeMetric(const String& str, bool legacyMode = false);