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

Merge branch 'problems-with-interfaces-snmp' into 'develop' 

Fixed interfaces snmp, because dont show icon of open graphs and problems with show graphs when click in icons. Gitlab: #541

See merge request !277
This commit is contained in:
vgilc 2017-03-29 10:12:53 +02:00
parent a6a9f7eff4 6948a2fa56
commit f7b4523b1f
3 changed files with 52 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/include/functions_agents.php
View File

@ -2473,27 +2473,27 @@ function agents_get_network_interfaces ($agents = false, $agents_filter = false)
else{ else{
$interface_traffic_modules = agents_get_modules($agent_id, $columns, "nombre LIKE 'if%Octets_$interface_name'"); $interface_traffic_modules = agents_get_modules($agent_id, $columns, "nombre LIKE 'if%Octets_$interface_name'");
} }
if (!empty($interface_traffic_modules) && count($interface_traffic_modules) >= 2) { if (!empty($interface_traffic_modules) && count($interface_traffic_modules) >= 2) {
$interface_traffic_modules_aux = array('in' => '', 'out' => ''); $interface_traffic_modules_aux = array('in' => '', 'out' => '');
foreach ($interface_traffic_modules as $interface_traffic_module) { foreach ($interface_traffic_modules as $interface_traffic_module) {
$interface_name_escaped = str_replace("/", "\/", $interface_name); $interface_name_escaped = str_replace("/", "\/", $interface_name);
if($type_interface){ if ($type_interface) {
if (preg_match ("/^" . $interface_name_escaped . "_if(.+)Octets$/i", $interface_traffic_module['nombre'], $matches)) { if (preg_match ("/^" . $interface_name_escaped . "_if(.+)Octets$/i", $interface_traffic_module['nombre'], $matches)) {
if (strtolower($matches[1]) == 'in') { if (strtolower($matches[1]) == 'in' || strtolower($matches[1]) == 'hcin') {
$interface_traffic_modules_aux['in'] = $interface_traffic_module['id_agente_modulo']; $interface_traffic_modules_aux['in'] = $interface_traffic_module['id_agente_modulo'];
} }
elseif (strtolower($matches[1]) == 'out') { elseif (strtolower($matches[1]) == 'out' || strtolower($matches[1]) == 'hcout') {
$interface_traffic_modules_aux['out'] = $interface_traffic_module['id_agente_modulo']; $interface_traffic_modules_aux['out'] = $interface_traffic_module['id_agente_modulo'];
} }
} }
} }
else{ else{
if (preg_match ("/^if(.+)Octets_$interface_name_escaped$/i", $interface_traffic_module['nombre'], $matches)) { if (preg_match ("/^if(.+)Octets_$interface_name_escaped$/i", $interface_traffic_module['nombre'], $matches)) {
if (strtolower($matches[1]) == 'in') { if (strtolower($matches[1]) == 'in' || strtolower($matches[1]) == 'hcin') {
$interface_traffic_modules_aux['in'] = $interface_traffic_module['id_agente_modulo']; $interface_traffic_modules_aux['in'] = $interface_traffic_module['id_agente_modulo'];
} }
elseif (strtolower($matches[1]) == 'out') { elseif (strtolower($matches[1]) == 'out' || strtolower($matches[1]) == 'hcout') {
$interface_traffic_modules_aux['out'] = $interface_traffic_module['id_agente_modulo']; $interface_traffic_modules_aux['out'] = $interface_traffic_module['id_agente_modulo'];
} }
} }

1
pandora_console/operation/agentes/estado_generalagente.php
View File

@ -450,6 +450,7 @@ if (!empty($network_interfaces)) {
$table_interface->head_colspan[0] = 8; $table_interface->head_colspan[0] = 8;
$table_interface->data = array(); $table_interface->data = array();
$event_text_cont = 0; $event_text_cont = 0;
foreach ($network_interfaces as $interface_name => $interface) { foreach ($network_interfaces as $interface_name => $interface) {
if (!empty($interface['traffic'])) { if (!empty($interface['traffic'])) {
$permission = false; $permission = false;

49
pandora_console/operation/agentes/interface_traffic_graph_win.php
View File

@ -82,11 +82,12 @@ $interface_traffic_modules = array(
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Pandora FMS Graph (<?php echo agents_get_alias($agent_id) . ' - ' . $interface_name; ?>)</title> <title>Pandora FMS Graph (<?php echo agents_get_alias($agent_id) . ' - ' . $interface_name; ?>)</title>
<link rel="stylesheet" href="../../include/styles/pandora_minimal.css" type="text/css" /> <link rel="stylesheet" href="../../include/styles/pandora_minimal.css" type="text/css" />
<script type='text/javaScript' src='../../include/javascript/calendar.js'></script> <link rel="stylesheet" href="../../include/styles/jquery-ui-1.10.0.custom.css" type="text/css" />
<script type='text/javascript' src='../../include/javascript/pandora.js'></script> <script type='text/javascript' src='../../include/javascript/pandora.js'></script>
<script type='text/javascript' src='../../include/javascript/jquery-1.9.0.js'></script> <script type='text/javascript' src='../../include/javascript/jquery-1.9.0.js'></script>
<script type='text/javascript' src='../../include/javascript/jquery.pandora.js'></script> <script type='text/javascript' src='../../include/javascript/jquery.pandora.js'></script>
<script type='text/javascript'> <script type='text/javascript' src='../../include/javascript/jquery.jquery-ui-1.10.0.custom.js'></script>
<script type='text/javascript'>
<!-- <!--
window.onload = function() { window.onload = function() {
// Hack to repeat the init process to period select // Hack to repeat the init process to period select
@ -103,7 +104,7 @@ $interface_traffic_modules = array(
$("#hidden-show_other").val(0); $("#hidden-show_other").val(0);
} }
} }
//--> -->
</script> </script>
</head> </head>
<body bgcolor="#ffffff" style='background:#ffffff;'> <body bgcolor="#ffffff" style='background:#ffffff;'>
@ -142,6 +143,7 @@ $interface_traffic_modules = array(
$width = (int) get_parameter("width", 555); $width = (int) get_parameter("width", 555);
$height = (int) get_parameter("height", 245); $height = (int) get_parameter("height", 245);
$start_date = (string) get_parameter("start_date", date("Y-m-d")); $start_date = (string) get_parameter("start_date", date("Y-m-d"));
$start_time = get_parameter ("start_time", date("H:i:s"));
$zoom = (int) get_parameter ("zoom", 1); $zoom = (int) get_parameter ("zoom", 1);
$baseline = get_parameter ("baseline", 0); $baseline = get_parameter ("baseline", 0);
$show_percentil = get_parameter ("show_percentil", 0); $show_percentil = get_parameter ("show_percentil", 0);
@ -153,12 +155,19 @@ $interface_traffic_modules = array(
echo "<script type='text/javascript'>window.resizeTo($width + 120, $height + 320);</script>"; echo "<script type='text/javascript'>window.resizeTo($width + 120, $height + 320);</script>";
} }
$current = date("Y-m-d"); /*$current = date("Y-m-d");
if ($start_date != $current) if ($start_date != $current)
$date = strtotime($start_date); $date = strtotime($start_date);
else else
$date = $utime; $date = $utime;
*/
$date = strtotime("$start_date $start_time");
$now = time();
if ($date > $now){
$date = $now;
}
$urlImage = ui_get_full_url(false); $urlImage = ui_get_full_url(false);
@ -229,6 +238,12 @@ $interface_traffic_modules = array(
$table->data[] = $data; $table->data[] = $data;
$table->rowclass[] = ''; $table->rowclass[] = '';
$data = array();
$data[0] = __('Begin time');
$data[1] = html_print_input_text ("start_time", $start_time,'', 10, 10, true);
$table->data[] = $data;
$table->rowclass[] = '';
$data = array(); $data = array();
$data[0] = __('Time range'); $data[0] = __('Time range');
$data[1] = html_print_extended_select_for_time('period', $period, '', '', 0, 7, true); $data[1] = html_print_extended_select_for_time('period', $period, '', '', 0, 7, true);
@ -295,6 +310,13 @@ $interface_traffic_modules = array(
</body> </body>
</html> </html>
<?php
// Echo the script tags of the datepicker and the timepicker
// Modify the user language cause the ui.datepicker language files use - instead _
$custom_user_language = str_replace('_', '-', $user_language);
ui_require_jquery_file("ui.datepicker-" . $custom_user_language, "include/javascript/i18n/", true);
ui_include_time_picker(true);
?>
<script> <script>
<?php <?php
@ -321,5 +343,24 @@ $interface_traffic_modules = array(
} }
?> ?>
// Add datepicker and timepicker
$("#text-start_date").datepicker({
dateFormat: "<?php echo DATE_FORMAT_JS; ?>"
});
$("#text-start_time").timepicker({
showSecond: true,
timeFormat: '<?php echo TIME_FORMAT_JS; ?>',
timeOnlyTitle: '<?php echo __('Choose time');?>',
timeText: '<?php echo __('Time');?>',
hourText: '<?php echo __('Hour');?>',
minuteText: '<?php echo __('Minute');?>',
secondText: '<?php echo __('Second');?>',
currentText: '<?php echo __('Now');?>',
closeText: '<?php echo __('Close');?>'
});
$.datepicker.setDefaults($.datepicker.regional["<?php echo $custom_user_language; ?>"]);
forced_title_callback(); forced_title_callback();
</script> </script>