tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-06-07 07:20:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

NotificationQuery: Use query column service_description' instead of service'

Browse Source 
refs #8613
This commit is contained in:
Johannes Meyer 2015-04-13 15:25:10 +02:00
parent 96954ea9a1
commit 15399d77ce
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/monitoring/application/controllers/AlertsummaryController.php
View File

@ -61,7 +61,7 @@ class Monitoring_AlertsummaryController extends Controller
array( array(
'host_name', 'host_name',
'host_display_name', 'host_display_name',
'service', 'service_description',
'service_display_name', 'service_display_name',
'notification_output', 'notification_output',
'notification_contact', 'notification_contact',
@ -479,7 +479,7 @@ class Monitoring_AlertsummaryController extends Controller
array( array(
'host_name', 'host_name',
'host_display_name', 'host_display_name',
'service', 'service_description',
'service_display_name', 'service_display_name',
'notification_output', 'notification_output',
'notification_contact', 'notification_contact',

2
modules/monitoring/application/controllers/ListController.php
View File

@ -326,7 +326,7 @@ class Monitoring_ListController extends Controller
$this->setAutorefreshInterval(15); $this->setAutorefreshInterval(15);
$query = $this->backend->select()->from('notification', array( $query = $this->backend->select()->from('notification', array(
'host_name', 'host_name',
'service', 'service_description',
'notification_output', 'notification_output',
'notification_contact', 'notification_contact',
'notification_start_time', 'notification_start_time',

2
modules/monitoring/application/controllers/ShowController.php
View File

@ -157,7 +157,7 @@ class Monitoring_ShowController extends Controller
$notifications = $this->backend->select()->from('notification', array( $notifications = $this->backend->select()->from('notification', array(
'host_name', 'host_name',
'service', 'service_description',
'notification_output', 'notification_output',
'notification_contact', 'notification_contact',
'notification_start_time', 'notification_start_time',

4
modules/monitoring/application/views/scripts/list/notifications.phtml
View File

@ -24,7 +24,7 @@ use Icinga\Module\Monitoring\Object\Service;
<table data-base-target="_next" class="action"> <table data-base-target="_next" class="action">
<tbody> <tbody>
<?php foreach ($notifications as $notification): <?php foreach ($notifications as $notification):
if (isset($notification->service)) { if (isset($notification->service_description)) {
$isService = true; $isService = true;
$stateName = Service::getStateText($notification->notification_state); $stateName = Service::getStateText($notification->notification_state);
} else { } else {
@ -44,7 +44,7 @@ use Icinga\Module\Monitoring\Object\Service;
<?php if ($isService): ?> <?php if ($isService): ?>
<?= $this->icon('service', $this->translate('Service')); ?> <?= $this->icon('service', $this->translate('Service')); ?>
<?= $this->link()->service( <?= $this->link()->service(
$notification->service, $notification->service_description,
$notification->service_display_name, $notification->service_display_name,
$notification->host_name, $notification->host_name,
$notification->host_display_name $notification->host_display_name

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
View File

@ -14,7 +14,7 @@ class NotificationQuery extends IdoQuery
), ),
'objects' => array( 'objects' => array(
'host_name' => 'o.name1', 'host_name' => 'o.name1',
'service' => 'o.name2' 'service_description' => 'o.name2'
), ),
'contact' => array( 'contact' => array(
'notification_contact' => 'c_o.name1', 'notification_contact' => 'c_o.name1',

2
modules/monitoring/library/Monitoring/DataView/Notification.php
View File

@ -14,7 +14,7 @@ class Notification extends DataView
{ {
return array( return array(
'host_name', 'host_name',
'service', 'service_description',
'notification_state', 'notification_state',
'notification_start_time', 'notification_start_time',
'notification_contact', 'notification_contact',