[Pkg-nagios-changes] [pkg-icinga-web] 01/01: Imported Upstream version 1.11.1
Markus Frosch
lazyfrosch-guest at moszumanska.debian.org
Tue Aug 5 15:20:03 UTC 2014
This is an automated email from the git hooks/post-receive script.
lazyfrosch-guest pushed a commit to branch upstream
in repository pkg-icinga-web.
commit 9682a38e5f8a4bb0ba5b19b36ee69f0b05253e0b
Author: Markus Frosch <markus at lazyfrosch.de>
Date: Tue Aug 5 16:07:26 2014 +0200
Imported Upstream version 1.11.1
---
app/modules/Api/actions/ApiCommandAction.class.php | 10 +++++--
app/modules/Api/config/commands/host.xml | 1 +
.../Commands/CommandDispatcherModel.class.php | 33 ++++++++++++++++------
.../DataProvider/UserProviderAction.class.php | 2 +-
app/modules/AppKit/config/javascript.xml | 11 +++++---
.../lib/js/ext-overrides/TreeNodeDontLeak.js | 11 ++++++++
.../lib/js/utils/String.js} | 23 ++++++---------
.../lib/js/Cronk/grid/renderer/ColumnRenderer.js | 11 ++++++++
.../Cronks/Tackle/Information/LongPluginOutput.js | 1 +
.../Cronks/Tackle/Information/OutputPanel.js | 12 ++++++++
.../models/Provider/StatusSummaryModel.class.php | 7 +++++
configure | 20 ++++++-------
doc/CHANGELOG-1.11 | 22 +++++++++++++++
doc/README.RHEL | 24 ++++++++++++++++
doc/README.SUSE | 24 ++++++++++++++++
doc/VERSION | 2 +-
etc/conf.d/cronks.xml | 2 +-
etc/make/version.m4 | 4 +--
etc/schema/mysql.sql | 2 +-
etc/schema/oracle.sql | 2 +-
etc/schema/pgsql.sql | 2 +-
etc/schema/sqlite.sql | 2 +-
icinga-web.spec | 5 +++-
23 files changed, 185 insertions(+), 48 deletions(-)
diff --git a/app/modules/Api/actions/ApiCommandAction.class.php b/app/modules/Api/actions/ApiCommandAction.class.php
index 3a1714a..404d1e4 100644
--- a/app/modules/Api/actions/ApiCommandAction.class.php
+++ b/app/modules/Api/actions/ApiCommandAction.class.php
@@ -45,16 +45,22 @@ class Api_ApiCommandAction extends IcingaApiBaseAction {
$command = $rd->getParameter("command");
$targets = json_decode($rd->getParameter("target"),true);
+
$data = json_decode($rd->getParameter("data"),true);
+ if (!is_array($data)) {
+ $this->setAttribute('error', 'Parameter data={} could not decoded from json');
+ return 'Error';
+ }
+
if (!is_array($targets)) {
$targets = array($targets);
}
$api = $this->getContext()->getModel("System.CommandSender","Cronks");
$api->setCommandName($command);
-
- $api->setData(array_merge($data,array("data"=>$data)));
+
+ $api->setData($data);
$api->setSelection($targets);
// send it
diff --git a/app/modules/Api/config/commands/host.xml b/app/modules/Api/config/commands/host.xml
index 7ec4051..5ee6ac4 100644
--- a/app/modules/Api/config/commands/host.xml
+++ b/app/modules/Api/config/commands/host.xml
@@ -298,6 +298,7 @@
<ic:label>Schedule next checks for covered services (forced)</ic:label>
<ic:parameters>
<ic:parameter ref="COMMAND_HOST" />
+ <ic:parameter ref="COMMAND_CHECKTIME" />
</ic:parameters>
</ic:command>
<ic:command name="DISABLE_HOST_SVC_CHECKS">
diff --git a/app/modules/Api/models/Commands/CommandDispatcherModel.class.php b/app/modules/Api/models/Commands/CommandDispatcherModel.class.php
index 4dd0598..f77c036 100644
--- a/app/modules/Api/models/Commands/CommandDispatcherModel.class.php
+++ b/app/modules/Api/models/Commands/CommandDispatcherModel.class.php
@@ -90,27 +90,44 @@ class Api_Commands_CommandDispatcherModel extends IcingaApiBaseModel implements
private function buildCommandString(array $command, array $params) {
$str = "[".time()."] ".$command["definition"];
+
foreach($command["parameters"] as $param=>$vals) {
if(!isset($vals["required"]))
$vals["required"] = true;
+ /*
+ * Use default values if any
+ */
+ if (!isset($params[$vals["alias"]]) && $vals["required"] && array_key_exists('defaultValue', $vals)) {
+ $params[$vals["alias"]] = $vals['defaultValue'];
+ }
+
if (!isset($params[$vals["alias"]]) && $vals["required"]) {
throw new MissingCommandParameterException($vals["alias"]." is missing");
} else if (!isset($params[$vals["alias"]])) {
$str .= ";";
} else {
$val = ($params[$vals["alias"]]);
- $val = preg_replace("/\n/"," ",$val);
-
- switch ($vals["type"]) {
- case "date":
- $val = strtotime($val);
- break;
+
+ /*
+ * Sanitize data to not break the whole command chain
+ */
+ if (is_array($val) == true) {
+ $val = '';
+ } else {
+ $val = preg_replace("/\n/"," ",$val);
+
+ switch ($vals["type"]) {
+ case "date":
+ $val = strtotime($val);
+ break;
+ }
}
+
// Perfdata is a a special case that requires | instead of ;
- if($param != "COMMAND_PERFDATA")
+ if($param != "COMMAND_PERFDATA") {
$str .= ";".$val;
- else {
+ } else {
if(trim($val) != "")
$str .= "|".$val;
}
diff --git a/app/modules/AppKit/actions/DataProvider/UserProviderAction.class.php b/app/modules/AppKit/actions/DataProvider/UserProviderAction.class.php
index c1ce19d..aa547f9 100644
--- a/app/modules/AppKit/actions/DataProvider/UserProviderAction.class.php
+++ b/app/modules/AppKit/actions/DataProvider/UserProviderAction.class.php
@@ -82,7 +82,7 @@ class AppKit_DataProvider_UserProviderAction extends AppKitBaseAction {
$userObject["roles"][] = array(
"id" => $role->role_id,
"name" => $role->role_name,
- "description" => $role->role_name,
+ "description" => $role->role_description,
"active" => $role->role_disabled != 1
);
}
diff --git a/app/modules/AppKit/config/javascript.xml b/app/modules/AppKit/config/javascript.xml
index 4cee384..81b87bc 100644
--- a/app/modules/AppKit/config/javascript.xml
+++ b/app/modules/AppKit/config/javascript.xml
@@ -36,7 +36,7 @@
<ae:parameter>%core.module_dir%/AppKit/lib/js/ux/EllipsisColumn.js</ae:parameter>
<ae:parameter>%core.module_dir%/AppKit/lib/js/search/AppKitSearchBox.js</ae:parameter>
<ae:parameter>%core.module_dir%/AppKit/lib/js/search/AppKitSearchHandler.js</ae:parameter>
-
+
<!-- Admin interface components -->
<ae:parameter>%core.module_dir%/AppKit/lib/js/admin/components/RoleListingGrid.js</ae:parameter>
<ae:parameter>%core.module_dir%/AppKit/lib/js/admin/components/UserListingGrid.js</ae:parameter>
@@ -54,11 +54,14 @@
<ae:parameter>%core.module_dir%/AppKit/lib/js/admin/RoleManager.js</ae:parameter>
<ae:parameter>%core.module_dir%/AppKit/lib/js/ux/SmartUpdateGrid.js</ae:parameter>
-
+
<!-- jsgettext -->
<ae:parameter>%core.root_dir%/lib/jsgettext/lib/Gettext.js</ae:parameter>
+
+ <ae:parameter>%core.module_dir%/AppKit/lib/js/ext-overrides/TreeNodeDontLeak.js</ae:parameter>
+ <ae:parameter>%core.module_dir%/AppKit/lib/js/utils/String.js</ae:parameter>
</javascript>
-
+
<!--
* Method is deprecated
<jactions>
@@ -69,6 +72,6 @@
</jaction>
</jactions>
-->
-
+
</ae:configuration>
</ae:configurations>
diff --git a/app/modules/AppKit/lib/js/ext-overrides/TreeNodeDontLeak.js b/app/modules/AppKit/lib/js/ext-overrides/TreeNodeDontLeak.js
new file mode 100644
index 0000000..1126754
--- /dev/null
+++ b/app/modules/AppKit/lib/js/ext-overrides/TreeNodeDontLeak.js
@@ -0,0 +1,11 @@
+(function () {
+ 'use strict';
+ var removeChild = Ext.tree.TreeNode.prototype.removeChild;
+ Ext.override(Ext.tree.TreeNode, {
+ removeChild: function () {
+ var node = removeChild.apply(this, arguments);
+ this.ownerTree.unregisterNode(node);
+ return node;
+ }
+ });
+}());
diff --git a/app/modules/Cronks/lib/js/Icinga/Cronks/Tackle/Information/LongPluginOutput.js b/app/modules/AppKit/lib/js/utils/String.js
similarity index 73%
copy from app/modules/Cronks/lib/js/Icinga/Cronks/Tackle/Information/LongPluginOutput.js
copy to app/modules/AppKit/lib/js/utils/String.js
index 8f93846..0ea3d3f 100644
--- a/app/modules/Cronks/lib/js/Icinga/Cronks/Tackle/Information/LongPluginOutput.js
+++ b/app/modules/AppKit/lib/js/utils/String.js
@@ -1,35 +1,30 @@
// {{{ICINGA_LICENSE_CODE}}}
// -----------------------------------------------------------------------------
// This file is part of icinga-web.
-//
+//
// Copyright (c) 2009-present Icinga Developer Team.
// All rights reserved.
-//
+//
// icinga-web is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// icinga-web is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with icinga-web. If not, see <http://www.gnu.org/licenses/>.
// -----------------------------------------------------------------------------
// {{{ICINGA_LICENSE_CODE}}}
-/*global Ext: false, Icinga: false, _: false */
-Ext.ns('Icinga.Cronks.Tackle.Information');
+(function() {
+ "use static";
-(function () {
- "use strict";
-
- Icinga.Cronks.Tackle.Information.LongPluginOutput = Ext.extend(
- Icinga.Cronks.Tackle.Information.OutputPanel, {
- title: _("Long plugin output"),
- tplField: 'object_long_output'
- });
+ String.prototype.nl2br = function() {
+ return (this + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1<br />$2');
+ };
})();
\ No newline at end of file
diff --git a/app/modules/Cronks/lib/js/Cronk/grid/renderer/ColumnRenderer.js b/app/modules/Cronks/lib/js/Cronk/grid/renderer/ColumnRenderer.js
index 1635dc1..373b8c1 100644
--- a/app/modules/Cronks/lib/js/Cronk/grid/renderer/ColumnRenderer.js
+++ b/app/modules/Cronks/lib/js/Cronk/grid/renderer/ColumnRenderer.js
@@ -80,6 +80,13 @@ Ext.ns('Cronk.grid');
Cronk.grid.ColumnRenderer = {
customColumnPerfdataSanitized: function (cfg) {
+
+ var multiLine = false;
+
+ if (!Ext.isEmpty(cfg.multiLine) && cfg.multiLine) {
+ multiLine = true;
+ }
+
return function (value, metaData, record, rowIndex, colIndex, store) {
if (!value) {
return _('no value');
@@ -99,6 +106,10 @@ Ext.ns('Cronk.grid');
metaData.attr = 'ext:qtip="' + Ext.util.Format.htmlEncode(value) + '"';
+ if (multiLine === true) {
+ value = String(value).nl2br();
+ }
+
return value;
};
},
diff --git a/app/modules/Cronks/lib/js/Icinga/Cronks/Tackle/Information/LongPluginOutput.js b/app/modules/Cronks/lib/js/Icinga/Cronks/Tackle/Information/LongPluginOutput.js
index 8f93846..668efc0 100644
--- a/app/modules/Cronks/lib/js/Icinga/Cronks/Tackle/Information/LongPluginOutput.js
+++ b/app/modules/Cronks/lib/js/Icinga/Cronks/Tackle/Information/LongPluginOutput.js
@@ -29,6 +29,7 @@ Ext.ns('Icinga.Cronks.Tackle.Information');
Icinga.Cronks.Tackle.Information.LongPluginOutput = Ext.extend(
Icinga.Cronks.Tackle.Information.OutputPanel, {
title: _("Long plugin output"),
+ keepLineBreaksInHTML: true,
tplField: 'object_long_output'
});
diff --git a/app/modules/Cronks/lib/js/Icinga/Cronks/Tackle/Information/OutputPanel.js b/app/modules/Cronks/lib/js/Icinga/Cronks/Tackle/Information/OutputPanel.js
index fbb8026..3049216 100644
--- a/app/modules/Cronks/lib/js/Icinga/Cronks/Tackle/Information/OutputPanel.js
+++ b/app/modules/Cronks/lib/js/Icinga/Cronks/Tackle/Information/OutputPanel.js
@@ -28,6 +28,7 @@ Ext.ns('Icinga.Cronks.Tackle.Information');
Icinga.Cronks.Tackle.Information.OutputPanel = Ext.extend(Ext.Panel, {
autoScroll: true,
+ keepLineBreaksInHTML: false,
constructor: function(c) {
Icinga.Cronks.Tackle.Information
@@ -48,6 +49,17 @@ Ext.ns('Icinga.Cronks.Tackle.Information');
Icinga.Cronks.Tackle.Information
.OutputPanel.superclass.initComponent.call(this);
+ },
+
+ update: function(htmlOrData, loadScripts, cb) {
+ if (!Ext.isEmpty(this.tplField) && this.keepLineBreaksInHTML === true) {
+ if (!Ext.isEmpty(htmlOrData[this.tplField])) {
+ htmlOrData[this.tplField] = String(htmlOrData[this.tplField]).nl2br();
+ }
+ }
+
+ Icinga.Cronks.Tackle.Information
+ .OutputPanel.superclass.update.call(this, htmlOrData, loadScripts, cb);
}
});
diff --git a/app/modules/Cronks/models/Provider/StatusSummaryModel.class.php b/app/modules/Cronks/models/Provider/StatusSummaryModel.class.php
index f7880e0..6a4e521 100644
--- a/app/modules/Cronks/models/Provider/StatusSummaryModel.class.php
+++ b/app/modules/Cronks/models/Provider/StatusSummaryModel.class.php
@@ -125,6 +125,13 @@ class Cronks_Provider_StatusSummaryModel extends CronksUserCacheDataModel {
if ((!$record['a_has_been_checked'])) {
$state = IcingaConstants::HOST_PENDING;
}
+
+ /*
+ * Test for target data because this can break the whole cronk, #6126 (mh)
+ */
+ if (!array_key_exists($state, $out)) {
+ continue;
+ }
if ($type === 'service') {
if ($record['hs_current_state'] !== "0" && (int)$record['hs_current_state'] > 0) {
diff --git a/configure b/configure
index 029fb71..e59ee5a 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for icinga-web 1.11.0.
+# Generated by GNU Autoconf 2.69 for icinga-web 1.11.1.
#
# Report bugs to <dev.icinga.org>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='icinga-web'
PACKAGE_TARNAME='icinga-web'
-PACKAGE_VERSION='1.11.0'
-PACKAGE_STRING='icinga-web 1.11.0'
+PACKAGE_VERSION='1.11.1'
+PACKAGE_STRING='icinga-web 1.11.1'
PACKAGE_BUGREPORT='dev.icinga.org'
PACKAGE_URL=''
@@ -1272,7 +1272,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures icinga-web 1.11.0 to adapt to many kinds of systems.
+\`configure' configures icinga-web 1.11.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1333,7 +1333,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of icinga-web 1.11.0:";;
+ short | recursive ) echo "Configuration of icinga-web 1.11.1:";;
esac
cat <<\_ACEOF
@@ -1465,7 +1465,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-icinga-web configure 1.11.0
+icinga-web configure 1.11.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1482,7 +1482,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by icinga-web $as_me 1.11.0, which was
+It was created by icinga-web $as_me 1.11.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -1832,7 +1832,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Release date
-RELEASE_DATE=2014-03-13
+RELEASE_DATE=2014-06-24
@@ -3368,7 +3368,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by icinga-web $as_me 1.11.0, which was
+This file was extended by icinga-web $as_me 1.11.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3421,7 +3421,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-icinga-web config.status 1.11.0
+icinga-web config.status 1.11.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/doc/CHANGELOG-1.11 b/doc/CHANGELOG-1.11
index b8da908..0e13127 100644
--- a/doc/CHANGELOG-1.11
+++ b/doc/CHANGELOG-1.11
@@ -5,6 +5,28 @@ Icinga-web 1.11 changelog
Thanks to all contributers, testers and developers. Please read AUTHORS and
THANKS for a detailed list :-)
+[[ 1.11.1 - 2014-06-24 ]]
+
+NOTE: Please apply the database schema update for your database!
+
+[ Bugs ]
+
+ * Add missing timestamp to SCHEDULE_FORCED_HOST_SVC_CHECKS data. (#5755)
+
+ * Change category for reporting cronk to addons. (#5993)
+
+ * Bypass data in StatusSummaryCronk when fields are missing. (#6126)
+
+ * Before sending commands test data before push out the pipe. There was
+ also an error that some commands use wrong data or never worked.
+
+ * Override ExtJS implementation of 'TreeNode::removeChild()'. This helps
+ add-ons to free memory when remove tree nodes (e.g. Business Process Addon).
+
+ * Display role description in user depended role grid. (#6261)
+
+ * Fix long plugin output to have multiline support. (#2653)
+
[[ 1.11.0 - 2014-03-13 ]]
[ NOTABLE CHANGES ]
diff --git a/doc/README.RHEL b/doc/README.RHEL
index 87340a4..83b5cee 100644
--- a/doc/README.RHEL
+++ b/doc/README.RHEL
@@ -87,6 +87,30 @@ idoutils' sections.
Check the documentation for more details
http://docs.icinga.org/latest/en/icinga-web-config.html
+Configuration for Icinga 2
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Icinga Web 1.x targets a default Icinga Core & IDOUtils installation. You will
+need to adjust certain configuration parameters in order to point them to Icinga 2's
+locations.
+
+* IDO DB Backend
+
+Only if the default credentials have been changed during the setup.
+
+# vim /etc/icinga-web/conf.d/databases.xml
+
+* External Command Pipe
+
+# vim /etc/icinga-web/conf.d/access.xml
+
+ <write>
+ <files>
+ <resource name="icinga_pipe">/var/run/icinga2/cmd/icinga.cmd</resource>
+ </files>
+ </write>
+
+# icinga-web-clearcache
Logs & Errors
~~~~~~~~~~~~~
diff --git a/doc/README.SUSE b/doc/README.SUSE
index b376dc5..61415e9 100644
--- a/doc/README.SUSE
+++ b/doc/README.SUSE
@@ -83,6 +83,30 @@ idoutils' sections.
Check the documentation for more details
http://docs.icinga.org/latest/en/icinga-web-config.html
+Configuration for Icinga 2
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Icinga Web 1.x targets a default Icinga Core & IDOUtils installation. You will
+need to adjust certain configuration parameters in order to point them to Icinga 2's
+locations.
+
+* IDO DB Backend
+
+Only if the default credentials have been changed during the setup.
+
+# vim /etc/icinga-web/conf.d/databases.xml
+
+* External Command Pipe
+
+# vim /etc/icinga-web/access.xml
+
+ <write>
+ <files>
+ <resource name="icinga_pipe">/var/run/icinga2/cmd/icinga.cmd</resource>
+ </files>
+ </write>
+
+# icinga-web-clearcache
Logs & Errors
~~~~~~~~~~~~~
diff --git a/doc/VERSION b/doc/VERSION
index 1cac385..5d1dd5c 100644
--- a/doc/VERSION
+++ b/doc/VERSION
@@ -1 +1 @@
-1.11.0
+0.0.0-1.11.1
diff --git a/etc/conf.d/cronks.xml b/etc/conf.d/cronks.xml
index 74fbf1b..aab06d8 100644
--- a/etc/conf.d/cronks.xml
+++ b/etc/conf.d/cronks.xml
@@ -50,7 +50,7 @@
<ae:parameter name="description">Seamless Jasper Integration</ae:parameter>
<ae:parameter name="name">Reporting</ae:parameter>
- <ae:parameter name="categories">icinga-reporting</ae:parameter>
+ <ae:parameter name="categories">addons</ae:parameter>
<ae:parameter name="image">cronks.Weather_Could_Sun</ae:parameter>
<ae:parameter name="groupsonly">appkit_admin</ae:parameter>
<ae:parameter name="ae:parameter">
diff --git a/etc/make/version.m4 b/etc/make/version.m4
index be57367..566c917 100644
--- a/etc/make/version.m4
+++ b/etc/make/version.m4
@@ -9,5 +9,5 @@ dnl to tag a specific release. Icinga releases do not use
dnl this name.
dnl
-m4_define([ICINGA_VERSION], [1.11.0])
-m4_define([ICINGA_RELEASE_DATE], [2014-03-13])
+m4_define([ICINGA_VERSION], [1.11.1])
+m4_define([ICINGA_RELEASE_DATE], [2014-06-24])
diff --git a/etc/schema/mysql.sql b/etc/schema/mysql.sql
index e100104..9c79ab2 100644
--- a/etc/schema/mysql.sql
+++ b/etc/schema/mysql.sql
@@ -42,7 +42,7 @@ ALTER TABLE nsm_user_role ADD CONSTRAINT nsm_user_role_usro_role_id_nsm_role_rol
/* Initial data import */
INSERT INTO nsm_user (user_id,user_account,user_name,user_firstname,user_lastname,user_password,user_salt,user_authsrc,user_email,user_disabled,user_modified,user_created) VALUES ('1','0','root','Enoch','Root','42bc5093863dce8c150387a5bb7e3061cf3ea67d2cf1779671e1b0f435e953a1','0c099ae4627b144f3a7eaa763ba43b10fd5d1caa8738a98f11bb973bebc52ccd','internal','root at localhost.local','0', NOW(), NOW());
-INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.10.1', NOW(), NOW());
+INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.11.1', NOW(), NOW());
INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('1','IcingaHostgroup','Limit data access to specific hostgroups','IcingaDataHostgroupPrincipalTarget','icinga');
INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('2','IcingaServicegroup','Limit data access to specific servicegroups','IcingaDataServicegroupPrincipalTarget','icinga');
INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('3','IcingaHostCustomVariablePair','Limit data access to specific custom variables','IcingaDataHostCustomVariablePrincipalTarget','icinga');
diff --git a/etc/schema/oracle.sql b/etc/schema/oracle.sql
index 9c17bf5..bb0e42c 100644
--- a/etc/schema/oracle.sql
+++ b/etc/schema/oracle.sql
@@ -621,7 +621,7 @@ INSERT INTO nsm_target (target_id,target_name,target_description,target_class,ta
INSERT INTO nsm_user (user_id,user_account,user_name,user_firstname,user_lastname,user_password,user_salt,user_authsrc,user_email,user_disabled,user_created,user_modified) VALUES ('1','0','root','Enoch','Root','42bc5093863dce8c150387a5bb7e3061cf3ea67d2cf1779671e1b0f435e953a1','0c099ae4627b144f3a7eaa763ba43b10fd5d1caa8738a98f11bb973bebc52ccd','internal','root at localhost.local','0',sysdate,sysdate);
-INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.10.1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.11.1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO nsm_principal (principal_id,principal_user_id,principal_type,principal_disabled) VALUES ('1','1','user','0');
INSERT INTO nsm_principal (principal_id,principal_role_id,principal_type,principal_disabled) VALUES ('2','2','role','0');
diff --git a/etc/schema/pgsql.sql b/etc/schema/pgsql.sql
index 4f5802a..9cc5a03 100644
--- a/etc/schema/pgsql.sql
+++ b/etc/schema/pgsql.sql
@@ -655,7 +655,7 @@ COPY cronk_principal_cronk (cpc_principal_id, cpc_cronk_id) FROM stdin;
--
COPY nsm_db_version (id, version, modified, created) FROM stdin;
-1 icinga-web/v1.10.1 2014-02-19 00:00:00 2014-02-19 00:00:00
+1 icinga-web/v1.11.1 2014-06-24 00:00:00 2014-06-24 00:00:00
\.
diff --git a/etc/schema/sqlite.sql b/etc/schema/sqlite.sql
index c5ad75f..f9beeb4 100644
--- a/etc/schema/sqlite.sql
+++ b/etc/schema/sqlite.sql
@@ -173,7 +173,7 @@ CREATE TABLE cronk_principal_category (
/* Initial data import */
-INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.10.1', DATETIME('now'), DATETIME('now'));
+INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.11.1', DATETIME('now'), DATETIME('now'));
INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('1','IcingaHostgroup','Limit data access to specific hostgroups','IcingaDataHostgroupPrincipalTarget','icinga');
INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('2','IcingaServicegroup','Limit data access to specific servicegroups','IcingaDataServicegroupPrincipalTarget','icinga');
INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('3','IcingaHostCustomVariablePair','Limit data access to specific custom variables','IcingaDataHostCustomVariablePrincipalTarget','icinga');
diff --git a/icinga-web.spec b/icinga-web.spec
index a26d617..c051aff 100644
--- a/icinga-web.spec
+++ b/icinga-web.spec
@@ -37,7 +37,7 @@
Summary: Open Source host, service and network monitoring Web UI
Name: icinga-web
-Version: 1.11.0
+Version: 1.11.1
Release: %{revision}%{?dist}
License: GPLv3
Group: Applications/System
@@ -310,6 +310,9 @@ fi
%attr(-,icinga,icinga) %{_localstatedir}/log/icingaCron
%changelog
+* Thu Jun 26 2014 Marius Hein <marius.hein at netways.de> - 1.11.1-1
+- release 1.11.1
+
* Thu Mar 13 2014 Michael Friedrich <michael.friedrich at netways.de> - 1.11.0-1
- bump to 1.11.0
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga-web.git
More information about the Pkg-nagios-changes
mailing list