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

Fix enable_perfdata.

Browse Source
This commit is contained in:
Michael Friedrich 2013-10-16 17:18:21 +02:00
parent 36c4cb0da8
commit 8686305848
4 changed files with 5 additions and 2 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() || !service->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() || !service->GetEnablePerfdata()) if (!(IcingaApplication::GetInstance()->GetEnablePerfdata() && service->GetEnablePerfdata()))
return; return;
Host::Ptr host = service->GetHost(); Host::Ptr host = service->GetHost();

1
etc/icinga2/conf.d/generic-service.conf
View File

@ -6,6 +6,7 @@ template Service "generic-service" {
max_check_attempts = 3, max_check_attempts = 3,
check_interval = 5m, check_interval = 5m,
retry_interval = 1m, retry_interval = 1m,
enable_perfdata = 1,
notifications["mail-icingaadmin"] = { notifications["mail-icingaadmin"] = {
templates = [ "mail-notification" ], templates = [ "mail-notification" ],

2
lib/icinga/icinga-type.conf
View File

@ -85,6 +85,8 @@ type Service {
%attribute number "enable_flapping", %attribute number "enable_flapping",
%attribute number "flapping_threshold", %attribute number "flapping_threshold",
%attribute number "enable_perfdata",
%attribute number "volatile", %attribute number "volatile",
%attribute array "host_dependencies" { %attribute array "host_dependencies" {