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

Merge pull request #3712 from ConstantinMatheis/master

Browse Source 
Add check source to history details view.
This commit is contained in:
Johannes Meyer 2019-04-18 14:37:26 +02:00 committed by GitHub
commit 2e2a269549
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -315,6 +315,7 @@ class EventController extends Controller
'last_hard_state' => 'statechangeevent_last_hard_state', 'last_hard_state' => 'statechangeevent_last_hard_state',
'output' => 'statechangeevent_output', 'output' => 'statechangeevent_output',
'long_output' => 'statechangeevent_long_output', 'long_output' => 'statechangeevent_long_output',
'check_source' => 'statechangeevent_check_source',
'host_name', 'host_name',
'service_description' 'service_description'
)) ))
@ -503,6 +504,7 @@ class EventController extends Controller
$details = array( $details = array(
array($this->translate('State time'), DateFormatter::formatTime($event->state_time)), array($this->translate('State time'), DateFormatter::formatTime($event->state_time)),
array($this->translate('State'), $this->state($isService, $event->state)), array($this->translate('State'), $this->state($isService, $event->state)),
array($this->translate('Check source'), $event->check_source),
array($this->translate('Check attempt'), $this->view->escape(sprintf( array($this->translate('Check attempt'), $this->view->escape(sprintf(
$this->translate('%d of %d'), $this->translate('%d of %d'),
(int) $event->current_check_attempt, (int) $event->current_check_attempt,

3
modules/monitoring/library/Monitoring/Backend/Ido/Query/StatechangeeventQuery.php
View File

@ -20,7 +20,8 @@ class StatechangeeventQuery extends IdoQuery
'statechangeevent_last_state' => 'sh.last_state', 'statechangeevent_last_state' => 'sh.last_state',
'statechangeevent_last_hard_state' => 'sh.last_hard_state', 'statechangeevent_last_hard_state' => 'sh.last_hard_state',
'statechangeevent_output' => 'sh.output', 'statechangeevent_output' => 'sh.output',
'statechangeevent_long_output' => 'sh.long_output' 'statechangeevent_long_output' => 'sh.long_output',
'statechangeevent_check_source' => 'sh.check_source'
), ),
'object' => array( 'object' => array(
'host_name' => 'o.name1', 'host_name' => 'o.name1',

1
modules/monitoring/library/Monitoring/DataView/Statechangeevent.php
View File

@ -19,6 +19,7 @@ class Statechangeevent extends DataView
'statechangeevent_last_hard_state', 'statechangeevent_last_hard_state',
'statechangeevent_output', 'statechangeevent_output',
'statechangeevent_long_output', 'statechangeevent_long_output',
'statechangeevent_check_source',
'host_name', 'host_name',
'service_description' 'service_description'
); );