Changeset 804 for branches/0.4/web
- Timestamp:
- 04/07/13 00:02:16 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/0.4/web/addons/job_monarch/graph.php
r803 r804 167 167 ."DEF:'cpu_wio${def_nr}'='${rrd_dir}/cpu_wio.rrd':'sum':AVERAGE "; 168 168 169 $report_names = array( "user", "nice", "system", "wio", "idle" ); 170 169 171 if( $conf['graphreport_stats'] ) 170 172 { 171 $series .= "CDEF:cpu_user${def_nr}_nonans=cpu_user${def_nr},UN,0,cpu_user${def_nr},IF "; 172 $series .= "CDEF:cpu_nice${def_nr}_nonans=cpu_nice${def_nr},UN,0,cpu_nice${def_nr},IF "; 173 $series .= "CDEF:cpu_system${def_nr}_nonans=cpu_system${def_nr},UN,0,cpu_system${def_nr},IF "; 174 $series .= "CDEF:cpu_wio${def_nr}_nonans=cpu_wio${def_nr},UN,0,cpu_wio${def_nr},IF "; 175 $series .= "CDEF:cpu_idle${def_nr}_nonans=cpu_idle${def_nr},UN,0,cpu_idle${def_nr},IF "; 173 foreach( $report_names as $r ) 174 { 175 $series .= "CDEF:cpu_${r}${def_nr}_nonans=cpu_${r}${def_nr},UN,0,cpu_${r}${def_nr},IF "; 176 } 176 177 } 177 178 178 179 $def_nr++; 179 180 } 180 181 181 182 182 if( $conf['graphreport_stats'] ) … … 209 209 $series .= $user_sum . $nice_sum . $system_sum . $wio_sum . $idle_sum; 210 210 211 $report_names = array( "user", "nice", "system", "wio", "idle" );212 211 213 212 $r_count = 0; … … 421 420 . "GPRINT:'${r}_avg':'${space2}Avg\:%6.1lf%s' " 422 421 . "GPRINT:'${r}_max':'${space1}Max\:%6.1lf%s\\l' "; 423 424 } 425 } 426 $r_count = $r_count + 1; 422 $r_count = $r_count + 1; 423 } 424 } 425 else 426 { 427 $series .= "AREA:'bmem_used${def_nr}'#".$conf['mem_used_color']."${memuse_str} " 428 ."STACK:'bmem_shared${def_nr}'#".$conf['mem_shared_color']."${memshared_str} " 429 ."STACK:'bmem_cached${def_nr}'#".$conf['mem_cached_color']."${memcached_str} " 430 ."STACK:'bmem_buffer${def_nr}'#".$conf['mem_buffered_color']."${membuff_str} " 431 ."STACK:'bmem_swap${def_nr}'#".$conf['mem_swapped_color']."${memswap_str} "; 432 } 427 433 428 434 }
Note: See TracChangeset
for help on using the changeset viewer.