Revert "Monitoring: no monitoring module, no Host/Service"

This reverts commit d905318589.

doc/82-Changelog.md

@@ -15,7 +15,6 @@ This version hasn't been released yet
 * FEATURE: Deployment Log now breaks lines (#2677)
 * FEATURE: Sort Template trees by name (#2691)
 * FIX: do not fail for (some) Service Dependencies (#2669, #1142)
-* FIX: error when editing virtual services w/o monitoring module (#2533, #2563)
 
 ### Icinga Configuration
 * FIX: render Set Services to individual zones where required (#1589, #2356)

library/Director/Monitoring.php

@@ -31,10 +31,6 @@ class Monitoring
 
     public function hasHost($hostname)
     {
-        if ($this->backend === null) {
-            return false;
-        }
-
         return $this->backend->select()->from('hostStatus', [
             'hostname' => 'host_name',
         ])->where('host_name', $hostname)->fetchOne() === $hostname;
@@ -42,10 +38,6 @@ class Monitoring
 
     public function hasService($hostname, $service)
     {
-        if ($this->backend === null) {
-            return false;
-        }
-
         return (array) $this->prepareServiceKeyColumnQuery($hostname, $service)->fetchRow() === [
             'hostname' => $hostname,
             'service'  => $service,
@@ -92,10 +84,6 @@ class Monitoring
 
     public function hasHostWithExtraFilter($hostname, Filter $filter)
     {
-        if ($this->backend === null) {
-            return false;
-        }
-
         return $this->backend->select()->from('hostStatus', [
             'hostname' => 'host_name',
             ])->where('host_name', $hostname)->applyFilter($filter)->fetchOne() === $hostname;
@@ -103,10 +91,6 @@ class Monitoring
 
     public function hasServiceWithExtraFilter($hostname, $service, Filter $filter)
     {
-        if ($this->backend === null) {
-            return false;
-        }
-
         return (array) $this
             ->prepareServiceKeyColumnQuery($hostname, $service)
             ->applyFilter($filter)