[pkg-nagios-changes] [Git][nagios-team/icingaweb2][upstream] New upstream version 2.12.6
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Wed Nov 19 16:03:03 GMT 2025
Bas Couwenberg pushed to branch upstream at Debian Nagios Maintainer Group / icingaweb2
Commits:
fc518a9c by Bas Couwenberg at 2025-11-19T16:57:45+01:00
New upstream version 2.12.6
- - - - -
27 changed files:
- .mailmap
- AUTHORS
- CHANGELOG.md
- VERSION
- application/VERSION
- application/views/scripts/showConfiguration.phtml
- doc/05-Authentication.md
- doc/20-Advanced-Topics.md
- icingaweb2.ruleset.xml
- library/Icinga/Application/Version.php
- library/Icinga/Application/webrouter.php
- library/Icinga/Authentication/Auth.php
- modules/doc/module.info
- modules/migrate/module.info
- modules/monitoring/module.info
- modules/setup/application/clicommands/ConfigCommand.php
- modules/setup/library/Setup/Webserver/Apache.php
- modules/setup/module.info
- modules/translation/module.info
- public/css/icinga/compat.less
- public/css/icinga/configmenu.less
- public/css/icinga/controls.less
- public/css/icinga/menu.less
- public/css/icinga/responsive.less
- public/css/themes/high-contrast.less
- public/js/icinga/behavior/modal.js
- public/js/icinga/events.js
Changes:
=====================================
.mailmap
=====================================
@@ -15,6 +15,7 @@ Eric Lippmann <eric.lippmann at icinga.com> <lippserd at googlemail.com>
Florian Strohmaier <florian.strohmaier at icinga.com> <florian.strohmaier at netways.de>
Florian Strohmaier <florian.strohmaier at icinga.com> <hello at florianstrohmaier.com>
Florian Strohmaier <florian.strohmaier at icinga.com> <florian.strohmaier at me.com>
+Gianluca Piccolo <gianluca.piccolo at wuerth-phoenix.com> <2795394+gianlucapiccolo at users.noreply.github.com>
Gunnar Beutner <gunnar.beutner at netways.de> <gunnar at beutner.name>
Jannis Moßhammer <jannis.mosshammer at netways.de>
Jan Schuppik <jan.schuppik at icinga.com> <114286749+Jan-Schuppik at users.noreply.github.com>
=====================================
AUTHORS
=====================================
@@ -1,4 +1,5 @@
Aaron Collins <acollins at chegg.com>
+Alex <alexander.noack at web.de>
Alexander A. Klimov <alexander.klimov at icinga.com>
Alexander Aleksandrovič Klimov <alexander.klimov at icinga.com>
Alexander Fuhr <alexander.fuhr at netways.de>
@@ -60,6 +61,7 @@ Jiri Pejchal <jiri.pejchal at gmail.com>
Joe Doherty <git at pjuu.com>
Johannes Meyer <johannes.meyer at icinga.com>
Johannes Rauh <johannes.rauh at icinga.com>
+Jolien Trog <jolien.trog at icinga.com>
Joonas Kylmälä <joonas.kylmala at kirjastot.fi>
Jorge Vallecillo <jorgevallecilloc at gmail.com>
Jo Rhett <jo at chegg.com>
=====================================
CHANGELOG.md
=====================================
@@ -4,6 +4,22 @@ Please make sure to always read our [Upgrading](doc/80-Upgrading.md) documentati
## What's New
+### What's New in Version 2.12.6
+
+You can find all issues related to this release on our [Roadmap](https://github.com/Icinga/icingaweb2/milestone/86?closed=1).
+
+#### It's Like Fine Wine
+
+Icinga Web 2.12 is now two years old. But like fine wine, it gets better with age. Each fix and improvement included
+this time enhances your experience with Icinga Web. Even if just a little bit. Maybe a small annoyance is gone now, or
+something you didn't even notice was broken is fixed.
+
+But let's get to it, a small selection of fixes and improvements:
+
+* Search box shows many magnifying glasses for some community themes #5395
+* Authentication hooks are not called with external backends #5415
+* Improve Minimal layout #5386
+
### What's New in Version 2.12.5
You can find all issues related to this release on our [Roadmap](https://github.com/Icinga/icingaweb2/milestone/85?closed=1).
=====================================
VERSION
=====================================
@@ -1 +1 @@
-v2.12.5
+v2.12.6
=====================================
application/VERSION
=====================================
@@ -1 +1 @@
-e0836c569734d6414c307ec0094cfed9a9dce694 2025-07-16 10:31:52 +0200
+a9e04752c5be0c015d6b2a3c5b2f752fece16487 2025-11-18 18:00:39 +0100
=====================================
application/views/scripts/showConfiguration.phtml
=====================================
@@ -21,7 +21,5 @@
<?= $this->translate('In case you can access the file by yourself, you can open it and insert the config manually:'); ?>
</p>
<p>
- <pre>
- <code><?= $this->escape($configString); ?></code>
- </pre>
+ <pre><code><?= $this->escape($configString); ?></code></pre>
</p>
=====================================
doc/05-Authentication.md
=====================================
@@ -59,7 +59,7 @@ sudo htpasswd -c /etc/icingaweb2/.http-users icingaadmin
#### Apache Configuration <a id="authentication-configuration-external-authentication-example-apache"></a>
-Add the following configuration to the `<Directory>` directive in the `icingaweb2.conf` web server
+Add the following configuration to the `<Directory>` directive in the `icingaweb2.conf` web server
configuration file.
```
=====================================
doc/20-Advanced-Topics.md
=====================================
@@ -157,6 +157,7 @@ Here is a list of all Icinga Web components that are capable of strict CSP.
| Icinga Web GenericTTS Integration | [v2.1.0](https://github.com/Icinga/icingaweb2-module-generictts/releases/tag/v2.1.0) |
| Icinga Web Nagvis Integration | [v1.2.0](https://github.com/Icinga/icingaweb2-module-nagvis/releases/tag/v1.2.0) |
| Icinga Web AWS Integration | [v1.1.0](https://github.com/Icinga/icingaweb2-module-aws/releases/tag/v1.1.0) |
+| Icinga Web vSphere Integration | [v1.8.0](https://github.com/Icinga/icingaweb2-module-vspheredb/releases/tag/v1.8.0) |
## Advanced Authentication Tips <a id="advanced-topics-authentication-tips"></a>
=====================================
icingaweb2.ruleset.xml
=====================================
@@ -41,7 +41,7 @@
<exclude-pattern>*/application/views/helpers/*</exclude-pattern>
<exclude-pattern>*/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php</exclude-pattern>
</rule>
- <rule ref="Squiz.Classes.ValidClassName.NotCamelCaps">
+ <rule ref="Squiz.Classes.ValidClassName.NotPascalCase">
<exclude-pattern>*/application/views/helpers/*</exclude-pattern>
<exclude-pattern>*/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php</exclude-pattern>
</rule>
=====================================
library/Icinga/Application/Version.php
=====================================
@@ -8,7 +8,7 @@ namespace Icinga\Application;
*/
class Version
{
- const VERSION = '2.12.5';
+ const VERSION = '2.12.6';
/**
* Get the version of this instance of Icinga Web 2
=====================================
library/Icinga/Application/webrouter.php
=====================================
@@ -18,7 +18,7 @@ if (isset($_SERVER['REQUEST_URI'])) {
// Workaround, PHPs internal Webserver seems to mess up SCRIPT_FILENAME
// as it prefixes it's absolute path with DOCUMENT_ROOT
-if (preg_match('/^PHP .* Development Server/', $_SERVER['SERVER_SOFTWARE'])) {
+if (preg_match('/^PHP.*Development Server/', $_SERVER['SERVER_SOFTWARE'])) {
$script = basename($_SERVER['SCRIPT_FILENAME']);
$_SERVER['PHP_SELF'] = $_SERVER['SCRIPT_NAME'] = '/' . $script;
$_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT']
=====================================
library/Icinga/Authentication/Auth.php
=====================================
@@ -6,6 +6,7 @@ namespace Icinga\Authentication;
use Exception;
use Icinga\Application\Config;
use Icinga\Application\Hook\AuditHook;
+use Icinga\Application\Hook\AuthenticationHook;
use Icinga\Application\Icinga;
use Icinga\Application\Logger;
use Icinga\Authentication\User\ExternalBackend;
@@ -246,6 +247,8 @@ class Auth
$user->setDomain(Config::app()->get('authentication', 'default_domain'));
}
$this->setAuthenticated($user);
+ AuthenticationHook::triggerLogin($user);
+
return true;
}
}
=====================================
modules/doc/module.info
=====================================
@@ -1,4 +1,4 @@
Module: doc
-Version: 2.12.5
+Version: 2.12.6
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.12.5
+Version: 2.12.6
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/module.info
=====================================
@@ -1,5 +1,5 @@
Module: monitoring
-Version: 2.12.5
+Version: 2.12.6
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/application/clicommands/ConfigCommand.php
=====================================
@@ -103,10 +103,12 @@ class ConfigCommand extends Command
* --enable-fpm Enable FPM handler for Apache (Nginx is always enabled)
*
* --fpm-url=<url> Address where to pass requests to FPM [127.0.0.1:9000]
+ * Only one of --fpm-socket-path or --fpm-url can be set at a time
*
* --fpm-uri=<uri> Alias for --fpm-url
*
- * --fpm-socket-path=<socketpath> Socket path where to pass requests to FPM, overrides --fpm-url
+ * --fpm-socket-path=<socketpath> Socket path where to pass requests to FPM
+ * Only one of --fpm-socket-path or --fpm-url can be set at a time
*
* --config=<directory> Path to Icinga Web 2's configuration files [/etc/icingaweb2]
*
@@ -166,14 +168,12 @@ class ConfigCommand extends Command
$enableFpm = $this->params->shift('enable-fpm', $webserver->getEnableFpm());
$fpmSocketPath = trim($this->params->get('fpm-socket-path', $webserver->getFpmSocketPath()));
- $fpmUrl = trim($this->params->get('fpm-url', $webserver->getFpmUrl()));
+ $fpmUrl = trim($this->params->get('fpm-url'));
if (empty($fpmUrl)) {
- $fpmUrl = trim($this->params->get('fpm-uri', $webserver->getFpmUrl()));
+ $fpmUrl = trim($this->params->get('fpm-uri'));
}
if (empty($fpmSocketPath) && empty($fpmUrl)) {
- $this->fail($this->translate(
- 'One of the arguments --fpm-socket-path or --fpm-url must be set to pass requests to FPM'
- ));
+ $fpmUrl = $webserver->getFpmUrl();
} elseif (!empty($fpmSocketPath) && !empty($fpmUrl)) {
$this->fail($this->translate(
'Only one of the arguments --fpm-socket-path or --fpm-url must be set to pass requests to FPM'
=====================================
modules/setup/library/Setup/Webserver/Apache.php
=====================================
@@ -16,14 +16,9 @@ class Apache extends Webserver
protected function createFpmUri()
{
- $apacheFpmUri = "";
- if (empty($this->fpmSocketPath)) {
- $apacheFpmUri = $this->fpmUrlSchema . $this->fpmUrl;
- } else {
- $apacheFpmUri = $this->fpmSocketSchema . $this->fpmSocketPath . '|' . $this->fpmUrlSchema . 'localhost';
- }
-
- return $apacheFpmUri;
+ return empty($this->fpmSocketPath)
+ ? $this->fpmUrlSchema . $this->fpmUrl
+ : $this->fpmSocketSchema . $this->fpmSocketPath . '|' . $this->fpmUrlSchema . 'localhost';
}
protected function getTemplate()
=====================================
modules/setup/module.info
=====================================
@@ -1,5 +1,5 @@
Module: setup
-Version: 2.12.5
+Version: 2.12.6
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/translation/module.info
=====================================
@@ -1,5 +1,5 @@
Module: translation
-Version: 2.12.5
+Version: 2.12.6
Description: Translation module
This module allows developers and translators to translate modules for multiple
languages. You do not need this module to run an internationalized web frontend.
=====================================
public/css/icinga/compat.less
=====================================
@@ -33,3 +33,7 @@ table.action {
table.avp {
.name-value-table();
}
+
+input.search {
+ background-size: 0;
+}
=====================================
public/css/icinga/configmenu.less
=====================================
@@ -233,6 +233,7 @@
position: absolute;
border: 1px solid @gray-lighter;
background: @body-bg-color;
+ color: @text-color;
box-shadow: 0 0 1em 0 rgba(0,0,0,.25);
z-index: 15;
.rounded-corners();
=====================================
public/css/icinga/controls.less
=====================================
@@ -26,7 +26,6 @@ form > .search-icon {
left: 0.25em;
top: ~"calc(50% - 0.5em)";
pointer-events: none;
- color: @menu-color;
opacity: 0.8;
}
=====================================
public/css/icinga/menu.less
=====================================
@@ -12,6 +12,7 @@
#menu {
background-color: @menu-bg-color;
+ color: @menu-color;
width: 100%;
flex: 1;
overflow: auto;
=====================================
public/css/icinga/responsive.less
=====================================
@@ -70,7 +70,11 @@
#layout.minimal-layout {
#sidebar {
width: 100%;
- overflow: auto;
+
+ &.expanded {
+ overflow: auto;
+ height: 100%;
+ }
}
#header-logo-container {
=====================================
public/css/themes/high-contrast.less
=====================================
@@ -225,11 +225,6 @@
}
}
-.controls input.search,
-input.search {
- background-image: url(../img/icons/search.png);
-}
-
.search-bar,
.button-link,
.view-mode-switcher > label {
=====================================
public/js/icinga/behavior/modal.js
=====================================
@@ -21,7 +21,7 @@
this.on('submit', '#modal form', this.onFormSubmit, this);
this.on('change', '#modal form select.autosubmit', this.onFormAutoSubmit, this);
this.on('change', '#modal form input.autosubmit', this.onFormAutoSubmit, this);
- this.on('click', '[data-icinga-modal]', this.onModalToggleClick, this);
+ this.on('click', '[data-icinga-modal][href]', this.onModalToggleClick, this);
this.on('mousedown', '#layout > #modal', this.onModalLeave, this);
this.on('click', '.modal-header > button', this.onModalClose, this);
this.on('keydown', this.onKeyDown, this);
@@ -114,7 +114,7 @@
}
let $autoSubmittedBy;
- if (typeof event.detail !== 'undefined' && "submittedBy" in event.detail) {
+ if (event.detail !== null && typeof event.detail === 'object' && "submittedBy" in event.detail) {
$autoSubmittedBy = $(event.detail.submittedBy);
}
=====================================
public/js/icinga/events.js
=====================================
@@ -261,7 +261,11 @@
}
}
- if (! $autoSubmittedBy && typeof event.detail !== 'undefined' && "submittedBy" in event.detail) {
+ if (! $autoSubmittedBy
+ && event.detail !== null
+ && typeof event.detail === 'object'
+ && "submittedBy" in event.detail
+ ) {
$autoSubmittedBy = $(event.detail.submittedBy);
}
View it on GitLab: https://salsa.debian.org/nagios-team/icingaweb2/-/commit/fc518a9c81017b797d875615389d7d63c4d10436
--
View it on GitLab: https://salsa.debian.org/nagios-team/icingaweb2/-/commit/fc518a9c81017b797d875615389d7d63c4d10436
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/20251119/d74a1901/attachment-0001.htm>
More information about the pkg-nagios-changes
mailing list