Changeset 127 for trunk

Timestamp:

06/06/05 17:42:59 (18 years ago)

Author:

bastiaans

Message:

web/addons/toga/overview.php:

• Added filters for pie chart

File:

• trunk/web/addons/toga/overview.php (modified) (7 diffs)

trunk/web/addons/toga/overview.php

@@ -25 +25 @@
 
 if( array_key_exists( "id", $filter ) )
-        $pie = drawJobPie();
+        $piefilter = 'id';
 else if( array_key_exists( "user", $filter ) )
-        $pie = drawUserPie();
+        $piefilter = 'user';
 else if( array_key_exists( "queue", $filter ) )
-        $pie = drawQueuePie();
-else
-        $pie = drawClusterPie();
-
+        $piefilter = 'queue';
+
+$pie = drawPie();
 $tpl->assign("pie", $pie );
 
@@ -190 +189 @@
 
 
-function drawClusterPie() {
-
-        global $jobs, $gnodes;
+function drawPie() {
+
+        global $jobs, $gnodes, $piefilter, $filter;
 
         $nodes = $gnodes;
-        
-        $pie_args = "title=" . rawurlencode("Cluster queue usage");
+
+        if( isset($piefilter) ) 
+                $pie_args = "title=" . rawurlencode("Cluster ".$piefilter." usage");
+        else
+                $pie_args = "title=" . rawurlencode("Cluster queue usage");
+                
         $pie_args .= "&size=250x150";
 
@@ -219 +222 @@
         $job_percentage = 100 - $empty_percentage; 
 
+        $qcolors = array();
         $color = randomColor( $qcolors );
         $qcolors[] = $color;
         $pie_args .= "&free=$empty_percentage,$color";
+
+        if( isset( $piefilter ) )
+                $filterpie = array();
 
         foreach( $nodes as $node ) {
@@ -237 +244 @@
                         $qname = $jobs[$myjob][queue];
 
-                        if( !isset( $queues[$qname] ) )
-                                $queues[$qname] = $job_weight[$myjob];
-                        else
-                                $queues[$qname] = $queues[$qname] + $job_weight[$myjob];
+                        if( isset($piefilter) ) {
+                                $countjob = 1;
+                                if( $piefilter == 'id' ) {
+                                        if( $myjob != $filter[$piefilter] )
+                                                $countjob = 0;
+                                } else if( $piefilter == 'user' ) {
+                                        if( $jobs[$myjob][owner] != $filter[$piefilter] )
+                                                $countjob = 0;
+                                } else {
+                                        if( $jobs[$myjob][$piefilter] != $filter[$piefilter] )
+                                                $countjob = 0;
+                                }
+
+                                if( $countjob ) {
+
+                                        if( !isset( $filterpie[$filter[$piefilter]] ) )
+                                                $filterpie[$filter[$piefilter]] = $job_weight[$myjob];
+                                        else
+                                                $filterpie[$filter[$piefilter]] = $filterpie[$filter[$piefilter]] + $job_weight[$myjob];
+                                } else {
+                                        if( !isset( $filterpie["other"] ) )
+                                                $filterpie["other"] = $job_weight[$myjob];
+                                        else
+                                                $filterpie["other"] = $filterpie["other"] + $job_weight[$myjob];
+
+                                }
+                                
+                        } else {
+
+                                if( !isset( $queues[$qname] ) )
+                                        $queues[$qname] = $job_weight[$myjob];
+                                else
+                                        $queues[$qname] = $queues[$qname] + $job_weight[$myjob];
+                        }
                 }
         }
 
-        $qcolors = array();
-        foreach( $queues as $queue => $totalweight) {
+        //$qcolors = array();
+        if( isset( $piefilter ) )
+                $graphvals = $filterpie;
+        else
+                $graphvals = $queues;
+
+        foreach( $graphvals as $name => $totalweight) {
 
                 $percentage = ( $totalweight / $used_nodes ) * $job_percentage;
@@ -251 +293 @@
                 $color = randomColor( $qcolors );
                 $qcolors[] = $color;
-                $pie_args .= "&$queue=$percentage,$color";
+                $pie_args .= "&$name=$percentage,$color";
         }
         $pie = "../../pie.php?$pie_args";
@@ -348 +390 @@
         global $sortorder, $sortby, $filter, $sh, $hc, $m;
         global $cluster_url, $get_metric_string, $host_url, $metrics;
-        global $start, $end, $reports;
+        global $start, $end, $reports, $gnodes;
 
         $metricname = $m;
@@ -463 +505 @@
                 //$tpl->assign("cluster", $clustername);
                 $tpl->assign("metric","$metricname $units");
-                $tpl->assign("id", $id);
+                $tpl->assign("id", $filter[id]);
                 # Host columns menu defined in header.php
                 $tpl->assign("cols_menu", $cols_menu);