Hello community,
here is the log from the commit of package icingaweb2-module-director for
openSUSE:Factory checked in at 2019-11-06 14:35:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/icingaweb2-module-director (Old)
and /work/SRC/openSUSE:Factory/.icingaweb2-module-director.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icingaweb2-module-director"
Wed Nov 6 14:35:56 2019 rev:12 rq:745551 version:1.7.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/icingaweb2-module-director/icingaweb2-module-director.changes
2019-10-17 12:22:41.151112596 +0200
+++
/work/SRC/openSUSE:Factory/.icingaweb2-module-director.new.2990/icingaweb2-module-director.changes
2019-11-06 14:35:58.590664028 +0100
@@ -1,0 +2,23 @@
+Tue Nov 5 18:07:53 UTC 2019 - [email protected]
+
+- Update to 1.7.2
+ * Fixed issues
+ - You can find issues and feature requests related to this
+ release on our roadmap
+ * DB Schema
+ - FIX: Rolling out new installations on MySQL v5.6 fails
+ (#1993)
+ * Icinga Configuration
+ - FIX: Render service_name for Notifications (#2006)
+ * User Interface
+ - FIX: Cloning Import Sources failed since v1.7.0 (#1997)
+ * CLI
+ - FIX: Importing Import Sources failed since v1.7.0 (#2005)
+ * Automation
+ - FIX: Fixing linux install script version check (#2008)
+ - FIX: Windows Kickstart Script - $GlobalZones was empty
+ (#2002)
+ * Documentation
+ - FIX: Missing single quote in mysql example bug (#2003)
+
+-------------------------------------------------------------------
Old:
----
icingaweb2-module-director-1.7.1.tar.gz
New:
----
icingaweb2-module-director-1.7.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ icingaweb2-module-director.spec ++++++
--- /var/tmp/diff_new_pack.GIy2pG/_old 2019-11-06 14:35:59.570665083 +0100
+++ /var/tmp/diff_new_pack.GIy2pG/_new 2019-11-06 14:35:59.574665087 +0100
@@ -19,7 +19,7 @@
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
Name: icingaweb2-module-director
-Version: 1.7.1
+Version: 1.7.2
Release: 0
Summary: Config module for Icinga Web 2
License: GPL-2.0-or-later
++++++ icingaweb2-module-director-1.7.1.tar.gz ->
icingaweb2-module-director-1.7.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/icingaweb2-module-director-1.7.1/application/controllers/ImportsourceController.php
new/icingaweb2-module-director-1.7.2/application/controllers/ImportsourceController.php
---
old/icingaweb2-module-director-1.7.1/application/controllers/ImportsourceController.php
2019-10-16 14:49:24.000000000 +0200
+++
new/icingaweb2-module-director-1.7.2/application/controllers/ImportsourceController.php
2019-11-05 16:59:41.000000000 +0100
@@ -125,6 +125,9 @@
$this->addTitle('Clone: %s', $source->get('source_name'));
$form = new CloneImportSourceForm($source);
$this->content()->add($form);
+ $form->on(CloneImportSourceForm::ON_SUCCESS, function
(CloneImportSourceForm $form) {
+ $this->getResponse()->redirectAndExit($form->getSuccessUrl());
+ });
$form->handleRequest($this->getServerRequest());
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/icingaweb2-module-director-1.7.1/contrib/linux-agent-installer/Icinga2Agent.bash
new/icingaweb2-module-director-1.7.2/contrib/linux-agent-installer/Icinga2Agent.bash
---
old/icingaweb2-module-director-1.7.1/contrib/linux-agent-installer/Icinga2Agent.bash
2019-10-16 14:49:24.000000000 +0200
+++
new/icingaweb2-module-director-1.7.2/contrib/linux-agent-installer/Icinga2Agent.bash
2019-11-05 16:59:41.000000000 +0100
@@ -109,7 +109,7 @@
esac
icinga_version() {
- "$ICINGA2_BIN" --version 2>/dev/null | grep -oP '\(version:
[rv]?\K\d+\.\d+\.\d+[^\)]*'
+ "$ICINGA2_BIN" --version 2>/dev/null | grep -oPi '\(version:
[rv]?\K\d+\.\d+\.\d+[^\)]*'
}
version() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/icingaweb2-module-director-1.7.1/contrib/windows-agent-installer/Icinga2Agent.psm1
new/icingaweb2-module-director-1.7.2/contrib/windows-agent-installer/Icinga2Agent.psm1
---
old/icingaweb2-module-director-1.7.1/contrib/windows-agent-installer/Icinga2Agent.psm1
2019-10-16 14:49:24.000000000 +0200
+++
new/icingaweb2-module-director-1.7.2/contrib/windows-agent-installer/Icinga2Agent.psm1
2019-11-05 16:59:41.000000000 +0100
@@ -232,8 +232,9 @@
$this.debug('Setting "agent_listen_port" to default 5665');
}
if ($this.cfg['global_zones'].Count -eq 0) {
- $this.cfg['global_zones'] = @( 'director-global' );
- $this.debug('Setting "global_zones" to default "director-global"');
+ $this.cfg['global_zones'] = @( 'director-global',
'global-templates' );
+ $this.generateGlobalZones();
+ $this.debug('Setting "global_zones" to default "director-global"
and "global-templates"');
}
if ($this.cfg['accept_config'] -eq -1) {
$this.cfg['accept_config'] = $TRUE;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/icingaweb2-module-director-1.7.1/doc/02-Installation.md
new/icingaweb2-module-director-1.7.2/doc/02-Installation.md
--- old/icingaweb2-module-director-1.7.1/doc/02-Installation.md 2019-10-16
14:49:24.000000000 +0200
+++ new/icingaweb2-module-director-1.7.2/doc/02-Installation.md 2019-11-05
16:59:41.000000000 +0100
@@ -41,7 +41,7 @@
#### MySQL (or MariaDB)
mysql -e "CREATE DATABASE director CHARACTER SET 'utf8';
- CREATE USER director@localhost IDENTIFIED BY 'some-password;
+ CREATE USER director@localhost IDENTIFIED BY 'some-password';
GRANT ALL ON director.* TO director@localhost;"
In case your MySQL root user is password-protected, please add `-p` to this
@@ -92,7 +92,7 @@
ICINGAWEB_MODULEPATH="/usr/share/icingaweb2/modules"
REPO_URL="https://github.com/icinga/icingaweb2-module-director";
TARGET_DIR="${ICINGAWEB_MODULEPATH}/director"
- MODULE_VERSION="1.7.1"
+ MODULE_VERSION="1.7.2"
URL="${REPO_URL}/archive/v${MODULE_VERSION}.tar.gz"
install -d -m 0755 "${TARGET_DIR}"
wget -q -O - "$URL" | tar xfz - -C "${TARGET_DIR}" --strip-components 1
@@ -109,7 +109,7 @@
ICINGAWEB_MODULEPATH="/usr/share/icingaweb2/modules"
REPO_URL="https://github.com/icinga/icingaweb2-module-director";
TARGET_DIR="${ICINGAWEB_MODULEPATH}/director"
- MODULE_VERSION="1.7.1"
+ MODULE_VERSION="1.7.2"
git clone "${REPO_URL}" "${TARGET_DIR}" --branch v${MODULE_VERSION}
You can now directly use our current GIT master or check out a specific
version.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icingaweb2-module-director-1.7.1/doc/82-Changelog.md
new/icingaweb2-module-director-1.7.2/doc/82-Changelog.md
--- old/icingaweb2-module-director-1.7.1/doc/82-Changelog.md 2019-10-16
14:49:24.000000000 +0200
+++ new/icingaweb2-module-director-1.7.2/doc/82-Changelog.md 2019-11-05
16:59:41.000000000 +0100
@@ -4,6 +4,32 @@
Please make sure to always read our [Upgrading](05-Upgrading.md) documentation
before switching to a new version.
+1.7.2
+-----
+
+### Fixed issues
+* You can find issues and feature requests related to this release on our
+
[roadmap](https://github.com/Icinga/icingaweb2-module-director/milestone/23?closed=1)
+
+### DB Schema
+* FIX: Rolling out new installations on MySQL v5.6 fails (#1993)
+
+### Icinga Configuration
+* FIX: Render service\_name for Notifications (#2006)
+
+### User Interface
+* FIX: Cloning Import Sources failed since v1.7.0 (#1997)
+
+### CLI
+* FIX: Importing Import Sources failed since v1.7.0 (#2005)
+
+### Automation
+* FIX: Fixing linux install script version check (#2008)
+* FIX: Windows Kickstart Script - $GlobalZones was empty (#2002)
+
+### Documentation
+* FIX: Missing single quote in mysql example bug (#2003)
+
1.7.1
-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/icingaweb2-module-director-1.7.1/library/Director/Objects/IcingaNotification.php
new/icingaweb2-module-director-1.7.2/library/Director/Objects/IcingaNotification.php
---
old/icingaweb2-module-director-1.7.1/library/Director/Objects/IcingaNotification.php
2019-10-16 14:49:24.000000000 +0200
+++
new/icingaweb2-module-director-1.7.2/library/Director/Objects/IcingaNotification.php
2019-11-05 16:59:41.000000000 +0100
@@ -244,6 +244,18 @@
return $this->renderRelationProperty('host', $this->get('host_id'),
'host_name');
}
+ /**
+ * Render service_id as service_name
+ *
+ * @codingStandardsIgnoreStart
+ * @return string
+ */
+ public function renderService_id()
+ {
+ // @codingStandardsIgnoreEnd
+ return $this->renderRelationProperty('service',
$this->get('service_id'), 'service_name');
+ }
+
protected function setKey($key)
{
if (is_int($key)) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/icingaweb2-module-director-1.7.1/library/Director/Objects/ImportSource.php
new/icingaweb2-module-director-1.7.2/library/Director/Objects/ImportSource.php
---
old/icingaweb2-module-director-1.7.1/library/Director/Objects/ImportSource.php
2019-10-16 14:49:24.000000000 +0200
+++
new/icingaweb2-module-director-1.7.2/library/Director/Objects/ImportSource.php
2019-11-05 16:59:41.000000000 +0100
@@ -115,11 +115,11 @@
public function setModifiers(array $modifiers)
{
- if ($this->loadedRowModifiers === null) {
+ if ($this->loadedRowModifiers === null &&
$this->hasBeenLoadedFromDb()) {
$this->loadedRowModifiers = $this->fetchRowModifiers();
}
$current = $this->loadedRowModifiers;
- if (count($current) !== count($modifiers)) {
+ if ($current !== null && count($current) !== count($modifiers)) {
$this->newRowModifiers = $modifiers;
} else {
$i = 0;
@@ -394,7 +394,6 @@
public function fetchRowModifiers()
{
$db = $this->getDb();
-
$modifiers = ImportRowModifier::loadAll(
$this->getConnection(),
$db->select()
@@ -403,7 +402,11 @@
->order('priority ASC')
);
- return $modifiers;
+ if ($modifiers) {
+ return $modifiers;
+ } else {
+ return [];
+ }
}
protected function fetchFlatRowModifiers()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/icingaweb2-module-director-1.7.1/library/Director/Web/Form/CloneImportSourceForm.php
new/icingaweb2-module-director-1.7.2/library/Director/Web/Form/CloneImportSourceForm.php
---
old/icingaweb2-module-director-1.7.1/library/Director/Web/Form/CloneImportSourceForm.php
2019-10-16 14:49:24.000000000 +0200
+++
new/icingaweb2-module-director-1.7.2/library/Director/Web/Form/CloneImportSourceForm.php
2019-11-05 16:59:41.000000000 +0100
@@ -52,13 +52,11 @@
$newName = $this->getElement('source_name')->getValue();
$export->source_name = $newName;
unset($export->originalId);
-
if (ImportSource::existsWithName($newName,
$this->source->getConnection())) {
$this->getElement('source_name')->addMessage('Name already
exists');
}
$this->newSource = ImportSource::import($export, $this->getTargetDb());
$this->newSource->store();
- $this->redirectOnSuccess();
}
public function getSuccessUrl()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icingaweb2-module-director-1.7.1/module.info
new/icingaweb2-module-director-1.7.2/module.info
--- old/icingaweb2-module-director-1.7.1/module.info 2019-10-16
14:49:24.000000000 +0200
+++ new/icingaweb2-module-director-1.7.2/module.info 2019-11-05
16:59:41.000000000 +0100
@@ -1,5 +1,5 @@
Name: Icinga Director
-Version: 1.7.1
+Version: 1.7.2
Depends: reactbundle (>=0.7.0), ipl (>=0.3.0), incubator (>=0.5.0)
Description: Director - Config tool for Icinga 2
Icinga Director is a configuration tool that has been designed to make
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icingaweb2-module-director-1.7.1/schema/mysql.sql
new/icingaweb2-module-director-1.7.2/schema/mysql.sql
--- old/icingaweb2-module-director-1.7.1/schema/mysql.sql 2019-10-16
14:49:24.000000000 +0200
+++ new/icingaweb2-module-director-1.7.2/schema/mysql.sql 2019-11-05
16:59:41.000000000 +0100
@@ -38,7 +38,7 @@
old_properties TEXT DEFAULT NULL COMMENT 'Property hash, JSON',
new_properties TEXT DEFAULT NULL COMMENT 'Property hash, JSON',
author VARCHAR(64) NOT NULL,
- change_time TIMESTAMP NOT NULL,
+ change_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
checksum VARBINARY(20) NOT NULL,
parent_checksum VARBINARY(20) DEFAULT NULL,
PRIMARY KEY (id),
