Changeset 811

Timestamp:

04/08/13 22:15:47 (11 years ago)

Author:

ramonb

Message:

index.php:

• dont show metric menu for search anymore
• preparation for meta view

search.php,
templates/search.tpl:

• set metric menu next to period selection now
• populate metric menu from archive, since we no longer parse XML in search

Location:

branches/0.4/web/addons/job_monarch

Files:

• index.php (modified) (4 diffs)
• search.php (modified) (2 diffs)
• templates/search.tpl (modified) (1 diff)

branches/0.4/web/addons/job_monarch/index.php

@@ -61 +61 @@
 $filter = array();
 
-if( !isset($view) ) $view = "overview";
+if( !isset($view) && $clustername!='') $view = "overview";
 if( !isset($sortorder) ) $sortorder = "desc";
 if( !isset($sortby) ) $sortby = "id";
@@ -238 +238 @@
     }
 
-    if (!count($metrics) && $view!='search' && $view!='host') 
+    if (!count($metrics) && $view!='' && $view!='search' && $view!='host') 
     {
         echo "<h4>Cannot find any metrics for selected cluster \"$clustername\", exiting.</h4>\n";
@@ -322 +322 @@
         #$range = "job";
 
-        if( $page_call != "host_view" )
+        if( ( $page_call != "host_view" ) && ( $page_call != "search" ) )
         {
 
@@ -505 +505 @@
     default:
 
-        include "./overview.php";
-        makeOverview();
+        include "./meta_view.php";
+        makeMetaview();
         break;
 }

branches/0.4/web/addons/job_monarch/search.php

@@ -226 +226 @@
     global $end_from_time, $end_to_time, $filter, $default_showhosts, $m, $hosts_up, $hc;
     global $period_start, $period_stop, $sortby, $sortorder, $COLUMN_REQUESTED_MEMORY;
-    global $SEARCH_RESULT_LIMIT, $COLUMN_NODES, $metricname, $self;
+    global $SEARCH_RESULT_LIMIT, $COLUMN_NODES, $metricname, $self, $conf;
 
     $longtitle = "Batch Archive Search :: Powered by Job Monarch!";
@@ -420 +420 @@
                 }
 
+                $trd = new TarchRrdGraph( $clustername, $host );
+                $rrd_dirs = $trd->getRrdDirs( $period_start, $period_stop );
+
+                $metric_menu = "<B>Metric</B>&nbsp;&nbsp;"
+                    ."<SELECT NAME=\"m\" OnChange=\"toga_form.submit();\">\n";
+
+                $archive_reports = array( "load_report", "cpu_report", "network_report", "packet_report", "mem_report" );
+                $file_metrics = $trd->dirList( $rrd_dirs[0] );
+
+                $archive_metrics = array();
+
+                foreach( $file_metrics as $k )
+                {
+                    $a_metric_file = explode( '.', $k);
+                    $archive_metrics[] = $a_metric_file[0];
+                }
+
+                $sorted_metrics = array_merge( $archive_reports, $archive_metrics );
+
+                asort( $sorted_metrics );
+
+                $selected_metric = $conf['default_metric'];
+
+                if( $metricname != '')
+                {
+                    $selected_metric = $metricname;
+                }
+
+                foreach( $sorted_metrics as $k )
+                {
+                    $url = rawurlencode($k);
+                    $metric_menu .= "<OPTION VALUE=\"$url\" ";
+                    if ($k == $selected_metric )
+                        $metric_menu .= "SELECTED";
+                    $metric_menu .= ">$k\n";
+                }
+                $metric_menu .= "</SELECT>\n";
+
+                $tpl_data->assign("metric_menu", $metric_menu );
+
                 # First pass to find the max value in all graphs for this
                 # metric. The $start,$end variables comes from get_context.php,

branches/0.4/web/addons/job_monarch/templates/search.tpl

@@ -266 +266 @@
     <INPUT TYPE="HIDDEN" NAME="period_start" VALUE="{$period_start}">
     <INPUT TYPE="HIDDEN" NAME="period_stop" VALUE="{$period_stop}">
-    <BR><BR><B>Graph/ from
+    <BR><B>Graph {$metric_menu} from
     <INPUT TYPE="text" NAME="period_start_pick" VALUE="{$period_start}" ALT="Start time" DISABLED="TRUE">
     <a href="javascript:show_calendar('document.{$form_name}.period_start_pick', document.{$form_name}.period_start_pick.value);" alt="Click to select a date/time" title="Click to select a date/time">