Fetch object comments by host_name and service_description

refs #8614
Icinga · Mar 12, 2015 · 7156bd7 · 7156bd7
1 parent 29b5e4f
commit 7156bd7
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -253,10 +253,13 @@ public function fetchComments()
             'type'      => 'comment_type',
         ))
             ->where('comment_type', array('comment', 'ack'))
-            ->where('comment_objecttype', $this->type)
-            ->where('comment_host', $this->host_name);
+            ->where('comment_objecttype', $this->type);
         if ($this->type === self::TYPE_SERVICE) {
-            $comments->where('comment_service', $this->service_description);
+            $comments
+                ->where('service_host_name', $this->host_name)
+                ->where('service_description', $this->service_description);
+        } else {
+            $comments->where('host_name', $this->host_name);
         }
         $this->comments = $comments->getQuery()->fetchAll();
         return $this;
@@ -387,8 +390,9 @@ public function fetchContacts()
                 'contact_pager',
         ));
         if ($this->type === self::TYPE_SERVICE) {
-            $contacts->where('service_host_name', $this->host_name);
-            $contacts->where('service_description', $this->service_description);
+            $contacts
+                ->where('service_host_name', $this->host_name)
+                ->where('service_description', $this->service_description);
         } else {
             $contacts->where('host_name', $this->host_name);
         }
@@ -430,8 +434,9 @@ public function fetchContactgroups()
                 'contactgroup_alias'
         ));
         if ($this->type === self::TYPE_SERVICE) {
-            $contactsGroups->where('service_host_name', $this->host_name);
-            $contactsGroups->where('service_description', $this->service_description);
+            $contactsGroups
+                ->where('service_host_name', $this->host_name)
+                ->where('service_description', $this->service_description);
         } else {
             $contactsGroups->where('host_name', $this->host_name);
         }