tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-04-24 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/functions_graph.php
	 operation/agentes/stat_win.php: Added units to Y axis in static 
	graphs. Also changed layout of launcher module graph window. 
	
	Fixes: #3520728



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6129 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2012-04-24 11:20:27 +00:00
parent 6c3dae49dd
commit c2e58c9d49
3 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2012-04-24 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_graph.php
operation/agentes/stat_win.php: Added units to Y axis in static
graphs. Also changed layout of launcher module graph window.
Fixes: #3520728
2012-04-24 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/agentes/estado_agente.php,

25
pandora_console/include/functions_graph.php
View File

@ -371,10 +371,17 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
$legend['alert'] = __('Alerts');
$chart_extra_data['legend_alerts'] = $legend['alert'];
}
$legend['max'] = __('Max') . ' (' .format_for_graph($max_value) . ')';
$legend['sum'] = __('Avg') . ' (' . $avg_value . ')';
$legend['min'] = __('Min') . ' (' . format_for_graph($min_value) . ')';
$legend['baseline'] = __('Baseline');
if (!$avg_only){
$legend['max'] = __('Max') . ' (' .format_for_graph($max_value) . ') ' . $unit;
$legend['sum'] = __('Avg') . ' (' . $avg_value . ') ' . $unit;
$legend['min'] = __('Min') . ' (' . format_for_graph($min_value) . ') ' . $unit;
}
else
$legend['sum'] = __('Avg') . ' (' . $avg_value . ') ' . $unit;
if ($baseline) {
$legend['baseline'] = __('Baseline');
}
if ($only_image) {
$flash_chart = false;
@ -385,7 +392,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
// Color commented not to restrict serie colors
return area_graph($flash_chart, $chart, $width, $height, $color, $legend,
$long_index, "images/image_problem.opaque.png", "", "", $homeurl,
$long_index, "images/image_problem.opaque.png", "", $unit, $homeurl,
$water_mark,
$config['fontpath'], $config['font_size'], $unit, $ttl, $series_type,
$chart_extra_data, $warning_min, $critical_min, $adapt_key);
@ -1991,19 +1998,19 @@ function grafico_modulo_boolean ($agent_module_id, $period, $show_events,
// Flash chart
$caption = __('Max. Value') . ': ' . $max_value . ' ' . __('Avg. Value') .
': ' . $avg_value . ' ' . __('Min. Value') . ': ' . $min_value;
': ' . $avg_value . ' ' . __('Min. Value') . ': ' . $min_value . ' ' . __('Units') . ': ' . $unit;
/////////////////////////////////////////////////////////////////////////////////////////
$legend = array();
$legend['sum'] = __('Avg') . ' (' . $avg_value . ')';
$legend['sum'] = __('Avg') . ' (' . $avg_value . ') ' . $unit;
if($show_events) {
$legend['event'] = __('Events');
}
if($show_alerts) {
$legend['alert'] = __('Alerts');
}
$legend['max'] = __('Max') . ' (' .format_for_graph($max_value) . ')';
$legend['min'] = __('Min') . ' (' . format_for_graph($min_value) . ')';
$legend['max'] = __('Max') . ' (' .format_for_graph($max_value) . ') ' . $unit;
$legend['min'] = __('Min') . ' (' . format_for_graph($min_value) . ') ' . $unit;
$legend['baseline'] = __('Baseline');
/////////////////////////////////////////////////////////////////////////////////////////
$color = array();

5
pandora_console/operation/agentes/stat_win.php
View File

@ -210,7 +210,10 @@ $urlImage .= $_SERVER['SERVER_NAME'] . $config['homeurl'] . '/';
// log4x doesnt support flash yet
//
echo '<div style="margin-left: 30px">';
if ($config['flash_charts'] == 1)
echo '<div style="margin-left: 70px">';
else
echo '<div style="margin-left: 50px">';
switch ($graph_type) {
case 'boolean':
echo grafico_modulo_boolean ($id, $period, $draw_events, $width, $height,