Skip to content
Commits on Source (2)
Show whitespace changes
Inline Side-by-side
ChangeLog
View file @ 0887b4b4
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
View file @ 0887b4b4
......@@ -21,53 +21,136 @@ 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&auml;ndiges Iconset besteht aus elf Dateien. Diese Dateien sind PNG-Bilder, die folgenderma&szlig;en hei&szlig;en m&uuml;ssen:</p>
<p>Ein vollst&auml;ndiges Iconset besteht aus mehreren Dateien. Diese Dateien sind PNG-Bilder, die folgenderma&szlig;en hei&szlig;en m&uuml;ssen:</p>
<table border=0>
<tr>
<th> Dateiname </th><th> Beschreibung </th>
<th>Dateiname</th>
<th>Beschreibung</th>
</tr>
<tr>
<td> &lt;set>_ack.png </td><td> best&auml;tigtes Problem (acknowledged)</td>
<td>&lt;set&gt;_critical.png</td>
<td>kritischer Zustand (critical)</td>
</tr>
<tr>
<td> &lt;set>_critical.png </td><td> kritischer Zustand (critical) </td>
<td>&lt;set&gt;_critical_ack.png</td>
<td>Acknowledged critical state</td>
</tr>
<tr>
<td> &lt;set>_down.png </td><td> Down-Zustand (Host) </td>
<td>&lt;set&gt;_critical_dt.png</td>
<td>Critical state in downtime</td>
</tr>
<tr>
<td> &lt;set>_downtime.png </td><td> Ausfallzeit (Host) </td>
<td>&lt;set&gt;_critical_stale.png</td>
<td>Stale critical state</td>
</tr>
<tr>
<td>&lt;set&gt;_down.png</td>
<td>Down-Zustand (Host)</td>
</tr>
<tr>
<td>&lt;set&gt;_down_ack.png</td>
<td>Acknowledged down state</td>
</tr>
<tr>
<td>&lt;set&gt;_down_dt.png</td>
<td>Down state in downtime</td>
</tr>
<tr>
<td>&lt;set&gt;_down_stale.png</td>
<td>Stale down state</td>
</tr>
<tr>
<td>&lt;set&gt;_error.png</td>
<td>Fehler beim Holen des Zustands</td>
</tr>
<tr>
<td>&lt;set&gt;_ok.png</td>
<td>OK-Status</td>
</tr>
<tr>
<td>&lt;set&gt;_ok_dt.png</td>
<td>OK state in downtime</td>
</tr>
<tr>
<td>&lt;set&gt;_ok_stale.png</td>
<td>Stale ok state</td>
</tr>
<tr>
<td>&lt;set&gt;_pending.png</td>
<td>Pending-Zustand</td>
</tr>
<tr>
<td>&lt;set&gt;_unchecked.png</td>
<td>ungepr&uuml;fter Zustand (Pending)</td>
</tr>
<tr>
<td> &lt;set>_error.png </td><td> Fehler beim Holen des Zustands </td>
<td>&lt;set&gt;_unknown.png</td>
<td>unbekannter Zustand (unknown)</td>
</tr>
<tr>
<td> &lt;set>_ok.png </td><td> OK-Status </td>
<td>&lt;set&gt;_unknown_ack.png</td>
<td>Acknowledged unknown state</td>
</tr>
<tr>
<td> &lt;set>_pending.png </td><td> Pending-Zustand </td>
<td>&lt;set&gt;_unknown_dt.png</td>
<td>Unknown state in downtime</td>
</tr>
<tr>
<td> &lt;set>_sack.png </td><td> best&auml;tigtes Problem (Service) </td>
<td>&lt;set&gt;_unknown_stale.png</td>
<td>Stale unknown state</td>
</tr>
<tr>
<td> &lt;set>_sdowntime.png </td><td> Ausfallzeit (Service) </td>
<td>&lt;set&gt;_unreachable.png</td>
<td>unerreichbarer Zustand (Host)</td>
</tr>
<tr>
<td> &lt;set>_unchecked.png </td><td> ungepr&uuml;fter Zustand (Pending) </td>
<td>&lt;set&gt;_unreachable_ack.png</td>
<td>Acknowledged unreachable state</td>
</tr>
<tr>
<td> &lt;set>_unknown.png </td><td> unbekannter Zustand (unknown) </td>
<td>&lt;set&gt;_unreachable_dt.png</td>
<td>Unreachable state in downtime</td>
</tr>
<tr>
<td>&lt;set&gt;_unreachable_stale.png</td>
<td>Stale unreachable state</td>
</tr>
<tr>
<td>&lt;set&gt;_up.png</td>
<td>Up-Zustand (Host)</td>
</tr>
<tr>
<td>&lt;set&gt;_up_dt.png</td>
<td>Up state in downtime</td>
</tr>
<tr>
<td>&lt;set&gt;_up_stale.png</td>
<td>Stale up state</td>
</tr>
<tr>
<td>&lt;set&gt;_warning.png</td>
<td>Warning-Zustand</td>
</tr>
<tr>
<td> &lt;set>_unreachable.png </td><td> unerreichbarer Zustand (Host) </td>
<td>&lt;set&gt;_warning_ack.png</td>
<td>Acknowledged warning state</td>
</tr>
<tr>
<td> &lt;set>_up.png </td><td> Up-Zustand (Host) </td>
<td>&lt;set&gt;_warning_dt.png</td>
<td>Warning state in downtime</td>
</tr>
<tr>
<td> &lt;set>_warning.png </td><td> Warning-Zustand </td>
<td>&lt;set&gt;_warning_stale.png</td>
<td>Stale warning state</td>
</tr>
</table>
<br>
......
docs/en_US/extending/iconsets.html
View file @ 0887b4b4
......@@ -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
View file @ 0887b4b4
......@@ -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
View file @ 0887b4b4
......@@ -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
View file @ 0887b4b4
......@@ -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 {}
......