tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adapted the functions to work with the metaconsole

Browse Source
This commit is contained in:
Alejandro Gallardo Escobar 2015-03-18 20:28:55 +01:00
parent 3bab9b06fe
commit 567b5125bd
1 changed files with 80 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
pandora_console/include/functions_graph.php
View File

@ -804,26 +804,26 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
$water_mark = array('file' => $water_mark = array('file' =>
$config['homedir'] . "/images/logo_vertical_water.png", $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url(false, false, false, false) . "/images/logo_vertical_water.png"); 'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
if ($compare === 'separated') { if ($compare === 'separated') {
return area_graph($flash_chart, $chart, $width, $height/2, $color, $legend, return area_graph($flash_chart, $chart, $width, $height/2, $color, $legend,
$long_index, ui_get_full_url("images/image_problem.opaque.png"), "", $unit, $homeurl, $long_index, ui_get_full_url("images/image_problem.opaque.png", false, false, false),
$water_mark, $config['fontpath'], $config['font_size'], $unit, $ttl, "", $unit, $homeurl, $water_mark, $config['fontpath'], $config['font_size'], $unit, $ttl,
$series_type, $chart_extra_data, $warning_min, $critical_min, $adapt_key, false, $series_type, $chart_extra_data, $warning_min, $critical_min, $adapt_key, false,
$series_suffix_str, $menu, $backgroundColor). $series_suffix_str, $menu, $backgroundColor).
'<br>'. '<br>'.
area_graph($flash_chart, $chart_prev, $width, $height/2, $color_prev, $legend_prev, area_graph($flash_chart, $chart_prev, $width, $height/2, $color_prev, $legend_prev,
$long_index_prev, ui_get_full_url("images/image_problem.opaque.png"), "", $unit, $homeurl, $long_index_prev, ui_get_full_url("images/image_problem.opaque.png", false, false, false),
$water_mark, $config['fontpath'], $config['font_size'], $unit, $ttl, "", $unit, $homeurl, $water_mark, $config['fontpath'], $config['font_size'], $unit, $ttl,
$series_type_prev, $chart_extra_data, $warning_min, $critical_min, $adapt_key, false, $series_type_prev, $chart_extra_data, $warning_min, $critical_min, $adapt_key, false,
$series_suffix_str, $menu, $backgroundColor); $series_suffix_str, $menu, $backgroundColor);
} }
else { else {
// Color commented not to restrict serie colors // Color commented not to restrict serie colors
return area_graph($flash_chart, $chart, $width, $height, $color, $legend, return area_graph($flash_chart, $chart, $width, $height, $color, $legend,
$long_index, ui_get_full_url("images/image_problem.opaque.png"), "", $unit, $homeurl, $long_index, ui_get_full_url("images/image_problem.opaque.png", false, false, false),
$water_mark, $config['fontpath'], $config['font_size'], $unit, $ttl, "", $unit, $homeurl, $water_mark, $config['fontpath'], $config['font_size'], $unit, $ttl,
$series_type, $chart_extra_data, $warning_min, $critical_min, $adapt_key, false, $series_type, $chart_extra_data, $warning_min, $critical_min, $adapt_key, false,
$series_suffix_str, $menu, $backgroundColor); $series_suffix_str, $menu, $backgroundColor);
} }
@ -1320,7 +1320,7 @@ function graphic_combined_module ($module_list, $weight_list, $period,
$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png", $water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("/images/logo_vertical_water.png")); 'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
//Work around for fixed the agents name with huge size chars. //Work around for fixed the agents name with huge size chars.
@ -1365,8 +1365,8 @@ function graphic_combined_module ($module_list, $weight_list, $period,
case CUSTOM_GRAPH_AREA: case CUSTOM_GRAPH_AREA:
return area_graph($flash_charts, $graph_values, $width, return area_graph($flash_charts, $graph_values, $width,
$height, $color, $module_name_list, $long_index, $height, $color, $module_name_list, $long_index,
ui_get_full_url("images/image_problem.opaque.png"), "", ui_get_full_url("images/image_problem.opaque.png", false, false, false),
"", $homeurl, $water_mark, $config['fontpath'], "", "", $homeurl, $water_mark, $config['fontpath'],
$fixed_font_size, "", $ttl, array(), array(), 0, 0, '', $fixed_font_size, "", $ttl, array(), array(), 0, 0, '',
false, '', true, $background_color); false, '', true, $background_color);
break; break;
@ -1374,22 +1374,22 @@ function graphic_combined_module ($module_list, $weight_list, $period,
case CUSTOM_GRAPH_STACKED_AREA: case CUSTOM_GRAPH_STACKED_AREA:
return stacked_area_graph($flash_charts, $graph_values, return stacked_area_graph($flash_charts, $graph_values,
$width, $height, $color, $module_name_list, $long_index, $width, $height, $color, $module_name_list, $long_index,
ui_get_full_url("images/image_problem.opaque.png"), "", ui_get_full_url("images/image_problem.opaque.png", false, false, false),
"", $water_mark, $config['fontpath'], $fixed_font_size, "", "", $water_mark, $config['fontpath'], $fixed_font_size,
"", $ttl, $homeurl, $background_color); "", $ttl, $homeurl, $background_color);
break; break;
case CUSTOM_GRAPH_LINE: case CUSTOM_GRAPH_LINE:
return line_graph($flash_charts, $graph_values, $width, return line_graph($flash_charts, $graph_values, $width,
$height, $color, $module_name_list, $long_index, $height, $color, $module_name_list, $long_index,
ui_get_full_url("images/image_problem.opaque.png"), "", ui_get_full_url("images/image_problem.opaque.png", false, false, false),
"", $water_mark, $config['fontpath'], $fixed_font_size, "", "", $water_mark, $config['fontpath'], $fixed_font_size,
"", $ttl, $homeurl, $background_color); "", $ttl, $homeurl, $background_color);
break; break;
case CUSTOM_GRAPH_STACKED_LINE: case CUSTOM_GRAPH_STACKED_LINE:
return stacked_line_graph($flash_charts, $graph_values, return stacked_line_graph($flash_charts, $graph_values,
$width, $height, $color, $module_name_list, $long_index, $width, $height, $color, $module_name_list, $long_index,
ui_get_full_url("images/image_problem.opaque.png"), "", ui_get_full_url("images/image_problem.opaque.png", false, false, false),
"", $water_mark, $config['fontpath'], $fixed_font_size, "", "", $water_mark, $config['fontpath'], $fixed_font_size,
"", $ttl, $homeurl, $background_color); "", $ttl, $homeurl, $background_color);
break; break;
} }
@ -1455,15 +1455,15 @@ function graphic_agentaccess ($id_agent, $width, $height, $period = 0, $return =
} }
$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png", $water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("/images/logo_vertical_water.png")); 'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
if ($empty_data) { if ($empty_data) {
$out = graph_nodata_image($width, $height); $out = graph_nodata_image($width, $height);
} }
else { else {
$out = area_graph($config['flash_charts'], $data, $width, $height, $out = area_graph($config['flash_charts'], $data, $width, $height, null, null, null,
null, null, null, ui_get_full_url("images/image_problem.opaque.png"), "", "", ui_get_full_url(false, false, false, false), ui_get_full_url("images/image_problem.opaque.png", false, false, false),
$water_mark, "", "", ui_get_full_url(false, false, false, false), $water_mark,
$config['fontpath'], $config['font_size'], "", 1, array(), array(), 0, 0, '', false, '', false); $config['fontpath'], $config['font_size'], "", 1, array(), array(), 0, 0, '', false, '', false);
} }
@ -1553,7 +1553,7 @@ function graph_agent_status ($id_agent = false, $width = 300, $height = 200, $re
array_walk($data, 'truncate_negatives'); array_walk($data, 'truncate_negatives');
$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png", $water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("/images/logo_vertical_water.png")); 'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
$colors = array(COL_CRITICAL, COL_WARNING, COL_NORMAL, COL_UNKNOWN); $colors = array(COL_CRITICAL, COL_WARNING, COL_NORMAL, COL_UNKNOWN);
@ -1566,8 +1566,8 @@ function graph_agent_status ($id_agent = false, $width = 300, $height = 200, $re
} }
$out = pie2d_graph($config['flash_charts'], $data, $width, $height, $out = pie2d_graph($config['flash_charts'], $data, $width, $height,
__("other"), __("other"), ui_get_full_url(false, false, false, false), '',
ui_get_full_url(false), '', $config['fontpath'], $config['font_size'], 1, "hidden", $colors); $config['fontpath'], $config['font_size'], 1, "hidden", $colors);
if ($return) { if ($return) {
return $out; return $out;
@ -1635,11 +1635,10 @@ function graph_event_module ($width = 300, $height = 200, $id_agent) {
} }
$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png", $water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("/images/logo_vertical_water.png")); 'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
return pie3d_graph($config['flash_charts'], $data, $width, $height, __("other"), return pie3d_graph($config['flash_charts'], $data, $width, $height, __("other"),
'', $water_mark, '', $water_mark, $config['fontpath'], $config['font_size'], 1, "bottom");
$config['fontpath'], $config['font_size'], 1, "bottom");
} }
function progress_bar($progress, $width, $height, $title = '', $mode = 1, $value_text = false, $color = false, $options = false) { function progress_bar($progress, $width, $height, $title = '', $mode = 1, $value_text = false, $color = false, $options = false) {
@ -1736,8 +1735,7 @@ function graph_sla_slicebar ($id, $period, $sla_min, $sla_max, $date, $daysWeek
5 => COL_NOTINIT); 5 => COL_NOTINIT);
return slicesbar_graph($data, $period, $width, $height, $colors, return slicesbar_graph($data, $period, $width, $height, $colors,
$config['fontpath'], $config['fontpath'], $round_corner, $home_url, $ttl);
$round_corner, $home_url, $ttl);
} }
/** /**
@ -1947,7 +1945,7 @@ function grafico_db_agentes_purge ($id_agent, $width = 380, $height = 300) {
$water_mark = array( $water_mark = array(
'file' => $config['homedir'] . "/images/logo_vertical_water.png", 'file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("/images/logo_vertical_water.png") 'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false)
); );
return pie3d_graph($config['flash_charts'], $data, $width, $height, return pie3d_graph($config['flash_charts'], $data, $width, $height,
@ -1979,11 +1977,10 @@ function grafico_db_agentes_paquetes($width = 380, $height = 300) {
} }
$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png", $water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("/images/logo_vertical_water.png")); 'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
return hbar_graph($config['flash_charts'], $data, $width, $height, array(), return hbar_graph($config['flash_charts'], $data, $width, $height, array(),
$legend, "", "", true, "", $legend, "", "", true, "", $water_mark,
$water_mark,
$config['fontpath'], $config['font_size'], false); $config['fontpath'], $config['font_size'], false);
} }
@ -2040,8 +2037,8 @@ function graph_db_agentes_modulos($width, $height) {
} }
$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png", $water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("/images/logo_vertical_water.png")); 'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
return hbar_graph($config['flash_charts'], return hbar_graph($config['flash_charts'],
$data, $width, $height, array(), $data, $width, $height, array(),
array(), "", "", true, "", array(), "", "", true, "",
@ -2087,8 +2084,11 @@ function graphic_user_activity ($width = 350, $height = 230) {
$data[$login['id_usuario']] = $login['n_incidents']; $data[$login['id_usuario']] = $login['n_incidents'];
} }
$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
return pie3d_graph($config['flash_charts'], $data, $width, $height, return pie3d_graph($config['flash_charts'], $data, $width, $height,
__('Other'), '', $config['homedir'] . "/images/logo_vertical_water.png", __('Other'), '', $water_mark,
$config['fontpath'], $config['font_size']); $config['fontpath'], $config['font_size']);
} }
@ -2122,8 +2122,11 @@ function grafico_incidente_prioridad () {
__('Very serious') => $data_tmp[4], __('Very serious') => $data_tmp[4],
__('Maintenance') => $data_tmp[5]); __('Maintenance') => $data_tmp[5]);
$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
return pie3d_graph($config['flash_charts'], $data, 320, 200, return pie3d_graph($config['flash_charts'], $data, 320, 200,
__('Other'), '', $config['homedir'] . "/images/logo_vertical_water.png", __('Other'), '', $water_mark,
$config['fontpath'], $config['font_size']); $config['fontpath'], $config['font_size']);
} }
@ -2157,8 +2160,11 @@ function graph_incidents_status () {
$data[__("Invalid")]++; $data[__("Invalid")]++;
} }
$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
return pie3d_graph($config['flash_charts'], $data, 370, 180, return pie3d_graph($config['flash_charts'], $data, 370, 180,
__('Other'), '', $config['homedir'] . "/images/logo_vertical_water.png", __('Other'), '', $water_mark,
$config['fontpath'], $config['font_size']); $config['fontpath'], $config['font_size']);
} }
@ -2195,8 +2201,11 @@ function graphic_incident_group () {
$data[__('All')] = $incidents_all; $data[__('All')] = $incidents_all;
} }
$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
return pie3d_graph($config['flash_charts'], $data, 320, 200, return pie3d_graph($config['flash_charts'], $data, 320, 200,
__('Other'), '', $config['homedir'] . "/images/logo_vertical_water.png", __('Other'), '', $water_mark,
$config['fontpath'], $config['font_size']); $config['fontpath'], $config['font_size']);
} }
@ -2234,8 +2243,11 @@ function graphic_incident_user () {
$data[$name] = $incident['n_incidents']; $data[$name] = $incident['n_incidents'];
} }
$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
return pie3d_graph($config['flash_charts'], $data, 320, 200, return pie3d_graph($config['flash_charts'], $data, 320, 200,
__('Other'), '', $config['homedir'] . "/images/logo_vertical_water.png", __('Other'), '', $water_mark,
$config['fontpath'], $config['font_size']); $config['fontpath'], $config['font_size']);
} }
@ -2282,8 +2294,11 @@ function graphic_incident_source($width = 320, $height = 200) {
$data[$origin['origen']] = $origin['n_incident']; $data[$origin['origen']] = $origin['n_incident'];
} }
$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
return pie3d_graph($config['flash_charts'], $data, $width, $height, return pie3d_graph($config['flash_charts'], $data, $width, $height,
__('Other'), '', $config['homedir'] . "/images/logo_vertical_water.png", __('Other'), '', $water_mark,
$config['fontpath'], $config['font_size']); $config['fontpath'], $config['font_size']);
} }
@ -2305,7 +2320,7 @@ function graph_events_validated($width = 300, $height = 200, $url = "", $meta =
} }
$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png", $water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false, false)); 'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
echo pie3d_graph( echo pie3d_graph(
true, $data_graph, $width, $height, __("other"), "", true, $data_graph, $width, $height, __("other"), "",
@ -2446,7 +2461,7 @@ function grafico_eventos_grupo ($width = 300, $height = 200, $url = "", $meta =
arsort($data); arsort($data);
$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png", $water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false, false)); 'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
return pie3d_graph($config['flash_charts'], $data, $width, $height, return pie3d_graph($config['flash_charts'], $data, $width, $height,
__('Other'), '', $water_mark, __('Other'), '', $water_mark,
@ -2518,7 +2533,7 @@ function grafico_eventos_total($filter = "", $width = 320, $height = 200) {
$water_mark = array( $water_mark = array(
'file' => $config['homedir'] . "/images/logo_vertical_water.png", 'file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("/images/logo_vertical_water.png")); 'url' => ui_get_full_url("/images/logo_vertical_water.png", false, false, false));
return pie3d_graph($config['flash_charts'], $data, $width, $height, return pie3d_graph($config['flash_charts'], $data, $width, $height,
__('Other'), '', $water_mark, __('Other'), '', $water_mark,
@ -2574,7 +2589,7 @@ function grafico_eventos_usuario ($width, $height) {
$water_mark = array( $water_mark = array(
'file' => $config['homedir'] . "/images/logo_vertical_water.png", 'file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("/images/logo_vertical_water.png")); 'url' => ui_get_full_url("/images/logo_vertical_water.png", false, false, false));
return pie3d_graph($config['flash_charts'], $data, $width, $height, return pie3d_graph($config['flash_charts'], $data, $width, $height,
__('Other'), '', $water_mark, __('Other'), '', $water_mark,
@ -2654,19 +2669,17 @@ function graph_custom_sql_graph ($id, $width, $height, $type = 'sql_graph_vbar',
} }
$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png", $water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("/images/logo_vertical_water.png")); 'url' => ui_get_full_url("/images/logo_vertical_water.png", false, false, false));
switch ($type) { switch ($type) {
case 'sql_graph_vbar': // vertical bar case 'sql_graph_vbar': // vertical bar
return vbar_graph($flash_charts, $data, $width, $height, array(), return vbar_graph($flash_charts, $data, $width, $height, array(),
array(), "", "", $homeurl, array(), "", "", $homeurl, $water_mark,
$water_mark,
$config['fontpath'], $config['font_size'], false, $ttl); $config['fontpath'], $config['font_size'], false, $ttl);
break; break;
case 'sql_graph_hbar': // horizontal bar case 'sql_graph_hbar': // horizontal bar
return hbar_graph($flash_charts, $data, $width, $height, array(), return hbar_graph($flash_charts, $data, $width, $height, array(),
array(), "", "", true, $homeurl, array(), "", "", true, $homeurl, $water_mark,
$water_mark,
$config['fontpath'], $config['font_size'], false, $ttl); $config['fontpath'], $config['font_size'], false, $ttl);
break; break;
case 'sql_graph_pie': // Pie case 'sql_graph_pie': // Pie
@ -3245,25 +3258,25 @@ function grafico_modulo_boolean ($agent_module_id, $period, $show_events,
} }
$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png", $water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("/images/logo_vertical_water.png")); 'url' => ui_get_full_url("/images/logo_vertical_water.png", false, false, false));
if ($compare === 'separated') { if ($compare === 'separated') {
return area_graph($flash_chart, $chart, $width, $height/2, $color, $legend, return area_graph($flash_chart, $chart, $width, $height/2, $color, $legend,
$long_index, ui_get_full_url("images/image_problem.opaque.png"), "", $unit, $homeurl, $long_index, ui_get_full_url("images/image_problem.opaque.png", false, false, false),
$water_mark, "", $unit, $homeurl, $water_mark,
$config['fontpath'], $config['font_size'], $unit, 1, $series_type, $config['fontpath'], $config['font_size'], $unit, 1, $series_type,
$chart_extra_data, 0, 0, $adapt_key, false, $series_suffix_str, $menu). $chart_extra_data, 0, 0, $adapt_key, false, $series_suffix_str, $menu).
'<br>'. '<br>'.
area_graph($flash_chart, $chart_prev, $width, $height/2, $color_prev, $legend_prev, area_graph($flash_chart, $chart_prev, $width, $height/2, $color_prev, $legend_prev,
$long_index_prev, ui_get_full_url("images/image_problem.opaque.png"), "", $unit, $homeurl, $long_index_prev, ui_get_full_url("images/image_problem.opaque.png", false, false, false),
$water_mark, "", $unit, $homeurl, $water_mark,
$config['fontpath'], $config['font_size'], $unit, 1, $series_type_prev, $config['fontpath'], $config['font_size'], $unit, 1, $series_type_prev,
$chart_extra_data_prev, 0, 0, $adapt_key, false, $series_suffix_str, $menu); $chart_extra_data_prev, 0, 0, $adapt_key, false, $series_suffix_str, $menu);
} }
else { else {
return area_graph($flash_chart, $chart, $width, $height, $color, $legend, return area_graph($flash_chart, $chart, $width, $height, $color, $legend,
$long_index, ui_get_full_url("images/image_problem.opaque.png"), "", $unit, $homeurl, $long_index, ui_get_full_url("images/image_problem.opaque.png", false, false, false),
$water_mark, "", $unit, $homeurl, $water_mark,
$config['fontpath'], $config['font_size'], $unit, 1, $series_type, $config['fontpath'], $config['font_size'], $unit, 1, $series_type,
$chart_extra_data, 0, 0, $adapt_key, false, $series_suffix_str, $menu); $chart_extra_data, 0, 0, $adapt_key, false, $series_suffix_str, $menu);
} }
@ -3336,11 +3349,12 @@ function graph_netflow_aggregate_area ($data, $period, $width, $height, $unit =
} }
$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png", $water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("/images/logo_vertical_water.png")); 'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
return area_graph($flash_chart, $chart, $width, $height, array (), $sources, return area_graph($flash_chart, $chart, $width, $height, array (), $sources,
array (), "images/image_problem.opaque.png", "", $unit, $homeurl, array (), ui_get_full_url("images/image_problem.opaque.png", false, false, false),
"", $unit, $homeurl,
$config['homedir'] . "/images/logo_vertical_water.png", $config['homedir'] . "/images/logo_vertical_water.png",
$config['fontpath'], $config['font_size'], $unit, 2); $config['fontpath'], $config['font_size'], $unit, 2);
} }
@ -3414,12 +3428,12 @@ function graph_netflow_total_area ($data, $period, $width, $height, $unit = '',
} }
$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png", $water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("/images/logo_vertical_water.png")); 'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
$legend = array (__('Max.') . ' ' . format_numeric($max) . ' ' . __('Min.') . ' ' . format_numeric($min) . ' ' . __('Avg.') . ' ' . format_numeric ($avg)); $legend = array (__('Max.') . ' ' . format_numeric($max) . ' ' . __('Min.') . ' ' . format_numeric($min) . ' ' . __('Avg.') . ' ' . format_numeric ($avg));
return area_graph($flash_chart, $chart, $width, $height, array (), $legend, return area_graph($flash_chart, $chart, $width, $height, array (), $legend,
array (), ui_get_full_url("images/image_problem.opaque.png"), "", "", $homeurl, array (), ui_get_full_url("images/image_problem.opaque.png", false, false, false),
$water_mark, "", "", $homeurl, $water_mark,
$config['fontpath'], $config['font_size'], $unit, $ttl); $config['fontpath'], $config['font_size'], $unit, $ttl);
} }
@ -3453,8 +3467,11 @@ function graph_netflow_aggregate_pie ($data, $aggregate, $ttl = 1, $only_image =
$flash_chart = false; $flash_chart = false;
} }
$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
return pie3d_graph($flash_chart, $values, 370, 200, return pie3d_graph($flash_chart, $values, 370, 200,
__('Other'), $config['homeurl'], $config['homedir'] . "/images/logo_vertical_water.png", __('Other'), $config['homeurl'], $water_mark,
$config['fontpath'], $config['font_size'], $ttl); $config['fontpath'], $config['font_size'], $ttl);
} }
@ -3760,7 +3777,7 @@ function grafico_modulo_string ($agent_module_id, $period, $show_events,
} }
$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png", $water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("/images/logo_vertical_water.png")); 'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
return area_graph($flash_chart, $chart, $width, $height, $color, return area_graph($flash_chart, $chart, $width, $height, $color,
$legend, array(), '', "", $unit, $homeurl, $legend, array(), '', "", $unit, $homeurl,