2013-07-30 Miguel de Dios <miguel.dedios@artica.es>
* mobile/operation/networkmap.php, godmode/users/user_list.php, include/javascript/pandora.js, include/javascript/openlayers.pandora.js, include/functions_snmp_browser.php, include/api.php, include/functions_api.php, operation/snmpconsole/snmp_browser.php, operation/agentes/networkmap.dinamic.php: improved the source code style. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8596 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper
parent
9b18352767
commit
c7e78e0190
|
|
@ -1,3 +1,13 @@
|
|||
2013-07-30 Miguel de Dios <miguel.dedios@artica.es>
|
||||
|
||||
* mobile/operation/networkmap.php, godmode/users/user_list.php,
|
||||
include/javascript/pandora.js,
|
||||
include/javascript/openlayers.pandora.js,
|
||||
include/functions_snmp_browser.php, include/api.php,
|
||||
include/functions_api.php, operation/snmpconsole/snmp_browser.php,
|
||||
operation/agentes/networkmap.dinamic.php: improved the source code
|
||||
style.
|
||||
|
||||
2013-07-30 Sergio Martin <sergio.martin@artica.es>
|
||||
|
||||
* include/functions_users.php
|
||||
|
|
|
|||
|
|
@ -168,7 +168,7 @@ if (isset ($_GET["user_del"])) { //delete user
|
|||
// Log to the metaconsole too
|
||||
if ($result) {
|
||||
db_pandora_audit("User management",
|
||||
__("Deleted user %s from %s", io_safe_input($id_user), io_safe_input($server['server_name'])));
|
||||
__("Deleted user %s from %s", io_safe_input($id_user), io_safe_input($server['server_name'])));
|
||||
}
|
||||
ui_print_result_message ($result,
|
||||
__('Successfully deleted from %s', io_safe_input($server['server_name'])),
|
||||
|
|
|
|||
|
|
@ -80,11 +80,11 @@ if ($correctLogin) {
|
|||
// The extension API file must exist and the extension must be enabled
|
||||
if (file_exists($extension_api_url) && !in_array($ext_name,extensions_get_disabled_extensions())) {
|
||||
include_once($extension_api_url);
|
||||
$function_name = 'apiextension_'.$op.'_'.$ext_function;
|
||||
$function_name = 'apiextension_' . $op .'_' . $ext_function;
|
||||
}
|
||||
}
|
||||
else {
|
||||
$function_name = 'api_'.$op.'_'.$op2;
|
||||
$function_name = 'api_' . $op . '_' . $op2;
|
||||
}
|
||||
|
||||
// Check if the function exists
|
||||
|
|
|
|||
|
|
@ -266,7 +266,9 @@ function api_get_agent_module_name_last_value($agentName, $moduleName, $other =
|
|||
|
||||
function api_get_module_last_value($idAgentModule, $trash1, $other = ';', $returnType)
|
||||
{
|
||||
$sql = sprintf('SELECT datos FROM tagente_estado WHERE id_agente_modulo = %d', $idAgentModule);
|
||||
$sql = sprintf('SELECT datos
|
||||
FROM tagente_estado
|
||||
WHERE id_agente_modulo = %d', $idAgentModule);
|
||||
$value = db_get_value_sql($sql);
|
||||
if ($value === false) {
|
||||
switch ($other['type']) {
|
||||
|
|
@ -330,16 +332,16 @@ function api_get_tree_agents($trash1, $trahs2, $other, $returnType)
|
|||
$returnReplace = ' ';
|
||||
$fields = false;
|
||||
}
|
||||
|
||||
|
||||
/** NOTE: if you want to add an output field, you have to add it to;
|
||||
1. $master_fields (field name)
|
||||
2. one of following field_column_mapping array (a pair of field name and corresponding column designation)
|
||||
|
||||
e.g. To add a new field named 'agent_NEWFIELD' that comes from tagente's COLUMN_X , you have to add;
|
||||
1. "agent_NEW_FIELD" to $master_fields
|
||||
2. "'agent_NEW_FIELD' => 'agent_NEWFIELD as COLUMN_X'" to $agent_field_column_mapping
|
||||
**/
|
||||
|
||||
1. $master_fields (field name)
|
||||
2. one of following field_column_mapping array (a pair of field name and corresponding column designation)
|
||||
|
||||
e.g. To add a new field named 'agent_NEWFIELD' that comes from tagente's COLUMN_X , you have to add;
|
||||
1. "agent_NEW_FIELD" to $master_fields
|
||||
2. "'agent_NEW_FIELD' => 'agent_NEWFIELD as COLUMN_X'" to $agent_field_column_mapping
|
||||
**/
|
||||
|
||||
/* all of output field names */
|
||||
$master_fields = array(
|
||||
'type_row',
|
||||
|
|
@ -471,209 +473,204 @@ function api_get_tree_agents($trash1, $trahs2, $other, $returnType)
|
|||
'alert_templates_field3',
|
||||
'alert_actions_field3',
|
||||
'alert_templates_id_group',
|
||||
'alert_actions_id_group'
|
||||
);
|
||||
|
||||
'alert_actions_id_group');
|
||||
|
||||
/* agent related field mappings (output field => column designation for 'tagente') */
|
||||
|
||||
|
||||
$agent_field_column_mapping = array(
|
||||
/* agent_id is not in this list (because it is mandatory) */
|
||||
/* agent_id_group is not in this list */
|
||||
'agent_name' => 'nombre as agent_name',
|
||||
'agent_direction' => 'direccion as agent_direction',
|
||||
'agent_comentary' => 'comentarios as agent_comentary',
|
||||
'agent_last_contant' => 'ultimo_contacto as agent_last_contant',
|
||||
'agent_mode' => 'modo as agent_mode',
|
||||
'agent_interval' => 'intervalo as agent_interval',
|
||||
'agent_id_os' => 'id_os as agent_id_os',
|
||||
'agent_os_version' => 'os_version as agent_os_version',
|
||||
'agent_version' => 'agent_version as agent_version',
|
||||
'agent_last_remote_contact' => 'ultimo_contacto_remoto as agent_last_remote_contact',
|
||||
'agent_disabled' => 'disabled as agent_disabled',
|
||||
'agent_id_parent' => 'id_parent as agent_id_parent',
|
||||
'agent_custom_id' => 'custom_id as agent_custom_id',
|
||||
'agent_server_name' => 'server_name as agent_server_name',
|
||||
'agent_cascade_protection' => 'cascade_protection as agent_cascade_protection',
|
||||
);
|
||||
|
||||
/* agent_id is not in this list (because it is mandatory) */
|
||||
/* agent_id_group is not in this list */
|
||||
'agent_name' => 'nombre as agent_name',
|
||||
'agent_direction' => 'direccion as agent_direction',
|
||||
'agent_comentary' => 'comentarios as agent_comentary',
|
||||
'agent_last_contant' => 'ultimo_contacto as agent_last_contant',
|
||||
'agent_mode' => 'modo as agent_mode',
|
||||
'agent_interval' => 'intervalo as agent_interval',
|
||||
'agent_id_os' => 'id_os as agent_id_os',
|
||||
'agent_os_version' => 'os_version as agent_os_version',
|
||||
'agent_version' => 'agent_version as agent_version',
|
||||
'agent_last_remote_contact' => 'ultimo_contacto_remoto as agent_last_remote_contact',
|
||||
'agent_disabled' => 'disabled as agent_disabled',
|
||||
'agent_id_parent' => 'id_parent as agent_id_parent',
|
||||
'agent_custom_id' => 'custom_id as agent_custom_id',
|
||||
'agent_server_name' => 'server_name as agent_server_name',
|
||||
'agent_cascade_protection' => 'cascade_protection as agent_cascade_protection');
|
||||
|
||||
/* module related field mappings 1/2 (output field => column for 'tagente_modulo') */
|
||||
|
||||
|
||||
$module_field_column_mampping = array(
|
||||
/* 'module_id_agent_modulo (id_agente_modulo) is not in this list */
|
||||
'module_id_agent' => 'id_agente as module_id_agent',
|
||||
'module_id_module_type' => 'id_tipo_modulo as module_id_module_type',
|
||||
'module_description' => 'descripcion as module_description',
|
||||
'module_name' => 'nombre as module_name',
|
||||
'module_max' => 'max as module_max',
|
||||
'module_min' => 'min as module_min',
|
||||
'module_interval' => 'module_interval',
|
||||
'module_tcp_port' => 'tcp_port as module_tcp_port',
|
||||
'module_tcp_send' => 'tcp_send as module_tcp_send',
|
||||
'module_tcp_rcv' => 'tcp_rcv as module_tcp_rcv',
|
||||
'module_snmp_community' => 'snmp_community as module_snmp_community',
|
||||
'module_snmp_oid' => 'snmp_oid as module_snmp_oid',
|
||||
'module_ip_target' => 'ip_target as module_ip_target',
|
||||
'module_id_module_group' => 'id_module_group as module_id_module_group',
|
||||
'module_flag' => 'flag as module_flag',
|
||||
'module_id_module' => 'id_modulo as module_id_module',
|
||||
'module_disabled' => 'disabled as module_disabled',
|
||||
'module_id_export' => 'id_export as module_id_export',
|
||||
'module_plugin_user' => 'plugin_user as module_plugin_user',
|
||||
'module_plugin_pass' => 'plugin_pass as module_plugin_pass',
|
||||
'module_plugin_parameter' => 'plugin_parameter as module_plugin_parameter',
|
||||
'module_id_plugin' => 'id_plugin as module_id_plugin',
|
||||
'module_post_process' => 'post_process as module_post_process',
|
||||
'module_prediction_module' => 'prediction_module as module_prediction_module',
|
||||
'module_max_timeout' => 'max_timeout as module_max_timeout',
|
||||
'module_max_retries' => 'max_retries as module_max_retries',
|
||||
'module_custom_id' => 'custom_id as module_custom_id',
|
||||
'module_history_data' => 'history_data as module_history_data',
|
||||
'module_min_warning' => 'min_warning as module_min_warning',
|
||||
'module_max_warning' => 'max_warning as module_max_warning',
|
||||
'module_str_warning' => 'str_warning as module_str_warning',
|
||||
'module_min_critical' => 'min_critical as module_min_critical',
|
||||
'module_max_critical' => 'max_critical as module_max_critical',
|
||||
'module_str_critical' => 'str_critical as module_str_critical',
|
||||
'module_min_ff_event' => 'min_ff_event as module_min_ff_event',
|
||||
'module_delete_pending' => 'delete_pending as module_delete_pending',
|
||||
);
|
||||
|
||||
/* 'module_id_agent_modulo (id_agente_modulo) is not in this list */
|
||||
'module_id_agent' => 'id_agente as module_id_agent',
|
||||
'module_id_module_type' => 'id_tipo_modulo as module_id_module_type',
|
||||
'module_description' => 'descripcion as module_description',
|
||||
'module_name' => 'nombre as module_name',
|
||||
'module_max' => 'max as module_max',
|
||||
'module_min' => 'min as module_min',
|
||||
'module_interval' => 'module_interval',
|
||||
'module_tcp_port' => 'tcp_port as module_tcp_port',
|
||||
'module_tcp_send' => 'tcp_send as module_tcp_send',
|
||||
'module_tcp_rcv' => 'tcp_rcv as module_tcp_rcv',
|
||||
'module_snmp_community' => 'snmp_community as module_snmp_community',
|
||||
'module_snmp_oid' => 'snmp_oid as module_snmp_oid',
|
||||
'module_ip_target' => 'ip_target as module_ip_target',
|
||||
'module_id_module_group' => 'id_module_group as module_id_module_group',
|
||||
'module_flag' => 'flag as module_flag',
|
||||
'module_id_module' => 'id_modulo as module_id_module',
|
||||
'module_disabled' => 'disabled as module_disabled',
|
||||
'module_id_export' => 'id_export as module_id_export',
|
||||
'module_plugin_user' => 'plugin_user as module_plugin_user',
|
||||
'module_plugin_pass' => 'plugin_pass as module_plugin_pass',
|
||||
'module_plugin_parameter' => 'plugin_parameter as module_plugin_parameter',
|
||||
'module_id_plugin' => 'id_plugin as module_id_plugin',
|
||||
'module_post_process' => 'post_process as module_post_process',
|
||||
'module_prediction_module' => 'prediction_module as module_prediction_module',
|
||||
'module_max_timeout' => 'max_timeout as module_max_timeout',
|
||||
'module_max_retries' => 'max_retries as module_max_retries',
|
||||
'module_custom_id' => 'custom_id as module_custom_id',
|
||||
'module_history_data' => 'history_data as module_history_data',
|
||||
'module_min_warning' => 'min_warning as module_min_warning',
|
||||
'module_max_warning' => 'max_warning as module_max_warning',
|
||||
'module_str_warning' => 'str_warning as module_str_warning',
|
||||
'module_min_critical' => 'min_critical as module_min_critical',
|
||||
'module_max_critical' => 'max_critical as module_max_critical',
|
||||
'module_str_critical' => 'str_critical as module_str_critical',
|
||||
'module_min_ff_event' => 'min_ff_event as module_min_ff_event',
|
||||
'module_delete_pending' => 'delete_pending as module_delete_pending');
|
||||
|
||||
/* module related field mappings 2/2 (output field => column for 'tagente_estado') */
|
||||
|
||||
|
||||
$estado_fields_to_columns_mapping = array(
|
||||
/* 'module_id_agent_modulo (id_agente_modulo) is not in this list */
|
||||
'module_id_agent_state' => 'id_agente_estado as module_id_agent_state',
|
||||
'module_data' => 'datos as module_data',
|
||||
'module_timestamp' => 'timestamp as module_timestamp',
|
||||
'module_state' => 'estado as module_state',
|
||||
'module_last_try' => 'last_try as module_last_try',
|
||||
'module_utimestamp' => 'utimestamp as module_utimestamp',
|
||||
'module_current_interval' => 'current_interval as module_current_interval',
|
||||
'module_running_by' => 'running_by as module_running_by',
|
||||
'module_last_execution_try' => 'last_execution_try as module_last_execution_try',
|
||||
'module_status_changes' => 'status_changes as module_status_changes',
|
||||
'module_last_status' => 'last_status as module_last_status',
|
||||
);
|
||||
|
||||
/* 'module_id_agent_modulo (id_agente_modulo) is not in this list */
|
||||
'module_id_agent_state' => 'id_agente_estado as module_id_agent_state',
|
||||
'module_data' => 'datos as module_data',
|
||||
'module_timestamp' => 'timestamp as module_timestamp',
|
||||
'module_state' => 'estado as module_state',
|
||||
'module_last_try' => 'last_try as module_last_try',
|
||||
'module_utimestamp' => 'utimestamp as module_utimestamp',
|
||||
'module_current_interval' => 'current_interval as module_current_interval',
|
||||
'module_running_by' => 'running_by as module_running_by',
|
||||
'module_last_execution_try' => 'last_execution_try as module_last_execution_try',
|
||||
'module_status_changes' => 'status_changes as module_status_changes',
|
||||
'module_last_status' => 'last_status as module_last_status');
|
||||
|
||||
/* alert related field mappings (output field => column for 'talert_template_modules', ... ) */
|
||||
|
||||
|
||||
$alert_fields_to_columns_mapping = array(
|
||||
/*** 'alert_id_agent_module (id_agent_module) is not in this list ***/
|
||||
'alert_template_modules_id' => 't1.id as alert_template_modules_id',
|
||||
'alert_id_alert_template' => 't1.id_alert_template as alert_id_alert_template',
|
||||
'alert_internal_counter' => 't1.internal_counter as alert_internal_counter',
|
||||
'alert_last_fired' => 't1.last_fired as alert_last_fired',
|
||||
'alert_last_reference' => 't1.last_reference as alert_last_reference',
|
||||
'alert_times_fired' => 't1.times_fired as alert_times_fired',
|
||||
'alert_disabled' => 't1.disabled as alert_disabled',
|
||||
'alert_force_execution' => 't1.force_execution as alert_force_execution',
|
||||
'alert_template_modules_priority' => 't1.priority as alert_template_modules_priority',
|
||||
|
||||
'alert_templates_id' => 't2.id as alert_templates_id',
|
||||
'alert_type' => 't2.type as alert_type',
|
||||
'alert_value' => 't2.value as alert_value',
|
||||
'alert_matches_value' => 't2.matches_value as alert_matches_value',
|
||||
'alert_max_value' => 't2.max_value as alert_max_value',
|
||||
'alert_min_value' => 't2.min_value as alert_min_value',
|
||||
'alert_time_threshold' => 't2.time_threshold as alert_time_threshold',
|
||||
'alert_max_alerts' => 't2.max_alerts as alert_max_alerts',
|
||||
'alert_min_alerts' => 't2.min_alerts as alert_min_alerts',
|
||||
'alert_time_from' => 't2.time_from as alert_time_from',
|
||||
'alert_time_to' => 't2.time_to as alert_time_to',
|
||||
'alert_monday' => 't2.monday as alert_monday',
|
||||
'alert_tuesday' => 't2.tuesday as alert_tuesday',
|
||||
'alert_wednesday' => 't2.wednesday as alert_wednesday',
|
||||
'alert_thursday' => 't2.thursday as alert_thursday',
|
||||
'alert_friday' => 't2.friday as alert_friday',
|
||||
'alert_saturday' => 't2.saturday as alert_saturday',
|
||||
'alert_sunday' => 't2.sunday as alert_sunday',
|
||||
'alert_templates_name' => 't2.name as alert_templates_name',
|
||||
'alert_templates_description' => 't2.description as alert_templates_description',
|
||||
'alert_templates_priority' => 't2.priority as alert_templates_priority',
|
||||
'alert_templates_id_group' => 't2.id_group as alert_templates_id_group',
|
||||
'alert_recovery_notify' => 't2.recovery_notify as alert_recovery_notify',
|
||||
'alert_field2_recovery' => 't2.field2_recovery as alert_field2_recovery',
|
||||
'alert_field3_recovery' => 't2.field3_recovery as alert_field3_recovery',
|
||||
'alert_templates_field1' => 't2.field1 as alert_templates_field1',
|
||||
'alert_templates_field2' => 't2.field2 as alert_templates_field2',
|
||||
'alert_templates_field3' => 't2.field3 as alert_templates_field3',
|
||||
|
||||
'alert_template_module_actions_id' => 't3.id as alert_template_module_actions_id',
|
||||
'alert_id_alert_action' => 't3.id_alert_action as alert_id_alert_action',
|
||||
'alert_id_alert_template_module' => 't3.id_alert_template_module as alert_id_alert_template_module',
|
||||
'alert_fires_min' => 't3.fires_min as alert_fires_min',
|
||||
'alert_fires_max' => 't3.fires_max as alert_fires_max',
|
||||
|
||||
'alert_actions_id' => 't4.id as alert_actions_id',
|
||||
'alert_actions_name' => 't4.name as alert_actions_name',
|
||||
'alert_id_alert_command' => 't4.id_alert_command as alert_id_alert_command',
|
||||
'alert_actions_id_group' => 't4.id_group as alert_actions_id_group',
|
||||
'alert_actions_field1' => 't4.field1 as alert_actions_field1',
|
||||
'alert_actions_field2' => 't4.field2 as alert_actions_field2',
|
||||
'alert_actions_field3' => 't4.field3 as alert_actions_field3',
|
||||
|
||||
'alert_command' => 't5.command as alert_command',
|
||||
'alert_internal' => 't5.internal as alert_internal',
|
||||
'alert_commands_id' => 't5.id as alert_commands_id',
|
||||
'alert_commands_name' => 't5.name as alert_commands_name',
|
||||
'alert_commands_description' => 't5.description as alert_commands_description',
|
||||
);
|
||||
|
||||
|
||||
/*** 'alert_id_agent_module (id_agent_module) is not in this list ***/
|
||||
'alert_template_modules_id' => 't1.id as alert_template_modules_id',
|
||||
'alert_id_alert_template' => 't1.id_alert_template as alert_id_alert_template',
|
||||
'alert_internal_counter' => 't1.internal_counter as alert_internal_counter',
|
||||
'alert_last_fired' => 't1.last_fired as alert_last_fired',
|
||||
'alert_last_reference' => 't1.last_reference as alert_last_reference',
|
||||
'alert_times_fired' => 't1.times_fired as alert_times_fired',
|
||||
'alert_disabled' => 't1.disabled as alert_disabled',
|
||||
'alert_force_execution' => 't1.force_execution as alert_force_execution',
|
||||
'alert_template_modules_priority' => 't1.priority as alert_template_modules_priority',
|
||||
|
||||
'alert_templates_id' => 't2.id as alert_templates_id',
|
||||
'alert_type' => 't2.type as alert_type',
|
||||
'alert_value' => 't2.value as alert_value',
|
||||
'alert_matches_value' => 't2.matches_value as alert_matches_value',
|
||||
'alert_max_value' => 't2.max_value as alert_max_value',
|
||||
'alert_min_value' => 't2.min_value as alert_min_value',
|
||||
'alert_time_threshold' => 't2.time_threshold as alert_time_threshold',
|
||||
'alert_max_alerts' => 't2.max_alerts as alert_max_alerts',
|
||||
'alert_min_alerts' => 't2.min_alerts as alert_min_alerts',
|
||||
'alert_time_from' => 't2.time_from as alert_time_from',
|
||||
'alert_time_to' => 't2.time_to as alert_time_to',
|
||||
'alert_monday' => 't2.monday as alert_monday',
|
||||
'alert_tuesday' => 't2.tuesday as alert_tuesday',
|
||||
'alert_wednesday' => 't2.wednesday as alert_wednesday',
|
||||
'alert_thursday' => 't2.thursday as alert_thursday',
|
||||
'alert_friday' => 't2.friday as alert_friday',
|
||||
'alert_saturday' => 't2.saturday as alert_saturday',
|
||||
'alert_sunday' => 't2.sunday as alert_sunday',
|
||||
'alert_templates_name' => 't2.name as alert_templates_name',
|
||||
'alert_templates_description' => 't2.description as alert_templates_description',
|
||||
'alert_templates_priority' => 't2.priority as alert_templates_priority',
|
||||
'alert_templates_id_group' => 't2.id_group as alert_templates_id_group',
|
||||
'alert_recovery_notify' => 't2.recovery_notify as alert_recovery_notify',
|
||||
'alert_field2_recovery' => 't2.field2_recovery as alert_field2_recovery',
|
||||
'alert_field3_recovery' => 't2.field3_recovery as alert_field3_recovery',
|
||||
'alert_templates_field1' => 't2.field1 as alert_templates_field1',
|
||||
'alert_templates_field2' => 't2.field2 as alert_templates_field2',
|
||||
'alert_templates_field3' => 't2.field3 as alert_templates_field3',
|
||||
|
||||
'alert_template_module_actions_id' => 't3.id as alert_template_module_actions_id',
|
||||
'alert_id_alert_action' => 't3.id_alert_action as alert_id_alert_action',
|
||||
'alert_id_alert_template_module' => 't3.id_alert_template_module as alert_id_alert_template_module',
|
||||
'alert_fires_min' => 't3.fires_min as alert_fires_min',
|
||||
'alert_fires_max' => 't3.fires_max as alert_fires_max',
|
||||
|
||||
'alert_actions_id' => 't4.id as alert_actions_id',
|
||||
'alert_actions_name' => 't4.name as alert_actions_name',
|
||||
'alert_id_alert_command' => 't4.id_alert_command as alert_id_alert_command',
|
||||
'alert_actions_id_group' => 't4.id_group as alert_actions_id_group',
|
||||
'alert_actions_field1' => 't4.field1 as alert_actions_field1',
|
||||
'alert_actions_field2' => 't4.field2 as alert_actions_field2',
|
||||
'alert_actions_field3' => 't4.field3 as alert_actions_field3',
|
||||
|
||||
'alert_command' => 't5.command as alert_command',
|
||||
'alert_internal' => 't5.internal as alert_internal',
|
||||
'alert_commands_id' => 't5.id as alert_commands_id',
|
||||
'alert_commands_name' => 't5.name as alert_commands_name',
|
||||
'alert_commands_description' => 't5.description as alert_commands_description');
|
||||
|
||||
|
||||
if ($fields == false) {
|
||||
$fields = $master_fields;
|
||||
}
|
||||
|
||||
|
||||
/** construct column list to query for tagente, tagente_modulo, tagente_estado and alert-related tables **/
|
||||
{
|
||||
$agent_additional_columns = "";
|
||||
$module_additional_columns = "";
|
||||
$estado_additional_columns = "";
|
||||
$alert_additional_columns = "";
|
||||
|
||||
foreach( $fields as $fld ) {
|
||||
if( array_key_exists ($fld, $agent_field_column_mapping ) ) {
|
||||
|
||||
foreach ($fields as $fld ) {
|
||||
if (array_key_exists ($fld, $agent_field_column_mapping ) ) {
|
||||
$agent_additional_columns .= (", " . $agent_field_column_mapping[$fld] );
|
||||
}
|
||||
if( array_key_exists ($fld, $module_field_column_mampping ) ) {
|
||||
if (array_key_exists ($fld, $module_field_column_mampping ) ) {
|
||||
$module_additional_columns .= (", " . $module_field_column_mampping[$fld]);
|
||||
}
|
||||
if( array_key_exists ($fld, $estado_fields_to_columns_mapping ) ) {
|
||||
if (array_key_exists ($fld, $estado_fields_to_columns_mapping ) ) {
|
||||
$estado_additional_columns .= (", " . $estado_fields_to_columns_mapping[$fld]);
|
||||
}
|
||||
if( array_key_exists ($fld, $alert_fields_to_columns_mapping ) ) {
|
||||
if (array_key_exists ($fld, $alert_fields_to_columns_mapping ) ) {
|
||||
$alert_additional_columns .= (", " . $alert_fields_to_columns_mapping[$fld]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$returnVar = array();
|
||||
|
||||
$groups = db_get_all_rows_sql('SELECT id_grupo as group_id, nombre as group_name, parent as group_parent, disabled, custom_id FROM tgrupo');
|
||||
$groups = db_get_all_rows_sql('SELECT id_grupo as group_id, nombre as group_name, parent as group_parent, disabled, custom_id FROM tgrupo');
|
||||
if ($groups === false) $groups = array();
|
||||
$groups = str_replace('\n', $returnReplace, $groups);
|
||||
|
||||
$agents = db_get_all_rows_sql('SELECT id_agente as agent_id, id_grupo as agent_id_group ' . $agent_additional_columns . ' FROM tagente');
|
||||
|
||||
$agents = db_get_all_rows_sql('
|
||||
SELECT id_agente AS agent_id, id_grupo AS agent_id_group ' . $agent_additional_columns . ' FROM tagente');
|
||||
if ($agents === false) $agents = array();
|
||||
$agents = str_replace('\n', $returnReplace, $agents);
|
||||
|
||||
|
||||
foreach ($groups as &$group) {
|
||||
$group['type_row'] = 'group';
|
||||
$returnVar[] = $group;
|
||||
|
||||
|
||||
foreach ($agents as $index => &$agent) {
|
||||
if ($agent['agent_id_group'] == $group['group_id']) {
|
||||
|
||||
|
||||
$agent['type_row'] = 'agent';
|
||||
$returnVar[] = $agent;
|
||||
|
||||
if( strlen($module_additional_columns) <= 0
|
||||
&& strlen($estado_additional_columns) <= 0
|
||||
&& strlen($alert_additional_columns) <= 0 )
|
||||
{
|
||||
|
||||
if ( strlen($module_additional_columns) <= 0
|
||||
&& strlen($estado_additional_columns) <= 0
|
||||
&& strlen($alert_additional_columns) <= 0 ) {
|
||||
continue; /** SKIP collecting MODULES and ALERTS **/
|
||||
}
|
||||
|
||||
|
||||
$modules = db_get_all_rows_sql('SELECT *
|
||||
FROM (SELECT id_agente_modulo as module_id_agent_modulo ' . $module_additional_columns . '
|
||||
FROM tagente_modulo
|
||||
|
|
@ -682,19 +679,18 @@ function api_get_tree_agents($trash1, $trahs2, $other, $returnType)
|
|||
FROM tagente_estado
|
||||
WHERE id_agente = ' . $agent['agent_id'] . ') AS t2
|
||||
ON t1.module_id_agent_modulo = t2.module_id_agent_modulo');
|
||||
|
||||
|
||||
if ($modules === false) $modules = array();
|
||||
$modules = str_replace('\n', $returnReplace, $modules);
|
||||
|
||||
|
||||
foreach ($modules as &$module) {
|
||||
$module['type_row'] = 'module';
|
||||
$returnVar[] = $module;
|
||||
|
||||
if( strlen($alert_additional_columns) <= 0 )
|
||||
{
|
||||
|
||||
if ( strlen($alert_additional_columns) <= 0 ) {
|
||||
continue; /** SKIP collecting ALERTS info **/
|
||||
}
|
||||
|
||||
|
||||
$alerts = db_get_all_rows_sql('SELECT t1.id_agent_module as alert_id_agent_module ' . $alert_additional_columns . '
|
||||
FROM (SELECT * FROM talert_template_modules
|
||||
WHERE id_agent_module = ' . $module['module_id_agent_modulo'] . ') AS t1
|
||||
|
|
@ -706,10 +702,10 @@ function api_get_tree_agents($trash1, $trahs2, $other, $returnType)
|
|||
ON t3.id_alert_action = t4.id
|
||||
LEFT JOIN talert_commands AS t5
|
||||
ON t4.id_alert_command = t5.id');
|
||||
|
||||
|
||||
if ($alerts === false) $alerts = array();
|
||||
$alerts = str_replace('\n', $returnReplace, $alerts);
|
||||
|
||||
|
||||
foreach ($alerts as &$alert) {
|
||||
$alert['type_row'] = 'alert';
|
||||
$returnVar[] = $alert;
|
||||
|
|
@ -720,7 +716,7 @@ function api_get_tree_agents($trash1, $trahs2, $other, $returnType)
|
|||
}
|
||||
}
|
||||
$data = array('type' => 'array', 'data' => $returnVar);
|
||||
|
||||
|
||||
$data['list_index'] = $fields;
|
||||
|
||||
returnData($returnType, $data, $separator);
|
||||
|
|
@ -3713,7 +3709,7 @@ function api_set_update_snmp_module_policy($id, $thrash1, $other, $thrash3) {
|
|||
* example:
|
||||
*
|
||||
* api.php?op=set&op2=apply_policy&id=1
|
||||
*
|
||||
*
|
||||
* @param $thrash3 Don't use
|
||||
*/
|
||||
function api_set_apply_policy($id, $thrash1, $other, $thrash3) {
|
||||
|
|
@ -3786,7 +3782,7 @@ function api_set_apply_policy($id, $thrash1, $other, $thrash3) {
|
|||
* example:
|
||||
*
|
||||
* api.php?op=set&op2=apply_all_policies
|
||||
*
|
||||
*
|
||||
* @param $thrash3 Don't use
|
||||
*/
|
||||
function api_set_apply_all_policies($thrash1, $thrash2, $other, $thrash3) {
|
||||
|
|
|
|||
|
|
@ -165,7 +165,8 @@ function snmp_browser_get_tree ($target_ip, $community, $starting_oid = '.', $ve
|
|||
$oid_tree = array('__LEAVES__' => array());
|
||||
if ($version == "3") {
|
||||
exec ($snmpwalk_bin . ' -m ALL -v 3 -u ' . escapeshellarg($snmp3_auth_user) . ' -A ' . escapeshellarg($snmp3_auth_pass) . ' -l ' . escapeshellarg($snmp3_security_level) . ' -a ' . escapeshellarg($snmp3_auth_method) . ' -x ' . escapeshellarg($snmp3_privacy_method) . ' -X ' . escapeshellarg($snmp3_privacy_pass) . ' ' . escapeshellarg($target_ip) . ' ' . escapeshellarg($starting_oid) . ' 2>/dev/null', $output, $rc);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
exec ($snmpwalk_bin . ' -m ALL -M +' . escapeshellarg($config['homedir'] . '/attachment/mibs') . ' -Cc -c ' . escapeshellarg($community) . ' -v ' . escapeshellarg($version) . ' ' . escapeshellarg($target_ip) . ' ' . escapeshellarg($starting_oid) . ' 2>/dev/null', $output, $rc);
|
||||
}
|
||||
//if ($rc != 0) {
|
||||
|
|
@ -259,16 +260,17 @@ function snmp_browser_get_oid ($target_ip, $community, $target_oid, $version = '
|
|||
$snmpget_bin = 'snmpget';
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
$snmpget_bin = $config['snmpget'];
|
||||
}
|
||||
if ($version == "3") {
|
||||
exec ($snmpget_bin . ' -m ALL -v 3 -u ' . escapeshellarg($snmp3_auth_user) . ' -A ' . escapeshellarg($snmp3_auth_pass) . ' -l ' . escapeshellarg($snmp3_security_level) . ' -a ' . escapeshellarg($snmp3_auth_method) . ' -x ' . escapeshellarg($snmp3_privacy_method) . ' -X ' . escapeshellarg($snmp3_privacy_pass) . ' ' . escapeshellarg($target_ip) . ' ' . escapeshellarg($target_oid) . ' 2>/dev/null', $output, $rc);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
exec ($snmpget_bin . ' -m ALL -M +' . escapeshellarg($config['homedir'] . '/attachment/mibs') . ' -On -c ' . escapeshellarg($community) . ' -v ' . escapeshellarg($version) . ' ' . escapeshellarg($target_ip) . ' ' . escapeshellarg($target_oid) . ' 2>/dev/null', $output, $rc);
|
||||
}
|
||||
|
||||
|
||||
if ($rc != 0) {
|
||||
return $oid_data;
|
||||
}
|
||||
|
|
@ -402,14 +404,14 @@ function snmp_browser_print_oid ($oid = array(), $custom_action = '', $return =
|
|||
|
||||
$table->head[0] = $closer;
|
||||
$table->head[1] = __('OID Information');
|
||||
|
||||
|
||||
// Add a span for custom actions
|
||||
if ($custom_action != '') {
|
||||
$output .= '<span id="snmp_custom_action">' . $closer . $custom_action . '</span>';
|
||||
}
|
||||
|
||||
$output .= html_print_table($table, true);
|
||||
|
||||
|
||||
if ($return) {
|
||||
return $output;
|
||||
}
|
||||
|
|
@ -441,11 +443,11 @@ function snmp_browser_print_container ($return = false, $width = '95%', $height
|
|||
$table->data[0][1] .= html_print_input_text ('community', '', '', 25, 0, true);
|
||||
$table->data[0][2] = '<strong>'.__('Starting OID').'</strong><br>';
|
||||
$table->data[0][2] .= html_print_input_text ('starting_oid', '.1.3.6.1.2', '', 25, 0, true);
|
||||
|
||||
|
||||
$table->data[0][3] = '<strong>' . __('Version') . '</strong>';
|
||||
$table->data[0][3] .= html_print_select (array ('1' => 'v. 1', '2' => 'v. 2', '2c' => 'v. 2c', '3' => 'v. 3'), 'snmp_browser_version', '', 'checkSNMPVersion();', '', '', true, false, false, '');
|
||||
$table->cellstyle[0][3] = 'width: 15px;';
|
||||
|
||||
|
||||
$table->data[0][4] = html_print_button(__('Browse'), 'browse', false, 'snmpBrowse()', 'class="sub search"', true);
|
||||
$table->cellstyle[0][4] = 'vertical-align: bottom;';
|
||||
|
||||
|
|
@ -471,7 +473,7 @@ function snmp_browser_print_container ($return = false, $width = '95%', $height
|
|||
$table3->data[6][2] = '<b>'.__('Security level').'</b>';
|
||||
$table3->data[6][3] = html_print_select(array('noAuthNoPriv' => __('Not auth and not privacy method'),
|
||||
'authNoPriv' => __('Auth and not privacy method'), 'authPriv' => __('Auth and privacy method')), 'snmp3_browser_security_level', '', '', '', '', true);
|
||||
|
||||
|
||||
// Search tools
|
||||
$table2->width = '100%';
|
||||
$table2->size = array ();
|
||||
|
|
@ -509,13 +511,13 @@ function snmp_browser_print_container ($return = false, $width = '95%', $height
|
|||
else {
|
||||
$output .= '<div id="snmp3_browser_options" style="display: none;">';
|
||||
}
|
||||
|
||||
|
||||
$output .= ui_toggle(html_print_table($table3, true), __('SNMP v3 options'), '', true, true);
|
||||
$output .= '</div>';
|
||||
$output .= '<div style="width: 100%; padding-top: 10px;">';
|
||||
$output .= ui_toggle(html_print_table($table2, true), __('Search options'), '', true, true);
|
||||
$output .= '</div>';
|
||||
|
||||
|
||||
// SNMP tree container
|
||||
$output .= '<div style="width: 100%; height: 100%; margin-top: 5px; position: relative;">';
|
||||
$output .= html_print_input_hidden ('search_count', 0, true);
|
||||
|
|
|
|||
|
|
@ -389,24 +389,24 @@ function js_activateEvents(callbackFunClick) {
|
|||
* Pandora click openlayers object.
|
||||
*/
|
||||
OpenLayers.Control.PandoraClick = OpenLayers.Class(OpenLayers.Control, {
|
||||
defaultHandlerOptions: {
|
||||
'single': true,
|
||||
'double': false,
|
||||
'pixelTolerance': 0,
|
||||
'stopSingle': false,
|
||||
'stopDouble': false
|
||||
},
|
||||
initialize: function(options) {
|
||||
this.handlerOptions = OpenLayers.Util.extend({}, this.defaultHandlerOptions);
|
||||
OpenLayers.Control.prototype.initialize.apply(this, arguments);
|
||||
this.handler = new OpenLayers.Handler.Click(this, {'click': options.callbackFunctionClick}, this.handlerOptions);
|
||||
}
|
||||
defaultHandlerOptions: {
|
||||
'single': true,
|
||||
'double': false,
|
||||
'pixelTolerance': 0,
|
||||
'stopSingle': false,
|
||||
'stopDouble': false
|
||||
},
|
||||
initialize: function(options) {
|
||||
this.handlerOptions = OpenLayers.Util.extend({}, this.defaultHandlerOptions);
|
||||
OpenLayers.Control.prototype.initialize.apply(this, arguments);
|
||||
this.handler = new OpenLayers.Handler.Click(this, {'click': options.callbackFunctionClick}, this.handlerOptions);
|
||||
}
|
||||
});
|
||||
|
||||
var click = new OpenLayers.Control.PandoraClick({callbackFunctionClick: callbackFunClick});
|
||||
|
||||
|
||||
map.addControl(click);
|
||||
click.activate();
|
||||
click.activate();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -124,12 +124,12 @@ function agent_changed (event, id_agent, selected) {
|
|||
* @returns {Boolean} True it is empty
|
||||
*/
|
||||
function isEmptyObject(obj) {
|
||||
for(var prop in obj) {
|
||||
if(obj.hasOwnProperty(prop))
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
for(var prop in obj) {
|
||||
if(obj.hasOwnProperty(prop))
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -170,7 +170,7 @@ class Networkmap {
|
|||
$filename_img = safe_url_extraclean (
|
||||
$system->getConfig('attachment_store')) . "/networkmap_" .
|
||||
$filter . "_" . $this->networkmap['font_size'];
|
||||
$url_img = "../attachment/networkmap_" .
|
||||
$url_img = "../attachment/networkmap_" .
|
||||
$filter . "_" . $this->networkmap['font_size'];
|
||||
$filename_dot = safe_url_extraclean(
|
||||
$system->getConfig("attachment_store")) . "/networkmap_" . $filter;
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ $graph = networkmap_generate_hash(__('Pandora FMS'), $group, $simple,
|
|||
$font_size, $layout, $nooverlap, $zoom, $ranksep, $center, $regen,
|
||||
$pure, $id_networkmap, $show_snmp_modules, true, true,
|
||||
$text_filter);
|
||||
html_debug_print($graph, true);
|
||||
|
||||
networkmap_print_jsdata($graph);
|
||||
|
||||
$zoom_default = file($config['homedir'] . '/images/zoom_default.svg');
|
||||
|
|
@ -75,25 +75,25 @@ echo '<div id="dinamic_networkmap"></div>';
|
|||
<style>
|
||||
|
||||
.node {
|
||||
stroke: #fff;
|
||||
stroke-width: 1.5px;
|
||||
stroke: #fff;
|
||||
stroke-width: 1.5px;
|
||||
}
|
||||
|
||||
.select_node {
|
||||
stroke: #000;
|
||||
stroke-width: 1.5px;
|
||||
stroke: #000;
|
||||
stroke-width: 1.5px;
|
||||
}
|
||||
|
||||
.link {
|
||||
stroke: #999;
|
||||
stroke-opacity: 1;
|
||||
stroke-width: 1;
|
||||
stroke: #999;
|
||||
stroke-opacity: 1;
|
||||
stroke-width: 1;
|
||||
}
|
||||
|
||||
.select_link {
|
||||
stroke: #000;
|
||||
stroke-opacity: 1;
|
||||
stroke-width: 1;
|
||||
stroke: #000;
|
||||
stroke-opacity: 1;
|
||||
stroke-width: 1;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
|
@ -104,29 +104,29 @@ var width = $("#dinamic_networkmap").width(),
|
|||
var color = d3.scale.category20();
|
||||
|
||||
var force = d3.layout.force()
|
||||
.charge(-60)
|
||||
.linkDistance(20)
|
||||
.friction(0.9)
|
||||
//.gravity(0.2)
|
||||
.size([width, height]);
|
||||
.charge(-60)
|
||||
.linkDistance(20)
|
||||
.friction(0.9)
|
||||
//.gravity(0.2)
|
||||
.size([width, height]);
|
||||
|
||||
var zoom_obj = d3.behavior.zoom();
|
||||
zoom_obj.scaleExtent([0.3, 3]).on("zoom", zoom);
|
||||
|
||||
var svg = d3.select("#dinamic_networkmap").append("svg")
|
||||
.attr("id", "dinamic_networkmap_svg")
|
||||
.attr("width", width)
|
||||
.attr("width", width)
|
||||
.attr("height", height)
|
||||
.attr("pointer-events", "all")
|
||||
.call(zoom_obj)
|
||||
.append('svg:g')
|
||||
.call(zoom_obj)
|
||||
.append('svg:g')
|
||||
|
||||
|
||||
///Added default zoom buttom
|
||||
d3.select("#dinamic_networkmap svg")
|
||||
.append("g")
|
||||
.attr("id", "zoom_control");
|
||||
|
||||
.append("g")
|
||||
.attr("id", "zoom_control");
|
||||
|
||||
zoom_default = $("#zoom_default").clone();
|
||||
$("#zoom_default").remove();
|
||||
|
||||
|
|
@ -138,21 +138,21 @@ d3.select("#zoom_default")
|
|||
.on("mouseout", out_zoom_default);
|
||||
|
||||
force
|
||||
.nodes(graph.nodes)
|
||||
.links(graph.links)
|
||||
.start();
|
||||
.nodes(graph.nodes)
|
||||
.links(graph.links)
|
||||
.start();
|
||||
|
||||
var link = svg.selectAll(".link")
|
||||
.data(graph.links)
|
||||
.enter().append("line")
|
||||
.attr("id", function(d) {
|
||||
.data(graph.links)
|
||||
.enter().append("line")
|
||||
.attr("id", function(d) {
|
||||
var id_text = 'link_'
|
||||
+ d.source.id
|
||||
+ "_" + d.target.id;
|
||||
|
||||
return id_text;
|
||||
})
|
||||
.attr("class", function(d) {
|
||||
.attr("class", function(d) {
|
||||
var class_text = 'link';
|
||||
|
||||
class_text += " source_" + d.source.id;
|
||||
|
|
@ -162,24 +162,24 @@ var link = svg.selectAll(".link")
|
|||
});
|
||||
|
||||
var node = svg.selectAll(".node")
|
||||
.data(graph.nodes)
|
||||
.enter().append("circle")
|
||||
.attr("id", function(d) { return "node_" + d.id})
|
||||
.attr("tooltip", function(d) { return d.tooltip})
|
||||
.attr("class", "node")
|
||||
.attr("r", 5)
|
||||
.style("fill", function(d) { return d.color; })
|
||||
.on("mouseover", over)
|
||||
.on("mouseout", out)
|
||||
.on("mousedown", mousedown)
|
||||
.on("mouseup", mouseup)
|
||||
//.on("click", click)
|
||||
.call(force.drag);
|
||||
.data(graph.nodes)
|
||||
.enter().append("circle")
|
||||
.attr("id", function(d) { return "node_" + d.id})
|
||||
.attr("tooltip", function(d) { return d.tooltip})
|
||||
.attr("class", "node")
|
||||
.attr("r", 5)
|
||||
.style("fill", function(d) { return d.color; })
|
||||
.on("mouseover", over)
|
||||
.on("mouseout", out)
|
||||
.on("mousedown", mousedown)
|
||||
.on("mouseup", mouseup)
|
||||
//.on("click", click)
|
||||
.call(force.drag);
|
||||
|
||||
svg.style("opacity", 1e-6)
|
||||
.transition()
|
||||
.duration(1000)
|
||||
.style("opacity", 1);
|
||||
svg.style("opacity", 1e-6)
|
||||
.transition()
|
||||
.duration(1000)
|
||||
.style("opacity", 1);
|
||||
|
||||
force.on("tick", function() {
|
||||
link.attr("x1", function(d) { return d.source.x; })
|
||||
|
|
|
|||
|
|
@ -56,8 +56,10 @@ if (is_ajax()) {
|
|||
$custom_action = urldecode (base64_decode ($custom_action));
|
||||
}
|
||||
|
||||
$oid = snmp_browser_get_oid ($target_ip, $community, $target_oid, $snmp_version,
|
||||
$snmp3_auth_user, $snmp3_security_level, $snmp3_auth_method, $snmp3_auth_pass, $snmp3_privacy_method, $snmp3_privacy_pass);
|
||||
$oid = snmp_browser_get_oid ($target_ip, $community,
|
||||
$target_oid, $snmp_version, $snmp3_auth_user,
|
||||
$snmp3_security_level, $snmp3_auth_method, $snmp3_auth_pass,
|
||||
$snmp3_privacy_method, $snmp3_privacy_pass);
|
||||
snmp_browser_print_oid ($oid, $custom_action);
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue