tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-29 08:44:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit d90531858923caeafcfff8b580abb7d5216dda0d.
This commit is contained in:
Thomas Gelf 2023-02-22 11:34:57 +01:00
parent d905318589
commit 4e41e7f2d8
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/82-Changelog.md
View File

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

16
library/Director/Monitoring.php
View File

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