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

#9270 InOctets and outOctets must be enabbled for graph

This commit is contained in:
Jonathan 2023-01-30 17:01:06 +01:00
parent 532a90252c
commit c75a49c6ec
3 changed files with 69 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
pandora_console/include/functions_treeview.php
View File

@ -847,30 +847,34 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
$permission = check_acl($config['id_user'], $agent['id_grupo'], 'RR'); $permission = check_acl($config['id_user'], $agent['id_grupo'], 'RR');
if ($permission) { if ($permission) {
$params = [ if ($interface['traffic']['in'] > 0 && $interface['traffic']['out'] > 0) {
'interface_name' => $interface_name, $params = [
'agent_id' => $id_agente, 'interface_name' => $interface_name,
'traffic_module_in' => $interface['traffic']['in'], 'agent_id' => $id_agente,
'traffic_module_out' => $interface['traffic']['out'], 'traffic_module_in' => $interface['traffic']['in'],
]; 'traffic_module_out' => $interface['traffic']['out'],
];
if (defined('METACONSOLE') && !empty($server_id)) { if (defined('METACONSOLE') && !empty($server_id)) {
$params['server'] = $server_id; $params['server'] = $server_id;
}
$params_json = json_encode($params);
$params_encoded = base64_encode($params_json);
$url = ui_get_full_url('operation/agentes/interface_traffic_graph_win.php', false, false, false);
$graph_url = "$url?params=$params_encoded";
$win_handle = dechex(crc32($interface['status_module_id'].$interface_name));
$graph_link = "<a href=\"javascript:winopeng_var('".$graph_url."','".$win_handle."', 800, 480)\">";
$graph_link .= html_print_image(
'images/chart_curve.png',
true,
['title' => __('Interface traffic')]
);
$graph_link .= '</a>';
} else {
$graph_link = __('inOctets and outOctets must be enabled.');
} }
$params_json = json_encode($params);
$params_encoded = base64_encode($params_json);
$url = ui_get_full_url('operation/agentes/interface_traffic_graph_win.php', false, false, false);
$graph_url = "$url?params=$params_encoded";
$win_handle = dechex(crc32($interface['status_module_id'].$interface_name));
$graph_link = "<a href=\"javascript:winopeng_var('".$graph_url."','".$win_handle."', 800, 480)\">";
$graph_link .= html_print_image(
'images/chart_curve.png',
true,
['title' => __('Interface traffic')]
);
$graph_link .= '</a>';
} else { } else {
$graph_link = ''; $graph_link = '';
} }

52
pandora_console/operation/agentes/interface_view.functions.php
View File

@ -539,8 +539,10 @@ function print_table(
$select_if_usage_module_data_out_down $select_if_usage_module_data_out_down
); );
$table->head[8] = __('Last data'); $table->head[8] = __('Graph');
$table->head[8] .= ui_get_sorting_arrows(
$table->head[9] = __('Last data');
$table->head[9] .= ui_get_sorting_arrows(
$last_data.'up', $last_data.'up',
$last_data.'down', $last_data.'down',
$select_if_last_data_up, $select_if_last_data_up,
@ -684,26 +686,30 @@ function print_table(
$permission = check_acl_one_of_groups($config['id_user'], $all_groups, 'RR'); $permission = check_acl_one_of_groups($config['id_user'], $all_groups, 'RR');
if ($permission) { if ($permission) {
$params = [ if ($agent_interfaces['traffic']['in'] > 0 && $agent_interfaces['traffic']['out'] > 0) {
'interface_name' => $agent_interfaces['if_name'], $params = [
'agent_id' => $agent_interfaces['agent_id'], 'interface_name' => $agent_interfaces['if_name'],
'traffic_module_in' => $agent_interfaces['traffic']['in'], 'agent_id' => $agent_interfaces['agent_id'],
'traffic_module_out' => $agent_interfaces['traffic']['out'], 'traffic_module_in' => $agent_interfaces['traffic']['in'],
]; 'traffic_module_out' => $agent_interfaces['traffic']['out'],
$params_json = json_encode($params); ];
$params_encoded = base64_encode($params_json); $params_json = json_encode($params);
$win_handle = dechex(crc32($interface['status_module_id'].$agent_interfaces['if_name'])); $params_encoded = base64_encode($params_json);
$graph_link = "<a href=\"javascript:winopeng_var('operation/agentes/interface_traffic_graph_win.php?params="; $win_handle = dechex(crc32($interface['status_module_id'].$agent_interfaces['if_name']));
$graph_link .= $params_encoded."','"; $graph_link = "<a href=\"javascript:winopeng_var('operation/agentes/interface_traffic_graph_win.php?params=";
$graph_link .= $win_handle."', 800, 480)\">"; $graph_link .= $params_encoded."','";
$graph_link .= html_print_image( $graph_link .= $win_handle."', 800, 480)\">";
'images/chart.png', $graph_link .= html_print_image(
true, 'images/chart.png',
[ true,
'title' => __('Interface traffic'), [
'class' => 'invert_filter', 'title' => __('Interface traffic'),
] 'class' => 'invert_filter',
).'</a>'; ]
).'</a>';
} else {
$graph_link = __('inOctets and outOctets must be enabled.');
}
} else { } else {
$graph_link = ''; $graph_link = '';
} }
@ -715,8 +721,8 @@ function print_table(
$table_data[$loop_index]['if_out_octets'] = ($ifOutOctets['datos'] === null) ? __('N/A') : $ifOutOctets['datos']; $table_data[$loop_index]['if_out_octets'] = ($ifOutOctets['datos'] === null) ? __('N/A') : $ifOutOctets['datos'];
$table_data[$loop_index]['if_usage_module_data_in'] = ($usage_module_data_in['datos'] === null) ? __('N/A') : $usage_module_data_in['datos']; $table_data[$loop_index]['if_usage_module_data_in'] = ($usage_module_data_in['datos'] === null) ? __('N/A') : $usage_module_data_in['datos'];
$table_data[$loop_index]['if_usage_module_data_out'] = ($usage_module_data_out['datos'] === null) ? __('N/A') : $usage_module_data_out['datos']; $table_data[$loop_index]['if_usage_module_data_out'] = ($usage_module_data_out['datos'] === null) ? __('N/A') : $usage_module_data_out['datos'];
$table_data[$loop_index]['if_graph'] = $graph_link;
$table_data[$loop_index]['if_last_data'] = human_time_comparation($agent_interfaces['last_contact']); $table_data[$loop_index]['if_last_data'] = human_time_comparation($agent_interfaces['last_contact']);
$table_data[$loop_index]['if_last_data'] .= $graph_link;
$loop_index++; $loop_index++;
} }

24
pandora_console/operation/agentes/pandora_networkmap.view.php
View File

@ -1265,16 +1265,20 @@ if (is_ajax() === true) {
$permission = check_acl($config['id_user'], $agent['id_grupo'], 'RR'); $permission = check_acl($config['id_user'], $agent['id_grupo'], 'RR');
if ($permission) { if ($permission) {
$params = [ if ($interface['traffic']['in'] > 0 && $interface['traffic']['out'] > 0) {
'interface_name' => $interface_name, $params = [
'agent_id' => $id_agent, 'interface_name' => $interface_name,
'traffic_module_in' => $interface['traffic']['in'], 'agent_id' => $id_agent,
'traffic_module_out' => $interface['traffic']['out'], 'traffic_module_in' => $interface['traffic']['in'],
]; 'traffic_module_out' => $interface['traffic']['out'],
$params_json = json_encode($params); ];
$params_encoded = base64_encode($params_json); $params_json = json_encode($params);
$win_handle = dechex(crc32($interface['status_module_id'].$interface_name)); $params_encoded = base64_encode($params_json);
$graph_link = "<a href=\"javascript:winopeng_var('operation/agentes/interface_traffic_graph_win.php?params=$params_encoded','$win_handle', 800, 480)\">".html_print_image('images/chart_curve.png', true, ['title' => __('Interface traffic')]).'</a>'; $win_handle = dechex(crc32($interface['status_module_id'].$interface_name));
$graph_link = "<a href=\"javascript:winopeng_var('operation/agentes/interface_traffic_graph_win.php?params=$params_encoded','$win_handle', 800, 480)\">".html_print_image('images/chart_curve.png', true, ['title' => __('Interface traffic')]).'</a>';
} else {
$graph_link = __('inOctets and outOctets must be enabled.');
}
} else { } else {
$graph_link = ''; $graph_link = '';
} }