[pkg-nagios-changes] [Git][nagios-team/pkg-icingaweb2][master] 4 commits: New upstream version 2.6.1
Bas Couwenberg
gitlab at salsa.debian.org
Mon Aug 6 06:28:59 BST 2018
Bas Couwenberg pushed to branch master at Debian Nagios Maintainer Group / pkg-icingaweb2
Commits:
0ca50acf by Bas Couwenberg at 2018-08-06T05:19:56Z
New upstream version 2.6.1
- - - - -
fa01e4e3 by Bas Couwenberg at 2018-08-06T05:20:02Z
Merge tag 'upstream/2.6.1'
Upstream version 2.6.1
- - - - -
656fcf74 by Bas Couwenberg at 2018-08-06T05:20:16Z
New upstream release.
- - - - -
3e9c0ee3 by Bas Couwenberg at 2018-08-06T05:20:56Z
Set distribution to unstable.
- - - - -
13 changed files:
- CHANGELOG.md
- VERSION
- application/VERSION
- debian/changelog
- library/Icinga/Application/Hook.php
- library/Icinga/Application/Version.php
- modules/doc/module.info
- modules/migrate/module.info
- modules/monitoring/library/Monitoring/Command/Transport/ApiCommandTransport.php
- modules/monitoring/module.info
- modules/setup/module.info
- modules/test/module.info
- modules/translation/module.info
Changes:
=====================================
CHANGELOG.md
=====================================
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,13 @@ Please make sure to always read our [Upgrading](doc/80-Upgrading.md) documentati
## What's New
+### What's New in Version 2.6.1
+
+You can find issues and features related to this release on our [Roadmap](https://github.com/Icinga/icingaweb2/milestone/51?closed=1).
+
+The command audit now logs a command's payload as JSON which fixes a
+[bug](https://github.com/Icinga/icingaweb2/issues/3535) that has been introduced in version 2.6.0.
+
### What's New in Version 2.6.0
You can find issues and features related to this release on our [Roadmap](https://github.com/Icinga/icingaweb2/milestone/48?closed=1).
@@ -814,4 +821,3 @@ The location of a user's preferences has been changed from config-dir/preference
* Bug 9378: Rpm calls usermod w/ invalid option on openSUSE
* Bug 9384: Timeline+Role problem
* Bug 9392: Command links seem to be broken
-
=====================================
VERSION
=====================================
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v2.6.0
+v2.6.1
=====================================
application/VERSION
=====================================
--- a/application/VERSION
+++ b/application/VERSION
@@ -1 +1 @@
-cfe6c7b06587189b3ef688183cacd32594db071a 2018-07-19 09:34:58 +0200
+b3e0b5d587c3587a09d82b3634dbe3a5dd315353 2018-08-02 12:46:39 +0200
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-icingaweb2 (2.6.0-2) UNRELEASED; urgency=medium
+icingaweb2 (2.6.1-1) unstable; urgency=medium
+ * New upstream release.
* Drop autopkgtest to test installability.
* Add lintian override for testsuite-autopkgtest-missing.
* Bump Standards-Version to 4.2.0, no changes.
- -- Bas Couwenberg <sebastic at debian.org> Wed, 01 Aug 2018 21:03:09 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 06 Aug 2018 07:20:45 +0200
icingaweb2 (2.6.0-1) unstable; urgency=medium
=====================================
library/Icinga/Application/Hook.php
=====================================
--- a/library/Icinga/Application/Hook.php
+++ b/library/Icinga/Application/Hook.php
@@ -70,7 +70,16 @@ class Hook
public static function has($name)
{
$name = self::normalizeHookName($name);
- return array_key_exists($name, self::$hooks);
+
+ if (! array_key_exists($name, self::$hooks)) {
+ return false;
+ }
+
+ $hook = self::$hooks[$name];
+ // $hook is in the format key => value
+ $hook = reset($hook);
+
+ return self::hasPermission($hook);
}
protected static function normalizeHookName($name)
=====================================
library/Icinga/Application/Version.php
=====================================
--- a/library/Icinga/Application/Version.php
+++ b/library/Icinga/Application/Version.php
@@ -8,7 +8,7 @@ namespace Icinga\Application;
*/
class Version
{
- const VERSION = '2.6.0';
+ const VERSION = '2.6.1';
/**
* Get the version of this instance of Icinga Web 2
=====================================
modules/doc/module.info
=====================================
--- a/modules/doc/module.info
+++ b/modules/doc/module.info
@@ -1,4 +1,4 @@
Module: doc
-Version: 2.6.0
+Version: 2.6.1
Description: Documentation module
Extracts, shows and exports documentation for Icinga Web 2 and its modules.
=====================================
modules/migrate/module.info
=====================================
--- a/modules/migrate/module.info
+++ b/modules/migrate/module.info
@@ -1,5 +1,5 @@
Module: migrate
-Version: 2.6.0
+Version: 2.6.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/library/Monitoring/Command/Transport/ApiCommandTransport.php
=====================================
--- a/modules/monitoring/library/Monitoring/Command/Transport/ApiCommandTransport.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/ApiCommandTransport.php
@@ -12,6 +12,7 @@ use Icinga\Module\Monitoring\Command\Renderer\IcingaApiCommandRenderer;
use Icinga\Module\Monitoring\Exception\CommandTransportException;
use Icinga\Module\Monitoring\Exception\CurlException;
use Icinga\Module\Monitoring\Web\Rest\RestRequest;
+use Icinga\Util\Json;
/**
* Command transport over Icinga 2's REST API
@@ -198,11 +199,7 @@ class ApiCommandTransport implements CommandTransportInterface
);
$data = $command->getData();
- $payload = [];
- foreach ($data as $key => $value) {
- $payload[] = "$key=$value";
- }
- $payload = implode(', ', $payload);
+ $payload = Json::encode($data);
AuditHook::logActivity(
'monitoring/command',
"Issued command {$command->getEndpoint()} with the following payload: $payload",
=====================================
modules/monitoring/module.info
=====================================
--- a/modules/monitoring/module.info
+++ b/modules/monitoring/module.info
@@ -1,5 +1,5 @@
Module: monitoring
-Version: 2.6.0
+Version: 2.6.1
Description: Icinga monitoring module
This is the core module for most Icingaweb users. It provides an
abstraction layer for various Icinga data backends.
=====================================
modules/setup/module.info
=====================================
--- a/modules/setup/module.info
+++ b/modules/setup/module.info
@@ -1,5 +1,5 @@
Module: setup
-Version: 2.6.0
+Version: 2.6.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
=====================================
--- a/modules/test/module.info
+++ b/modules/test/module.info
@@ -1,5 +1,5 @@
Module: test
-Version: 2.6.0
+Version: 2.6.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
=====================================
--- a/modules/translation/module.info
+++ b/modules/translation/module.info
@@ -1,5 +1,5 @@
Module: translation
-Version: 2.6.0
+Version: 2.6.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
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-icingaweb2/compare/c22ae798e84bba3d1e777e1d9e38d697bf62b7d7...3e9c0ee33d8f71771b3c7c7d0d82af34310899ef
--
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-icingaweb2/compare/c22ae798e84bba3d1e777e1d9e38d697bf62b7d7...3e9c0ee33d8f71771b3c7c7d0d82af34310899ef
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/20180806/fb8e0397/attachment-0001.html>
More information about the pkg-nagios-changes
mailing list