[pkg-nagios-changes] [Git][nagios-team/pkg-nagvis][master] 8 commits: Update German debconf translation. (closes: #958049)
Bas Couwenberg
gitlab at salsa.debian.org
Wed Apr 29 09:41:59 BST 2020
Bas Couwenberg pushed to branch master at Debian Nagios Maintainer Group / pkg-nagvis
Commits:
06a2d526 by Bas Couwenberg at 2020-04-29T10:30:54+02:00
Update German debconf translation. (closes: #958049)
- - - - -
72baa01f by Bas Couwenberg at 2020-04-29T10:32:04+02:00
Update Dutch debconf translation. (closes: #958809)
- - - - -
baf666c9 by Bas Couwenberg at 2020-04-29T10:33:50+02:00
Update changelog.
- - - - -
1f1883ad by Bas Couwenberg at 2020-04-29T10:34:04+02:00
New upstream version 1.9.19
- - - - -
b7c5076a by Bas Couwenberg at 2020-04-29T10:34:11+02:00
Update upstream source from tag 'upstream/1.9.19'
Update to upstream version '1.9.19'
with Debian dir 8f286bca81947d6890ac5e7faceb0002d8392e54
- - - - -
4efea2bc by Bas Couwenberg at 2020-04-29T10:34:32+02:00
New upstream release.
- - - - -
4e9e7b48 by Bas Couwenberg at 2020-04-29T10:35:39+02:00
Refresh patches.
- - - - -
101494b7 by Bas Couwenberg at 2020-04-29T10:36:07+02:00
Set distribution to unstable.
- - - - -
9 changed files:
- ChangeLog
- debian/changelog
- debian/patches/config.patch
- debian/po/de.po
- debian/po/nl.po
- share/frontend/nagvis-js/js/ElementLine.js
- share/frontend/nagvis-js/js/ViewMap.js
- share/server/core/classes/GlobalMapCfg.php
- share/server/core/defines/global.php
Changes:
=====================================
ChangeLog
=====================================
@@ -1,3 +1,10 @@
+1.9.19
+Frontend:
+ * FIX: Fix weathermap lines displaying byte/s instead of bit/s for Checkmk
+ interface checks (issue #230)
+ * FIX: New textboxes introduced with 1.9.18 broke the map configs (issue #245)
+ * FIX: Fix potential javascript error when zooming (issue #242)
+
1.9.18
Core:
* Add new map global option "ignore_linked_maps_summary_state" (issue #223)
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+nagvis (1:1.9.19-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release.
+ * Update German debconf translation.
+ (closes: #958049)
+ * Update Dutch debconf translation.
+ (closes: #958809)
+ * Refresh patches.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 29 Apr 2020 10:35:50 +0200
+
nagvis (1:1.9.18-1) unstable; urgency=medium
[ Debian Janitor ]
=====================================
debian/patches/config.patch
=====================================
@@ -11,7 +11,7 @@ Last-Update: 2013-12-12
--- a/share/server/core/classes/GlobalMainCfg.php
+++ b/share/server/core/classes/GlobalMainCfg.php
-@@ -1625,11 +1625,11 @@
+@@ -1625,11 +1625,11 @@ class GlobalMainCfg {
* @author Lars Michelsen <lm at larsmichelsen.com>
*/
private function setPathsByBase($base, $htmlBase) {
@@ -30,7 +30,7 @@ Last-Update: 2013-12-12
$this->validConfig['paths']['sharedvar']['default'] = $base.HTDOCS_DIR.'/var/';
--- a/share/server/core/defines/global.php
+++ b/share/server/core/defines/global.php
-@@ -75,11 +75,11 @@
+@@ -75,11 +75,11 @@ define('DEBUGFILE', '../../../var/nagvis
// The last value wins.
//
// Path to the main configuration file
=====================================
debian/po/de.po
=====================================
@@ -5,13 +5,13 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: nagvis 1:1.6.4.dfsg.1-3\n"
+"Project-Id-Version: nagvis 1:1.9.18-1\n"
"Report-Msgid-Bugs-To: nagvis at packages.debian.org\n"
"POT-Creation-Date: 2020-01-21 20:05+0100\n"
-"PO-Revision-Date: 2012-06-04 18:12+0200\n"
+"PO-Revision-Date: 2020-04-17 21:55+0200\n"
"Last-Translator: Erik Pfannenstein <debianignatz at gmx.de>\n"
"Language-Team: de <debian-l10n-german at lists.debian.org>\n"
-"Language: \n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -20,7 +20,7 @@ msgstr ""
#. Choices
#: ../nagvis.templates:2001
msgid "shinken"
-msgstr ""
+msgstr "shinken"
#. Type: select
#. Description
=====================================
debian/po/nl.po
=====================================
@@ -2,31 +2,34 @@
# Copyright (C) 2012 THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the nagvis package.
# Jeroen Schot <schot at a-eskwadraat.nl>, 2012.
+# Frans Spiesschaert <Frans.Spiesschaert at yucom.be>, 2020.
#
msgid ""
msgstr ""
-"Project-Id-Version: nagvis 1:1.6.4.dfsg.1-3\n"
+"Project-Id-Version: nagvis 1_1.9.18-1\n"
"Report-Msgid-Bugs-To: nagvis at packages.debian.org\n"
"POT-Creation-Date: 2020-01-21 20:05+0100\n"
-"PO-Revision-Date: 2012-06-04 16:47+0200\n"
-"Last-Translator: Jeroen Schot <schot at a-eskwadraat.nl>\n"
-"Language-Team: Debian l10n Dutch <debian-l10n-dutch at lists.debian.org>\n"
+"PO-Revision-Date: 2020-03-27 10:46+0100\n"
+"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
+"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Gtranslator 3.30.1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. Type: select
#. Choices
#: ../nagvis.templates:2001
msgid "shinken"
-msgstr ""
+msgstr "shinken"
#. Type: select
#. Description
#: ../nagvis.templates:2002
msgid "Monitoring suite used with NagVis:"
-msgstr "Welk bewakingspakket gebruikt u met NagVis?"
+msgstr "Welke bewakingssuite gebruikt u met NagVis?"
#. Type: select
#. Description
@@ -46,14 +49,15 @@ msgid ""
"monitoring suite, please choose \"other\". You'll have to configure it "
"manually."
msgstr ""
-"Als u NagVis wilt gebruiken met een ander backend of met een ander "
-"bewakingspakket, kies dan \"anders\". Deze zal u handmatig moeten instellen."
+"Als u NagVis wilt gebruiken met een ander backend of met een andere "
+"bewakingssuite, kies dan \"other\". Deze zal u handmatig moeten instellen."
#. Type: boolean
#. Description
#: ../nagvis.templates:3001
msgid "Delete NagVis data when purging the package?"
-msgstr "Verwijder gegevens van NagVis bij het wissen ('purge') van het pakket?"
+msgstr ""
+"Gegevens van NagVis verwijderen bij het wissen ('purge') van het pakket?"
#. Type: boolean
#. Description
@@ -65,7 +69,7 @@ msgid ""
"now, or you may want to keep them and clean up by hand later."
msgstr ""
"NagVis maakt bestanden aan in /var/{cache,lib}/nagvis en /etc/nagvis "
-"(bijvoorbeeld achtergrondafbeeldingen en map-bestanden), inclusief een "
+"(bijvoorbeeld achtergrondafbeeldingen en kaartbestanden), inclusief een "
"kleine database voor authenticatie. Als u deze bestanden niet nodig heeft "
"kunnen ze nu worden verwijderd, of u kunt ze nu bewaren en later zelf met de "
"hand opruimen."
=====================================
share/frontend/nagvis-js/js/ElementLine.js
=====================================
@@ -764,7 +764,7 @@ var ElementLine = Element.extend({
// and maximum values given to be able to calculate the percentage usage
if (perf[0][2] === null || perf[0][2] === ''
|| perf[1][2] === null || perf[1][2] === '') {
- perf = this.calculateUsage(perf);
+ perf = this.calculateUsage(perf, this.obj.conf.output);
}
this.perfdata = perf;
@@ -813,7 +813,7 @@ var ElementLine = Element.extend({
* with an empty UOM. If found it uses the current value and max value
* for calculating the percentage usage and also the current usage.
*/
- calculateUsage: function(oldPerfdata) {
+ calculateUsage: function(oldPerfdata, output) {
var newPerfdata = [];
var foundNew = false;
var line_label_in = 'in';
@@ -823,8 +823,10 @@ var ElementLine = Element.extend({
// can be made by some curios hack. The most hackish hack I've ever seen. From hell.
// Well, let's deal with it.
var display_bits = false;
- if(oldPerfdata.length >= 11 && oldPerfdata[10][5] == '0.0')
- display_bits = true;
+ output = output.match("In: [0-9](.*)Out: [0-9]")[1] || "";
+ if(output.includes("bit/s")){
+ display_bits=true;
+ }
// This loop takes perfdata with the labels "in" and "out" and uses the current value
// and maximum values to parse the percentage usage of the line
=====================================
share/frontend/nagvis-js/js/ViewMap.js
=====================================
@@ -237,7 +237,7 @@ var ViewMap = View.extend({
var parents = obj.getParentObjectIds();
if (parents) {
for (var parentObjId in parents) {
- this.objects[parentObjId].addChild(obj);
+ if (isset(this.objects[parentObjId])) this.objects[parentObjId].addChild(obj);
}
}
},
=====================================
share/server/core/classes/GlobalMapCfg.php
=====================================
@@ -301,7 +301,7 @@ class GlobalMapCfg {
// here.
if(version_compare(PHP_VERSION, '5.1.2', '==')) {
$file = file($this->configFile);
- } else {
+ } else {
$file = file($this->configFile, FILE_SKIP_EMPTY_LINES | FILE_IGNORE_NEW_LINES);
}
@@ -624,7 +624,7 @@ class GlobalMapCfg {
} else {
$val = $_REQUEST[$key];
}
-
+
if(!$only_customized || ($val != $this->getValue(0, $key))) {
return $val;
}
@@ -634,7 +634,7 @@ class GlobalMapCfg {
$userParams = $USERCFG->getValue('params-' . $this->name);
if(isset($userParams[$key])) {
return $userParams[$key];
-
+
} elseif(!$only_user_supplied) {
// Otherwise use the map global value (if allowed)
return $this->getValue(0, $key);
@@ -1545,6 +1545,8 @@ class GlobalMapCfg {
if(is_array($val))
$val = implode(',', $val);
+ $val = str_replace( "\n", '<br/>', $val );
+
$newLine = $key.'='.$val."\n";
if($lineNum !== null && $newLine !== '') {
=====================================
share/server/core/defines/global.php
=====================================
@@ -23,7 +23,7 @@
*****************************************************************************/
// NagVis Version
-define('CONST_VERSION', '1.9.18');
+define('CONST_VERSION', '1.9.19');
// Set PHP error handling to standard level
// Different levels for php versions below 5.1 because PHP 5.1 reports
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-nagvis/-/compare/17a98ef954781241ccd0df54b3a81251364333be...101494b75fed50843c20fcb9052a5514de44a86b
--
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-nagvis/-/compare/17a98ef954781241ccd0df54b3a81251364333be...101494b75fed50843c20fcb9052a5514de44a86b
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/20200429/ab612317/attachment-0001.html>
More information about the pkg-nagios-changes
mailing list