[pkg-nagios-changes] [Git][nagios-team/pkg-icingaweb2][upstream] New upstream version 2.8.1
Bas Couwenberg
gitlab at salsa.debian.org
Tue Jun 30 05:10:21 BST 2020
Bas Couwenberg pushed to branch upstream at Debian Nagios Maintainer Group / pkg-icingaweb2
Commits:
2afee4ad by Bas Couwenberg at 2020-06-30T05:50:21+02:00
New upstream version 2.8.1
- - - - -
29 changed files:
- CHANGELOG.md
- VERSION
- application/VERSION
- application/fonts/fontello-ifont/config.json
- application/fonts/fontello-ifont/css/ifont-codes.css
- application/fonts/fontello-ifont/css/ifont-embedded.css
- application/fonts/fontello-ifont/css/ifont-ie7-codes.css
- application/fonts/fontello-ifont/css/ifont-ie7.css
- application/fonts/fontello-ifont/css/ifont.css
- application/fonts/fontello-ifont/demo.html
- application/fonts/fontello-ifont/font/ifont.eot
- application/fonts/fontello-ifont/font/ifont.svg
- application/fonts/fontello-ifont/font/ifont.ttf
- application/fonts/fontello-ifont/font/ifont.woff
- application/fonts/fontello-ifont/font/ifont.woff2
- library/Icinga/Application/Version.php
- library/Icinga/Authentication/User/DbUserBackend.php
- library/Icinga/Data/Db/DbQuery.php
- modules/doc/module.info
- modules/migrate/module.info
- modules/monitoring/application/controllers/TacticalController.php
- modules/monitoring/application/views/scripts/tactical/index.phtml
- modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
- modules/monitoring/module.info
- modules/setup/module.info
- modules/test/module.info
- modules/translation/module.info
- public/css/icinga/base.less
- public/css/icinga/responsive.less
Changes:
=====================================
CHANGELOG.md
=====================================
@@ -4,17 +4,38 @@ Please make sure to always read our [Upgrading](doc/80-Upgrading.md) documentati
## What's New
+### What's New in Version 2.8.1
+
+You can find all issues related to this release on the respective [milestone](https://github.com/Icinga/icingaweb2/milestone/61?closed=1).
+
+#### Case Sensitivity Problems
+
+A fix in v2.8.0 led to users being not able to login if they got their username's case wrong. A hostgroup name's case
+has also been incorrectly taken into account despite using a `CI` labelled column in the servicegrid and other lists.
+
+* Login usernames now case sensitive in 2.8 [#4184](https://github.com/Icinga/icingaweb2/issues/4184)
+* Case insensitive hostgroup filter in service grid not working [#4178](https://github.com/Icinga/icingaweb2/issues/4178)
+
+#### Issues With Numbers
+
+An attempt to avoid misrepresenting environments in the tactical overview had an opposite effect by showing negative
+numbers. Filtering for timestamps in the event history also showed no results because our filters couldn't cope with
+plain numbers anymore.
+
+* Tactical overview showing "-1 pending" hosts [#4174](https://github.com/Icinga/icingaweb2/issues/4174)
+* Timestamp filters not working correctly in history views [#4182](https://github.com/Icinga/icingaweb2/issues/4182)
+
### What's New in Version 2.8.0
You can find all issues related to this release on our [Roadmap](https://github.com/Icinga/icingaweb2/milestone/60?closed=1).
#### Icinga DB
-It's happening. Yes. Our latest hot shit is now available for those who are willing to participate in this enormous
+It's happening. Yes. Our latest achievement is now available for those who are willing to participate in this enormous
endeavour. Icinga Web 2 is also a crucial part of it and accompanies the first release of Icinga DB. If you like
to participate, don't forget to update Icinga Web 2 as well.
-#### Support For Even More Hot Shit
+#### Support for PHP 7.4 and MySQL 8
We also made sure that you won't be disappointed by Icinga Web 2 if you're running PHP 7.4 or trying to access a MySQL
database with version 8+. These should pose no issues anymore now. But if you still somehow managed to get issues
=====================================
VERSION
=====================================
@@ -1 +1 @@
-v2.8.0
+v2.8.1
=====================================
application/VERSION
=====================================
@@ -1 +1 @@
-642ec11228c3be8d2abbdff6ef31da77e34f6c70 2020-06-08 11:02:03 +0200
+233bd29e4104125b4e5ef631e8c16dde33dadd9a 2020-06-29 10:28:41 +0200
=====================================
application/fonts/fontello-ifont/config.json
=====================================
@@ -845,6 +845,30 @@
"css": "angle-double-down",
"code": 61699,
"src": "fontawesome"
+ },
+ {
+ "uid": "f3f90c8c89795da30f7444634476ea4f",
+ "css": "angle-left",
+ "code": 61700,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "7bf14281af5633a597f85b061ef1cfb9",
+ "css": "angle-right",
+ "code": 61701,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "5de9370846a26947e03f63142a3f1c07",
+ "css": "angle-up",
+ "code": 61702,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "e4dde1992f787163e2e2b534b8c8067d",
+ "css": "angle-down",
+ "code": 61703,
+ "src": "fontawesome"
}
]
}
\ No newline at end of file
=====================================
application/fonts/fontello-ifont/css/ifont-codes.css
=====================================
@@ -137,5 +137,9 @@
.icon-github-circled:before { content: '\f09b'; } /* '' */
.icon-angle-double-up:before { content: '\f102'; } /* '' */
.icon-angle-double-down:before { content: '\f103'; } /* '' */
+.icon-angle-left:before { content: '\f104'; } /* '' */
+.icon-angle-right:before { content: '\f105'; } /* '' */
+.icon-angle-up:before { content: '\f106'; } /* '' */
+.icon-angle-down:before { content: '\f107'; } /* '' */
.icon-history:before { content: '\f1da'; } /* '' */
.icon-binoculars:before { content: '\f1e5'; } /* '' */
\ No newline at end of file
=====================================
application/fonts/fontello-ifont/css/ifont-embedded.css
=====================================
The diff for this file was not included because it is too large.
=====================================
application/fonts/fontello-ifont/css/ifont-ie7-codes.css
=====================================
@@ -137,5 +137,9 @@
.icon-github-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-angle-double-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-angle-double-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.icon-angle-left { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.icon-angle-right { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.icon-angle-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.icon-angle-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-history { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-binoculars { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
\ No newline at end of file
=====================================
application/fonts/fontello-ifont/css/ifont-ie7.css
=====================================
@@ -148,5 +148,9 @@
.icon-github-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-angle-double-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-angle-double-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.icon-angle-left { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.icon-angle-right { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.icon-angle-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.icon-angle-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-history { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-binoculars { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
\ No newline at end of file
=====================================
application/fonts/fontello-ifont/css/ifont.css
=====================================
@@ -1,11 +1,11 @@
@font-face {
font-family: 'ifont';
- src: url('../font/ifont.eot?42867337');
- src: url('../font/ifont.eot?42867337#iefix') format('embedded-opentype'),
- url('../font/ifont.woff2?42867337') format('woff2'),
- url('../font/ifont.woff?42867337') format('woff'),
- url('../font/ifont.ttf?42867337') format('truetype'),
- url('../font/ifont.svg?42867337#ifont') format('svg');
+ src: url('../font/ifont.eot?95568481');
+ src: url('../font/ifont.eot?95568481#iefix') format('embedded-opentype'),
+ url('../font/ifont.woff2?95568481') format('woff2'),
+ url('../font/ifont.woff?95568481') format('woff'),
+ url('../font/ifont.ttf?95568481') format('truetype'),
+ url('../font/ifont.svg?95568481#ifont') format('svg');
font-weight: normal;
font-style: normal;
}
@@ -15,7 +15,7 @@
@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: 'ifont';
- src: url('../font/ifont.svg?42867337#ifont') format('svg');
+ src: url('../font/ifont.svg?95568481#ifont') format('svg');
}
}
*/
@@ -193,5 +193,9 @@
.icon-github-circled:before { content: '\f09b'; } /* '' */
.icon-angle-double-up:before { content: '\f102'; } /* '' */
.icon-angle-double-down:before { content: '\f103'; } /* '' */
+.icon-angle-left:before { content: '\f104'; } /* '' */
+.icon-angle-right:before { content: '\f105'; } /* '' */
+.icon-angle-up:before { content: '\f106'; } /* '' */
+.icon-angle-down:before { content: '\f107'; } /* '' */
.icon-history:before { content: '\f1da'; } /* '' */
.icon-binoculars:before { content: '\f1e5'; } /* '' */
\ No newline at end of file
=====================================
application/fonts/fontello-ifont/demo.html
=====================================
@@ -229,11 +229,11 @@ body {
}
@font-face {
font-family: 'ifont';
- src: url('./font/ifont.eot?11177247');
- src: url('./font/ifont.eot?11177247#iefix') format('embedded-opentype'),
- url('./font/ifont.woff?11177247') format('woff'),
- url('./font/ifont.ttf?11177247') format('truetype'),
- url('./font/ifont.svg?11177247#ifont') format('svg');
+ src: url('./font/ifont.eot?64148803');
+ src: url('./font/ifont.eot?64148803#iefix') format('embedded-opentype'),
+ url('./font/ifont.woff?64148803') format('woff'),
+ url('./font/ifont.ttf?64148803') format('truetype'),
+ url('./font/ifont.svg?64148803#ifont') format('svg');
font-weight: normal;
font-style: normal;
}
@@ -504,6 +504,12 @@ body {
<div class="row">
<div class="the-icons span3" title="Code: 0xf102"><i class="demo-icon icon-angle-double-up"></i> <span class="i-name">icon-angle-double-up</span><span class="i-code">0xf102</span></div>
<div class="the-icons span3" title="Code: 0xf103"><i class="demo-icon icon-angle-double-down"></i> <span class="i-name">icon-angle-double-down</span><span class="i-code">0xf103</span></div>
+ <div class="the-icons span3" title="Code: 0xf104"><i class="demo-icon icon-angle-left"></i> <span class="i-name">icon-angle-left</span><span class="i-code">0xf104</span></div>
+ <div class="the-icons span3" title="Code: 0xf105"><i class="demo-icon icon-angle-right"></i> <span class="i-name">icon-angle-right</span><span class="i-code">0xf105</span></div>
+ </div>
+ <div class="row">
+ <div class="the-icons span3" title="Code: 0xf106"><i class="demo-icon icon-angle-up"></i> <span class="i-name">icon-angle-up</span><span class="i-code">0xf106</span></div>
+ <div class="the-icons span3" title="Code: 0xf107"><i class="demo-icon icon-angle-down"></i> <span class="i-name">icon-angle-down</span><span class="i-code">0xf107</span></div>
<div class="the-icons span3" title="Code: 0xf1da"><i class="demo-icon icon-history"></i> <span class="i-name">icon-history</span><span class="i-code">0xf1da</span></div>
<div class="the-icons span3" title="Code: 0xf1e5"><i class="demo-icon icon-binoculars"></i> <span class="i-name">icon-binoculars</span><span class="i-code">0xf1e5</span></div>
</div>
=====================================
application/fonts/fontello-ifont/font/ifont.eot
=====================================
Binary files a/application/fonts/fontello-ifont/font/ifont.eot and b/application/fonts/fontello-ifont/font/ifont.eot differ
=====================================
application/fonts/fontello-ifont/font/ifont.svg
=====================================
@@ -1,7 +1,7 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Copyright (C) 2018 by original authors @ fontello.com</metadata>
+<metadata>Copyright (C) 2020 by original authors @ fontello.com</metadata>
<defs>
<font id="ifont" horiz-adv-x="1000" >
<font-face font-family="ifont" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
@@ -282,6 +282,14 @@
<glyph glyph-name="angle-double-down" unicode="" d="M600 368q0-7-6-13l-260-260q-5-6-13-6t-12 6l-260 260q-6 6-6 13t6 13l28 28q5 5 12 5t13-5l219-220 220 220q5 5 13 5t12-5l28-28q6-6 6-13z m0 214q0-7-6-13l-260-260q-5-5-13-5t-12 5l-260 260q-6 6-6 13t6 13l28 28q5 6 12 6t13-6l219-219 220 219q5 6 13 6t12-6l28-28q6-6 6-13z" horiz-adv-x="642.9" />
+<glyph glyph-name="angle-left" unicode="" d="M350 546q0-7-6-12l-219-220 219-219q6-6 6-13t-6-13l-28-28q-5-5-12-5t-13 5l-260 261q-6 5-6 12t6 13l260 260q5 6 13 6t12-6l28-28q6-5 6-13z" horiz-adv-x="357.1" />
+
+<glyph glyph-name="angle-right" unicode="" d="M332 314q0-7-5-12l-261-261q-5-5-12-5t-13 5l-28 28q-6 6-6 13t6 13l219 219-219 220q-6 5-6 12t6 13l28 28q5 6 13 6t12-6l261-260q5-5 5-13z" horiz-adv-x="357.1" />
+
+<glyph glyph-name="angle-up" unicode="" d="M600 189q0-7-6-12l-28-28q-5-6-12-6t-13 6l-220 219-219-219q-5-6-13-6t-12 6l-28 28q-6 5-6 12t6 13l260 260q5 6 12 6t13-6l260-260q6-5 6-13z" horiz-adv-x="642.9" />
+
+<glyph glyph-name="angle-down" unicode="" d="M600 439q0-7-6-12l-260-261q-5-5-13-5t-12 5l-260 261q-6 5-6 12t6 13l28 28q5 6 12 6t13-6l219-219 220 219q5 6 13 6t12-6l28-28q6-5 6-13z" horiz-adv-x="642.9" />
+
<glyph glyph-name="history" unicode="" d="M857 350q0-87-34-166t-91-137-137-92-166-34q-96 0-183 41t-147 114q-4 6-4 13t5 11l76 77q6 5 14 5 9-1 13-7 41-53 100-82t126-29q58 0 110 23t92 61 61 91 22 111-22 111-61 91-92 61-110 23q-55 0-105-20t-90-57l77-77q17-16 8-38-10-23-33-23h-250q-15 0-25 11t-11 25v250q0 24 22 33 22 10 39-8l72-72q60 57 137 88t159 31q87 0 166-34t137-92 91-137 34-166z m-357 161v-250q0-8-5-13t-13-5h-178q-8 0-13 5t-5 13v35q0 8 5 13t13 5h125v197q0 8 5 13t12 5h36q8 0 13-5t5-13z" horiz-adv-x="857.1" />
<glyph glyph-name="binoculars" unicode="" d="M393 671v-428q0-15-11-25t-25-11v-321q0-15-10-25t-26-11h-285q-15 0-25 11t-11 25v285l139 488q4 12 17 12h237z m178 0v-392h-142v392h142z m429-500v-285q0-15-11-25t-25-11h-285q-15 0-25 11t-11 25v321q-15 0-25 11t-11 25v428h237q13 0 17-12z m-589 661v-125h-197v125q0 8 5 13t13 5h161q8 0 13-5t5-13z m375 0v-125h-197v125q0 8 5 13t13 5h161q8 0 13-5t5-13z" horiz-adv-x="1000" />
=====================================
application/fonts/fontello-ifont/font/ifont.ttf
=====================================
Binary files a/application/fonts/fontello-ifont/font/ifont.ttf and b/application/fonts/fontello-ifont/font/ifont.ttf differ
=====================================
application/fonts/fontello-ifont/font/ifont.woff
=====================================
Binary files a/application/fonts/fontello-ifont/font/ifont.woff and b/application/fonts/fontello-ifont/font/ifont.woff differ
=====================================
application/fonts/fontello-ifont/font/ifont.woff2
=====================================
Binary files a/application/fonts/fontello-ifont/font/ifont.woff2 and b/application/fonts/fontello-ifont/font/ifont.woff2 differ
=====================================
library/Icinga/Application/Version.php
=====================================
@@ -8,7 +8,7 @@ namespace Icinga\Application;
*/
class Version
{
- const VERSION = '2.8.0';
+ const VERSION = '2.8.1';
/**
* Get the version of this instance of Icinga Web 2
=====================================
library/Icinga/Authentication/User/DbUserBackend.php
=====================================
@@ -184,9 +184,15 @@ class DbUserBackend extends DbRepository implements UserBackendInterface, Inspec
$columns = array('password_hash');
}
+ $nameColumn = 'name';
+ if ($this->ds->getDbType() === 'mysql') {
+ $username = strtolower($username);
+ $nameColumn = 'BINARY LOWER(name)';
+ }
+
$query = $this->ds->select()
->from($this->prependTablePrefix('user'), $columns)
- ->where(($this->ds->getDbType() === 'mysql' ? 'BINARY ' : '') . 'name', $username)
+ ->where($nameColumn, $username)
->where('active', true);
$statement = $this->ds->getDbAdapter()->prepare($query->getSelectQuery());
=====================================
library/Icinga/Data/Db/DbQuery.php
=====================================
@@ -251,7 +251,7 @@ class DbQuery extends SimpleQuery
protected function valueToTimestamp($value)
{
// We consider integers as valid timestamps. Does not work for URL params
- if (ctype_digit($value)) {
+ if (! is_string($value) || ctype_digit($value)) {
return $value;
}
$value = strtotime($value);
=====================================
modules/doc/module.info
=====================================
@@ -1,4 +1,4 @@
Module: doc
-Version: 2.8.0
+Version: 2.8.1
Description: Documentation module
Extracts, shows and exports documentation for Icinga Web 2 and its modules.
=====================================
modules/migrate/module.info
=====================================
@@ -1,5 +1,5 @@
Module: migrate
-Version: 2.8.0
+Version: 2.8.1
Description: Migrate module
This module was introduced with the domain-aware authentication feature in version 2.5.0.
It helps you migrating users and user configurations according to a given domain.
=====================================
modules/monitoring/application/controllers/TacticalController.php
=====================================
@@ -37,6 +37,7 @@ class TacticalController extends Controller
'hosts_unreachable_handled',
'hosts_unreachable_unhandled',
'hosts_pending',
+ 'hosts_pending_not_checked',
'hosts_not_checked',
'services_ok',
@@ -47,6 +48,7 @@ class TacticalController extends Controller
'services_unknown_handled',
'services_unknown_unhandled',
'services_pending',
+ 'services_pending_not_checked',
'services_not_checked',
)
);
@@ -63,8 +65,8 @@ class TacticalController extends Controller
$summary = $stats->fetchRow();
// Correct pending counts. Done here instead of in the query for compatibility reasons.
- $summary->hosts_pending -= $summary->hosts_not_checked;
- $summary->services_pending -= $summary->services_not_checked;
+ $summary->hosts_pending -= $summary->hosts_pending_not_checked;
+ $summary->services_pending -= $summary->services_pending_not_checked;
$hostSummaryChart = new Donut();
$hostSummaryChart
@@ -74,7 +76,7 @@ class TacticalController extends Controller
->addSlice($summary->hosts_unreachable_handled, array('class' => 'slice-state-unreachable-handled'))
->addSlice($summary->hosts_unreachable_unhandled, array('class' => 'slice-state-unreachable'))
->addSlice($summary->hosts_pending, array('class' => 'slice-state-pending'))
- ->addSlice($summary->hosts_not_checked, array('class' => 'slice-state-not-checked'))
+ ->addSlice($summary->hosts_pending_not_checked, array('class' => 'slice-state-not-checked'))
->setLabelBig($summary->hosts_down_unhandled)
->setLabelBigEyeCatching($summary->hosts_down_unhandled > 0)
->setLabelSmall($this->translate('Hosts Down'));
@@ -89,7 +91,7 @@ class TacticalController extends Controller
->addSlice($summary->services_unknown_handled, array('class' => 'slice-state-unknown-handled'))
->addSlice($summary->services_unknown_unhandled, array('class' => 'slice-state-unknown'))
->addSlice($summary->services_pending, array('class' => 'slice-state-pending'))
- ->addSlice($summary->services_not_checked, array('class' => 'slice-state-not-checked'))
+ ->addSlice($summary->services_pending_not_checked, array('class' => 'slice-state-not-checked'))
->setLabelBig($summary->services_critical_unhandled)
->setLabelBigEyeCatching($summary->services_critical_unhandled > 0)
->setLabelSmall($this->translate('Services Critical'));
=====================================
modules/monitoring/application/views/scripts/tactical/index.phtml
=====================================
@@ -1,3 +1,6 @@
+<?php
+use Icinga\Data\Filter\Filter;
+?>
<?php if (! $this->compact): ?>
<div class="controls">
<?= $this->tabs ?>
@@ -53,15 +56,15 @@
<?php endif ?>
<?php if ($statusSummary->hosts_pending): ?>
<li>
- <a href="<?= $this->filteredUrl('monitoring/list/hosts', array('host_state' => 99, 'sort' => 'host_last_check', 'dir' => 'asc')) ?>">
+ <a href="<?= $this->filteredUrl('monitoring/list/hosts', array('host_state' => 99, 'sort' => 'host_last_check', 'dir' => 'asc'))->addFilter(Filter::not(Filter::where('host_active_checks_enabled', 0), Filter::where('host_passive_checks_enabled', 0))) ?>">
<span class="state state-pending badge"><?= $statusSummary->hosts_pending ?></span><?= $this->translate('Pending') ?>
</a>
</li>
<?php endif ?>
- <?php if ($statusSummary->hosts_not_checked): ?>
+ <?php if ($statusSummary->hosts_pending_not_checked): ?>
<li>
- <a href="<?= $this->filteredUrl('monitoring/list/hosts', array('host_active_checks_enabled' => 0, 'host_passive_checks_enabled' => 0, 'sort' => 'host_last_check', 'dir' => 'asc')) ?>">
- <span class="state slice-state-not-checked badge"><?= $statusSummary->hosts_not_checked ?></span><?= $this->translate('Not Checked') ?>
+ <a href="<?= $this->filteredUrl('monitoring/list/hosts', array('host_state' => 99, 'host_active_checks_enabled' => 0, 'host_passive_checks_enabled' => 0, 'sort' => 'host_last_check', 'dir' => 'asc')) ?>">
+ <span class="state slice-state-not-checked badge"><?= $statusSummary->hosts_pending_not_checked ?></span><?= $this->translate('Not Checked') ?>
</a>
</li>
<?php endif ?>
@@ -124,15 +127,15 @@
<?php endif;
if ($statusSummary->services_pending):?>
<li>
- <a href="<?= $this->filteredUrl('monitoring/list/services', array('service_state' => 99, 'sort' => 'service_last_check', 'dir' => 'asc')) ?>">
+ <a href="<?= $this->filteredUrl('monitoring/list/services', array('service_state' => 99, 'sort' => 'service_last_check', 'dir' => 'asc'))->addFilter(Filter::not(Filter::where('service_active_checks_enabled', 0), Filter::where('service_passive_checks_enabled', 0))) ?>">
<span class="state state-pending badge"><?= $statusSummary->services_pending ?></span><?= $this->translate('Pending') ?>
</a>
</li>
<?php endif;
- if ($statusSummary->services_not_checked):?>
+ if ($statusSummary->services_pending_not_checked):?>
<li>
- <a href="<?= $this->filteredUrl('monitoring/list/services', array('service_active_checks_enabled' => 0, 'service_passive_checks_enabled' => 0, 'sort' => 'service_last_check', 'dir' => 'asc')) ?>">
- <span class="state slice-state-not-checked badge"><?= $statusSummary->services_not_checked ?></span><?= $this->translate('Not Checked') ?>
+ <a href="<?= $this->filteredUrl('monitoring/list/services', array('service_state' => 99, 'service_active_checks_enabled' => 0, 'service_passive_checks_enabled' => 0, 'sort' => 'service_last_check', 'dir' => 'asc')) ?>">
+ <span class="state slice-state-not-checked badge"><?= $statusSummary->services_pending_not_checked ?></span><?= $this->translate('Not Checked') ?>
</a>
</li>
<?php endif?>
=====================================
modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
=====================================
@@ -568,6 +568,13 @@ abstract class IdoQuery extends DbQuery
$and = false;
}
+ $alias = $filter->getColumn();
+ $column = $subQuery->aliasToColumnName($alias);
+ if (isset($this->caseInsensitiveColumns[$subQuery->aliasToTableName($alias)][$alias])) {
+ $column = 'LOWER( ' . $column . ' )';
+ $subQueryFilter->setExpression(array_map('strtolower', $subQueryFilter->getExpression()));
+ }
+
$additional = null;
list($theirs, $ours) = $this->joinSubQuery($subQuery, $queryName, $subQueryFilter, $and, $negate, $additional);
@@ -620,7 +627,7 @@ abstract class IdoQuery extends DbQuery
$subQueryFilter->setColumn(preg_replace(
'/(?<=^|\s)\w+(?=\.)/',
'sub_$0',
- $subQuery->aliasToColumnName($filter->getColumn())
+ $column
));
if ($negate) {
=====================================
modules/monitoring/module.info
=====================================
@@ -1,5 +1,5 @@
Module: monitoring
-Version: 2.8.0
+Version: 2.8.1
Description: Icinga monitoring module
IDO accessor and UI for your monitoring. This is the initial instalment for a
graphical presentation of Icinga environments. The predecessor of Icinga DB.
=====================================
modules/setup/module.info
=====================================
@@ -1,5 +1,5 @@
Module: setup
-Version: 2.8.0
+Version: 2.8.1
Description: Setup module
Web based wizard for setting up Icinga Web 2 and its modules.
This includes the data backends (e.g. relational database, LDAP),
=====================================
modules/test/module.info
=====================================
@@ -1,5 +1,5 @@
Module: test
-Version: 2.8.0
+Version: 2.8.1
Description: Translation module
This module allows developers to run (unit) tests against Icinga Web 2 and
any of its modules. Usually you do not need to enable this.
=====================================
modules/translation/module.info
=====================================
@@ -1,5 +1,5 @@
Module: translation
-Version: 2.8.0
+Version: 2.8.1
Description: Translation module
This module allows developers and translators to translate Icinga Web 2 and
its modules for multiple languages. You do not need this module to run an
=====================================
public/css/icinga/base.less
=====================================
@@ -191,7 +191,7 @@ td, th {
content: "";
display: block;
- background: @body-bg-color url(/img/icinga-loader.gif) no-repeat center center;
+ background: @body-bg-color url(../img/icinga-loader.gif) no-repeat center center;
background-size: 4em 4em;
opacity: 0;
=====================================
public/css/icinga/responsive.less
=====================================
@@ -70,6 +70,7 @@
#layout.minimal-layout {
#sidebar {
width: 100%;
+ overflow: auto;
}
#header-logo-container {
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-icingaweb2/-/commit/2afee4adc900e0742b514abbb59242bf0a892e54
--
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-icingaweb2/-/commit/2afee4adc900e0742b514abbb59242bf0a892e54
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20200630/ab911fea/attachment-0001.html>
More information about the pkg-nagios-changes
mailing list