[pkg-nagios-changes] [Git][nagios-team/pkg-nagvis][master] 2 commits: New upstream version 1.9.11
Markus Frosch
gitlab at salsa.debian.org
Fri Jan 25 18:09:35 GMT 2019
Markus Frosch pushed to branch master at Debian Nagios Maintainer Group / pkg-nagvis
Commits:
32486613 by Markus Frosch at 2019-01-25T18:09:05Z
New upstream version 1.9.11
- - - - -
0887b4b4 by Markus Frosch at 2019-01-25T18:09:13Z
Update upstream source from tag 'upstream/1.9.11'
Update to upstream version '1.9.11'
with Debian dir 5a474d4aefd0f9f22d66e47b3825a8b246fbfb41
- - - - -
6 changed files:
- ChangeLog
- docs/de_DE/extending/iconsets.html
- docs/en_US/extending/iconsets.html
- share/frontend/nagvis-js/js/ElementLine.js
- share/server/core/defines/global.php
- share/userfiles/templates/default.css
Changes:
=====================================
ChangeLog
=====================================
@@ -1,3 +1,8 @@
+1.9.11
+Frontend
+ * FIX: Weathermap lines now respect the configured error colors
+ * FIX: Fixed wrapping of long map names in sidebar
+
1.9.10
Frontend
* FIX: Network error popups are now shown when an error occurs and hidden again
=====================================
docs/de_DE/extending/iconsets.html
=====================================
@@ -21,54 +21,137 @@ ist nicht das Problem, aber der std_small-Iconset von NagVis ist zu groß f
Erstellen Sie Ihr eigenes Iconset.
<br>
<h2>Was ist ein Iconset?</h2>
-<p>Ein vollständiges Iconset besteht aus elf Dateien. Diese Dateien sind PNG-Bilder, die folgendermaßen heißen müssen:</p>
+<p>Ein vollständiges Iconset besteht aus mehreren Dateien. Diese Dateien sind PNG-Bilder, die folgendermaßen heißen müssen:</p>
<table border=0>
-<tr>
-<th> Dateiname </th><th> Beschreibung </th>
-</tr>
-<tr>
-<td> <set>_ack.png </td><td> bestätigtes Problem (acknowledged)</td>
-</tr>
-<tr>
-<td> <set>_critical.png </td><td> kritischer Zustand (critical) </td>
-</tr>
-<tr>
-<td> <set>_down.png </td><td> Down-Zustand (Host) </td>
-</tr>
-<tr>
-<td> <set>_downtime.png </td><td> Ausfallzeit (Host) </td>
-</tr>
-<tr>
-<td> <set>_error.png </td><td> Fehler beim Holen des Zustands </td>
-</tr>
-<tr>
-<td> <set>_ok.png </td><td> OK-Status </td>
-</tr>
-<tr>
-<td> <set>_pending.png </td><td> Pending-Zustand </td>
-</tr>
-<tr>
-<td> <set>_sack.png </td><td> bestätigtes Problem (Service) </td>
-</tr>
-<tr>
-<td> <set>_sdowntime.png </td><td> Ausfallzeit (Service) </td>
-</tr>
-<tr>
-<td> <set>_unchecked.png </td><td> ungeprüfter Zustand (Pending) </td>
-</tr>
-<tr>
-<td> <set>_unknown.png </td><td> unbekannter Zustand (unknown) </td>
-</tr>
-<tr>
-<td> <set>_unreachable.png </td><td> unerreichbarer Zustand (Host) </td>
-</tr>
-<tr>
-<td> <set>_up.png </td><td> Up-Zustand (Host) </td>
-</tr>
-<tr>
-<td> <set>_warning.png </td><td> Warning-Zustand </td>
-</tr>
+ <tr>
+ <th>Dateiname</th>
+ <th>Beschreibung</th>
+ </tr>
+ <tr>
+ <td><set>_critical.png</td>
+ <td>kritischer Zustand (critical)</td>
+ </tr>
+ <tr>
+ <td><set>_critical_ack.png</td>
+ <td>Acknowledged critical state</td>
+ </tr>
+ <tr>
+ <td><set>_critical_dt.png</td>
+ <td>Critical state in downtime</td>
+ </tr>
+ <tr>
+ <td><set>_critical_stale.png</td>
+ <td>Stale critical state</td>
+ </tr>
+
+ <tr>
+ <td><set>_down.png</td>
+ <td>Down-Zustand (Host)</td>
+ </tr>
+ <tr>
+ <td><set>_down_ack.png</td>
+ <td>Acknowledged down state</td>
+ </tr>
+ <tr>
+ <td><set>_down_dt.png</td>
+ <td>Down state in downtime</td>
+ </tr>
+ <tr>
+ <td><set>_down_stale.png</td>
+ <td>Stale down state</td>
+ </tr>
+
+ <tr>
+ <td><set>_error.png</td>
+ <td>Fehler beim Holen des Zustands</td>
+ </tr>
+
+ <tr>
+ <td><set>_ok.png</td>
+ <td>OK-Status</td>
+ </tr>
+ <tr>
+ <td><set>_ok_dt.png</td>
+ <td>OK state in downtime</td>
+ </tr>
+ <tr>
+ <td><set>_ok_stale.png</td>
+ <td>Stale ok state</td>
+ </tr>
+
+ <tr>
+ <td><set>_pending.png</td>
+ <td>Pending-Zustand</td>
+ </tr>
+ <tr>
+ <td><set>_unchecked.png</td>
+ <td>ungeprüfter Zustand (Pending)</td>
+ </tr>
+
+ <tr>
+ <td><set>_unknown.png</td>
+ <td>unbekannter Zustand (unknown)</td>
+ </tr>
+ <tr>
+ <td><set>_unknown_ack.png</td>
+ <td>Acknowledged unknown state</td>
+ </tr>
+ <tr>
+ <td><set>_unknown_dt.png</td>
+ <td>Unknown state in downtime</td>
+ </tr>
+ <tr>
+ <td><set>_unknown_stale.png</td>
+ <td>Stale unknown state</td>
+ </tr>
+
+ <tr>
+ <td><set>_unreachable.png</td>
+ <td>unerreichbarer Zustand (Host)</td>
+ </tr>
+ <tr>
+ <td><set>_unreachable_ack.png</td>
+ <td>Acknowledged unreachable state</td>
+ </tr>
+ <tr>
+ <td><set>_unreachable_dt.png</td>
+ <td>Unreachable state in downtime</td>
+ </tr>
+ <tr>
+ <td><set>_unreachable_stale.png</td>
+ <td>Stale unreachable state</td>
+ </tr>
+
+ <tr>
+ <td><set>_up.png</td>
+ <td>Up-Zustand (Host)</td>
+ </tr>
+ <tr>
+ <td><set>_up_dt.png</td>
+ <td>Up state in downtime</td>
+ </tr>
+ <tr>
+ <td><set>_up_stale.png</td>
+ <td>Stale up state</td>
+ </tr>
+
+ <tr>
+ <td><set>_warning.png</td>
+ <td>Warning-Zustand</td>
+ </tr>
+ <tr>
+ <td><set>_warning_ack.png</td>
+ <td>Acknowledged warning state</td>
+ </tr>
+ <tr>
+ <td><set>_warning_dt.png</td>
+ <td>Warning state in downtime</td>
+ </tr>
+ <tr>
+ <td><set>_warning_stale.png</td>
+ <td>Stale warning state</td>
+ </tr>
</table>
<br>
NagVis sucht nach <code><set>_ok.png</code>-Bildern, um die Iconsets aufzulisten. Das heißt, dass ein <code><set>_ok.png</code>-Bild vorhanden sein muss,
@@ -97,4 +180,4 @@ Um das Iconset in Ihrer NagVis-Installation zu nutzen, kopieren Sie alle Dateien
<h2>Der Test</h2>
öffnen Sie eine Ihrer Maps und fügen Sie ein neues Host-Icon hinzu. Sie sollten nun in der Lage sein, std_mini als Iconset auszuwählen.
<br>
-</html>
+</html>
=====================================
docs/en_US/extending/iconsets.html
=====================================
@@ -16,7 +16,7 @@
<h3>Solution</h3>
<p>Build your own iconset.</p>
<h2>What is an iconset?</h2>
- <p>A complete iconset consists of 14 files. These files are png images which are named like this:</p>
+ <p>A complete iconset consists of a number of files. These files are png images which are named like this:</p>
<table>
<tbody>
<tr>
=====================================
share/frontend/nagvis-js/js/ElementLine.js
=====================================
@@ -759,6 +759,9 @@ var ElementLine = Element.extend({
},
calcWeathermapColor: function(id) {
+ if (this.obj.conf.summary_state == "ERROR")
+ return oStates["ERROR"].color;
+
if (!this.perfdata)
return '#FFCC66';
@@ -767,8 +770,7 @@ var ElementLine = Element.extend({
} else {
this.obj.conf.summary_output += ' (Weathermap Line Error: Value '
+ id +' is not a percentage value)';
- return '#FFCC66';
-
+ return oStates["ERROR"].color;
}
},
=====================================
share/server/core/defines/global.php
=====================================
@@ -23,7 +23,7 @@
*****************************************************************************/
// NagVis Version
-define('CONST_VERSION', '1.9.10');
+define('CONST_VERSION', '1.9.11');
// Set PHP error handling to standard level
// Different levels for php versions below 5.1 because PHP 5.1 reports
=====================================
share/userfiles/templates/default.css
=====================================
@@ -696,7 +696,7 @@ div#popupWindow h1 {
#sidebar li {margin:0;padding:0;line-height:25px;}
#sidebar li.spacerbottom {border-bottom:1px dotted #e5e5e5}
#sidebar li.spacertop {border-top:1px dotted #e5e5e5}
-#sidebar li > div {width:200px;height:25px;clear:both;}
+#sidebar li > div {width:200px;clear:both;}
#sidebar li > div a {padding-left:20px;}
#sidebar li.parent div {}
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-nagvis/compare/2879a5dccddfcaa2bde954013ea133302d6ab953...0887b4b4608b7dcad9aed17503e7991844cde85d
--
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-nagvis/compare/2879a5dccddfcaa2bde954013ea133302d6ab953...0887b4b4608b7dcad9aed17503e7991844cde85d
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/20190125/e3c1a46d/attachment-0001.html>
More information about the pkg-nagios-changes
mailing list