From: Michael Friedrich <michael.friedrich@netways.de>
Date: Wed, 16 Oct 2013 15:18:21 +0000 (+0200)
Subject: Fix enable_perfdata.
X-Git-Tag: v0.0.3~86
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8686305848009963c23dab75310a9e69b98abc08;p=icinga2

Fix enable_perfdata.
---

diff --git a/components/perfdata/graphitewriter.cpp b/components/perfdata/graphitewriter.cpp
index ab01a2f07..75360447a 100644
--- a/components/perfdata/graphitewriter.cpp
+++ b/components/perfdata/graphitewriter.cpp
@@ -94,7 +94,7 @@ void GraphiteWriter::ReconnectTimerHandler(void)
 
 void GraphiteWriter::CheckResultHandler(const Service::Ptr& service, const Dictionary::Ptr& cr)
 {
-	if (!IcingaApplication::GetInstance()->GetEnablePerfdata() || !service->GetEnablePerfdata())
+	if (!(IcingaApplication::GetInstance()->GetEnablePerfdata() && service->GetEnablePerfdata()))
 		return;
 
 	Host::Ptr host = service->GetHost();
diff --git a/components/perfdata/perfdatawriter.cpp b/components/perfdata/perfdatawriter.cpp
index 6d9282dd1..1dfe35c8c 100644
--- a/components/perfdata/perfdatawriter.cpp
+++ b/components/perfdata/perfdatawriter.cpp
@@ -84,7 +84,7 @@ double PerfdataWriter::GetRotationInterval(void) const
 
 void PerfdataWriter::CheckResultHandler(const Service::Ptr& service, const Dictionary::Ptr& cr)
 {
-	if (!IcingaApplication::GetInstance()->GetEnablePerfdata() || !service->GetEnablePerfdata())
+	if (!(IcingaApplication::GetInstance()->GetEnablePerfdata() && service->GetEnablePerfdata()))
 		return;
 
 	Host::Ptr host = service->GetHost();
diff --git a/etc/icinga2/conf.d/generic-service.conf b/etc/icinga2/conf.d/generic-service.conf
index a734b4148..7e8acb8f2 100644
--- a/etc/icinga2/conf.d/generic-service.conf
+++ b/etc/icinga2/conf.d/generic-service.conf
@@ -6,6 +6,7 @@ template Service "generic-service" {
   max_check_attempts = 3,
   check_interval = 5m,
   retry_interval = 1m,
+  enable_perfdata = 1,
 
   notifications["mail-icingaadmin"] = {
     templates = [ "mail-notification" ],
diff --git a/lib/icinga/icinga-type.conf b/lib/icinga/icinga-type.conf
index f6d525369..fe684a63d 100644
--- a/lib/icinga/icinga-type.conf
+++ b/lib/icinga/icinga-type.conf
@@ -85,6 +85,8 @@ type Service {
 	%attribute number "enable_flapping",
 	%attribute number "flapping_threshold",
 
+	%attribute number "enable_perfdata",
+
 	%attribute number "volatile",
 
 	%attribute array "host_dependencies" {