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

Revert "Recover critical status the SNMPTrap on SNMP console actions" 

This reverts commit 8ef8f31f67.
This commit is contained in:
fermin831 2018-06-22 13:29:36 +02:00
parent 6a53e924bb
commit 16cff75242
2 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pandora_console/include/functions_modules.php
View File

@ -2741,22 +2741,4 @@ function get_module_realtime_link_graph ($module) {
return $link_button; return $link_button;
} }
/**
* @brief Force a module to adopt a determinated status.
* WARNING: Only use this function to modules that changes their status
* with some user action through the console
* @param int New status
* @param int Agent module to force new status
*/
function force_set_module_status ($status, $id_agent_module) {
return db_process_sql_update( 'tagente_estado',
array(
'estado' => $status,
'known_status' => $status,
'last_known_status' => $status
),
array('id_agente_modulo' => $id_agent_module)
);
}
?> ?>

15
pandora_console/operation/snmpconsole/snmp_view.php
View File

@ -18,7 +18,6 @@
// Load global vars // Load global vars
global $config; global $config;
enterprise_include ("operation/snmpconsole/snmp_view.php"); enterprise_include ("operation/snmpconsole/snmp_view.php");
enterprise_include ("include/functions_snmp.php");
require_once("include/functions_agents.php"); require_once("include/functions_agents.php");
require_once("include/functions_snmp.php"); require_once("include/functions_snmp.php");
@ -98,19 +97,18 @@ else {
if (isset ($_GET["delete"])) { if (isset ($_GET["delete"])) {
$id_trap = (int) get_parameter_get ("delete", 0); $id_trap = (int) get_parameter_get ("delete", 0);
if ($id_trap > 0 && check_acl ($config['id_user'], 0, "IM")) { if ($id_trap > 0 && check_acl ($config['id_user'], 0, "IM")) {
if($group_by){ if($group_by){
$sql_ids_traps = "SELECT id_trap, source FROM ttrap WHERE oid IN (SELECT oid FROM ttrap WHERE id_trap = ".$id_trap.") $sql_ids_traps = "SELECT id_trap FROM ttrap WHERE oid IN (SELECT oid FROM ttrap WHERE id_trap = ".$id_trap.")
AND source IN (SELECT source FROM ttrap WHERE id_trap = ".$id_trap.")"; AND source IN (SELECT source FROM ttrap WHERE id_trap = ".$id_trap.")";
$ids_traps = db_get_all_rows_sql($sql_ids_traps); $ids_traps = db_get_all_rows_sql($sql_ids_traps);
foreach ($ids_traps as $key => $value) { foreach ($ids_traps as $key => $value) {
$result = db_process_sql_delete('ttrap', array('id_trap' => $value['id_trap'])); $result = db_process_sql_delete('ttrap', array('id_trap' => $value['id_trap']));
enterprise_hook('snmp_update_forwarded_modules', array($value));
} }
} else { } else {
$forward_info = db_get_row('ttrap', 'id_trap', $id_trap);
$result = db_process_sql_delete('ttrap', array('id_trap' => $id_trap)); $result = db_process_sql_delete('ttrap', array('id_trap' => $id_trap));
enterprise_hook('snmp_update_forwarded_modules', array($forward_info));
ui_print_result_message ($result, ui_print_result_message ($result,
__('Successfully deleted'), __('Successfully deleted'),
__('Could not be deleted')); __('Could not be deleted'));
@ -131,7 +129,6 @@ if (isset ($_GET["check"])) {
'status' => 1, 'status' => 1,
'id_usuario' => $config["id_user"]); 'id_usuario' => $config["id_user"]);
$result = db_process_sql_update('ttrap', $values, array('id_trap' => $id_trap)); $result = db_process_sql_update('ttrap', $values, array('id_trap' => $id_trap));
enterprise_hook('snmp_update_forwarded_modules', array($id_trap));
ui_print_result_message ($result, ui_print_result_message ($result,
__('Successfully updated'), __('Successfully updated'),
@ -149,20 +146,17 @@ if (isset ($_POST["deletebt"])) {
if (is_array ($trap_ids) && check_acl ($config['id_user'], 0, "IW")) { if (is_array ($trap_ids) && check_acl ($config['id_user'], 0, "IW")) {
if($group_by){ if($group_by){
foreach ($trap_ids as $key => $value) { foreach ($trap_ids as $key => $value) {
$sql_ids_traps = "SELECT id_trap, source FROM ttrap WHERE oid IN (SELECT oid FROM ttrap WHERE id_trap = ".$value.") $sql_ids_traps = "SELECT id_trap FROM ttrap WHERE oid IN (SELECT oid FROM ttrap WHERE id_trap = ".$value.")
AND source IN (SELECT source FROM ttrap WHERE id_trap = ".$value.")"; AND source IN (SELECT source FROM ttrap WHERE id_trap = ".$value.")";
$ids_traps = db_get_all_rows_sql($sql_ids_traps); $ids_traps = db_get_all_rows_sql($sql_ids_traps);
foreach ($ids_traps as $key2 => $value2) { foreach ($ids_traps as $key2 => $value2) {
$result = db_process_sql_delete('ttrap', array('id_trap' => $value2['id_trap'])); $result = db_process_sql_delete('ttrap', array('id_trap' => $value2['id_trap']));
enterprise_hook('snmp_update_forwarded_modules', array($value2));
} }
} }
} else { } else {
foreach ($trap_ids as $id_trap) { foreach ($trap_ids as $id_trap) {
$forward_info = db_get_row('ttrap', 'id_trap', $id_trap);
db_process_sql_delete('ttrap', array('id_trap' => $id_trap)); db_process_sql_delete('ttrap', array('id_trap' => $id_trap));
enterprise_hook('snmp_update_forwarded_modules', array($forward_info));
} }
} }
} }
@ -179,7 +173,6 @@ if (isset ($_POST["updatebt"])) {
foreach ($trap_ids as $id_trap) { foreach ($trap_ids as $id_trap) {
$sql = sprintf ("UPDATE ttrap SET status = 1, id_usuario = '%s' WHERE id_trap = %d", $config["id_user"], $id_trap); $sql = sprintf ("UPDATE ttrap SET status = 1, id_usuario = '%s' WHERE id_trap = %d", $config["id_user"], $id_trap);
db_process_sql ($sql); db_process_sql ($sql);
enterprise_hook('snmp_update_forwarded_modules', array($id_trap));
} }
} }
else { else {