diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 5d27dbd765..deab5abf6f 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,13 @@ +2008-10-14 Evi Vanoost + + * include/functions_db.php: Style changes and language updates and a + fully functional delete_agent function + + * include/functions.php: Comment update for safe_input + + * manage_config.php: Merged Sancho's bug fixes and a rewrite. It works + it is more elegant and is more extensive in database cleanup + 2008-10-14 Sancho Lerena * operation/snmpconsole/snmp_alert.php: Texst changes for diff --git a/pandora_console/godmode/agentes/manage_config.php b/pandora_console/godmode/agentes/manage_config.php index 6aa9950a5b..26c96f32fc 100644 --- a/pandora_console/godmode/agentes/manage_config.php +++ b/pandora_console/godmode/agentes/manage_config.php @@ -17,8 +17,6 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -// WARNING: Do not use generic get_parameter() functions here, because some of the -// variables passed are arrays and are not supported by these functions. // Load global vars require ("include/config.php"); @@ -37,431 +35,422 @@ $id_group = get_parameter ("id_group", 0); $origen = get_parameter ("origen", -1); $update_agent = get_parameter ("update_agent", -1); $update_group = get_parameter ("update_group", -1); +$destino = get_parameter_post ("destino",array ()); +$origen_modulo = get_parameter_post ("origen_modulo", array ()); // Operations // --------------- -if ((isset($_GET["operacion"])) && ($update_agent == -1) && ($update_group == -1)) { - // DATA COPY - // --------- - if (isset($_POST["copy"])) { - echo "

".__('Data Copy')."

"; - // Initial checkings - // if selected more than 0 agents - if (isset($_POST["destino"])) - $destino = $_POST["destino"]; - if ((!isset($_POST["destino"])) OR (count($destino) <= 0)) { - echo "

ERROR: ".__('No selected agents to copy')."

"; - return; - } - if (isset($_POST["origen_modulo"])) - $origen_modulo = $_POST["origen_modulo"]; - - if ((!isset($_POST["origen_modulo"])) OR (count($origen_modulo) <= 0)) { - echo "

ERROR: ".__('No modules has been selected')."

"; - return; - } - - $multiple=1; - - // Source - $id_origen = $_POST["origen"]; - - // If selected modules or alerts - if (isset($_POST["modules"])) - $modulos = 1; - else - $modulos = 0; - if (isset($_POST["alerts"])) - $alertas = 1; - else - $alertas = 0; - if (($alertas + $modulos) == 0){ - echo "

ERROR: ".__('You must select modules and/or alerts for copy operation')."

";; - echo ""; - include ("general/footer.php"); - exit; - } - - // Copy - // ---- - for ($a=0;$a
".__('copyage')." [".dame_nombre_agente($id_origen)."] -> [".dame_nombre_agente($id_agente)."]"; - if ($multiple == 0) - $b = -1; - else - $b = 0; - - // Module read - if ($modulos == 1) { - for ($b=$b; $b < count($origen_modulo); $b++){ - if ($multiple == 0) - $sql1='SELECT * FROM tagente_modulo WHERE id_agente = '.$id_origen; - else - $sql1='SELECT * FROM tagente_modulo WHERE id_agente_modulo = '.$origen_modulo[$b]; - $result1=mysql_query($sql1); - while ($row=mysql_fetch_array($result1)){ - $o_id_agente_modulo = $row["id_agente_modulo"]; - $o_id_tipo_modulo = $row["id_tipo_modulo"]; - $o_nombre = $row["nombre"]; - $d_id_agente = $id_agente; // Rapelace with destination agent id - // Read every module in source agent - $o_descripcion = $row["descripcion"]; - $o_max = $row["max"]; - $o_min = $row["min"]; - $o_module_interval = $row["module_interval"]; - $o_tcp_port = $row["tcp_port"]; - $o_tcp_send = $row["tcp_send"]; - $o_tcp_rcv = $row["tcp_rcv"]; - $o_snmp_community = $row["snmp_community"]; - $o_snmp_oid = $row["snmp_oid"]; - // Replace IP Address for main ip address of destination module - $real_ip_address = give_agent_address ($id_agente); - $o_ip_target = $real_ip_address; - $o_id_module_group = $row["id_module_group"]; - // 2.0 new modules - $o_max_timeout = $row["max_timeout"]; - $o_prediction_module = $row["prediction_module"]; - $o_post_process = $row["post_process"]; - $o_id_plugin = $row["id_plugin"]; - $o_plugin_parameter = $row["plugin_parameter"]; - $o_plugin_user = $row["plugin_user"]; - $o_plugin_pass = $row["plugin_pass"]; - $o_id_modulo = $row["id_modulo"]; - - - // Write every module in destination agent - $sql = "INSERT INTO tagente_modulo ( - id_agente,id_tipo_modulo,descripcion, nombre, max, min, - module_interval, tcp_port, tcp_send, tcp_rcv, snmp_community, - snmp_oid, ip_target, id_module_group, flag, - max_timeout, prediction_module, post_process, id_plugin, - plugin_parameter, plugin_user, plugin_pass, id_modulo - ) VALUES ( - $d_id_agente, '$o_id_tipo_modulo', '$o_descripcion', - '$o_nombre', '$o_max', '$o_min', '$o_module_interval', - '$o_tcp_port', '$o_tcp_send', '$o_tcp_rcv', '$o_snmp_community', - '$o_snmp_oid', '$o_ip_target', $o_id_module_group, 1, - $o_max_timeout, $o_prediction_module, '$o_post_process', - $o_id_plugin, '$o_plugin_parameter', '$o_plugin_user', - '$o_plugin_pass', $o_id_modulo - )"; - $result2=mysql_query($sql); - if (! $result2) - echo "

".__('Problem updating database')."

"; - $o_id_agente_modulo = mysql_insert_id(); - - // Create with different estado if proc type or data type - if ( - ($o_id_agente_modulo != "") AND ( - ($o_id_tipo_modulo == 2) || - ($o_id_tipo_modulo == 6) || - ($o_id_tipo_modulo == 9) || - ($o_id_tipo_modulo == 100) || - ($o_id_tipo_modulo == 21) || - ($o_id_tipo_modulo == 18))){ - $sql_status_insert = "INSERT INTO tagente_estado - (id_agente_modulo,datos,timestamp,cambio,estado,id_agente, utimestamp) - VALUES ( - $o_id_agente_modulo, 0,'0000-00-00 00:00:00',0,0,'".$d_id_agente."',0 - )"; - } else { - $sql_status_insert = "INSERT INTO tagente_estado - (id_agente_modulo,datos,timestamp,cambio,estado,id_agente, utimestamp) - VALUES ( - $o_id_agente_modulo, 0,'0000-00-00 00:00:00',0,100,'".$d_id_agente."',0 - )"; - } - $result_status=mysql_query($sql_status_insert); - echo "
  ".__('Copying module')." ->".$o_nombre; - } - } - } - if ($multiple == 0) - $b=-1; - else - $b=0; - - // Alerts - // ------ - if ($alertas == 1){ - for ($b=$b; $b < count($origen_modulo); $b++){ - if ($multiple == 0) - $sql1='SELECT * FROM tagente_modulo WHERE id_agente = '.$id_origen; - else - $sql1='SELECT * FROM tagente_modulo WHERE id_agente_modulo = '.$origen_modulo[$b]; - $result1=mysql_query($sql1); - while ($row=mysql_fetch_array($result1)){ - $o_id_agente_modulo = $row["id_agente_modulo"]; - $o_id_tipo_modulo = $row["id_tipo_modulo"]; - $o_nombre = $row["nombre"]; - $d_id_agente = $id_agente; // destination agent id - // For each agent module, given as $o_id_agente_modulo: - // Searching if destination agent has a agente_modulo with same type and name that source - $sqlp="SELECT * FROM tagente_modulo WHERE id_agente = ".$d_id_agente." AND nombre = '".$o_nombre."' AND id_tipo_modulo = ".$o_id_tipo_modulo; - $resultp=mysql_query($sqlp); - if ( $rowp=mysql_fetch_array($resultp)){ - // If rowp success get ID - $d_id_agente_modulo = $rowp["id_agente_modulo"]; - // Read every alert from source agent - $sql2='SELECT * FROM talerta_agente_modulo WHERE id_agente_modulo = '.$o_id_agente_modulo; - $result3=mysql_query($sql2); - while ($row3=mysql_fetch_array($result3)){ - $o_id_alerta = $row3["id_alerta"]; - $o_al_campo1 = $row3["al_campo1"]; - $o_al_campo2 = $row3["al_campo2"]; - $o_al_campo3 = $row3["al_campo3"]; - $o_descripcion = $row3["descripcion"]; - $o_dis_max = $row3["dis_max"]; - $o_dis_min = $row3["dis_min"]; - $o_time_threshold = $row3["time_threshold"]; - $o_last_fired = "2001-01-01 00:00:00"; - $o_max_alerts = $row3["max_alerts"]; - $o_min_alerts = $row3["min_alerts"]; - $o_times_fired = 0; - - $o_alert_text = $row3["alert_text"]; - $o_time_from = $row3["time_from"]; - $o_time_to = $row3["time_to"]; - $o_monday = $row3["monday"]; - $o_tuesday = $row3["tuesday"]; - $o_wednesday = $row3["wednesday"]; - $o_thursday = $row3["thursday"]; - $o_friday = $row3["friday"]; - $o_saturday = $row3["saturday"]; - $o_sunday = $row3["sunday"]; - $o_recovery_notify = $row3["recovery_notify"]; - $o_priority = $row3["priority"]; - $o_al_f2_recovery= $row3["al_f2_recovery"]; - $o_al_f3_recovery= $row3["al_f3_recovery"]; - - // Insert - $sql_al="INSERT INTO talerta_agente_modulo (id_agente_modulo, id_alerta, al_campo1, al_campo2, al_campo3, descripcion, dis_max, dis_min, time_threshold, last_fired, max_alerts, times_fired, min_alerts, - alert_text, time_from, time_to, monday, tuesday, wednesday, - thursday, friday, saturday, sunday, recovery_notify, priority, - al_f2_recovery, al_f3_recovery ) - VALUES ( $d_id_agente_modulo , $o_id_alerta, '$o_al_campo1', - '$o_al_campo2', '$o_al_campo3', '$o_descripcion', $o_dis_max, - $o_dis_min, $o_time_threshold, '$o_last_fired', $o_max_alerts, - $o_times_fired, $o_min_alerts, '$o_alert_text', '$o_time_from', - '$o_time_to', '$o_monday', '$o_tuesday', '$o_wednesday', - '$o_thursday', '$o_friday', '$o_saturday', '$o_sunday', - $o_recovery_notify, $o_priority, '$o_al_f2_recovery', - '$o_al_f3_recovery' )"; - $result_al=mysql_query($sql_al); - echo "
  ".__('Copying alert')." ->".$o_descripcion; - } - } else - echo "

ERROR: ".__('Not found').$o_nombre.__(' in agent ').dame_nombre_agente($d_id_agente)."

"; - } //while - } // for - } // Alerts - } // for each destination agent - } //end if copy modules or alerts - - - // ----------- - // DELETE DATA - // ----------- - - elseif (isset($_POST["delete"])) { - echo "

".__('Delete Data')."

"; - // Initial checkings - - // if selected more than 0 agents - if (isset($_POST["destino"])) - $destino = $_POST["destino"]; - else - $destino = array(); - if (count($destino) <= 0) { - echo "

" . __("Deleting source agent. No destination targets defined") . "

"; - $destino[0] = $origen; - } - - // If selected modules or alerts - if (isset($_POST["modules"])) - $modulos = 1; - else - $modulos = 0; - if (isset($_POST["alerts"])) - $alertas = 1; - else - $alertas = 0; - - if (isset($_POST["origen_modulo"])) - $origen_modulo = $_POST["origen_modulo"]; - else - $origen_modulo = array(); - if (count($origen_modulo) <= 0) - $allmodules = 1; - else - $allmodules = 0; - - for ($a=0;$a ".__('Deleting data')." -> ".dame_nombre_agente($id_agente); - if ($allmodules == 1){ - // Deleting data - if ($modulos == 1){ - mysql_query ("DELETE FROM tagente_datos WHERE id_agente_modulo=$id_agente"); - mysql_query ("DELETE FROM tagente_datos_inc WHERE id_agente_modulo=$id_agente"); - mysql_query ("DELETE FROM tagente_datos_string WHERE id_agente_modulo=$id_agente"); - mysql_query ("DELETE FROM tagente_estado WHERE id_agente = $id_agente"); - mysql_query ("DELETE FROM tagente_modulo WHERE id_agente = $id_agente"); - } - if ($alertas == 1){ - mysql_query ("DELETE FROM talerta_agente_modulo WHERE id_agent = $id_agente"); - echo "DELETE talertas* where id_agente = $id_agente
"; - } - mysql_query ("DELETE FROM tevent WHERE id_agente = $id_agente"); - } else { - for ($i=0; $i < count($origen_modulo); $i++){ - $source_module = $origen_modulo[$i]; - $source_module_name = get_db_sql ("SELECT nombre FROM tagente_modulo WHERE id_agente_modulo = $source_module"); - $id_modulo = get_db_sql ("SELECT id_agente_modulo FROM tagente_modulo WHERE nombre = '$source_module_name' AND id_agente = $id_agente"); - if ($modulos == 1){ - mysql_query ("DELETE FROM tagente_datos WHERE id_agente_modulo=$id_modulo"); - mysql_query ("DELETE FROM tagente_datos_inc WHERE id_agente_modulo=$id_modulo"); - mysql_query ("DELETE FROM tagente_datos_string WHERE id_agente_modulo=$id_modulo"); - mysql_query ("DELETE FROM tagente_datos_string WHERE id_agente_modulo=$id_modulo"); - mysql_query ("DELETE FROM tagente_estado WHERE id_agente_modulo = $id_modulo"); - mysql_query ("DELETE FROM tagente_modulo WHERE id_agente_modulo = $id_modulo"); - } - if ($alertas == 1){ - mysql_query ("DELETE FROM talerta_agente_modulo WHERE id_agente_modulo = $id_modulo"); - } - mysql_query ("DELETE FROM tevent WHERE id_agentmodule = $id_modulo"); - } - } - } +// DATA COPY +// --------- +if (isset($_POST["copy"])) { + echo "

".__('Data Copy')."

"; + + if (empty ($destino)) { + echo '

ERROR: '.__('No selected agents to copy').'

'; + return; + } + + if (empty ($origen_modulo)) { + echo '

ERROR: '.__('No modules have been selected').'

'; + return; } - // ----------- - // DELETE AGENT - // ----------- - - elseif (isset($_POST["delete_agent"])) { - echo "

".__('Delete agents')."

"; - // Initial checkings + // If selected modules or alerts + if (isset($_POST["modules"])) { + $modulos = 1; + } else { + $modulos = 0; + } - // if selected more than 0 agents - $destino = $_POST["destino"]; - if (count($destino) <= 0) { - $destino[0]=$origen; - } + if (isset($_POST["alerts"])) { + $alertas = 1; + } else { + $alertas = 0; + } + + if (($alertas + $modulos) == 0){ + echo '

ERROR: '.__('You must check modules and/or alerts to be copied').'

'; + return; + } - // Delete - for ($a=0;$a ".__('Deleting data')." -> ".dame_nombre_agente($id_agente); - delete_agent($id_agente); - }// for - }//delete + if ($modulos == 1) { + echo '

'.__('Copying module').' ['.dame_nombre_agente ($origen).' - '.$module["nombre"].'] -> ['.dame_nombre_agente ($id_agent_dest).']'; + $sql = sprintf ("INSERT INTO tagente_modulo + (id_agente, id_tipo_modulo, descripcion, nombre, max, min, module_interval, tcp_port, tcp_send, tcp_rcv, + snmp_community, snmp_oid, ip_target, id_module_group, flag, id_modulo, disabled, id_export, + plugin_user, plugin_pass, plugin_parameter, id_plugin, post_process, prediction_module, max_timeout) + VALUES (%d,".$module["id_tipo_modulo"].",'".$module["descripcion"]."','".$module["nombre"]."',".$module["max"].",".$module["min"].",".$module["module_interval"].",".$module["tcp_port"].",'".$module["tcp_send"]."','".$module["tcp_rcv"]."', + '".$module["snmp_community"]."','".$module["snmp_oid"]."','%s',".$module["id_module_group"].",".$module["flag"].",".$module["id_modulo"].",".$module["disabled"].",".$module["id_export"].", + '".$module["plugin_user"]."','".$module["plugin_pass"]."','".$module["plugin_parameter"]."',".$module["id_plugin"].",'".$module["post_process"]."',".$module["prediction_module"].",".$module["max_timeout"].")", + $id_agent_dest,give_agent_address ($id_agent_dest)); - // ============ - // Form view - // ============ - } else { - - // title - echo '

'.__('Agent configuration'). '>'. __('Configuration Management'). '

'; - echo '
'; - echo ""; - - // Source group - echo ''; - echo '
'. __('Source group'). '

'; - echo ''; - echo '  '; - echo ''; - echo '

'; + $id_new_module = process_sql ($sql, "insert_id"); + if (empty ($id_new_module)) { + $errors++; + } else { + switch ($module["id_tipo_modulo"]) { + case 2: + case 6: + case 9: + case 100: + case 21: + case 18: + $sql = sprintf ("INSERT INTO tagente_estado (id_agente_modulo, datos, timestamp, cambio, estado, id_agente, utimestamp) + VALUES (%d, 0,'0000-00-00 00:00:00',0,0, %d, 0)", $id_new_module, $id_agent_dest); + default: + $sql = sprintf ("INSERT INTO tagente_estado (id_agente_modulo, datos, timestamp, cambio, estado, id_agente, utimestamp) + VALUES (%d, 0,'0000-00-00 00:00:00',0,100, %d, 0)", $id_new_module, $id_agent_dest); + } + $result = process_sql ($sql); + if ($result === false) + $errors++; + }//If empty id_new_module + } //If modulos + + if ($alertas == 1) { + if (empty ($id_new_module)) { + //If we didn't copy modules or if we + //didn't create new modules we have to + //look for the module id + $sql = sprintf ("SELECT id_agente_modulo FROM tagente_modulo WHERE nombre = '%s' AND id_agente = %d", $module["nombre"], $id_agent_dest); + $id_new_module = get_db_sql ($sql); + if (empty ($id_new_module)) { + continue; //If we can't find a module belonging to this agent with the same name, skip the loop + } + } - // Source agent - echo ''. __('Source agent').'

'; - - // Show combo with SOURCE agents - if ($id_group != 0) - $sql1 = "SELECT * FROM tagente WHERE id_grupo = $id_group ORDER BY nombre "; - else - $sql1 = 'SELECT * FROM tagente ORDER BY nombre'; - echo ''; - - echo '  '; - echo ''; - echo '

'; - - // Source Module(s) - echo "".__('Modules')."

"; - echo ""; - - echo '		'; - echo ''.__('Targets'). ' '; - pandora_help ('manageconfig'); - echo '

'; - echo ''; - echo '
'.__('Modules'); - echo ''; - echo '
'.__('Alerts'); - echo ''; - echo '
'; - - - // Destination agent - echo '
'; - echo ''.__('To Agent(s):').'

'; - echo "'; - - // Form buttons - echo '		'; - echo "

"; - echo ' '; - echo "      "; - pandora_help ('manageconfig'); - echo "

"; - echo ''; - - echo "

"; - echo ''; - - echo '
'; - echo '
'; + + $module_alerts = get_db_all_rows_field_filter ("talerta_agente_modulo", "id_agente_modulo", $id_module); + if (empty ($module_alerts)) { + $module_alerts = array (); + } + + foreach ($module_alerts as $alert) { + echo '

'.__('Copying alert').' ['.dame_nombre_agente ($origen).' - '.$module["nombre"].'] -> ['.dame_nombre_agente ($id_agent_dest).']'; + if (!empty ($alert["id_agent"])) { + //Compound alert + $alert["id_agent"] = $id_agent_dest; + } + $sql = sprintf ("INSERT INTO talerta_agente_modulo + (id_agente_modulo, id_alerta, al_campo1, al_campo2, al_campo3, descripcion, dis_max, dis_min, + time_threshold, max_alerts, module_type, min_alerts, alert_text, disable, time_from, + time_to, id_agent, monday, tuesday, wednesday, thursday, friday, saturday, sunday, + recovery_notify, priority, al_f2_recovery, al_f3_recovery) + VALUES ( + %d,%d,'%s','%s','%s','%s',%d,%d, + %d,%d,%d,%d,'%s',%d,'%s', + '%s',%d,%d,%d,%d,%d,%d,%d,%d, + %d,%d,'%s','%s')", + $id_new_module,$alert["id_alerta"],$alert["al_campo1"],$alert["al_campo2"],$alert["al_campo3"],$alert["descripcion"],$alert["dis_max"],$alert["dis_min"], + $alert["time_threshold"],$alert["max_alerts"],$alert["module_type"],$alert["min_alerts"],$alert["alert_text"],$alert["disable"],$alert["time_from"], + $alert["time_to"],$alert["id_agent"],$alert["monday"],$alert["tuesday"],$alert["wednesday"],$alert["thursday"],$alert["friday"],$alert["saturday"],$alert["sunday"], + $alert["recovery_notify"],$alert["priority"],$alert["al_f2_recovery"],$alert["al_f3_recovery"]); + + $new_alert = process_sql ($sql, "insert_id"); + + if ($new_alert === false) { + $errors++; + } elseif (!empty ($alert["id_agent"])) { + $sql = sprintf ("SELECT operation FROM tcompound_alert WHERE id_aam = %d", $alert["id_aam"]); + $result = get_db_all_row_sql ($sql); + + if ($result === false) + continue; // This alert is supposed to be part of a + // compound alert but there is no entry for + // it in the tcompound_alert table so we skip this + + foreach ($result as $comp_alert) { + $sql = sprintf ("INSERT INTO tcompound_alert (id_aam, operation) VALUES (%d, '%s')",$new_alert,$comp_alert["operation"]); + $result = process_sql ($sql); + if ($result === false) + $errors++; + } //foreach compound alert + } //if-elseif compound alert + } //foreach alert + } //if alerts + } //Foreach destino + } //Foreach origen_modulo + if ($errors > 1) { + echo '

'.__('There was an error copying the module, the copy has been cancelled').'

'; + process_sql ("ROLLBACK;"); + } else { + echo '

'.__('Successfully copied module').'

'; + process_sql ("COMMIT;"); } + process_sql ("SET AUTOCOMMIT = 1;"); + return; //Page shouldn't continue anymore +} //end of copy modules or alerts + +// ----------- +// DELETE DATA +// ----------- +if (isset ($_POST["delete"])) { + echo "

".__('Agent Module Data Deletion')."

"; + + if (empty ($destino)) { + echo '

ERROR: '.__('No selected agents to copy').'

'; + return; + } + + if (empty ($origen_modulo)) { + echo '

ERROR: '.__('No modules have been selected').'

'; + return; + } + + + + // If selected modules or alerts + if (isset($_POST["alerts"])) { + $alertas = 1; + } else { + $alertas = 0; + } + + if (isset($_POST["modules"])) { + $modulos = 1; + $alertas = 1; + } else { + $modulos = 0; + } + + if (($alertas + $modulos) == 0){ + echo '

ERROR: '.__('You must check modules and/or alerts to be deleted').'

'; + return; + } + + // Deletion + // ---- + $errors = 0; + + process_sql ("SET AUTOCOMMIT = 0;"); + process_sql ("START TRANSACTION;"); //Start a transaction + + function temp_sql_delete ($table, $row, $value) { + global $errors; //Globalize the errors variable + $sql = sprintf ("DELETE FROM %s WHERE %s = %s", $table, $row, $value); + + $result = process_sql ($sql); + + if ($result === false) + $errors++; + } + + foreach ($origen_modulo as $id_module_src) { + $nombre_src = get_db_value ("nombre", "tagente_modulo", "id_agente_modulo", $id_module_src); + + foreach ($destino as $agent_dest) { + $sql = sprintf ("SELECT id_agente_modulo FROM tagente_modulo WHERE nombre = '%s' AND id_agente = %d", $nombre_src, $agent_dest); + $id_module_dest = get_db_sql ($sql); + if ($id_module_dest === false) + continue; //If we don't have a module like that in the agent, then don't try deleting + + if ($alertas == 1) { + //Alert + temp_sql_delete ("tcompound_alert", "id_aam", "ANY(SELECT id_aam FROM talerta_agente_modulo WHERE id_agente_modulo = ".$id_module_dest.")"); + temp_sql_delete ("talerta_agente_modulo", "id_agente_modulo", $id_module_dest); + } + + if ($modulos == 1) { + //Standard data + temp_sql_delete ("tagente_datos", "id_agente_modulo", $id_module_dest); + + //Incremental Data + temp_sql_delete ("tagente_datos_inc", "id_agente_modulo", $id_module_dest); + + //String data + temp_sql_delete ("tagente_datos_string", "id_agente_modulo", $id_module_dest); + + //Data image + temp_sql_delete ("tagent_data_image", "id_agent_module", $id_module_dest); + + //Events (up/down monitors) + temp_sql_delete ("tevento", "id_agentmodule", $id_module_dest); + + //Graphs, layouts & reports + temp_sql_delete ("tgraph_source", "id_agent_module", $id_module_dest); + temp_sql_delete ("tlayout_data", "id_agente_modulo", $id_module_dest); + temp_sql_delete ("treport_content", "id_agent_module", $id_module_dest); + + //The status of the module + temp_sql_delete ("tagente_estado", "id_agente_modulo", $id_module_dest); + + //The actual modules, don't put anything based on + //tagente_modulo after this + temp_sql_delete ("tagente_modulo", "id_agente_modulo", $id_module_dest); + } //if modulos + } //foreach destino + } //foreach origen_modulo + + if ($errors > 1) { + echo '

'.__('There was an error removing the module data, the removal has been cancelled').'

'; + process_sql ("ROLLBACK;"); + } else { + echo '

'.__('Successfully removed module data').'

'; + process_sql ("COMMIT;"); + } + process_sql ("SET AUTOCOMMIT = 1;"); + return; //Page shouldn't continue anymore +} //if $_POST['delete'] + +// ----------- +// DELETE AGENT +// ----------- + +if (isset ($_POST["delete_agent"])) { + echo "

".__('Deleting Agent')."

"; + // Initial checkings + + // if selected more than 0 agents + $destino = get_parameter_post ("destino", array ()); + + if (empty ($destino)) { + echo '

ERROR: '.__('You must select at least one agent to be removed').'

'; + return; + } + + $result = delete_agent ($destino); + + if ($result === false) { + echo '

'.__('There was an error removing the agents. Removal has been cancelled').'

'; + } else { + echo '

'.__('Successfully removed agents').'

'; + } + + return; +} + + +// ============ +// Form view +// ============ + +// title +echo '

'.__('Agent configuration'). '>'. __('Configuration Management').'

'; +echo ''; +echo ''; + +// Source group +echo ''; + +echo ''; + + +// Destination agent +$result = get_db_all_rows_in_table ("tagente", "nombre"); +$agents = array (); +if ($result === false) { + $result = array (); +} + +foreach ($result as $row) { + if (give_acl ($config["id_user"], $row["id_grupo"], "AW")) + $agents[$row["id_agente"]] = $row["nombre"]; +} + +echo ''; + +// Form buttons +echo ''; +echo '
'. __('Source group'). '

'; +$groups = get_user_groups ($config['id_user']); + +print_select ($groups, "id_group", $id_group, 'javascript:this.form.submit();', '', 0, false, false, false, '" style="width:200px'); +echo '

'; + +// Source agent +echo ''. __('Source agent').'

'; + +// Show combo with SOURCE agents +if ($id_group > 1) { //Group -1, 0 and 1 all mean that we should select ALL + $result = get_db_all_rows_field_filter ("tagente", "id_grupo", $id_group, "nombre"); +} else { + $result = get_db_all_rows_in_table ("tagente", "nombre"); +} + +if ($result === false) { + $result = array (); + $result[0]["id_grupo"] = 0; + $result[0]["id_agente"] = 0; + $result[0]["nombre"] = __('No Agents in this Group'); +} + +$agents = array (); +foreach ($result as $row) { + if (give_acl ($config["id_user"], $row["id_grupo"], "AR")) + $agents[$row["id_agente"]] = $row["nombre"]; +} + +if ($origen == -1 || ($id_group > 1 && dame_id_grupo ($origen) != $id_group)) { + $origen = $result[0]["id_agente"]; + //If the agent selected is not in the group selected (that + //happens if an agent was selected and then the group was changed) +} + +print_select ($agents, "origen", $origen, 'javascript:this.form.submit();', '', 0, false, false, false, '" style="width:200px'); +echo '

'; + +// Source Module(s) +$result = get_db_all_rows_field_filter ("tagente_modulo", "id_agente", $origen, "nombre"); +$modules = array (); + +if ($result === false) { + $result = array (); + $result[0]["id_agente_modulo"] = -1; + if ($origen > 0) { + $result[0]["nombre"] = __('No modules for this agent'); + } else { + $result[0]["nombre"] = __('No agent selected'); + } +} +foreach ($result as $row) { + $modules[$row["id_agente_modulo"]] = $row["nombre"]; +} + +echo ''.__('Modules').'

'; +print_select ($modules, "origen_modulo[]", '', '', '', 0, false, true, false, '" style="width:250px'); +echo '		'; +echo ''.__('Targets'). ''; +pandora_help ('manageconfig'); +echo '

'; +echo ''; +echo '
'.__('Modules').''; +print_checkbox_extended ("modules", "1", false, false, '', 'class="chk"'); + +echo '
'.__('Alerts').''; +print_checkbox_extended ("alerts", "1", false, false, '', 'class="chk"'); +echo '
'; +echo ''.__('To Agent(s):').'

'; +print_select ($agents, "destino[]", $destino, '', '', 0, false, true, false, '" style="width:250px'); +echo '		'; +echo "

"; +print_submit_button (__('Copy Modules/Alerts'), "copy", false, 'class="sub copy" onClick="if (!confirm("'.__('Are you sure?').'")) return false;"'); +pandora_help ('manageconfig'); +echo "

"; +print_submit_button (__('Delete Modules/Alerts'), "delete", false, 'class="sub delete" onClick="if (!confirm("'.__('Are you sure you want to delete these modules and alerts?').'")) return false;"'); +pandora_help ('manageconfig'); +echo "

"; +print_submit_button (__('Delete Agents'), "delete_agent", false, 'class="sub delete" onClick="if (!confirm("'.__('Are you sure you want to delete these agents?').'")) return false;"'); +pandora_help ('manageconfig'); +echo '
'; ?> diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index c99cd1f671..78f082a297 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -39,9 +39,9 @@ function pandora_help ($help_id, $return = false) { * Cleans a string by decoding from UTF-8 and replacing the HTML * entities. * - * @param value String to be cleaned. + * @param value String or array of strings to be cleaned. * - * @return The string cleaned. + * @return The cleaned string. */ function safe_input ($value) { if (is_numeric ($value)) diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php index 36ec63e1a0..62a8131fb0 100644 --- a/pandora_console/include/functions_db.php +++ b/pandora_console/include/functions_db.php @@ -1434,7 +1434,7 @@ function process_sql ($sql, $rettype = "affected_rows") { } else { $result = mysql_query ($sql); if ($result === false) { - echo 'Error: get_db_all_rows_sql ("'.$sql.'") :'. mysql_error ().'
'; + echo 'Error: process_sql ("'.$sql.'") :'. mysql_error ().'
'; return false; } elseif ($result === true) { if ($rettype == "insert_id") { @@ -1526,7 +1526,8 @@ function get_db_all_fields_in_table ($table, $field, $condition = '', $order_fie * @return True if there were alerts fired. */ function return_status_agent_module ($id_agentmodule = 0) { - $status = get_db_vakye ('estado', 'tagente_estado', 'id_agente_modulo', $id_agentmodule); + $status = get_db_value ('estado', 'tagente_estado', 'id_agente_modulo', $id_agentmodule); + if ($status == 100) { // We need to check if there are any alert on this item $times_fired = get_db_value ('SUM(times_fired)', 'talerta_agente_modulo', @@ -1583,11 +1584,11 @@ function return_status_layout ($id_layout = 0) { * * @param id_agentmodule * - * @return + * @return a numerically formatted value */ function return_value_agent_module ($id_agentmodule) { - return format_numeric (get_db_value ('datos', 'tagente_estado', - 'id_agente_modulo', $id_agentmodule)); + return format_numeric (get_db_value ('datos', 'tagente_estado', + 'id_agente_modulo', $id_agentmodule)); } /** @@ -1803,29 +1804,31 @@ function get_agent_module_value_sumatory ($id_agent_module, $period, $date = 0) return (float) $sum; } /** - * Get a translated string (alias version of lang_string(). + * Get a translated string * * @param string String to translate * * @return The translated string. If not defined, the same string will be returned */ function __ ($string) { - return lang_string ($string); + global $l10n; + + if (is_null ($l10n)) + return $string; + + return $l10n->translate ($string); } /** - * Get a translated string. + * Get a translated string. (DEPRECATED IN FAVOR OF __ ) + * Calls to the __ function will automatically be picked up by the translators * * @param string String to translate * * @return The translated string. If not defined, the same string will be returned */ function lang_string ($string) { - global $l10n; - - if (is_null ($l10n)) - return $string; - return $l10n->translate ($string); + return __ ($string); } /** @@ -1833,7 +1836,7 @@ function lang_string ($string) { * * This check assumes that server_keepalive should be at least 15 minutes. * - * @return The number of agents alive. + * @return The number of servers alive. */ function check_server_status () { $sql = "SELECT COUNT(id_server) FROM tserver WHERE status = 1 AND keepalive > NOW() - INTERVAL 15 MINUTE"; @@ -2179,20 +2182,111 @@ function server_status ($id_server) { return $serverinfo; } -function delete_agent ($id_agente) { /* - mysql_query ("DELETE FROM tagente_datos WHERE id_agente_modulo = $id_agente"); - mysql_query ("DELETE FROM tagente_datos_inc WHERE id_agente_modulo = $id_agente"); - mysql_query ("DELETE FROM tagente_datos_string WHERE id_agente_modulo = $id_agente"); - mysql_query ("DELETE FROM talerta_agente_modulo WHERE id_agent = $id_agente"); - mysql_query ("DELETE FROM tevent WHERE id_agente = $id_agente"); - mysql_query ("DELETE FROM tagent_access WHERE id_agent = $id_agente"); - mysql_query ("DELETE FROM tplanned_downtime_agents WHERE id_agent = $id_agente"); - mysql_query ("DELETE FROM tagente_estado WHERE id_agente = $id_agente"); - mysql_query ("DELETE FROM tagente_modulo WHERE id_agente = $id_agente"); - mysql_query ("DELETE FROM tagente WHERE id_agente = $id_agente"); - mysql_query ("DELETE FROM taddress_agent WHERE id_agent = $id_agente"); + * This function will delete the agent from the database in a transaction + * You can pass a variable or an array of ID's to be removed (int) + * + * @param $id_agents An array or variable with integeres of ID's to be erased + * + * returns false in case of a problem, true in case of successful + * */ - echo "BORRANDO AGENTE A SACO $id_agente"; + +function delete_agent ($id_agents) { + //Init vars + $errors = 0; + + //Subfunciton for less typing + function temp_sql_delete ($table, $row, $value) { + global $errors; //Globalize the errors variable + $sql = sprintf ("DELETE FROM %s WHERE %s = %s", $table, $row, $value); + $result = process_sql ($sql); + if ($result === false) + $errors++; + } + + //Convert single values to an array + if (!is_array ($id_agents)) { + $id_agents[0] = (int) $id_agents; + } + + //Start transaction + process_sql ("SET AUTOCOMMIT = 0;"); + $trerr = process_sql ("START TRANSACTION;"); + + if ($trerr === false) { + echo "Error starting transaction"; + return false; + } + + foreach ($id_agents as $id_agent) { + $id_agent = (int) $id_agent; //Cast as integer + + if ($id_agent < 1) + continue; //If an agent is not an integer or invalid, don't process it + + //A variable where we store that long subquery thing for + //modules + $tmodbase = "ANY(SELECT id_agente_modulo FROM tagente_modulo WHERE id_agente = ".$id_agent.")"; + + //IP address + $sql = sprintf ("SELECT id_ag FROM taddress_agent, taddress WHERE taddress_agent.id_a = taddress.id_a AND id_agent = %d", $id_agent); + $result = get_db_all_rows_sql ($sql); + + foreach ($result as $row) { + temp_sql_delete ("taddress_agent", "id_ag", $row["id_ag"]); + } + + //Standard data + temp_sql_delete ("tagente_datos", "id_agente_modulo", $tmodbase); + + //Incremental Data + temp_sql_delete ("tagente_datos_inc", "id_agente_modulo", $tmodbase); + + //String data + temp_sql_delete ("tagente_datos_string", "id_agente_modulo", $tmodbase); + + //Alert + temp_sql_delete ("tcompound_alert", "id_aam", "ANY(SELECT id_aam FROM talerta_agente_modulo WHERE id_agent = ".$id_agent.")"); + temp_sql_delete ("talerta_agente_modulo", "id_agente_modulo", $tmodbase); + temp_sql_delete ("talerta_agente_modulo", "id_agent", $id_agent); + + //Data image + temp_sql_delete ("tagent_data_image", "id_agent", $id_agent); + + //Events (up/down monitors) + temp_sql_delete ("tevento", "id_agente", $id_agent); + + //Graphs, layouts & reports + temp_sql_delete ("tgraph_source", "id_agent_module", $tmodbase); + temp_sql_delete ("tlayout_data", "id_agente_modulo", $tmodbase); + temp_sql_delete ("treport_content", "id_agent_module", $tmodbase); + + //Planned Downtime + temp_sql_delete ("tplanned_downtime_agents", "id_agent", $id_agent); + + //The status of the module + temp_sql_delete ("tagente_estado", "id_agente_modulo", $tmodbase); + + //The actual modules, don't put anything based on + //tagente_modulo after this + temp_sql_delete ("tagente_modulo", "id_agente", $id_agent); + + //Access entries + temp_sql_delete ("tagent_access", "id_agent", $id_agent); + + //And at long last, the agent + temp_sql_delete ("tagente", "id_agente", $id_agent); + } + + if ($errors > 1) { + process_sql ("ROLLBACK;"); + process_sql ("SET AUTOCOMMIT = 1;"); + return false; + } else { + process_sql ("COMMIT;"); + process_sql ("SET AUTOCOMMIT = 1;"); + return true; + } } ?>