"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "functions.php" between
ganglia-web-3.7.1.tar.gz and ganglia-web-3.7.2.tar.gz

About: Ganglia is a scalable distributed monitoring system for high-performance computing systems such as clusters and grids (Ganglia Web UI).

functions.php  (ganglia-web-3.7.1):functions.php  (ganglia-web-3.7.2)
skipping to change at line 748 skipping to change at line 748
$mreg[] = $regex_array["regex"]; $mreg[] = $regex_array["regex"];
} }
} }
if ( isset($item['size']) ) { if ( isset($item['size']) ) {
$graph_args_array[] = "z=" . $item['size']; $graph_args_array[] = "z=" . $item['size'];
} else { } else {
$graph_args_array[] = "z=" . $default_size; $graph_args_array[] = "z=" . $default_size;
} }
if ( isset($item['sortit']) ) {
$graph_args_array[] = "sortit=" . $item['sortit'];
}
// If graph type is not specified default to line graph // If graph type is not specified default to line graph
if (isset($item['graph_type']) && if (isset($item['graph_type']) &&
in_array($item['graph_type'], array('line', 'stack'))) in_array($item['graph_type'], array('line', 'stack')))
$graph_args_array[] = "gtype=" . $item['graph_type']; $graph_args_array[] = "gtype=" . $item['graph_type'];
else else
$graph_args_array[] = "gtype=line"; $graph_args_array[] = "gtype=line";
if (isset($item['upper_limit'])) if (isset($item['upper_limit']))
$graph_args_array[] = "x=" . $item['upper_limit']; $graph_args_array[] = "x=" . $item['upper_limit'];
skipping to change at line 1110 skipping to change at line 1114
} // end function ganglia_cache_metrics } // end function ganglia_cache_metrics
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// //
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
function build_aggregate_graph_config ($graph_type, function build_aggregate_graph_config ($graph_type,
$line_width, $line_width,
$hreg, $hreg,
$mreg, $mreg,
$glegend, $glegend,
$exclude_host_from_legend_label) { $exclude_host_from_legend_label,
$sortit = true) {
global $conf, $index_array, $hosts, $grid, $clusters, $debug, $metrics; global $conf, $index_array, $hosts, $grid, $clusters, $debug, $metrics;
retrieve_metrics_cache(); retrieve_metrics_cache();
$color_count = count($conf['graph_colors']); $color_count = count($conf['graph_colors']);
$graph_config["report_name"]=isset($mreg) ? sanitize(implode($mreg)) : NUL L; $graph_config["report_name"]=isset($mreg) ? sanitize(implode($mreg)) : NUL L;
$graph_config["title"]=isset($mreg) ? sanitize(implode($mreg)) : NULL; $graph_config["title"]=isset($mreg) ? sanitize(implode($mreg)) : NULL;
$graph_config["glegend"]=isset($glegend) ? sanitize($glegend) : "show"; $graph_config["glegend"]=isset($glegend) ? sanitize($glegend) : "show";
skipping to change at line 1156 skipping to change at line 1161
for ($i = 1; $i < count($metric_subexpr); $i++) { for ($i = 1; $i < count($metric_subexpr); $i++) {
$legend[] = $metric_subexpr[$i]; $legend[] = $metric_subexpr[$i];
} }
$metric_matches[$metric_key] = implode(' ', $legend); $metric_matches[$metric_key] = implode(' ', $legend);
} else { } else {
$metric_matches[$metric_key] = $metric_key; $metric_matches[$metric_key] = $metric_key;
} }
} }
} }
} }
ksort($metric_matches); if($sortit) {
ksort($metric_matches);
}
} }
if( isset($metric_matches)){ if( isset($metric_matches)){
$metric_matches_unique = array_unique($metric_matches); $metric_matches_unique = array_unique($metric_matches);
} }
else{ else{
$metric_matches_unique = array($metric_name => $metric_name); $metric_matches_unique = array($metric_name => $metric_name);
} }
if ( isset($host_matches)) { if ( isset($host_matches)) {
 End of changes. 3 change blocks. 
2 lines changed or deleted 9 lines changed or added

Home  |  About  |  All  |  Newest  |  Fossies Dox  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTPS