[pkg-nagios-changes] [Git][nagios-team/pkg-nagvis][master] 15 commits: Update branch in gbp.conf & Vcs-Git URL.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Sun Aug 15 15:07:36 BST 2021
Bas Couwenberg pushed to branch master at Debian Nagios Maintainer Group / pkg-nagvis
Commits:
018f1c94 by Bas Couwenberg at 2021-07-05T16:25:44+02:00
Update branch in gbp.conf & Vcs-Git URL.
- - - - -
1d211e01 by Bas Couwenberg at 2021-07-05T16:26:39+02:00
New upstream version 1.9.26
- - - - -
c19df8ee by Bas Couwenberg at 2021-07-05T16:26:45+02:00
Update upstream source from tag 'upstream/1.9.26'
Update to upstream version '1.9.26'
with Debian dir 4856a0ab69cd4170ec76a74aa50d616c39a703df
- - - - -
3412b903 by Bas Couwenberg at 2021-07-05T16:27:07+02:00
New upstream release.
- - - - -
b3adb675 by Bas Couwenberg at 2021-07-05T16:29:17+02:00
Set distribution to experimental.
- - - - -
d96f843d by Bas Couwenberg at 2021-07-16T09:35:27+02:00
New upstream version 1.9.27
- - - - -
54c63d48 by Bas Couwenberg at 2021-07-16T09:35:35+02:00
Update upstream source from tag 'upstream/1.9.27'
Update to upstream version '1.9.27'
with Debian dir a23bf4c62b6784bf37db959ac55fd56bf50181a6
- - - - -
ca0f2074 by Bas Couwenberg at 2021-07-16T09:35:55+02:00
New upstream release.
- - - - -
e45c046b by Bas Couwenberg at 2021-07-16T09:54:01+02:00
Mark patches as Forwarded: not-needed.
- - - - -
b9e2607f by Bas Couwenberg at 2021-07-16T09:54:01+02:00
Drop obsolete Files-Excluded & repacksuffix.
- - - - -
93890a1e by Bas Couwenberg at 2021-07-16T09:54:01+02:00
Update lintian overrides.
- - - - -
dd84aebb by Bas Couwenberg at 2021-07-16T09:54:01+02:00
Use .maintscript file for dpkg-maintscript-helper commands.
- - - - -
4dda1f53 by Bas Couwenberg at 2021-07-16T09:54:01+02:00
Set distribution to experimental.
- - - - -
e8333195 by Bas Couwenberg at 2021-08-15T15:59:16+02:00
Revert "Update branch in gbp.conf & Vcs-Git URL."
This reverts commit 018f1c9460c03d857d26cebd5b9c50c3f4dc0f92.
- - - - -
2b50b05a by Bas Couwenberg at 2021-08-15T16:02:54+02:00
Move from experimental to unstable.
- - - - -
20 changed files:
- ChangeLog
- debian/changelog
- debian/copyright
- debian/nagvis.lintian-overrides
- debian/nagvis.maintscript
- debian/nagvis.postinst
- debian/nagvis.postrm
- debian/nagvis.preinst
- debian/patches/config.patch
- debian/patches/jquery_path.patch
- debian/watch
- docs/en_US/worldmap.html
- omd_install.sh
- share/frontend/nagvis-js/ext/dwoo-1.1.0/Dwoo/Compiler.php
- share/server/core/classes/CoreAuthModPDO.php
- share/server/core/classes/CoreAuthorisationModPDO.php
- share/server/core/classes/CorePDOHandler.php
- share/server/core/defines/global.php
- share/server/core/sources/filter.php
- share/server/core/sources/worldmap.php
Changes:
=====================================
ChangeLog
=====================================
@@ -1,4 +1,18 @@
+1.9.27
+Core
+ * FIX: Fix PHP 7 (or older) incompatibilities introduced with 1.9.26
+ (Error (Error): Call to undefined method ReflectionType::getName())
+
+1.9.26
+Core
+ * FIX: Fix PHP 8 incompatibilites
+
+Worldmap
+ * Add new option filter_group for filtering host objects on a worldmap based
+ on the membership of hosts in a host group.
+
1.9.25
+Core
* FIX: Fix map corruption regression introduced with 1.9.24
This issue was triggered by objects on a map having a numeric "object_id"
attribute. The issue resulted in map configuration files without "define
@@ -6,11 +20,14 @@
show an error like "Error: (0) in_array() expects parameter 2 to be array, bool given".
You will have to find the problematic map config (.cfg) and readd the global
section.
- * FIX: Fix editing map options when object_id not set in global section object
* FIX: Fix possible map corruption caused by object ID cleanup (#280)
* FIX: Fix missing socket string in some livestatus backend error messages
+Frontend
+ * FIX: Fix editing map options when object_id not set in global section object
+
1.9.24
+Core
* FIX: Fix more PHP 7.4 incompatibilites (#265)
(This fixes one issue related to the PDO auth module and one issue related
to map configurations with numeric object_id attributes.)
@@ -18,20 +35,20 @@
(Undefined index 'downtime' was shown)
1.9.23
-Frontend:
+Frontend
* Make NagVis compatible with Checkmk 2.0 auth cookies
1.9.22
-Core:
+Core
* FIX: Fix error handling of DB backends when DB opening failed
(Undefined property: CorePDOHandler::$dsn) (#267)
-Frontend:
+Frontend
* Colors with alpha channel are now allowed (format: #RRGGBBAA) (#270)
* FIX: Improve validation of file names in several places to prevent input of
not printable characters.
-Worldmap:
+Worldmap
* Improve recently introduced textbox scaling according to zoom (pull #263)
1.9.21
=====================================
debian/changelog
=====================================
@@ -1,3 +1,28 @@
+nagvis (1:1.9.27-1) unstable; urgency=medium
+
+ * Team upload.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 15 Aug 2021 15:59:19 +0200
+
+nagvis (1:1.9.27-1~exp1) experimental; urgency=medium
+
+ * Team upload.
+ * New upstream release.
+ * Mark patches as Forwarded: not-needed.
+ * Drop obsolete Files-Excluded & repacksuffix.
+ * Update lintian overrides.
+ * Use .maintscript file for dpkg-maintscript-helper commands.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 16 Jul 2021 09:36:27 +0200
+
+nagvis (1:1.9.26-1~exp1) experimental; urgency=medium
+
+ * Team upload.
+ * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 05 Jul 2021 16:28:55 +0200
+
nagvis (1:1.9.25-2) unstable; urgency=medium
* Add maintscript configuration to migrate php-gettext symlink to dir.
=====================================
debian/copyright
=====================================
@@ -1,7 +1,6 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: NagVis
Source: http://sourceforge.net/projects/nagvis/files/
-Files-Excluded: uifx share/netmap/shell.html share/netmap/shell.swf share/netmap/modules/gmap
Files: *
Copyright: Copyright 2007-2013, Lars Michelsen <lars at vertical-visions.de>
=====================================
debian/nagvis.lintian-overrides
=====================================
@@ -6,3 +6,11 @@ apache2-reverse-dependency-calls-invoke-rc.d postinst
# user and group
spelling-error-in-readme-debian nagios nagios (duplicate word) nagios
+
+# Not a problem
+package-contains-documentation-outside-usr-share-doc *
+extra-license-file usr/share/nagvis/share/server/core/ext/*/COPYING
+
+# Not guaranteed to be compatible
+embedded-php-library usr/share/nagvis/share/server/core/ext/php-gettext* please use php-php-gettext
+
=====================================
debian/nagvis.maintscript
=====================================
@@ -1 +1,5 @@
symlink_to_dir /usr/share/nagvis/share/server/core/ext/php-gettext-1.0.12 ../../../../../php/php-php-gettext 1:1.9.25-2~
+
+mv_conffile /etc/apache2/conf.d/nagvis.conf /etc/nagvis/apache2.conf 1:1.7.9+dfsg1-1~
+rm_conffile /etc/nagvis/automaps/__automap.cfg 1:1.7.9+dfsg1-1~
+
=====================================
debian/nagvis.postinst
=====================================
@@ -21,20 +21,12 @@ if dpkg --compare-versions "$2" lt-nl "1:1.7.9+dfsg1-1~"; then
# help by adding a empty file
touch /etc/nagvis/apache2.conf
- # move /etc/apache2/conf.d/nagvis.conf to /etc/nagvis/apache2.conf
- dpkg-maintscript-helper mv_conffile \
- /etc/apache2/conf.d/nagvis.conf /etc/nagvis/apache2.conf "1:1.7.9+dfsg1-1~" nagvis -- "$@"
-
# unregister old file
ucf -p /etc/apache2/conf.d/nagvis.conf
ucfr -p nagvis /etc/apache2/conf.d/nagvis.conf
# delete helper file
rm -f /etc/nagvis/apache2.conf.dpkg-new
- # remove old automap
- dpkg-maintscript-helper rm_conffile \
- /etc/nagvis/automaps/__automap.cfg "1:1.7.9+dfsg1-1~" nagvis -- "$@"
-
rmdir /etc/nagvis/automaps/ 2>/dev/null || true
fi
=====================================
debian/nagvis.postrm
=====================================
@@ -18,14 +18,6 @@ set -e
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
-# move /etc/apache2/conf.d/nagvis.conf to /etc/nagvis/apache2.conf
-dpkg-maintscript-helper mv_conffile \
- /etc/apache2/conf.d/nagvis.conf /etc/nagvis/apache2.conf "1:1.7.9+dfsg1-1~" nagvis -- "$@"
-
-# remove old automap
-dpkg-maintscript-helper rm_conffile \
- /etc/nagvis/automaps/__automap.cfg "1:1.7.9+dfsg1-1~" nagvis -- "$@"
-
# Apache2
if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
. /usr/share/apache2/apache2-maintscript-helper
=====================================
debian/nagvis.preinst
=====================================
@@ -13,14 +13,6 @@ set -e
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
-# move /etc/apache2/conf.d/nagvis.conf to /etc/nagvis/apache2.conf
-dpkg-maintscript-helper mv_conffile \
- /etc/apache2/conf.d/nagvis.conf /etc/nagvis/apache2.conf "1:1.7.9+dfsg1-1~" nagvis -- "$@"
-
-# remove old automap
-dpkg-maintscript-helper rm_conffile \
- /etc/nagvis/automaps/__automap.cfg "1:1.7.9+dfsg1-1~" nagvis -- "$@"
-
case "$1" in
install|upgrade)
;;
=====================================
debian/patches/config.patch
=====================================
@@ -1,13 +1,8 @@
-From: Alexander Reichle-Schmehl <tolimar at debian.org>
-Date: Wed, 12 Dec 2018 07:53:28 +0100
-Subject: Change nagvis config paths for Debian
+Description: Change nagvis config paths for Debian
+Author: Alexander Reichle-Schmehl <tolimar at debian.org>
+Forwarded: not-needed
Reviewed-by: Markus Frosch <markus at lazyfrosch.de>
-Last-Update: 2013-12-12
----
- share/server/core/classes/GlobalMainCfg.php | 10 +++++-----
- share/server/core/defines/global.php | 6 +++---
- 2 files changed, 8 insertions(+), 8 deletions(-)
--- a/share/server/core/classes/GlobalMainCfg.php
+++ b/share/server/core/classes/GlobalMainCfg.php
=====================================
debian/patches/jquery_path.patch
=====================================
@@ -1,9 +1,8 @@
Description: Remove version from jquery.min.js filename
So we can use a symlink to libjs-jquery
Author: Markus Frosch <lazyfrosch at debian.org>
-Last-Update: 2019-01-25
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Forwarded: not-needed
+
--- a/share/userfiles/templates/on-demand-filter.header.html
+++ b/share/userfiles/templates/on-demand-filter.header.html
@@ -1,5 +1,5 @@
=====================================
debian/watch
=====================================
@@ -2,7 +2,6 @@ version=4
opts=\
dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/;s/\-/\./g,\
-repacksuffix=+dfsg,\
filenamemangle=s/(?:.*?)?(?:rel|v|nagvis)?[\-\_]?(\d\S+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/nagvis-$1.$2/ \
https://github.com/NagVis/nagvis/releases \
(?:.*?/)?(?:rel|v|nagvis)?[\-\_]?(\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
=====================================
docs/en_US/worldmap.html
=====================================
@@ -50,24 +50,28 @@
worldmap_center=50.86837814203458,10.21728515625
worldmap_zoom=6
worldmap_tiles_saturate=33
+
+ filter_group=my_group
}</pre>
- <p>Only the last three attributes are worldmap specific definitions, all of them are mandatory for
- worldmaps.</p>
+ <p>The attributes after <code>icon_size=32</code> are worldmap specific definitions.</p>
- <p>The <code>sources=worldmap</code> line tells the map to use the worldmap source, which cares about
+ <p>The <code>sources=worldmap</code> (mandatory) line tells the map to use the worldmap source, which cares about
putting all the objects having geographical coordinates, for rendering the map.</p>
- <p>The <code>worldmap_center=50.86837814203458,10.21728515625</code> specifies the latitude and longitude
+ <p>The <code>worldmap_center=50.86837814203458,10.21728515625</code> (mandatory) specifies the latitude and longitude
coordinates to use as initial center for the worldmaps viewport.</p>
- <p>The <code>worldmap_zoom=6</code> specifies the initial zoom level to be used when rendering the worldmap.
+ <p>The <code>worldmap_zoom=6</code> (mandatory) specifies the initial zoom level to be used when rendering the worldmap.
NagVis allows zoom levels from 2 (world) to 20 (building, detail).</p>
- <p>The <code>worldmap_tiles_saturate=33</code> dims the colors of default OpenStreetMap so that red motorways or
+ <p>The <code>worldmap_tiles_saturate=33</code> (optional) dims the colors of default OpenStreetMap so that red motorways or
large green forests don't interfere with actual map objects. Possible values are 0 (no colors, grayscale) through 100 (full colors).</p>
+ <p>The <code>filter_group=my_group</code> (optional) is an attribute for filtering the host objects on a worldmap by their
+ memberships in the given host group. Only members of the group will be shown on the worldmap.</p>
+
<h2>Create your own worldmap</h2>
<p>You can start creating your own worldmap by using the way you use for other maps too. Select
=====================================
omd_install.sh
=====================================
@@ -194,9 +194,9 @@ patch -s $OMD_ROOT/local/share/nagvis/htdocs/server/core/defines/global.php <<EO
+\$_path_parts = explode('/', dirname(\$_SERVER["SCRIPT_FILENAME"]));
+if(\$_path_parts[count(\$_path_parts) - 6] == 'local') // handle OMD local/ hierarchy
-+ \$_base_dir = join(array_slice(explode('/' ,dirname(\$_SERVER["SCRIPT_FILENAME"])), 0, -6), '/');
++ \$_base_dir = join('/', array_slice(explode('/' ,dirname(\$_SERVER["SCRIPT_FILENAME"])), 0, -6));
+else
-+ \$_base_dir = join(array_slice(explode('/' ,dirname(\$_SERVER["SCRIPT_FILENAME"])), 0, -5), '/');
++ \$_base_dir = join('/', array_slice(explode('/' ,dirname(\$_SERVER["SCRIPT_FILENAME"])), 0, -5));
+
/**
* Set the search path for included files
=====================================
share/frontend/nagvis-js/ext/dwoo-1.1.0/Dwoo/Compiler.php
=====================================
@@ -3006,18 +3006,34 @@ class Dwoo_Compiler implements Dwoo_ICompiler
}
$out = array();
- foreach ($ref->getParameters() as $param) {
- if (($class = $param->getClass()) !== null && $class->name === 'Dwoo') {
- continue;
- }
- if (($class = $param->getClass()) !== null && $class->name === 'Dwoo_Compiler') {
- continue;
+
+ if (PHP_VERSION_ID < 70100) {
+ foreach ($ref->getParameters() as $param) {
+ if (($class = $param->getClass()) !== null && $class->name === 'Dwoo') {
+ continue;
+ }
+ if (($class = $param->getClass()) !== null && $class->name === 'Dwoo_Compiler') {
+ continue;
+ }
+ if ($param->getName() === 'rest' && $param->isArray() === true) {
+ $out[] = array('*', $param->isOptional(), null);
+ }
+ $out[] = array($param->getName(), $param->isOptional(), $param->isOptional() ? $param->getDefaultValue() : null);
}
- if ($param->getName() === 'rest' && $param->isArray() === true) {
- $out[] = array('*', $param->isOptional(), null);
+ } else {
+ foreach ($ref->getParameters() as $param) {
+ if ($param->getType() && !$param->getType()->isBuiltin() && $param->getType()->getName() === 'Dwoo') {
+ continue;
+ }
+ if ($param->getType() && !$param->getType()->isBuiltin() && $param->getType()->getName() === 'Dwoo_Compiler') {
+ continue;
+ }
+ if ($param->getName() === 'rest' && $param->getType() && $param->getType()->getName() === 'array') {
+ $out[] = array('*', $param->isOptional(), null);
+ }
+ $out[] = array($param->getName(), $param->isOptional(), $param->isOptional() ? $param->getDefaultValue() : null);
}
- $out[] = array($param->getName(), $param->isOptional(), $param->isOptional() ? $param->getDefaultValue() : null);
- }
+ }
return $out;
}
=====================================
share/server/core/classes/CoreAuthModPDO.php
=====================================
@@ -55,7 +55,7 @@ class CoreAuthModPDO extends CoreAuthModule {
$config = $this->getConfig();
if(!$this->DB->open($config['driver'], $config['params'], $config['username'], $config['password'])) {
throw new NagVisException(l('Unable to open auth database ([DB]): [MSG]',
- Array('DB' => $this->DB->dsn,
+ Array('DB' => $this->DB->getDSN(),
'MSG' => json_encode($this->DB->error()))));
} else {
// Create initial db scheme if needed
=====================================
share/server/core/classes/CoreAuthorisationModPDO.php
=====================================
@@ -33,7 +33,7 @@ class CoreAuthorisationModPDO extends CoreAuthorisationModule {
$config = $this->getConfig();
if(!$this->DB->open($config['driver'], $config['params'], $config['username'], $config['password'])) {
throw new NagVisException(l('Unable to open auth database ([DB]): [MSG]',
- Array('DB' => $this->DB->dsn,
+ Array('DB' => $this->DB->getDSN(),
'MSG' => json_encode($this->DB->error()))));
} else {
// Create initial db scheme if needed
=====================================
share/server/core/classes/CorePDOHandler.php
=====================================
@@ -301,6 +301,10 @@ class CorePDOHandler {
return true;
}
+ public function getDSN() {
+ return $this->dsn;
+ }
+
public function getRegularExpressionOperator() {
return $this->data['re_op'];
}
=====================================
share/server/core/defines/global.php
=====================================
@@ -23,7 +23,7 @@
*****************************************************************************/
// NagVis Version
-define('CONST_VERSION', '1.9.25');
+define('CONST_VERSION', '1.9.27');
// Set PHP error handling to standard level
// Different levels for php versions below 5.1 because PHP 5.1 reports
=====================================
share/server/core/sources/filter.php
=====================================
@@ -75,7 +75,7 @@ function process_filter($MAPCFG, $map_name, &$map_config, $params = null) {
if($params === null)
$params = $MAPCFG->getSourceParams();
- //filter_hostgroup($map_config, $params);
+ filter_hostgroup($map_config, $params);
return true; // allow caching
}
=====================================
share/server/core/sources/worldmap.php
=====================================
@@ -15,6 +15,7 @@ $viewParams = array(
'backend_id',
'worldmap_center',
'worldmap_zoom',
+ 'filter_group',
)
);
@@ -168,7 +169,7 @@ function worldmap_init_db() {
$DB = new CorePDOHandler();
if (!$DB->open('sqlite', array('filename' => cfg('paths', 'cfg').'worldmap.db'), null, null))
throw new NagVisException(l('Unable to open worldmap database ([DB]): [MSG]',
- Array('DB' => $DB->dsn,
+ Array('DB' => $DB->getDSN(),
'MSG' => json_encode($DB->error()))));
worldmap_init_schema();
@@ -442,6 +443,7 @@ function process_worldmap($MAPCFG, $map_name, &$map_config) {
$map_config[$object_id] = $obj;
}
+
return true;
}
elseif ($clone_id !== null)
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-nagvis/-/compare/f632caf47d13fef1da0767f04b7e7e5a5721e6e4...2b50b05aa608ca56168ff9d69002e8c18101bcfc
--
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-nagvis/-/compare/f632caf47d13fef1da0767f04b7e7e5a5721e6e4...2b50b05aa608ca56168ff9d69002e8c18101bcfc
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/20210815/bfa04963/attachment-0001.htm>
More information about the pkg-nagios-changes
mailing list