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

2014-05-14 Sergio Martin <sergio.martin@artica.es> 

* extensions/realtime_graphs/ajax.php
	extensions/realtime_graphs/realtime_graphs.js
	godmode/agentes/module_manager_editor_network.php: Improvements
	in realtime graphs and snmp walk modal window



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9934 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2014-05-14 11:44:43 +00:00
parent 26f09b52bc
commit 152312dee6
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2014-05-14 Sergio Martin <sergio.martin@artica.es>
* extensions/realtime_graphs/ajax.php
extensions/realtime_graphs/realtime_graphs.js
godmode/agentes/module_manager_editor_network.php: Improvements
in realtime graphs and snmp walk modal window
2014-05-14 Sergio Martin <sergio.martin@artica.es> 2014-05-14 Sergio Martin <sergio.martin@artica.es>
* extensions/realtime_graphs/ajax.php: Improve the commands of * extensions/realtime_graphs/ajax.php: Improve the commands of

1
pandora_console/extensions/realtime_graphs/ajax.php
View File

@ -68,7 +68,6 @@ if (empty($data)) {
$data = 0; $data = 0;
} }
$graph_title .= ' (' . $refresh/1000 . ' ' . __('Seconds') . ')';
echo '{ echo '{
"label": "' . $graph_title . '", "label": "' . $graph_title . '",
"data": [["' . time() . '", ' . $data . ']] "data": [["' . time() . '", ' . $data . ']]

12
pandora_console/extensions/realtime_graphs/realtime_graphs.js
View File

@ -31,6 +31,7 @@ var refresh = parseInt($('#refresh').val());
var incremental = $('#checkbox-incremental').is(':checked'); var incremental = $('#checkbox-incremental').is(':checked');
var incremental_base = 0; var incremental_base = 0;
var last_inc = 0; var last_inc = 0;
var to;
refresh_graph(); refresh_graph();
@ -86,14 +87,13 @@ function refresh_graph () {
if (serie.data[0][1] < 0) { if (serie.data[0][1] < 0) {
serie.data[0][1] = 0; serie.data[0][1] = 0;
} }
} }
data[0].data.push(serie.data[0]); data[0].data.push(serie.data[0]);
$.plot("#" + id, data, options); $.plot("#" + id, data, options);
} }
}); });
window.setTimeout(refresh_graph, refresh); to = window.setTimeout(refresh_graph, refresh);
} }
$('#graph').change(function() { $('#graph').change(function() {
@ -101,7 +101,11 @@ $('#graph').change(function() {
}); });
$('#refresh').change(function() { $('#refresh').change(function() {
//refresh_graph(); var refresh = parseInt($('#refresh').val());
// Stop and start the Timeout
clearTimeout(to);
to = window.setTimeout(refresh_graph, refresh);
}); });
// Show the SNMP browser window // Show the SNMP browser window
@ -127,7 +131,7 @@ function snmpBrowserWindow () {
opacity: 0.5, opacity: 0.5,
background: "black" background: "black"
}, },
width: 730, width: 780,
height: 430 height: 430
}); });
} }

2
pandora_console/godmode/agentes/module_manager_editor_network.php
View File

@ -335,7 +335,7 @@ function snmpBrowserWindow () {
opacity: 0.5, opacity: 0.5,
background: "black" background: "black"
}, },
width: 730, width: 780,
height: 430 height: 430
}); });
} }