Author: Lars Michelsen <[email protected]>
Date: Sat Jul 6 14:37:46 2013 +0200
Committer: Lars Michelsen <[email protected]>
Commit-Date: Sat Jul 6 14:37:46 2013 +0200
Fixed host state handling
---
share/server/core/classes/objects/NagVisHost.php | 2 +-
.../core/classes/objects/NagVisHostgroup.php | 2 +-
share/server/core/functions/core.php | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/share/server/core/classes/objects/NagVisHost.php
b/share/server/core/classes/objects/NagVisHost.php
index a566b34..5b98e7a 100644
--- a/share/server/core/classes/objects/NagVisHost.php
+++ b/share/server/core/classes/objects/NagVisHost.php
@@ -194,7 +194,7 @@ class NagVisHost extends NagVisStatefulObject {
if($this->aStateCounts !== null) {
foreach($this->aStateCounts AS $sState => $aSubstates) {
// Ignore host state here
- if($sState != 'UP' && $sState != 'DOWN' && $sState !=
'UNREACHABLE' && $sState != 'UNCHECKED') {
+ if(is_host_state($sState)) {
// Loop all substates (normal,ack,downtime,...)
foreach($aSubstates AS $sSubState => $iCount) {
// Found some objects with this state+substate
diff --git a/share/server/core/classes/objects/NagVisHostgroup.php
b/share/server/core/classes/objects/NagVisHostgroup.php
index 0816b14..6a9f66d 100644
--- a/share/server/core/classes/objects/NagVisHostgroup.php
+++ b/share/server/core/classes/objects/NagVisHostgroup.php
@@ -121,7 +121,7 @@ class NagVisHostgroup extends NagVisStatefulObject {
// Count all child objects
$iSumCount += $iCount;
- if($sState === 'UP' || $sState === 'DOWN' || $sState ===
'UNREACHABLE' || $sState === 'UNCHECKED') {
+ if(is_host_state($sState)) {
if(!isset($arrHostStates[$sState])) {
$arrHostStates[$sState] = $iCount;
} else {
diff --git a/share/server/core/functions/core.php
b/share/server/core/functions/core.php
index 7cdbe6c..a8a26b6 100644
--- a/share/server/core/functions/core.php
+++ b/share/server/core/functions/core.php
@@ -127,4 +127,8 @@ function state_num($state_str) {
return $a[$state_str];
}
+function is_host_state($state) {
+ return $state == UNCHECKED || $state == UNREACHABLE || $state == DOWN ||
$state == UP;
+}
+
?>
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
