Fix enable_perfdata.

diff --git a/components/perfdata/graphitewriter.cpp b/components/perfdata/graphitewriter.cpp
index ab01a2f075bf6b55bcf303b95947953ccb55c060..75360447a211391b1925f1fa27988f481314c113 100644 (file)
--- 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 6d9282dd1bab31e744d5075572d740a0a44322c7..1dfe35c8cd132c3974ccad6a5db9b15d9fb11959 100644 (file)
--- 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 a734b414830f0b19f3478f02fe699b433023d17f..7e8acb8f2cfb54c3dc11c6c62714192ffd659f52 100644 (file)
--- 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 f6d525369a85eb8d48feb87b6992b58bad495383..fe684a63d080c69cd595216f1cc9eb65c37c3d1d 100644 (file)
--- 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" {