Module: nagvis Branch: nagvis-1.5 Commit: dc770751c5daf0b2ea7937fba1d1d15f37ef999b URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=dc770751c5daf0b2ea7937fba1d1d15f37ef999b
Author: Lars Michelsen <[email protected]> Date: Tue Jan 11 21:05:25 2011 +0100 Made downtime/ack colors configurable (Seems automatic lighten of color is not enough) --- ChangeLog | 1 + docs/en_US/nagvis_config_format_description.html | 12 +++++ share/frontend/nagvis-js/js/frontend.js | 13 ++++- share/server/core/classes/GlobalMainCfg.php | 52 +++++++++++++++++++++- 4 files changed, 74 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b4ea806..ba566a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ Automap * Hiding deprecated maxLayers param from automap modify dialog Frontend + * Made downtime/ack colors configurable (Seems automatic lighten of color is not enough) * Bugfix: Multisite - Added state colors to multisite map listing (Thanks to BMuc) * Bugfix: Fixed showmaps,showautomaps,... option usage on overview page * Bugfix: Fixed search dialog access when using explicit permissions diff --git a/docs/en_US/nagvis_config_format_description.html b/docs/en_US/nagvis_config_format_description.html index add201e..b5ea5e7 100644 --- a/docs/en_US/nagvis_config_format_description.html +++ b/docs/en_US/nagvis_config_format_description.html @@ -501,21 +501,33 @@ interval=15</pre> <tr><th style="width:200px">Value</th><th style="width:150px">Default</th></tr> <tr><td>unreachable_bgcolor</td><td>#F1811B</td></tr> <tr><td>unreachable_color</td><td>#F1811B</td></tr> + <tr><td>unreachable_ack_bgcolor</td><td></td></tr> + <tr><td>unreachable_downtime_bgcolor</td><td></td></tr> <tr><td>unreachable_sound</td><td>std_unreachable.mp3</td></tr> <tr><td>down_bgcolor</td><td>#FF0000</td></tr> <tr><td>down_color</td><td>#FF0000</td></tr> + <tr><td>down_ack_bgcolor</td><td></td></tr> + <tr><td>down_downtime_bgcolor</td><td></td></tr> <tr><td>down_sound</td><td>std_down.mp3</td></tr> <tr><td>critical_bgcolor</td><td>#FF0000</td></tr> <tr><td>critical_color</td><td>#FF0000</td></tr> + <tr><td>critical_ack_bgcolor</td><td></td></tr> + <tr><td>critical_downtime_bgcolor</td><td></td></tr> <tr><td>critical_sound</td><td>std_critical.mp3</td></tr> <tr><td>warning_bgcolor</td><td>#FFFF00</td></tr> <tr><td>warning_color</td><td>#FFFF00</td></tr> + <tr><td>warning_ack_bgcolor</td><td></td></tr> + <tr><td>warning_downtime_bgcolor</td><td></td></tr> <tr><td>warning_sound</td><td>std_warning.mp3</td></tr> <tr><td>unknown_bgcolor</td><td>#FFCC66</td></tr> <tr><td>unknown_color</td><td>#FFCC66</td></tr> + <tr><td>unknown_ack_bgcolor</td><td></td></tr> + <tr><td>unknown_downtime_bgcolor</td><td></td></tr> <tr><td>unknown_sound</td><td></td></tr> <tr><td>error_bgcolor</td><td>#0000FF</td></tr> <tr><td>error_color</td><td>#0000FF</td></tr> + <tr><td>error_ack_bgcolor</td><td></td></tr> + <tr><td>error_downtime_bgcolor</td><td></td></tr> <tr><td>error_sound</td><td></td></tr> <tr><td>ok_bgcolor</td><td>#00FF00</td></tr> <tr><td>ok_color</td><td>#00FF00</td></tr> diff --git a/share/frontend/nagvis-js/js/frontend.js b/share/frontend/nagvis-js/js/frontend.js index 8db4253..7a75c0b 100644 --- a/share/frontend/nagvis-js/js/frontend.js +++ b/share/frontend/nagvis-js/js/frontend.js @@ -498,9 +498,16 @@ function getBackgroundColor(oObj) { sColor = oStates[oObj.summary_state].bgcolor; // Ack or downtime? - if((oObj.summary_in_downtime && oObj.summary_in_downtime === 1) - || (oObj.summary_problem_has_been_acknowledged && oObj.summary_problem_has_been_acknowledged === 1)) - sColor = lightenColor(sColor, 100, 100, 100); + if(oObj.summary_in_downtime && oObj.summary_in_downtime === 1) + if(isset(oStates[oObj.summary_state]['downtime_bgcolor']) && oStates[oObj.summary_state]['downtime_bgcolor'] != '') + sColor = oStates[oObj.summary_state]['downtime_bgcolor']; + else + sColor = lightenColor(sColor, 100, 100, 100); + else if(oObj.summary_problem_has_been_acknowledged && oObj.summary_problem_has_been_acknowledged === 1) + if(isset(oStates[oObj.summary_state]['ack_bgcolor']) && oStates[oObj.summary_state]['ack_bgcolor'] != '') + sColor = oStates[oObj.summary_state]['ack_bgcolor']; + else + sColor = lightenColor(sColor, 100, 100, 100); } oObj = null; diff --git a/share/server/core/classes/GlobalMainCfg.php b/share/server/core/classes/GlobalMainCfg.php index f0674f7..187a5c3 100644 --- a/share/server/core/classes/GlobalMainCfg.php +++ b/share/server/core/classes/GlobalMainCfg.php @@ -657,10 +657,18 @@ class GlobalMainCfg { 'editable' => 1, 'default' => '5', 'match' => MATCH_INTEGER), + 'unreachable_ack_bgcolor' => Array('must' => 0, + 'editable' => 1, + 'default' => '', + 'match' => MATCH_COLOR), 'unreachable_downtime' => Array('must' => 1, 'editable' => 1, 'default' => '5', 'match' => MATCH_INTEGER), + 'unreachable_downtime_bgcolor' => Array('must' => 0, + 'editable' => 1, + 'default' => '', + 'match' => MATCH_COLOR), 'unreachable_bgcolor' => Array('must' => 1, 'editable' => 1, 'default' => '#F1811B', @@ -681,10 +689,18 @@ class GlobalMainCfg { 'editable' => 1, 'default' => '5', 'match' => MATCH_INTEGER), + 'down_ack_bgcolor' => Array('must' => 0, + 'editable' => 1, + 'default' => '', + 'match' => MATCH_COLOR), 'down_downtime' => Array('must' => 1, 'editable' => 1, 'default' => '5', 'match' => MATCH_INTEGER), + 'down_downtime_bgcolor' => Array('must' => 0, + 'editable' => 1, + 'default' => '', + 'match' => MATCH_COLOR), 'down_bgcolor' => Array('must' => 1, 'editable' => 1, 'default' => '#FF0000', @@ -705,10 +721,18 @@ class GlobalMainCfg { 'editable' => 1, 'default' => '5', 'match' => MATCH_INTEGER), + 'critical_ack_bgcolor' => Array('must' => 0, + 'editable' => 1, + 'default' => '', + 'match' => MATCH_COLOR), 'critical_downtime' => Array('must' => 1, 'editable' => 1, 'default' => '5', 'match' => MATCH_INTEGER), + 'critical_downtime_bgcolor' => Array('must' => 0, + 'editable' => 1, + 'default' => '', + 'match' => MATCH_COLOR), 'critical_bgcolor' => Array('must' => 1, 'editable' => 1, 'default' => '#FF0000', @@ -729,10 +753,18 @@ class GlobalMainCfg { 'editable' => 1, 'default' => '4', 'match' => MATCH_INTEGER), + 'warning_ack_bgcolor' => Array('must' => 0, + 'editable' => 1, + 'default' => '', + 'match' => MATCH_COLOR), 'warning_downtime' => Array('must' => 1, 'editable' => 1, 'default' => '4', 'match' => MATCH_INTEGER), + 'warning_downtime_bgcolor' => Array('must' => 0, + 'editable' => 1, + 'default' => '', + 'match' => MATCH_COLOR), 'warning_bgcolor' => Array('must' => 1, 'editable' => 1, 'default' => '#FFFF00', @@ -753,10 +785,18 @@ class GlobalMainCfg { 'editable' => 1, 'default' => '2', 'match' => MATCH_INTEGER), + 'unknown_ack_bgcolor' => Array('must' => 0, + 'editable' => 1, + 'default' => '', + 'match' => MATCH_COLOR), 'unknown_downtime' => Array('must' => 1, 'editable' => 1, 'default' => '2', 'match' => MATCH_INTEGER), + 'unknown_downtime_bgcolor' => Array('must' => 0, + 'editable' => 1, + 'default' => '', + 'match' => MATCH_COLOR), 'unknown_bgcolor' => Array('must' => 1, 'editable' => 1, 'default' => '#FFCC66', @@ -777,10 +817,18 @@ class GlobalMainCfg { 'editable' => 1, 'default' => '2', 'match' => MATCH_INTEGER), + 'error_ack_bgcolor' => Array('must' => 0, + 'editable' => 1, + 'default' => '', + 'match' => MATCH_COLOR), 'error_downtime' => Array('must' => 1, 'editable' => 1, 'default' => '2', 'match' => MATCH_INTEGER), + 'error_downtime_bgcolor' => Array('must' => 0, + 'editable' => 1, + 'default' => '', + 'match' => MATCH_COLOR), 'error_bgcolor' => Array('must' => 1, 'editable' => 1, 'default' => '#0000FF', @@ -1509,7 +1557,9 @@ class GlobalMainCfg { $arr[strtoupper($key[0])] = Array(); } - if(isset($key[1])) { + if(isset($key[1]) && isset($key[2])) { + $arr[strtoupper($key[0])][$key[1].'_'.$key[2]] = $this->getValue('states', $lowState); + } elseif(isset($key[1])) { // ack/downtime $arr[strtoupper($key[0])][$key[1]] = $this->getValue('states', $lowState); } else { ------------------------------------------------------------------------------ Protect Your Site and Customers from Malware Attacks Learn about various malware tactics and how to avoid them. Understand malware threats, the impact they can have on your business, and how you can protect your company and customers by using code signing. http://p.sf.net/sfu/oracle-sfdevnl _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
