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

Merge branch '1433-Mensaje-No-data-to-show-diferentes-en-graficas-de-modulos-y-de-interfaces' into 'develop' 

Change image_problem no data sign to image_problem_area_small - #1433

See merge request artica/pandorafms!908
This commit is contained in:
vgilc 2017-10-26 11:13:31 +02:00
parent 3ff14bb001 bd47d5362a
commit 0604dfedbf
4 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
pandora_console/images/image_problem_area_small.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

52
pandora_console/include/functions_graph.php
View File

@ -949,7 +949,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
return return
area_graph($flash_chart, $chart, $width, $height/2, $color, area_graph($flash_chart, $chart, $width, $height/2, $color,
$legend, $long_index, $legend, $long_index,
ui_get_full_url("images/image_problem.opaque.png", false, false, false), ui_get_full_url("images/image_problem_area_small.png", false, false, false),
$title, $unit, $homeurl, $water_mark, $config['fontpath'], $title, $unit, $homeurl, $water_mark, $config['fontpath'],
$config['font_size'], $unit, $ttl, $series_type, $config['font_size'], $unit, $ttl, $series_type,
$chart_extra_data, $warning_min, $critical_min, $chart_extra_data, $warning_min, $critical_min,
@ -958,7 +958,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
'<br>'. '<br>'.
area_graph($flash_chart, $chart_prev, $width, $height/2, area_graph($flash_chart, $chart_prev, $width, $height/2,
$color_prev, $legend_prev, $long_index_prev, $color_prev, $legend_prev, $long_index_prev,
ui_get_full_url("images/image_problem.opaque.png", false, false, false), ui_get_full_url("images/image_problem_area_small.png", false, false, false),
$title, $unit, $homeurl, $water_mark, $config['fontpath'], $title, $unit, $homeurl, $water_mark, $config['fontpath'],
$config['font_size'], $unit, $ttl, $series_type_prev, $config['font_size'], $unit, $ttl, $series_type_prev,
$chart_extra_data, $warning_min, $critical_min, $chart_extra_data, $warning_min, $critical_min,
@ -977,7 +977,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
return return
area_graph($flash_chart, $chart, $width, $height, $color, area_graph($flash_chart, $chart, $width, $height, $color,
$legend, $long_index, $legend, $long_index,
ui_get_full_url("images/image_problem.opaque.png", false, false, false), ui_get_full_url("images/image_problem_area_small.png", false, false, false),
$title, $unit, $homeurl, $water_mark, $config['fontpath'], $title, $unit, $homeurl, $water_mark, $config['fontpath'],
$config['font_size'], $unit, $ttl, $series_type, $config['font_size'], $unit, $ttl, $series_type,
$chart_extra_data, $warning_min, $critical_min, $chart_extra_data, $warning_min, $critical_min,
@ -990,13 +990,13 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
return return
line_graph($flash_chart, $chart, $width, $height/2, $color, line_graph($flash_chart, $chart, $width, $height/2, $color,
$legend, $long_index, $legend, $long_index,
ui_get_full_url("images/image_problem.opaque.png", false, false, false), ui_get_full_url("images/image_problem_area_small.png", false, false, false),
$title, $unit, $water_mark, $config['fontpath'], $title, $unit, $water_mark, $config['fontpath'],
$config['font_size'], $unit, $ttl, $homeurl, $backgroundColor). $config['font_size'], $unit, $ttl, $homeurl, $backgroundColor).
'<br>'. '<br>'.
line_graph($flash_chart, $chart_prev, $width, $height/2, $color, line_graph($flash_chart, $chart_prev, $width, $height/2, $color,
$legend, $long_index, $legend, $long_index,
ui_get_full_url("images/image_problem.opaque.png", false, false, false), ui_get_full_url("images/image_problem_area_small.png", false, false, false),
$title, $unit, $water_mark, $config['fontpath'], $title, $unit, $water_mark, $config['fontpath'],
$config['font_size'], $unit, $ttl, $homeurl, $backgroundColor); $config['font_size'], $unit, $ttl, $homeurl, $backgroundColor);
} }
@ -1005,7 +1005,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
return return
line_graph($flash_chart, $chart, $width, $height, $color, line_graph($flash_chart, $chart, $width, $height, $color,
$legend, $long_index, $legend, $long_index,
ui_get_full_url("images/image_problem.opaque.png", false, false, false), ui_get_full_url("images/image_problem_area_small.png", false, false, false),
$title, $unit, $water_mark, $config['fontpath'], $title, $unit, $water_mark, $config['fontpath'],
$config['font_size'], $unit, $ttl, $homeurl, $backgroundColor); $config['font_size'], $unit, $ttl, $homeurl, $backgroundColor);
} }
@ -2059,7 +2059,7 @@ 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", false, false, false), ui_get_full_url("images/image_problem_area_small.png", false, false, false),
$title, "", $homeurl, $water_mark, $config['fontpath'], $title, "", $homeurl, $water_mark, $config['fontpath'],
$fixed_font_size, $unit, $ttl, array(), array(), $yellow_threshold, $red_threshold, '', $fixed_font_size, $unit, $ttl, array(), array(), $yellow_threshold, $red_threshold, '',
false, '', true, $background_color,$dashboard, $vconsole, 0, $percentil_result, $threshold_data); false, '', true, $background_color,$dashboard, $vconsole, 0, $percentil_result, $threshold_data);
@ -2068,14 +2068,14 @@ 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", false, false, false), ui_get_full_url("images/image_problem_area_small.png", false, false, false),
$title, "", $water_mark, $config['fontpath'], $fixed_font_size, $title, "", $water_mark, $config['fontpath'], $fixed_font_size,
"", $ttl, $homeurl, $background_color,$dashboard, $vconsole); "", $ttl, $homeurl, $background_color,$dashboard, $vconsole);
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", false, false, false), ui_get_full_url("images/image_problem_area_small.png", false, false, false),
$title, "", $water_mark, $config['fontpath'], $fixed_font_size, $title, "", $water_mark, $config['fontpath'], $fixed_font_size,
$unit, $ttl, $homeurl, $background_color, $dashboard, $unit, $ttl, $homeurl, $background_color, $dashboard,
$vconsole, $series_type, $percentil_result, $yellow_threshold, $red_threshold, $threshold_data); $vconsole, $series_type, $percentil_result, $yellow_threshold, $red_threshold, $threshold_data);
@ -2083,7 +2083,7 @@ function graphic_combined_module ($module_list, $weight_list, $period,
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", false, false, false), ui_get_full_url("images/image_problem_area_small.png", false, false, false),
"", "", $water_mark, $config['fontpath'], $fixed_font_size, "", "", $water_mark, $config['fontpath'], $fixed_font_size,
"", $ttl, $homeurl, $background_color, $dashboard, $vconsole); "", $ttl, $homeurl, $background_color, $dashboard, $vconsole);
break; break;
@ -2091,28 +2091,28 @@ function graphic_combined_module ($module_list, $weight_list, $period,
case CUSTOM_GRAPH_BULLET_CHART: case CUSTOM_GRAPH_BULLET_CHART:
return stacked_bullet_chart($flash_charts, $graph_values, return stacked_bullet_chart($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", false, false, false), ui_get_full_url("images/image_problem_area_small.png", false, false, false),
"", "", $water_mark, $config['fontpath'], ($config['font_size']+1), "", "", $water_mark, $config['fontpath'], ($config['font_size']+1),
"", $ttl, $homeurl, $background_color); "", $ttl, $homeurl, $background_color);
break; break;
case CUSTOM_GRAPH_GAUGE: case CUSTOM_GRAPH_GAUGE:
return stacked_gauge($flash_charts, $graph_values, return stacked_gauge($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", false, false, false), ui_get_full_url("images/image_problem_area_small.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_HBARS: case CUSTOM_GRAPH_HBARS:
return hbar_graph($flash_charts, $graph_values, return hbar_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", false, false, false), ui_get_full_url("images/image_problem_area_small.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_VBARS: case CUSTOM_GRAPH_VBARS:
return vbar_graph($flash_charts, $graph_values, return vbar_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", false, false, false), ui_get_full_url("images/image_problem_area_small.png", false, false, false),
"", "", $water_mark, $config['fontpath'], $fixed_font_size, "", "", $water_mark, $config['fontpath'], $fixed_font_size,
"", $ttl, $homeurl, $background_color, true); "", $ttl, $homeurl, $background_color, true);
break; break;
@ -2235,7 +2235,7 @@ function graphic_agentaccess ($id_agent, $width, $height, $period = 0, $return =
} }
else { else {
$out = area_graph($config['flash_charts'], $data, $width, $height, null, null, null, $out = area_graph($config['flash_charts'], $data, $width, $height, null, null, null,
ui_get_full_url("images/image_problem.opaque.png", false, false, false), ui_get_full_url("images/image_problem_area_small.png", false, false, false),
"", "", ui_get_full_url(false, 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);
} }
@ -2704,7 +2704,7 @@ function grafico_db_agentes_purge ($id_agent, $width = 380, $height = 300) {
|| (empty($num_1day) && empty($num_1week) && empty($num_1month) || (empty($num_1day) && empty($num_1week) && empty($num_1month)
&& empty($num_3months) && empty($num_all) && empty($num_3months) && empty($num_all)
&& ($config['history_db_enabled'] == 1 && empty($num_all_w_history)))) { && ($config['history_db_enabled'] == 1 && empty($num_all_w_history)))) {
return html_print_image('images/image_problem.png', true); return html_print_image('images/image_problem_area_small.png', true);
} }
// Data indexes // Data indexes
@ -4521,20 +4521,20 @@ function grafico_modulo_boolean ($agent_module_id, $period, $show_events,
if ($type_graph === 'area') { if ($type_graph === 'area') {
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", false, false, false), $long_index, ui_get_full_url("images/image_problem_area_small.png", false, false, false),
"", $unit, $homeurl, $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", false, false, false), $long_index_prev, ui_get_full_url("images/image_problem_area_small.png", false, false, false),
"", $unit, $homeurl, $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", false, false, false), $long_index, ui_get_full_url("images/image_problem_area_small.png", false, false, false),
$title, $unit, $homeurl, $water_mark, $title, $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);
@ -4545,13 +4545,13 @@ function grafico_modulo_boolean ($agent_module_id, $period, $show_events,
return return
line_graph($flash_chart, $chart, $width, $height/2, $color, line_graph($flash_chart, $chart, $width, $height/2, $color,
$legend, $long_index, $legend, $long_index,
ui_get_full_url("images/image_problem.opaque.png", false, false, false), ui_get_full_url("images/image_problem_area_small.png", false, false, false),
"", $unit, $water_mark, $config['fontpath'], "", $unit, $water_mark, $config['fontpath'],
$config['font_size'], $unit, $ttl, $homeurl, $backgroundColor). $config['font_size'], $unit, $ttl, $homeurl, $backgroundColor).
'<br>'. '<br>'.
line_graph($flash_chart, $chart_prev, $width, $height/2, $color, line_graph($flash_chart, $chart_prev, $width, $height/2, $color,
$legend, $long_index, $legend, $long_index,
ui_get_full_url("images/image_problem.opaque.png", false, false, false), ui_get_full_url("images/image_problem_area_small.png", false, false, false),
"", $unit, $water_mark, $config['fontpath'], "", $unit, $water_mark, $config['fontpath'],
$config['font_size'], $unit, $ttl, $homeurl, $backgroundColor); $config['font_size'], $unit, $ttl, $homeurl, $backgroundColor);
} }
@ -4560,7 +4560,7 @@ function grafico_modulo_boolean ($agent_module_id, $period, $show_events,
return return
line_graph($flash_chart, $chart, $width, $height, $color, line_graph($flash_chart, $chart, $width, $height, $color,
$legend, $long_index, $legend, $long_index,
ui_get_full_url("images/image_problem.opaque.png", false, false, false), ui_get_full_url("images/image_problem_area_small.png", false, false, false),
$title, $unit, $water_mark, $config['fontpath'], $title, $unit, $water_mark, $config['fontpath'],
$config['font_size'], $unit, $ttl, $homeurl, $backgroundColor); $config['font_size'], $unit, $ttl, $homeurl, $backgroundColor);
} }
@ -4691,7 +4691,7 @@ function graph_netflow_aggregate_area ($data, $period, $width, $height, $unit =
return area_graph($flash_chart, $chart, $width, $height, $color, return area_graph($flash_chart, $chart, $width, $height, $color,
$sources, array (), ui_get_full_url("images/image_problem.opaque.png", false, false, false), $sources, array (), ui_get_full_url("images/image_problem_area_small.png", false, false, false),
"", $unit, $homeurl, "", $unit, $homeurl,
$config['homedir'] . "/images/logo_vertical_water.png", $config['homedir'] . "/images/logo_vertical_water.png",
$config['fontpath'], $config['font_size'], $unit, $ttl); $config['fontpath'], $config['font_size'], $unit, $ttl);
@ -4776,7 +4776,7 @@ function graph_netflow_total_area ($data, $period, $width, $height, $unit = '',
$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", false, false, false), array (), ui_get_full_url("images/image_problem_area_small.png", false, false, false),
"", "", $homeurl, $water_mark, "", "", $homeurl, $water_mark,
$config['fontpath'], $config['font_size'], $unit, $ttl); $config['fontpath'], $config['font_size'], $unit, $ttl);
} }
@ -5152,7 +5152,7 @@ function grafico_modulo_string ($agent_module_id, $period, $show_events,
return return
line_graph($flash_chart, $chart, $width, $height, $color, line_graph($flash_chart, $chart, $width, $height, $color,
$legend, $long_index, $legend, $long_index,
ui_get_full_url("images/image_problem.opaque.png", false, false, false), ui_get_full_url("images/image_problem_area_small.png", false, false, false),
$title, $unit, $water_mark, $config['fontpath'], $title, $unit, $water_mark, $config['fontpath'],
$config['font_size'], $unit, $ttl, $homeurl, $backgroundColor); $config['font_size'], $unit, $ttl, $homeurl, $backgroundColor);
} }
@ -5663,7 +5663,7 @@ function grafico_modulo_log4x_format_y_axis ( $number , $decimals=2, $dec_point=
} }
function graph_nodata_image($width = 300, $height = 110, $type = 'area', $text = '') { function graph_nodata_image($width = 300, $height = 110, $type = 'area', $text = '') {
$image = ui_get_full_url('images/image_problem_' . $type . '.png', $image = ui_get_full_url('images/image_problem_area_small.png',
false, false, false); false, false, false);
// if ($text == '') { // if ($text == '') {

2
pandora_console/include/functions_reporting.php
View File

@ -2166,7 +2166,7 @@ function reporting_exception($report, $content, $type = 'dinamic',
'color' => array(), 'color' => array(),
'legend' => array(), 'legend' => array(),
'long_index' => array(), 'long_index' => array(),
'no_data_image' => ui_get_full_url("images/image_problem.opaque.png", false, false, false), 'no_data_image' => ui_get_full_url("images/image_problem_area_small.png", false, false, false),
'xaxisname' => "", 'xaxisname' => "",
'yaxisname' => "", 'yaxisname' => "",
'water_mark' => ui_get_full_url(false, false, false, false) . "/images/logo_vertical_water.png", 'water_mark' => ui_get_full_url(false, false, false, false) . "/images/logo_vertical_water.png",

4
pandora_console/include/functions_reporting_html.php
View File

@ -2811,13 +2811,13 @@ function reporting_get_stats_summary($data, $graph_width, $graph_height) {
$tdata[0] = '<div style="margin: auto; width: ' . $graph_width . 'px;">' . graph_agent_status (false, $graph_width, $graph_height, true, true) . '</div>'; $tdata[0] = '<div style="margin: auto; width: ' . $graph_width . 'px;">' . graph_agent_status (false, $graph_width, $graph_height, true, true) . '</div>';
} }
else { else {
$tdata[2] = html_print_image('images/image_problem.png', true, array('width' => $graph_width)); $tdata[2] = html_print_image('images/image_problem_area_small.png', true, array('width' => $graph_width));
} }
if ($data["monitor_alerts"] > 0) { if ($data["monitor_alerts"] > 0) {
$tdata[2] = '<div style="margin: auto; width: ' . $graph_width . 'px;">' . graph_alert_status ($data["monitor_alerts"], $data["monitor_alerts_fired"], $graph_width, $graph_height, true, true) . '</div>'; $tdata[2] = '<div style="margin: auto; width: ' . $graph_width . 'px;">' . graph_alert_status ($data["monitor_alerts"], $data["monitor_alerts_fired"], $graph_width, $graph_height, true, true) . '</div>';
} }
else { else {
$tdata[2] = html_print_image('images/image_problem.png', true, array('width' => $graph_width)); $tdata[2] = html_print_image('images/image_problem_area_small.png', true, array('width' => $graph_width));
} }
$table_sum->rowclass[] = ''; $table_sum->rowclass[] = '';
$table_sum->data[] = $tdata; $table_sum->data[] = $tdata;