tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3946 from Icinga/fix/wrong-dashlet-order-3931 

Fix wrong dashlet order
This commit is contained in:
Johannes Meyer 2019-09-26 14:34:13 +02:00 committed by GitHub
parent b4f1847ec0 d055e43367
commit 5352e72d1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/Icinga/Application/Modules/DashboardContainer.php
View File

@ -43,12 +43,16 @@ class DashboardContainer extends NavigationItemContainer
* *
* @param string $name * @param string $name
* @param string $url * @param string $url
* @param int $priority
* *
* @return $this * @return $this
*/ */
public function add($name, $url) public function add($name, $url, $priority = null)
{ {
$this->dashlets[$name] = $url; $this->dashlets[$name] = [
'url' => $url,
'priority' => $priority
];
return $this; return $this;
} }
} }

7
library/Icinga/Application/Modules/Module.php
View File

@ -350,10 +350,11 @@ class Module
foreach ($panes as $pane) { foreach ($panes as $pane) {
/** @var DashboardContainer $pane */ /** @var DashboardContainer $pane */
$dashlets = []; $dashlets = [];
foreach ($pane->getDashlets() as $dashletName => $dashletUrl) { foreach ($pane->getDashlets() as $dashletName => $dashletConfig) {
$dashlets[$dashletName] = [ $dashlets[$dashletName] = [
'label' => $this->translate($dashletName), 'label' => $this->translate($dashletName),
'url' => $dashletUrl 'url' => $dashletConfig['url'],
'priority' => $dashletConfig['priority']
]; ];
} }

39
modules/monitoring/configuration.php
View File

@ -295,15 +295,18 @@ $section->add(N_('Monitoring Health'), array(
$dashboard = $this->dashboard(N_('Current Incidents'), array('priority' => 50)); $dashboard = $this->dashboard(N_('Current Incidents'), array('priority' => 50));
$dashboard->add( $dashboard->add(
N_('Service Problems'), N_('Service Problems'),
'monitoring/list/services?service_problem=1&limit=10&sort=service_severity' 'monitoring/list/services?service_problem=1&limit=10&sort=service_severity',
100
); );
$dashboard->add( $dashboard->add(
N_('Recently Recovered Services'), N_('Recently Recovered Services'),
'monitoring/list/services?service_state=0&limit=10&sort=service_last_state_change&dir=desc' 'monitoring/list/services?service_state=0&limit=10&sort=service_last_state_change&dir=desc',
110
); );
$dashboard->add( $dashboard->add(
N_('Host Problems'), N_('Host Problems'),
'monitoring/list/hosts?host_problem=1&sort=host_severity' 'monitoring/list/hosts?host_problem=1&sort=host_severity',
120
); );
/* /*
@ -329,19 +332,23 @@ $dashboard->add(
$dashboard = $this->dashboard(N_('Overdue'), array('priority' => 70)); $dashboard = $this->dashboard(N_('Overdue'), array('priority' => 70));
$dashboard->add( $dashboard->add(
N_('Late Host Check Results'), N_('Late Host Check Results'),
'monitoring/list/hosts?host_next_update<now' 'monitoring/list/hosts?host_next_update<now',
100
); );
$dashboard->add( $dashboard->add(
N_('Late Service Check Results'), N_('Late Service Check Results'),
'monitoring/list/services?service_next_update<now' 'monitoring/list/services?service_next_update<now',
110
); );
$dashboard->add( $dashboard->add(
N_('Acknowledgements Active For At Least Three Days'), N_('Acknowledgements Active For At Least Three Days'),
'monitoring/list/comments?comment_type=Ack&comment_timestamp<-3 days&sort=comment_timestamp&dir=asc' 'monitoring/list/comments?comment_type=Ack&comment_timestamp<-3 days&sort=comment_timestamp&dir=asc',
120
); );
$dashboard->add( $dashboard->add(
N_('Downtimes Active For More Than Three Days'), N_('Downtimes Active For More Than Three Days'),
'monitoring/list/downtimes?downtime_is_in_effect=1&downtime_scheduled_start<-3%20days&sort=downtime_start&dir=asc' 'monitoring/list/downtimes?downtime_is_in_effect=1&downtime_scheduled_start<-3%20days&sort=downtime_start&dir=asc',
130
); );
/* /*
@ -350,27 +357,33 @@ $dashboard->add(
$dashboard = $this->dashboard(N_('Muted'), array('priority' => 80)); $dashboard = $this->dashboard(N_('Muted'), array('priority' => 80));
$dashboard->add( $dashboard->add(
N_('Disabled Service Notifications'), N_('Disabled Service Notifications'),
'monitoring/list/services?service_notifications_enabled=0&limit=10' 'monitoring/list/services?service_notifications_enabled=0&limit=10',
100
); );
$dashboard->add( $dashboard->add(
N_('Disabled Host Notifications'), N_('Disabled Host Notifications'),
'monitoring/list/hosts?host_notifications_enabled=0&limit=10' 'monitoring/list/hosts?host_notifications_enabled=0&limit=10',
110
); );
$dashboard->add( $dashboard->add(
N_('Disabled Service Checks'), N_('Disabled Service Checks'),
'monitoring/list/services?service_active_checks_enabled=0&limit=10' 'monitoring/list/services?service_active_checks_enabled=0&limit=10',
120
); );
$dashboard->add( $dashboard->add(
N_('Disabled Host Checks'), N_('Disabled Host Checks'),
'monitoring/list/hosts?host_active_checks_enabled=0&limit=10' 'monitoring/list/hosts?host_active_checks_enabled=0&limit=10',
130
); );
$dashboard->add( $dashboard->add(
N_('Acknowledged Problem Services'), N_('Acknowledged Problem Services'),
'monitoring/list/services?service_acknowledgement_type=2&service_problem=1&sort=service_state&limit=10' 'monitoring/list/services?service_acknowledgement_type=2&service_problem=1&sort=service_state&limit=10',
140
); );
$dashboard->add( $dashboard->add(
N_('Acknowledged Problem Hosts'), N_('Acknowledged Problem Hosts'),
'monitoring/list/hosts?host_acknowledgement_type=2&host_problem=1&sort=host_severity&limit=10' 'monitoring/list/hosts?host_acknowledgement_type=2&host_problem=1&sort=host_severity&limit=10',
150
); );
/* /*