Changeset 736 for branches/0.4
- Timestamp:
- 03/24/13 18:44:13 (11 years ago)
- Location:
- branches/0.4/web/addons/job_monarch
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/0.4/web/addons/job_monarch/graph.php
r734 r736 23 23 */ 24 24 25 global $metrics, $rrds, $range, $start, $r, $conf ;25 global $metrics, $rrds, $range, $start, $r, $conf, $m; 26 26 $range = $r; 27 27 … … 79 79 } 80 80 81 $trd = new TarchRrdGraph( $cluster, $hostname );82 83 81 $graph = $metricname; 84 82 … … 96 94 else 97 95 { 96 $trd = new TarchRrdGraph( $cluster, $hostname ); 98 97 $rrd_dirs = $trd->getRrdDirs( $period_start, $period_stop ); 99 98 } … … 370 369 371 370 $subtitle = $metricname; 372 if ($context == "host")371 if($context == "host") 373 372 { 374 373 if ($size == "small") -
branches/0.4/web/addons/job_monarch/host_view.php
r735 r736 61 61 62 62 $rrdirs = array(); 63 63 64 if( $view == "overview-host" ) 65 { 66 $rrdirs[] = $conf['rrds'] . '/' . $clustername .'/'. $hostname; 67 } 68 else 64 69 { 65 70 $trd = new TarchRrdGraph( $clustername, $hostname ); 66 71 $rrdirs = $trd->getRrdDirs( $period_start, $period_stop ); 67 72 } 68 else69 {70 $rrdirs[] = $conf['rrds'] . '/' . $cluster .'/'. $hostname;71 }72 73 73 74 $longtitle = "Batch Archive Node Report :: Powered by Job Monarch!"; … … 76 77 makeHeader( 'host_view', $title, $longtitle ); 77 78 79 #print_r( $rrdirs); 80 78 81 $metrics = $metrics[$hostname]; 79 82 $mymetrics = array(); … … 81 84 foreach( $rrdirs as $rrdir ) 82 85 { 83 $ml = $trd->dirList( $rrdir ); 84 85 foreach( $ml as $lmetr ) 86 { 87 $metrn_fields = explode( '.', $lmetr ); 88 89 $metrn = $metrn_fields[0]; 90 91 if( !in_array( $metrn, $mymetrics ) ) 92 { 93 $mymetrics[$metrn] = $metrics[$metrn]; 86 #printf("rrd dir %s\n", $rrdir ); 87 if( $view == "overview-host" ) 88 { 89 $mymetrics = $metrics; 90 #print_r( $mymetrics ); 91 } 92 else 93 { 94 #printf("archive mode\n"); 95 $ml = $trd->dirList( $rrdir ); 96 97 foreach( $ml as $lmetr ) 98 { 99 $metrn_fields = explode( '.', $lmetr ); 100 101 $metrn = $metrn_fields[0]; 102 103 if( !in_array( $metrn, $mymetrics ) ) 104 { 105 $mymetrics[$metrn] = $metrics[$metrn]; 106 } 94 107 } 95 108 } … … 127 140 $tpl->assign("ip", $hosts_up[IP]); 128 141 142 #print_r( $mymetrics ); 143 129 144 foreach ($mymetrics as $name => $v) 130 145 { … … 134 149 if ($v[SOURCE] == "gmond") $s_metrics[$name] = $v; 135 150 } 136 else if ($v[SLOPE] == "zero" or $always_constant[$name])151 else if ($v[SLOPE] == "zero" or $always_constant[$name]) 137 152 { 138 153 $c_metrics[$name] = $v; … … 145 160 { 146 161 $graphargs = "c=$cluster_url&h=$hostname&m=$name" 147 ."&z= medium&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop";162 ."&z=overview-medium&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop"; 148 163 # Adding units to graph 2003 by Jason Smith <smithj4@bnl.gov>. 149 164 if ($v[UNITS]) -
branches/0.4/web/addons/job_monarch/index.php
r735 r736 386 386 } 387 387 388 if( $view == "search" or $view == "host" or $view == "overview-host")388 if( $view == "search" or $view == "host" ) 389 389 { 390 390
Note: See TracChangeset
for help on using the changeset viewer.