Index: /trunk/web/addons/job_monarch/host_view.php =================================================================== --- /trunk/web/addons/job_monarch/host_view.php (revision 398) +++ /trunk/web/addons/job_monarch/host_view.php (revision 399) @@ -67,6 +67,31 @@ global $job_start, $job_stop; + //print_r( $metrics ); + + //printf( "c %s\n", $clustername ); + + $trd = new TarchRrdGraph( $clustername, $hostname ); + $rrdirs = $trd->getRrdDirs( $period_start, $period_stop ); + $metrics = $metrics[$hostname]; - //print_r( $metrics ); + $mymetrics = array(); + + foreach( $rrdirs as $rrdir ) + { + $ml = $trd->dirList( $rrdir ); + + foreach( $ml as $lmetr ) + { + $metrn_fields = explode( '.', $lmetr ); + + $metrn = $metrn_fields[0]; + + if( !in_array( $metrn, $mymetrics ) ) + { + $mymetrics[$metrn] = $metrics[$metrn]; + } + } + } + $hosts_up = $hosts_up[$hostname]; //print_r( $hosts_up ); @@ -106,5 +131,5 @@ $tpl->assign("ip", $hosts_up[IP]); - foreach ($metrics as $name => $v) + foreach ($mymetrics as $name => $v) { if ($v[TYPE] == "string" or $v[TYPE]=="timestamp" or $always_timestamp[$name]) Index: /trunk/web/addons/job_monarch/index.php =================================================================== --- /trunk/web/addons/job_monarch/index.php (revision 398) +++ /trunk/web/addons/job_monarch/index.php (revision 399) @@ -404,8 +404,8 @@ break; - //case "host": - - // includeHostPage(); - // break; + case "host": + + includeHostPage(); + break; default: @@ -438,9 +438,9 @@ break; - //case "host": - - // include "./host_view.php"; - // makeHostView(); - // break; + case "host": + + include "./host_view.php"; + makeHostView(); + break; default: Index: /trunk/web/addons/job_monarch/search.php =================================================================== --- /trunk/web/addons/job_monarch/search.php (revision 398) +++ /trunk/web/addons/job_monarch/search.php (revision 399) @@ -500,5 +500,5 @@ $val = $metrics[$host][$metricname]; $class = "metric"; - $host_link="\"?c=$cluster_url&h=$host_url&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop\""; + $host_link="\"?view=host&c=$cluster_url&h=$host_url&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop\""; if ($val[TYPE]=="timestamp" or $always_timestamp[$metricname]) { Index: /trunk/web/addons/job_monarch/templates/host_view.tpl =================================================================== --- /trunk/web/addons/job_monarch/templates/host_view.tpl (revision 398) +++ /trunk/web/addons/job_monarch/templates/host_view.tpl (revision 399) @@ -51,13 +51,13 @@