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

Implement GetEnablePerfdata/GetEnableEventHandlers.

Browse Source
This commit is contained in:
Gunnar Beutner 2013-10-16 10:47:02 +02:00
parent 7211133c00
commit 33cc106a14
5 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/perfdata/graphitewriter.cpp
View File

@ -94,7 +94,7 @@ void GraphiteWriter::ReconnectTimerHandler(void)
void GraphiteWriter::CheckResultHandler(const Service::Ptr& service, const Dictionary::Ptr& cr) void GraphiteWriter::CheckResultHandler(const Service::Ptr& service, const Dictionary::Ptr& cr)
{ {
if (!IcingaApplication::GetInstance()->GetEnablePerfdata()) if (!IcingaApplication::GetInstance()->GetEnablePerfdata() || !service->GetEnablePerfdata())
return; return;
Host::Ptr host = service->GetHost(); Host::Ptr host = service->GetHost();

2
components/perfdata/perfdatawriter.cpp
View File

@ -84,7 +84,7 @@ double PerfdataWriter::GetRotationInterval(void) const
void PerfdataWriter::CheckResultHandler(const Service::Ptr& service, const Dictionary::Ptr& cr) void PerfdataWriter::CheckResultHandler(const Service::Ptr& service, const Dictionary::Ptr& cr)
{ {
if (!IcingaApplication::GetInstance()->GetEnablePerfdata()) if (!IcingaApplication::GetInstance()->GetEnablePerfdata() || !service->GetEnablePerfdata())
return; return;
Host::Ptr host = service->GetHost(); Host::Ptr host = service->GetHost();

7
lib/icinga/service-event.cpp
View File

@ -25,6 +25,11 @@ using namespace icinga;
boost::signals2::signal<void (const Service::Ptr&)> Service::OnEventCommandExecuted; boost::signals2::signal<void (const Service::Ptr&)> Service::OnEventCommandExecuted;
bool Service::GetEnableEventHandlers(void) const
{
return m_EnableEventHandlers;
}
EventCommand::Ptr Service::GetEventCommand(void) const EventCommand::Ptr Service::GetEventCommand(void) const
{ {
return EventCommand::GetByName(m_EventCommand); return EventCommand::GetByName(m_EventCommand);
@ -32,7 +37,7 @@ EventCommand::Ptr Service::GetEventCommand(void) const
void Service::ExecuteEventHandler(void) void Service::ExecuteEventHandler(void)
{ {
if (!IcingaApplication::GetInstance()->GetEnableEventHandlers()) if (!IcingaApplication::GetInstance()->GetEnableEventHandlers() || !GetEnableEventHandlers())
return; return;
EventCommand::Ptr ec = GetEventCommand(); EventCommand::Ptr ec = GetEventCommand();

9
lib/icinga/service.cpp
View File

@ -328,6 +328,11 @@ std::set<Service::Ptr> Service::GetParentServices(void) const
return parents; return parents;
} }
bool Service::GetEnablePerfdata(void) const
{
return m_EnablePerfdata;
}
bool Service::ResolveMacro(const String& macro, const Dictionary::Ptr& cr, String *result) const bool Service::ResolveMacro(const String& macro, const Dictionary::Ptr& cr, String *result) const
{ {
if (macro == "SERVICEDESC") { if (macro == "SERVICEDESC") {
@ -460,6 +465,8 @@ void Service::InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes)
bag->Set("flapping_negative", m_FlappingNegative); bag->Set("flapping_negative", m_FlappingNegative);
bag->Set("flapping_lastchange", m_FlappingLastChange); bag->Set("flapping_lastchange", m_FlappingLastChange);
bag->Set("enable_flapping", m_EnableFlapping); bag->Set("enable_flapping", m_EnableFlapping);
bag->Set("enable_perfdata", m_EnablePerfdata);
bag->Set("enable_event_handlers", m_EnableEventHandlers);
} }
} }
@ -518,5 +525,7 @@ void Service::InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes
m_FlappingNegative = bag->Get("flapping_negative"); m_FlappingNegative = bag->Get("flapping_negative");
m_FlappingLastChange = bag->Get("flapping_lastchange"); m_FlappingLastChange = bag->Get("flapping_lastchange");
m_EnableFlapping = bag->Get("enable_flapping"); m_EnableFlapping = bag->Get("enable_flapping");
m_EnablePerfdata = bag->Get("enable_perfdata");
m_EnableEventHandlers = bag->Get("enable_event_handlers");
} }
} }

5
lib/icinga/service.h
View File

@ -213,6 +213,8 @@ public:
bool GetEnablePassiveChecks(void) const; bool GetEnablePassiveChecks(void) const;
void SetEnablePassiveChecks(bool enabled, const String& authority = String()); void SetEnablePassiveChecks(bool enabled, const String& authority = String());
bool GetEnablePerfdata(void) const;
bool GetForceNextCheck(void) const; bool GetForceNextCheck(void) const;
void SetForceNextCheck(bool forced, const String& authority = String()); void SetForceNextCheck(bool forced, const String& authority = String());
@ -323,6 +325,7 @@ public:
/* Event Handler */ /* Event Handler */
void ExecuteEventHandler(void); void ExecuteEventHandler(void);
shared_ptr<EventCommand> GetEventCommand(void) const; shared_ptr<EventCommand> GetEventCommand(void) const;
bool GetEnableEventHandlers(void) const;
/* Flapping Detection */ /* Flapping Detection */
bool GetEnableFlapping(void) const; bool GetEnableFlapping(void) const;
@ -353,6 +356,7 @@ private:
Value m_AcknowledgementExpiry; Value m_AcknowledgementExpiry;
String m_HostName; String m_HostName;
Value m_Volatile; Value m_Volatile;
Value m_EnablePerfdata;
/* Checks */ /* Checks */
String m_CheckCommand; String m_CheckCommand;
@ -412,6 +416,7 @@ private:
std::set<Notification::Ptr> m_Notifications; std::set<Notification::Ptr> m_Notifications;
/* Event Handler */ /* Event Handler */
Value m_EnableEventHandlers;
String m_EventCommand; String m_EventCommand;
/* Flapping */ /* Flapping */