From 1ba315f4145ceaa7c0377619d49bae4c203e1b5e Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Thu, 1 Oct 2015 17:25:45 +0200 Subject: [PATCH] Revert "monitoring: Disable slow dashboards" This reverts commit 6d2a18f4e0d39c540715c058b7ddf4ef727d86f4. --- modules/monitoring/configuration.php | 84 ++++++++++++++-------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php index 455f6a66a..9760acdf9 100644 --- a/modules/monitoring/configuration.php +++ b/modules/monitoring/configuration.php @@ -248,18 +248,18 @@ $dashboard->add( /* * Overview */ -//$dashboard = $this->dashboard(N_('Overview'), array('priority' => 60)); -//$dashboard->add( -// N_('Service Grid'), -// 'monitoring/list/servicegrid?limit=15,18' -//); -//$dashboard->add( -// N_('Service Groups'), -// 'monitoring/list/servicegroups' -//); -//$dashboard->add( -// N_('Host Groups'), -// 'monitoring/list/hostgroups' +$dashboard = $this->dashboard(N_('Overview'), array('priority' => 60)); +$dashboard->add( + N_('Service Grid'), + 'monitoring/list/servicegrid?limit=15,18' +); +$dashboard->add( + N_('Service Groups'), + 'monitoring/list/servicegroups' +); +$dashboard->add( + N_('Host Groups'), + 'monitoring/list/hostgroups' ); /* @@ -315,40 +315,40 @@ $dashboard->add( /* * Activity Stream */ -//$dashboard = $this->dashboard(N_('Activity Stream'), array('priority' => 90)); -//$dashboard->add( -// N_('Recent Events'), -// 'monitoring/list/eventhistory?timestamp>=-3%20days&sort=timestamp&dir=desc&limit=8' -//); -//$dashboard->add( -// N_('Recent Hard State Changes'), -// 'monitoring/list/eventhistory?timestamp>=-3%20days&type=hard_state&sort=timestamp&dir=desc&limit=8' -//); -//$dashboard->add( -// N_('Recent Notifications'), -// 'monitoring/list/eventhistory?timestamp>=-3%20days&type=notify&sort=timestamp&dir=desc&limit=8' -//); -//$dashboard->add( -// N_('Downtimes Recently Started'), -// 'monitoring/list/eventhistory?timestamp>=-3%20days&type=dt_start&sort=timestamp&dir=desc&limit=8' -//); -//$dashboard->add( -// N_('Downtimes Recently Ended'), -// 'monitoring/list/eventhistory?timestamp>=-3%20days&type=dt_end&sort=timestamp&dir=desc&limit=8' -//); +$dashboard = $this->dashboard(N_('Activity Stream'), array('priority' => 90)); +$dashboard->add( + N_('Recent Events'), + 'monitoring/list/eventhistory?timestamp>=-3%20days&sort=timestamp&dir=desc&limit=8' +); +$dashboard->add( + N_('Recent Hard State Changes'), + 'monitoring/list/eventhistory?timestamp>=-3%20days&type=hard_state&sort=timestamp&dir=desc&limit=8' +); +$dashboard->add( + N_('Recent Notifications'), + 'monitoring/list/eventhistory?timestamp>=-3%20days&type=notify&sort=timestamp&dir=desc&limit=8' +); +$dashboard->add( + N_('Downtimes Recently Started'), + 'monitoring/list/eventhistory?timestamp>=-3%20days&type=dt_start&sort=timestamp&dir=desc&limit=8' +); +$dashboard->add( + N_('Downtimes Recently Ended'), + 'monitoring/list/eventhistory?timestamp>=-3%20days&type=dt_end&sort=timestamp&dir=desc&limit=8' +); /* * Stats */ -//$dashboard = $this->dashboard(N_('Stats'), array('priority' => 99)); -//$dashboard->add( -// N_('Check Stats'), -// 'monitoring/health/stats' -//); -//$dashboard->add( -// N_('Process Information'), -// 'monitoring/health/info' -//); +$dashboard = $this->dashboard(N_('Stats'), array('priority' => 99)); +$dashboard->add( + N_('Check Stats'), + 'monitoring/health/stats' +); +$dashboard->add( + N_('Process Information'), + 'monitoring/health/info' +); /* * CSS