Author: Lars Michelsen <[email protected]>
Date: Sat Sep 3 00:02:41 2011 +0200
Committer: Lars Michelsen <[email protected]>
Commit-Date: Sat Sep 3 00:02:41 2011 +0200
Added new icon *_unreachable icon to represent the UNREACHABLE host state
---
ChangeLog | 1 +
docs/en_US/extending/iconsets.html | 48 ++++++++++++++------
.../core/classes/objects/NagVisStatefulObject.php | 4 --
.../images/iconsets/std_big_unreachable.png | Bin 0 -> 1982 bytes
.../images/iconsets/std_medium_unreachable.png | Bin 0 -> 1435 bytes
.../images/iconsets/std_small_unreachable.png | Bin 0 -> 924 bytes
6 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 14f0c1b..a0141aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ Core
* Cleanup: Recoded message class calls to exceptions
* omd_install.sh can now be called from other directories
* Allowing more unicode signs in e.g. map aliases
+ * Added new icon *_unreachable icon to represent the UNREACHABLE host state
Frontend
* Readded the "edit" action to the maps module. In this mode all object are
diff --git a/docs/en_US/extending/iconsets.html
b/docs/en_US/extending/iconsets.html
index 8311a8c..65b249d 100644
--- a/docs/en_US/extending/iconsets.html
+++ b/docs/en_US/extending/iconsets.html
@@ -20,35 +20,55 @@
</tr>
<tr>
<td><set>_ack.png</td>
- <td>Acknowledged problem</td>
+ <td>Acknowledged host problem</td>
+ </tr>
+ <tr>
+ <td><set>_critical.png</td>
+ <td>Critical state</td>
+ </tr>
+ <tr>
+ <td><set>_down.png</td>
+ <td>Down state (Host)</td>
+ </tr>
+ <tr>
+ <td><set>_downtime.png</td>
+ <td>Some host state in downtime (Host)</td>
</tr>
<tr>
<td><set>_error.png</td>
<td>Error while fetching status</td>
</tr>
<tr>
- <td><set>_unknown.png</td>
- <td>Unkown state</td>
+ <td><set>_ok.png</td>
+ <td>OK state</td>
</tr>
<tr>
- <td><set>_critical.png</td>
- <td>Critical state</td>
+ <td><set>_pending.png</td>
+ <td>PENDING state</td>
</tr>
<tr>
- <td><set>_ok.png</td>
- <td>Ok state</td>
+ <td><set>_sack.png</td>
+ <td>Acknowledged service problem</td>
</tr>
<tr>
- <td><set>_up.png</td>
- <td>Up state (Host)</td>
+ <td><set>_sdowntime.png</td>
+ <td>Some service state in downtime</td>
</tr>
<tr>
- <td><set>_down.png</td>
- <td>Down state (Host)</td>
+ <td><set>_unchecked.png</td>
+ <td>Unchecked service (pending)</td>
</tr>
<tr>
- <td><set>_sack.png</td>
- <td>Acknowledged problem (Service)</td>
+ <td><set>_unknown.png</td>
+ <td>Unkown state</td>
+ </tr>
+ <tr>
+ <td><set>_unreachable.png</td>
+ <td>Unreachable state (Host)</td>
+ </tr>
+ <tr>
+ <td><set>_up.png</td>
+ <td>Up state (Host)</td>
</tr>
<tr>
<td><set>_warning.png</td>
@@ -87,4 +107,4 @@
<p>Open one of your maps and add a new host-icon. You should now be
able to select std_mini as iconset.</p>
<br>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/share/server/core/classes/objects/NagVisStatefulObject.php
b/share/server/core/classes/objects/NagVisStatefulObject.php
index 64718d7..0b2901e 100644
--- a/share/server/core/classes/objects/NagVisStatefulObject.php
+++ b/share/server/core/classes/objects/NagVisStatefulObject.php
@@ -655,10 +655,6 @@ class NagVisStatefulObject extends NagVisObject {
} elseif($this->getSummaryInDowntime() == 1) {
$icon = $this->iconset.'_'.$sPre.'downtime.'.$fileType;
} else {
- // Handle unreachable state with down icon
- if($stateLow == 'unreachable') {
- $stateLow = 'down';
- }
$icon = $this->iconset.'_'.$stateLow.'.'.$fileType;
}
break;
diff --git a/share/userfiles/images/iconsets/std_big_unreachable.png
b/share/userfiles/images/iconsets/std_big_unreachable.png
new file mode 100644
index 0000000..b8c9bb3
Binary files /dev/null and
b/share/userfiles/images/iconsets/std_big_unreachable.png differ
diff --git a/share/userfiles/images/iconsets/std_medium_unreachable.png
b/share/userfiles/images/iconsets/std_medium_unreachable.png
new file mode 100644
index 0000000..422a871
Binary files /dev/null and
b/share/userfiles/images/iconsets/std_medium_unreachable.png differ
diff --git a/share/userfiles/images/iconsets/std_small_unreachable.png
b/share/userfiles/images/iconsets/std_small_unreachable.png
new file mode 100644
index 0000000..81f3e00
Binary files /dev/null and
b/share/userfiles/images/iconsets/std_small_unreachable.png differ
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
