Changeset 145 for trunk/web/addons/toga/libtoga.php

Timestamp:

06/17/05 17:14:55 (19 years ago)

Author:

bastiaans

Message:

web/addons/toga/libtoga.php:

• Small bugfixes
• Added getRrdDirs and Files functions for graphs

web/addons/toga/templates/search.tpl:

• Small rearrangement

web/addons/toga/index.php:

• Outlining

web/addons/toga/search.php:

• Fixed graphing output!

web/addons/toga/graph.php

• Fixed to handle multiple RRD's from multiple timeperiods

File:

• trunk/web/addons/toga/libtoga.php (modified) (6 diffs)

trunk/web/addons/toga/libtoga.php

@@ -2 +2 @@
 // If php is compiled without globals
 //
-if ( !empty( $_GET ) ) {
-        extract( $_GET );
-}
+//if ( !empty( $_GET ) ) {
+//        extract( $_GET );
+//}
 
 class HTTPVariables {
@@ -60 +60 @@
 chdir( $GANGLIA_PATH );
 
-$context = 'cluster';
-
 include_once "./conf.php";
 include_once "./functions.php";
 include_once "./ganglia.php";
-//include_once "./get_context.php";
+include_once "./get_context.php";
+unset( $start );
+$context = 'cluster';
 include_once "./get_ganglia.php";
 
@@ -229 +229 @@
         var $rrdbin, $rrdvalues, $clustername, $hostname, $tempdir, $tarchdir, $metrics;
 
-        function TarchRrd( $clustername, $rrdbin = '/usr/bin/rrdtool', $tarchdir = '/data/toga/rrds' ) {
+        function TarchRrdGraph( $clustername, $hostname, $rrdbin = '/usr/bin/rrdtool', $tarchdir = '/data/toga/rrds' ) {
+        
                 $this->rrdbin = $rrdbin;
                 $this->rrdvalues = array();
                 $this->tarchdir = $tarchdir;
+                $this->clustername = $clustername;
+                $this->hostname = $hostname;
         }
 
@@ -274 +277 @@
         function getTimePeriods( $start, $end ) {
 
+                //printf("start = %s end = %s\n", $start, $end );
                 $times = array();
                 $dirlist = $this->dirList( $this->tarchdir . '/' . $this->clustername . '/' . $this->hostname );
+
+                //print_r( $dirlist );
+
                 $first = 0;
                 $last = 9999999999999;
@@ -287 +294 @@
                 }
 
+                //printf( "first = %s last = %s\n", $first, $last );
+
                 foreach( $dirlist as $dir ) {
 
-                        if( $dir >= $first and $dir <= $last and !array_key_exists( $dir, $times ) )
+                        //printf( "dir %s ", $dir );
+
+                        if( $dir >= $first and $dir <= $last and !array_key_exists( $dir, $times ) ) {
+                        
                                 $times[] = $dir;
-                }
+                                //printf("newtime %s ", $dir );
+
+                        }
+                }
+
+                //print_r( $times );
 
                 sort( $times );
 
+                //print_r( $times );
+
                 return $times;
+        }
+
+        function getRrdDirs( $start, $stop ) {
+
+                //printf( "tarchdir = %s\n", $this->tarchdir );
+                $timess = $this->getTimePeriods( $start, $stop );
+                //print_r( $timess );
+
+                $rrd_files = array();
+
+                foreach( $timess as $time ) {
+
+                        $rrd_files[] = $this->tarchdir . '/' . $this->clustername . '/' . $this->hostname. '/'.$time;
+                }
+
+                return $rrd_files;
+        }
+
+        function getRrdFiles( $metric, $start, $stop ) {
+
+                $times = $this->getTimePeriods( $start, $stop );
+
+                $rrd_files = array();
+
+                foreach( $times as $time ) {
+
+                        $rrd_files[] = $this->tarchdir . '/' . $this->clustername . '/' . $this->hostname . '/' .$time. '/' . $metric. '.rrd';
+                }
+
+                return $rrd_files;
         }
 
@@ -309 +358 @@
 
                 //return $graph;
+                return 0;
         }
 }