Merge branch 'master' into feature/monitoring-restrictions-9009
This commit is contained in:
Johannes Meyer
commit
2bffe56bd5
|
|
@ -86,12 +86,8 @@ class ConfigController extends Controller
|
|||
if ($this->firstAllowedAction === null) {
|
||||
throw new SecurityException($this->translate('No permission for application configuration'));
|
||||
}
|
||||
$action = $this->getTabs()->get($this->firstAllowedAction);
|
||||
if (substr($action->getUrl()->getPath(), 0, 7) === 'config/') {
|
||||
$this->forward($this->firstAllowedAction);
|
||||
} else {
|
||||
$this->redirectNow($action->getUrl());
|
||||
}
|
||||
|
||||
$this->redirectNow($this->getTabs()->get($this->firstAllowedAction)->getUrl());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<?php
|
||||
/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
|
||||
|
||||
use \Exception;
|
||||
use Icinga\Exception\ProgrammingError;
|
||||
use Icinga\Forms\ConfirmRemovalForm;
|
||||
use Icinga\Forms\Dashboard\DashletForm;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<?php
|
||||
/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
|
||||
|
||||
use \Exception;
|
||||
use Icinga\Application\Logger;
|
||||
use Icinga\Data\DataArray\ArrayDatasource;
|
||||
use Icinga\Data\Reducible;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<?php
|
||||
/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
|
||||
|
||||
use \Exception;
|
||||
use Icinga\Application\Logger;
|
||||
use Icinga\Exception\ConfigurationError;
|
||||
use Icinga\Exception\NotFoundError;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<?php
|
||||
/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
|
||||
|
||||
use \Exception;
|
||||
use Icinga\Application\Config;
|
||||
use Icinga\Exception\NotFoundError;
|
||||
use Icinga\Forms\ConfirmRemovalForm;
|
||||
|
|
|
|||
|
|
@ -5,29 +5,20 @@ use Icinga\Web\Notification;
|
|||
use Icinga\Authentication\Manager as Auth;
|
||||
|
||||
|
||||
if (Auth::getInstance()->isAuthenticated()): ?>
|
||||
<div id="header">
|
||||
<ul id="notifications"><?php
|
||||
|
||||
$moduleName = $this->layout()->moduleName;
|
||||
if ($moduleName) {
|
||||
$moduleClass = ' icinga-module module-' . $moduleName;
|
||||
} else {
|
||||
$moduleClass = '';
|
||||
}
|
||||
|
||||
$refresh = '';
|
||||
if ($this->layout()->autorefreshInterval) {
|
||||
$refresh = ' data-icinga-refresh="' . $this->layout()->autorefreshInterval . '"';
|
||||
}
|
||||
|
||||
$notifications = Notification::getInstance();
|
||||
if ($notifications->hasMessages()) {
|
||||
foreach ($notifications->getMessages() as $m) {
|
||||
echo '<li class="' . $m->type . '">' . $this->escape($m->message) . '</li>';
|
||||
if (Auth::getInstance()->isAuthenticated()):
|
||||
$moduleName = $this->layout()->moduleName;
|
||||
if ($moduleName) {
|
||||
$moduleClass = ' icinga-module module-' . $moduleName;
|
||||
} else {
|
||||
$moduleClass = '';
|
||||
}
|
||||
}
|
||||
?></ul>
|
||||
|
||||
$refresh = '';
|
||||
if ($this->layout()->autorefreshInterval) {
|
||||
$refresh = ' data-icinga-refresh="' . $this->layout()->autorefreshInterval . '"';
|
||||
}
|
||||
?>
|
||||
<div id="header">
|
||||
<div id="logo" data-base-target="_main">
|
||||
<?= $this->qlink(
|
||||
'',
|
||||
|
|
@ -56,6 +47,16 @@ if ($notifications->hasMessages()) {
|
|||
<div id="col3" class="container">
|
||||
</div>
|
||||
</div><!-- END of main -->
|
||||
<div id="footer">
|
||||
<ul id="notifications"><?php
|
||||
$notifications = Notification::getInstance();
|
||||
if ($notifications->hasMessages()) {
|
||||
foreach ($notifications->getMessages() as $m) {
|
||||
echo '<li class="' . $m->type . '">' . $this->escape($m->message) . '</li>';
|
||||
}
|
||||
}
|
||||
?></ul>
|
||||
</div>
|
||||
<?php else: ?>
|
||||
<?= $this->render('inline.phtml') ?>
|
||||
<?php endif ?>
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ if (array_key_exists('_dev', $_GET)) {
|
|||
$ie8jsfile = 'js/icinga.ie8.js';
|
||||
$lang = Translator::splitLocaleCode()->language;
|
||||
$isIframe = $this->layout()->isIframe;
|
||||
$showFullscreen = $this->layout()->showFullscreen;
|
||||
$iframeClass = $isIframe ? ' iframe' : '';
|
||||
|
||||
?><!DOCTYPE html>
|
||||
|
|
@ -49,7 +50,7 @@ $iframeClass = $isIframe ? ' iframe' : '';
|
|||
</head>
|
||||
<body id="body">
|
||||
<pre id="responsive-debug"></pre>
|
||||
<div id="layout" class="default-layout">
|
||||
<div id="layout" class="default-layout<?php if ($showFullscreen): ?> fullscreen-layout<?php endif ?>">
|
||||
<?= $this->render('body.phtml') ?>
|
||||
</div>
|
||||
<!--[if IE 8]>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
<?php
|
||||
/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
|
||||
|
||||
use \Zend_View_Helper_FormElement;
|
||||
|
||||
/**
|
||||
* Render number input controls
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
<div class="controls">
|
||||
<?php if (! $this->compact): ?>
|
||||
<?= $this->tabs ?>
|
||||
<?php endif ?>
|
||||
</div>
|
||||
<?php if ($this->dashboard): ?>
|
||||
<div class="dashboard content">
|
||||
|
|
@ -15,4 +17,4 @@
|
|||
) ?>
|
||||
</p>
|
||||
</div>
|
||||
<?php endif ?>
|
||||
<?php endif ?>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+
|
||||
|
||||
%define revision 3.beta3
|
||||
%define revision 4.rc1
|
||||
|
||||
Name: icingaweb2
|
||||
Version: 2.0.0
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ class Query extends SimpleQuery
|
|||
{
|
||||
$result = $this->fetchAll();
|
||||
$sorted = array();
|
||||
$quotedDn = preg_quote($this->connection->getDN(), '/');
|
||||
$quotedDn = preg_quote($this->ds->getDN(), '/');
|
||||
foreach ($result as $key => & $item) {
|
||||
$new_key = LdapUtils::implodeDN(
|
||||
array_reverse(
|
||||
|
|
@ -170,7 +170,7 @@ class Query extends SimpleQuery
|
|||
unset($groups);
|
||||
ksort($sorted);
|
||||
|
||||
$tree = Root::forConnection($this->connection);
|
||||
$tree = Root::forConnection($this->ds);
|
||||
$root_dn = $tree->getDN();
|
||||
foreach ($sorted as $sort_key => & $key) {
|
||||
if ($key === $root_dn) {
|
||||
|
|
|
|||
|
|
@ -86,9 +86,13 @@ class ActionController extends Zend_Controller_Action
|
|||
$this->handlerBrowserWindows();
|
||||
$this->view->translationDomain = 'icinga';
|
||||
$this->_helper->layout()->isIframe = $request->getUrl()->shift('isIframe');
|
||||
$this->_helper->layout()->showFullscreen = $request->getUrl()->shift('showFullscreen');
|
||||
$this->_helper->layout()->moduleName = false;
|
||||
|
||||
$this->view->compact = $request->getParam('view') === 'compact';
|
||||
if ($request->getUrl()->shift('showCompact')) {
|
||||
$this->view->compact = true;
|
||||
}
|
||||
if ($this->rerenderLayout = $request->getUrl()->shift('renderLayout')) {
|
||||
$this->xhrLayout = 'body';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ class StyleSheet
|
|||
'css/icinga/layout-structure.less',
|
||||
'css/icinga/menu.less',
|
||||
'css/icinga/header-elements.less',
|
||||
'css/icinga/footer-elements.less',
|
||||
'css/icinga/main-content.less',
|
||||
'css/icinga/tabs.less',
|
||||
'css/icinga/forms.less',
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<?php
|
||||
/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
|
||||
|
||||
use \Zend_Controller_Router_Route;
|
||||
use Icinga\Application\Icinga;
|
||||
|
||||
if (Icinga::app()->isCli()) {
|
||||
|
|
|
|||
|
|
@ -20,6 +20,12 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
|
|||
public function perfdata($perfdataStr, $compact = false, $limit = 0, $color = Perfdata::PERFDATA_OK)
|
||||
{
|
||||
$pieChartData = PerfdataSet::fromString($perfdataStr)->asArray();
|
||||
uasort(
|
||||
$pieChartData,
|
||||
function($a, $b) {
|
||||
return $a->worseThan($b) ? -1 : ($b->worseThan($a) ? 1 : 0);
|
||||
}
|
||||
);
|
||||
$results = array();
|
||||
$keys = array('', 'label', 'value', 'min', 'max', 'warn', 'crit');
|
||||
$columns = array();
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
'compact' => true,
|
||||
'showHost' => false,
|
||||
'services' => $services,
|
||||
'addColumns' => array()
|
||||
'addColumns' => array(),
|
||||
'baseTarget' => '_self'
|
||||
)
|
||||
); ?>
|
||||
|
|
@ -25,7 +25,7 @@ if (count($services) === 0) {
|
|||
return;
|
||||
}
|
||||
?>
|
||||
<table data-base-target="_next"
|
||||
<table data-base-target="<?= isset($baseTarget) ? $baseTarget : '_next'; ?>"
|
||||
class="action multiselect <?php if ($this->compact): ?> compact<?php endif ?>" style="table-layout: auto;"
|
||||
data-icinga-multiselect-url="<?= $this->href("monitoring/services/show") ?>"
|
||||
data-icinga-multiselect-data="service,host">
|
||||
|
|
@ -60,7 +60,7 @@ if (count($services) === 0) {
|
|||
</td>
|
||||
|
||||
<td>
|
||||
<div class="sparkline-box"><?= $this->perfdata($service->service_perfdata, true, 8) ?> </div>
|
||||
<div class="sparkline-box"><?= $this->perfdata($service->service_perfdata, true, 5) ?> </div>
|
||||
<?= $this->iconImage()->service($service) ?>
|
||||
<?= implode(' ', $this->serviceFlags($service)); ?>
|
||||
<?= $this->qlink(
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ use Icinga\Util\Format;
|
|||
use InvalidArgumentException;
|
||||
use Icinga\Exception\ProgrammingError;
|
||||
use Icinga\Web\Widget\Chart\InlinePie;
|
||||
use Icinga\Module\Monitoring\Object\Service;
|
||||
use Zend_Controller_Front;
|
||||
|
||||
class Perfdata
|
||||
|
|
@ -453,4 +454,60 @@ class Perfdata
|
|||
);
|
||||
return $parts;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the state indicated by this perfdata
|
||||
*
|
||||
* @see Service
|
||||
*
|
||||
* @return int
|
||||
*/
|
||||
public function getState()
|
||||
{
|
||||
if ($this->value === null) {
|
||||
return Service::STATE_UNKNOWN;
|
||||
}
|
||||
|
||||
if (! ($this->criticalThreshold === null
|
||||
|| $this->value < $this->criticalThreshold)) {
|
||||
return Service::STATE_CRITICAL;
|
||||
}
|
||||
|
||||
if (! ($this->warningThreshold === null
|
||||
|| $this->value < $this->warningThreshold)) {
|
||||
return Service::STATE_WARNING;
|
||||
}
|
||||
|
||||
return Service::STATE_OK;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return whether the state indicated by this perfdata is worse than
|
||||
* the state indicated by the other perfdata
|
||||
* CRITICAL > UNKNOWN > WARNING > OK
|
||||
*
|
||||
* @param Perfdata $rhs the other perfdata
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function worseThan(Perfdata $rhs)
|
||||
{
|
||||
if (($state = $this->getState()) === ($rhsState = $rhs->getState())) {
|
||||
return $this->getPercentage() > $rhs->getPercentage();
|
||||
}
|
||||
|
||||
if ($state === Service::STATE_CRITICAL) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if ($state === Service::STATE_UNKNOWN) {
|
||||
return $rhsState !== Service::STATE_CRITICAL;
|
||||
}
|
||||
|
||||
if ($state === Service::STATE_WARNING) {
|
||||
return $rhsState === Service::STATE_OK;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,50 @@
|
|||
/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
|
||||
|
||||
div#footer {
|
||||
position: fixed;
|
||||
left: 0px;
|
||||
right: 0px;
|
||||
bottom: 0px;
|
||||
z-index: 9999;
|
||||
}
|
||||
|
||||
/** Notifications **/
|
||||
|
||||
#notifications {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
#notifications > li {
|
||||
list-style-type: none;
|
||||
display: block;
|
||||
border-top: 1px solid #999;
|
||||
color: white;
|
||||
line-height: 2.5em;
|
||||
padding-left: 3em;
|
||||
background-repeat: no-repeat;
|
||||
background-position: 1em center;
|
||||
}
|
||||
|
||||
#notifications > li:hover {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
#notifications > li.info {
|
||||
background-color: @colorFormNotificationInfo;
|
||||
}
|
||||
|
||||
#notifications > li.warning {
|
||||
background-color: @colorWarningHandled;
|
||||
}
|
||||
#notifications > li.error {
|
||||
background-color: @colorCritical;
|
||||
background-image: url(../img/icons/error_white.png);
|
||||
}
|
||||
|
||||
#notifications > li.success {
|
||||
background-color: #fe6;
|
||||
background-image: url(../img/icons/success.png);
|
||||
color: #333;
|
||||
}
|
||||
/** END of Notifications **/
|
||||
|
|
@ -81,13 +81,29 @@ html {
|
|||
|
||||
/** Fullscreen layout **/
|
||||
#layout.fullscreen-layout {
|
||||
#header, #sidebar, .controls > .tabs {
|
||||
#header, #sidebar {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.container .controls {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.controls > ul.tabs {
|
||||
margin-top: 0;
|
||||
height: 1.5em;
|
||||
background-color: @colorPetrol;
|
||||
font-size: 0.75em;
|
||||
padding: 0.2em 0 0;
|
||||
}
|
||||
|
||||
.controls > ul.tabs > li > a {
|
||||
line-height: 1.5em;
|
||||
}
|
||||
|
||||
#main {
|
||||
left: 0;
|
||||
top: 0;
|
||||
top: 0 !important;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -23,43 +23,6 @@ img.icon {
|
|||
border: none;
|
||||
}
|
||||
|
||||
/** Notifications **/
|
||||
|
||||
#notifications {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
#notifications > li {
|
||||
list-style-type: none;
|
||||
display: block;
|
||||
border-bottom: 1px solid #999;
|
||||
color: white;
|
||||
line-height: 2.5em;
|
||||
padding-left: 3em;
|
||||
background-repeat: no-repeat;
|
||||
background-position: 1em center;
|
||||
}
|
||||
|
||||
#notifications > li.info {
|
||||
background-color: @colorFormNotificationInfo;
|
||||
}
|
||||
|
||||
#notifications > li.warning {
|
||||
background-color: @colorWarningHandled;
|
||||
}
|
||||
#notifications > li.error {
|
||||
background-color: @colorCritical;
|
||||
background-image: url(../img/icons/error_white.png);
|
||||
}
|
||||
|
||||
#notifications > li.success {
|
||||
background-color: #fe6;
|
||||
background-image: url(../img/icons/success.png);
|
||||
color: #333;
|
||||
}
|
||||
/** END of Notifications **/
|
||||
|
||||
/* TODO: Remove once there is no more module container */
|
||||
.container > div > pre {
|
||||
margin: 1em;
|
||||
|
|
|
|||
|
|
@ -105,6 +105,9 @@
|
|||
// We catch scroll events in our containers
|
||||
$('.container').on('scroll', { self: this }, this.icinga.events.onContainerScroll);
|
||||
|
||||
// Remove notifications on click
|
||||
$(document).on('click', '#notifications li', function () { $(this).remove(); });
|
||||
|
||||
// We want to catch each link click
|
||||
$(document).on('click', 'a', { self: this }, this.linkClicked);
|
||||
$(document).on('click', 'tr[href]', { self: this }, this.linkClicked);
|
||||
|
|
|
|||
|
|
@ -706,7 +706,7 @@
|
|||
},
|
||||
|
||||
initializeControls: function (parent) {
|
||||
if ($(parent).closest('.dashboard').length) {
|
||||
if ($(parent).closest('.dashboard').length || $('#layout').hasClass('fullscreen-layout')) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -736,14 +736,19 @@
|
|||
|
||||
fixControls: function ($parent) {
|
||||
var self = this;
|
||||
if ($('#layout').hasClass('fullscreen-layout')) {
|
||||
return;
|
||||
}
|
||||
|
||||
if ('undefined' === typeof $parent) {
|
||||
|
||||
$('#header').css({height: 'auto'});
|
||||
$('#main').css({top: $('#header').css('height')});
|
||||
$('#sidebar').css({top: $('#header').height() + 'px'});
|
||||
$('#header').css({height: $('#header').height() + 'px'});
|
||||
$('#inner-layout').css({top: $('#header').css('height')});
|
||||
if (! $('#layout').hasClass('fullscreen-layout')) {
|
||||
$('#header').css({height: 'auto'});
|
||||
$('#main').css({top: $('#header').css('height')});
|
||||
$('#sidebar').css({top: $('#header').height() + 'px'});
|
||||
$('#header').css({height: $('#header').height() + 'px'});
|
||||
$('#inner-layout').css({top: $('#header').css('height')});
|
||||
}
|
||||
$('.container').each(function (idx, container) {
|
||||
self.fixControls($(container));
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in New Issue