Merge branch 'iconnor-updated-console' into storageareas
This commit is contained in:
commit
7219e0624b
|
@ -91,7 +91,7 @@ for( $i = 0; $i < count($displayMonitors); $i += 1 ) {
|
||||||
$monitor['zma'] = zmaStatus( $monitor );
|
$monitor['zma'] = zmaStatus( $monitor );
|
||||||
$monitor['ZoneCount'] = dbFetchOne( 'select count(Id) as ZoneCount from Zones where MonitorId = ?', 'ZoneCount', array($monitor['Id']) );
|
$monitor['ZoneCount'] = dbFetchOne( 'select count(Id) as ZoneCount from Zones where MonitorId = ?', 'ZoneCount', array($monitor['Id']) );
|
||||||
$counts = array();
|
$counts = array();
|
||||||
for ( $j = 0; $j < count($eventCounts); $j++ ) {
|
for ( $j = 0; $j < count($eventCounts); $j += 1 ) {
|
||||||
$filter = addFilterTerm( $eventCounts[$j]['filter'], count($eventCounts[$j]['filter']['terms']), array( "cnj" => "and", "attr" => "MonitorId", "op" => "=", "val" => $monitor['Id'] ) );
|
$filter = addFilterTerm( $eventCounts[$j]['filter'], count($eventCounts[$j]['filter']['terms']), array( "cnj" => "and", "attr" => "MonitorId", "op" => "=", "val" => $monitor['Id'] ) );
|
||||||
parseFilter( $filter );
|
parseFilter( $filter );
|
||||||
$counts[] = "count(if(1".$filter['sql'].",1,NULL)) as EventCount$j";
|
$counts[] = "count(if(1".$filter['sql'].",1,NULL)) as EventCount$j";
|
||||||
|
@ -99,8 +99,9 @@ for( $i = 0; $i < count($displayMonitors); $i += 1 ) {
|
||||||
}
|
}
|
||||||
$sql = "select ".join($counts,", ")." from Events as E where MonitorId = ?";
|
$sql = "select ".join($counts,", ")." from Events as E where MonitorId = ?";
|
||||||
$counts = dbFetchOne( $sql, NULL, array($monitor['Id']) );
|
$counts = dbFetchOne( $sql, NULL, array($monitor['Id']) );
|
||||||
if ( $counts ) $displayMonitors[$i] = array_merge( $monitor, $counts );
|
if ( $counts )
|
||||||
for ( $j = 0; $j < count($eventCounts); $j++ ) {
|
$displayMonitors[$i] = $monitor = array_merge( $monitor, $counts );
|
||||||
|
for ( $j = 0; $j < count($eventCounts); $j += 1 ) {
|
||||||
$eventCounts[$j]['total'] += $monitor['EventCount'.$j];
|
$eventCounts[$j]['total'] += $monitor['EventCount'.$j];
|
||||||
}
|
}
|
||||||
$zoneCount += $monitor['ZoneCount'];
|
$zoneCount += $monitor['ZoneCount'];
|
||||||
|
|
Loading…
Reference in New Issue