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

Merge branch 'feature/ticket#1327-NetworkInterfaceReport' into develop

Browse Source
This commit is contained in:
Alejandro Gallardo Escobar 2014-10-01 13:55:51 +02:00
commit 3c41de5238
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/godmode/agentes/planned_downtime.export_csv.php
View File

@ -112,8 +112,7 @@ $sql = "SELECT *
WHERE $where_values WHERE $where_values
ORDER BY type_execution DESC, date_from DESC"; ORDER BY type_execution DESC, date_from DESC";
$downtimes = @db_get_all_rows_sql($sql); $downtimes = @db_get_all_rows_sql($sql);
html_debug_print($sql);
html_debug_print($downtimes);
if (!empty($downtimes)) { if (!empty($downtimes)) {
ob_clean(); ob_clean();
// Show contentype header // Show contentype header

18
pandora_console/include/functions_reporting.php
View File

@ -3606,7 +3606,9 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$sizgraph_h += count($modules) * 15; $sizgraph_h += count($modules) * 15;
$table->colspan[1][0] = 3; $table->colspan[1][0] = 3;
$data = array (); $data = array();
$only_image = (bool)$config['flash_charts'] ? false : true;
require_once ($config["homedir"] . '/include/functions_graph.php'); require_once ($config["homedir"] . '/include/functions_graph.php');
$data[0] = graphic_combined_module( $data[0] = graphic_combined_module(
@ -3621,7 +3623,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
0, 0,
$graph["stacked"], $graph["stacked"],
$report["datetime"], $report["datetime"],
true, $only_image,
ui_get_full_url(false) . '/'); ui_get_full_url(false) . '/');
array_push ($table->data, $data); array_push ($table->data, $data);
@ -7587,13 +7589,15 @@ function reporting_network_interfaces_table ($content, $report, $mini, $item_tit
$ttl = $is_pdf ? 2 : 1; $ttl = $is_pdf ? 2 : 1;
$graph_width = 600; $graph_width = 900;
$graph_height = 200; $graph_height = 200;
$datetime = $report['datetime']; $datetime = $report['datetime'];
$period = $content['period']; $period = $content['period'];
if ($is_pdf) { if ($is_pdf) {
$graph_width = 800;
$graph_height = 200;
pdf_header_content($pdf, $content, $report, $item_title, false, $content["description"]); pdf_header_content($pdf, $content, $report, $item_title, false, $content["description"]);
} }
else if ($is_html) { else if ($is_html) {
@ -7614,7 +7618,11 @@ function reporting_network_interfaces_table ($content, $report, $mini, $item_tit
} }
} }
$network_interfaces_by_agents = agents_get_network_interfaces(false, array('id_grupo' => $content['id_group'])); $filter = array(
'id_grupo' => $content['id_group'],
'disabled' => 0
);
$network_interfaces_by_agents = agents_get_network_interfaces(false, $filter);
if (empty($network_interfaces_by_agents)) { if (empty($network_interfaces_by_agents)) {
$data = array(); $data = array();
@ -7681,7 +7689,7 @@ function reporting_network_interfaces_table ($content, $report, $mini, $item_tit
if (!empty($interface['traffic'])) { if (!empty($interface['traffic'])) {
$only_image = !(bool)$config['flash_charts'] || $is_pdf ? true : false; $only_image = !(bool)$config['flash_charts'] || $is_pdf ? true : false;
$graph = custom_graphs_print(0, $graph = custom_graphs_print(0,
$graph_height, $graph_height,
$graph_width, $graph_width,

2
pandora_console/operation/reporting/reporting_viewer.php
View File

@ -63,6 +63,8 @@ $enable_init_date = get_parameter('enable_init_date', 0);
$url = "index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id=$id_report&date=$date&time=$time&pure=$pure"; $url = "index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id=$id_report&date=$date&time=$time&pure=$pure";
$options = array();
$options['list_reports'] = array('active' => false, $options['list_reports'] = array('active' => false,
'text' => '<a href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&pure='.$pure.'">' . 'text' => '<a href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&pure='.$pure.'">' .
html_print_image("images/report_list.png", true, array ("title" => __('Report list'))) .'</a>'); html_print_image("images/report_list.png", true, array ("title" => __('Report list'))) .'</a>');