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

2011-09-29 Sergio Martin <sergio.martin@artica.es> 

* extensions/snmp_explorer.php
	godmode/agentes/agent_manager.php: Fixed timeout problem
	with big machines changing the transfer to ajax data mode
	to serialize way. Fixed little bugs as None option when 
	are data and few checks to avoid errors when try create
	modules without select any OID.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5023 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2011-09-29 14:39:19 +00:00
parent 9abdd317c6
commit 060b46b184
3 changed files with 46 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2011-09-29 Sergio Martin <sergio.martin@artica.es>
* extensions/snmp_explorer.php
godmode/agentes/agent_manager.php: Fixed timeout problem
with big machines changing the transfer to ajax data mode
to serialize way. Fixed little bugs as None option when
are data and few checks to avoid errors when try create
modules without select any OID.
2011-09-28 Sergio Martin <sergio.martin@artica.es>
* godmode/setup/setup_auth.php: Fixed LDAP jquery problem

55
pandora_console/extensions/snmp_explorer.php
View File

@ -19,6 +19,7 @@ include_once($config['homedir'] . "/include/functions_agents.php");
require_once ('include/functions_modules.php');
require_once ('include/functions_alerts.php');
require_once ('include/functions_reporting.php');
require_once ('include/graphs/functions_utils.php');
function snmp_explorer() {
@ -91,6 +92,10 @@ function snmp_explorer() {
if($create_modules) {
$interfaces = json_decode(html_entity_decode(get_parameter_post("snmp_json")), true);
if(is_null($interfaces)) {
$interfaces = array();
}
$values = array();
if($tcp_port != ''){
@ -122,7 +127,7 @@ function snmp_explorer() {
}
}
}
$modules = get_parameter('module');
$modules = get_parameter('module', array());
$id_snmp = get_parameter('id_snmp');
if($id_snmp == false) {
@ -201,10 +206,6 @@ function snmp_explorer() {
// Create the interface list for the interface
$interfaces_list = array();
foreach($interfaces as $interface){
/*foreach($interface as $key => $interf) {
echo $key.": ".$interf['value']."<br>";
}*/
// Get the interface name, removing " " characters and avoid "blank" interfaces
if (!isset($interface['ifName']) || $interface['ifName']['value'] == "")
continue;
@ -296,8 +297,10 @@ function snmp_explorer() {
echo '<span id="form_interfaces">';
echo '<span id ="none_text" style="display: none;">' . __('None') . '</span>';
echo "<form method='post' action='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=extension&id_agente=$id_agent&id_extension=snmp_explorer'>";
$id_snmp_serialize = serialize_in_temp($interfaces, $config['id_user']."_snmp");
html_print_input_hidden('id_snmp_serialize', $id_snmp_serialize);
html_print_input_hidden('snmp_json', htmlentities(json_encode($interfaces)));
html_print_input_hidden('create_modules', 1);
html_print_input_hidden('ip_target', $ip_target);
html_print_input_hidden('tcp_port', $tcp_port);
@ -383,32 +386,36 @@ function snmp_changed_by_multiple_snmp (event, id_snmp, selected) {
{"page" : "godmode/agentes/agent_manager",
"get_modules_json_for_multiple_snmp": 1,
"id_snmp[]": idSNMP,
"snmp_json": $("#hidden-snmp_json").val()
"id_snmp_serialize": $("#hidden-id_snmp_serialize").val()
},
function (data) {
$('#module').empty ();
if (typeof($(document).data('text_for_module')) != 'undefined') {
$('#module').append ($('<option></option>').html ($(document).data('text_for_module')).attr("value", 0).attr('selected', true));
}
else {
if (typeof(data['any_text']) != 'undefined') {
$('#module').append ($('<option></option>').html (data['any_text']).attr ("value", 0).attr('selected', true));
}
else {
var anyText = $("#any_text").html(); //Trick for catch the translate text.
if (anyText == null) {
anyText = 'Any';
}
$('#module').append ($('<option></option>').html (anyText).attr ("value", 0).attr('selected', true));
}
}
c = 0;
jQuery.each (data, function (i, val) {
s = js_html_entity_decode(val);
$('#module').append ($('<option></option>').html (s).attr ("value", i));
$('#module').fadeIn ('normal');
c++;
});
if(c == 0){
if (typeof($(document).data('text_for_module')) != 'undefined') {
$('#module').append ($('<option></option>').html ($(document).data('text_for_module')).attr("value", 0).attr('selected', true));
}
else {
if (typeof(data['any_text']) != 'undefined') {
$('#module').append ($('<option></option>').html (data['any_text']).attr ("value", 0).attr('selected', true));
}
else {
var anyText = $("#any_text").html(); //Trick for catch the translate text.
if (anyText == null) {
anyText = 'Any';
}
$('#module').append ($('<option></option>').html (anyText).attr ("value", 0).attr('selected', true));
}
}
}
if (selected != undefined)
$('#module').attr ('value', selected);
$('#module').attr ('disabled', 0);

8
pandora_console/godmode/agentes/agent_manager.php
View File

@ -51,9 +51,13 @@ if (is_ajax ()) {
$get_modules_json_for_multiple_snmp = (bool) get_parameter("get_modules_json_for_multiple_snmp", 0);
if ($get_modules_json_for_multiple_snmp) {
require_once ('include/graphs/functions_utils.php');
$idSNMP = get_parameter('id_snmp');
$snmp = json_decode(html_entity_decode(get_parameter('snmp_json')),true);
$id_snmp_serialize = get_parameter('id_snmp_serialize');
$snmp = unserialize_in_temp($id_snmp_serialize, false);
$oid_snmp = array();
$out = false;
foreach($idSNMP as $id) {