Changeset 409 for trunk/web/addons/job_monarch/index.php

Timestamp:

07/06/07 14:16:44 (17 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/version.php:

• SVN version

web/addons/job_monarch/libtoga.php:

• need $start in my graph.php

jobmond/jobmond.py:

• added number of running and queued jobs metric reporting

web/addons/job_monarch/graph.php:

• added 'job_report' graph, shows running and queued jobs

web/addons/job_monarch/overview.php:

• included IMG to job_report graph

web/addons/job_monarch/index.php:

• added range menu
• fixed metric_menu selection now properly instantly refreshes graphs

web/addons/job_monarch/templates/overview.tpl:

• added job_report graph

File:

• trunk/web/addons/job_monarch/index.php (modified) (5 diffs)

trunk/web/addons/job_monarch/index.php

@@ -26 +26 @@
 set_time_limit(0);
 
+
+$my_dir = getcwd();
+
+global $r, $range;
+
+include_once "./libtoga.php";
+
 if ( !empty( $_GET ) ) {
         extract( $_GET );
 }
 
-$my_dir = getcwd();
-
-include_once "./libtoga.php";
+//printf( "r2%s\n", $range );
 
 global $GANGLIA_PATH;
@@ -102 +107 @@
         global $default_refresh, $filterorder, $view;
         global $JOB_ARCHIVE, $period_start, $period_stop, $h, $id;
-        global $job_start, $job_stop;
+        global $job_start, $job_stop, $range, $r;
         
         if( isset($default_metric) and !isset($m) )
@@ -287 +292 @@
         $tpl->assignGlobal("view", $view);
 
+
         if( array_key_exists( "id", $filter ) or isset($hostname) ) {
+
+                $range = "job";
 
                 //print_r( $context_metrics );
@@ -293 +301 @@
                 if (is_array($context_metrics) ) {
                         $metric_menu = "<B>Metric</B>&nbsp;&nbsp;"
-                                ."<SELECT NAME=\"m\" OnChange=\"".$form_name.".submit();\">\n";
+                                ."<SELECT NAME=\"m\" OnChange=\"toga_form.submit();\">\n";
 
                         sort($context_metrics);
@@ -332 +340 @@
         //$ex_fn = $tpl->getVarValue( "_ROOT", "form_name" );
 
+        $context_ranges[]="hour";
+        $context_ranges[]="day";
+        $context_ranges[]="week";
+        $context_ranges[]="month";
+        $context_ranges[]="year";
+        $context_ranges[]="job";
+
+        $range_menu = "<B>Last</B>&nbsp;&nbsp;" ."<SELECT NAME=\"r\" OnChange=\"toga_form.submit();\">\n";
+        foreach ($context_ranges as $v) {
+                $url=rawurlencode($v);
+                $range_menu .= "<OPTION VALUE=\"$url\" ";
+                if ($v == $range)
+                        $range_menu .= "SELECTED";
+                $range_menu .= ">$v\n";
+        }
+        $range_menu .= "</SELECT>\n";
+
+        $tpl->assign("range_menu", $range_menu);
+
         if( $view == "search" or $view == "host" ) {