[icinga-checkins] icinga.org: icingaweb2/master: Monitoring/Object: re-add process_perfdata

git at icinga.org git at icinga.org
Sat Nov 1 01:48:40 CET 2014


Module: icingaweb2
Branch: master
Commit: 18bd49e636b7fb715f798b7b2bf0dc791199640c
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=18bd49e636b7fb715f798b7b2bf0dc791199640c

Author: Thomas Gelf <thomas at gelf.net>
Date:   Sat Nov  1 01:47:55 2014 +0100

Monitoring/Object: re-add process_perfdata

We would live better with unique column names on hosts and services

* Got introduced in 6095e440 and removed in c0e34473
* This might be a canditate for a regression test, as only graphers (PNP) are using this columns right now
* It makes IMO absolutely no sense to keep all those long column names in that object classes

---

 modules/monitoring/library/Monitoring/Object/Host.php    |    3 ++-
 modules/monitoring/library/Monitoring/Object/Service.php |    1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index 455d299..483cb2b 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -130,7 +130,8 @@ class Host extends MonitoredObject
             'host_notes_url',
             'host_modified_host_attributes',
             'host_problem',
-            'host_process_performance_data'
+            'host_process_performance_data',
+            'process_perfdata' => 'host_process_performance_data'
         ))
             ->where('host_name', $this->host);
     }
diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 7a0812d..28d0338 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -191,6 +191,7 @@ class Service extends MonitoredObject
             'service_flap_detection_enabled_changed',
             'service_modified_service_attributes',
             'service_process_performance_data',
+            'process_perfdata' => 'service_process_performance_data',
             'service_percent_state_change',
             'service_host_name'
         ))



More information about the icinga-checkins mailing list