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

2013-01-18 Sergio Martin <sergio.martin@artica.es> 

* include/functions_config.php
	include/help/en/help_events_replication.php
	include/help/en/help_module_interval.php
	include/help/en/help_events_history.php
	include/help/es/help_events_replication.php
	include/help/es/help_events_history.php
	operation/events/events.php: Fixed bug #3599448 of
	setup javascript error. 
	Added help documents to events history and events 
	replication. Typo fix in other help document



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7506 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-01-18 12:06:26 +00:00
parent 16403a5189
commit b1cccdb653
8 changed files with 82 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pandora_console/ChangeLog
View File

@ -1,3 +1,16 @@
2013-01-18 Sergio Martin <sergio.martin@artica.es>
* include/functions_config.php
include/help/en/help_events_replication.php
include/help/en/help_module_interval.php
include/help/en/help_events_history.php
include/help/es/help_events_replication.php
include/help/es/help_events_history.php
operation/events/events.php: Fixed bug #3599448 of
setup javascript error.
Added help documents to events history and events
replication. Typo fix in other help document
2013-01-18 Sergio Martin <sergio.martin@artica.es>
* operation/events/events_rss.php

36
pandora_console/include/functions_config.php
View File

@ -121,25 +121,23 @@ function config_update_config () {
$update_manage_settings_result = db_process_sql_update('tupdate_settings', $values, $where);
}
}
if(isset($config['enterprise_installed']) && $config['enterprise_installed'] == 1) {
config_update_value ('trap2agent', (string) get_parameter ('trap2agent'));
config_update_value ('acl_enterprise', get_parameter ('acl_enterprise'));
config_update_value ('metaconsole', get_parameter ('metaconsole'));
config_update_value ('collection_max_size', get_parameter('collection_max_size'));
config_update_value ('activate_netflow', (bool) get_parameter ('activate_netflow'));
config_update_value ('event_replication', (int)get_parameter('event_replication'));
config_update_value ('replication_interval', (int)get_parameter('replication_interval'));
config_update_value ('replication_dbhost', (string)get_parameter('replication_dbhost'));
config_update_value ('replication_dbname', (string)get_parameter('replication_dbname'));
config_update_value ('replication_dbuser', (string)get_parameter('replication_dbuser'));
config_update_value ('replication_dbpass', (string)get_parameter('replication_dbpass'));
config_update_value ('replication_dbport', (string)get_parameter('replication_dbport'));
config_update_value ('replication_mode', (string)get_parameter('replication_mode'));
config_update_value ('public_url', get_parameter('public_url'));
config_update_value ('referer_security', get_parameter('referer_security'));
config_update_value ('trap2agent', (string) get_parameter ('trap2agent'));
config_update_value ('acl_enterprise', get_parameter ('acl_enterprise'));
config_update_value ('metaconsole', get_parameter ('metaconsole'));
config_update_value ('collection_max_size', get_parameter('collection_max_size'));
config_update_value ('activate_netflow', (bool) get_parameter ('activate_netflow'));
config_update_value ('event_replication', (int)get_parameter('event_replication'));
config_update_value ('replication_interval', (int)get_parameter('replication_interval'));
config_update_value ('replication_dbhost', (string)get_parameter('replication_dbhost'));
config_update_value ('replication_dbname', (string)get_parameter('replication_dbname'));
config_update_value ('replication_dbuser', (string)get_parameter('replication_dbuser'));
config_update_value ('replication_dbpass', (string)get_parameter('replication_dbpass'));
config_update_value ('replication_dbport', (string)get_parameter('replication_dbport'));
config_update_value ('replication_mode', (string)get_parameter('replication_mode'));
config_update_value ('public_url', get_parameter('public_url'));
config_update_value ('referer_security', get_parameter('referer_security'));
$enterprise = enterprise_include_once ('godmode/setup/setup.php');
if ($enterprise !== ENTERPRISE_NOT_HOOK) {
config_update_value ('enable_pass_policy', get_parameter('enable_pass_policy'));
config_update_value ('pass_size', get_parameter('pass_size'));
config_update_value ('pass_expire', get_parameter('pass_expire'));
@ -151,7 +149,7 @@ function config_update_config () {
config_update_value ('enable_pass_policy_admin', get_parameter('enable_pass_policy_admin'));
config_update_value ('enable_pass_history', get_parameter('enable_pass_history'));
config_update_value ('compare_pass', get_parameter('compare_pass'));
}
}
config_update_value ('log_collector', (bool)get_parameter('log_collector'));
/////////////

9
pandora_console/include/help/en/help_events_history.php Normal file
View File

@ -0,0 +1,9 @@
<?php
/* Include package help/en
*/
?>
<p> When the history events are enabled, the purging script (pandora_db.pl) will copy the not validated or in process events (only new ones) to the history table before delete it.
<br><br>These events can be consulted in the history events view. This view can be accessed in a new tab in the events section.
</p>

16
pandora_console/include/help/en/help_events_replication.php Normal file
View File

@ -0,0 +1,16 @@
<?php
/* Include package help/en
*/
?>
<p> When the events replication is activated, the received events will be copied to the remote database of a metaconsole.
<br><br>
Is necessary configurate the credentials of the metaconsole database, the replication mode (all events or only validated ones) and the replication interval in seconds.
<br><br>
<b>NOTES:</b>
<br><br>
The event viewer will be disabled when this option is activated.
<br><br>
To be effective the changes on the events replication configuration will be necessary restart the server.
</p>

2
pandora_console/include/help/en/help_module_interval.php
View File

@ -1,5 +1,5 @@
<?php
/* Include package help/es
/* Include package help/en
*/
?>

9
pandora_console/include/help/es/help_events_history.php Normal file
View File

@ -0,0 +1,9 @@
<?php
/* Include package help/es
*/
?>
<p> Cuando el histórico de eventos está activado, el script de purgado (pandora_db.pl) copiará los eventos no validados o en proceso (solo los nuevos) a la tabla de histórico antes de eliminarlos.
<br><br>Estos eventos pueden ser consultados en la vista de eventos históricos. Esta vista es accesible desde una nueva pestaña en la sección de eventos.
</p>

16
pandora_console/include/help/es/help_events_replication.php Normal file
View File

@ -0,0 +1,16 @@
<?php
/* Include package help/es
*/
?>
<p> Cuando la replicación de eventos está activada, los eventos recibidos se copiarán a la base de datos remota de una metaconsola.
<br><br>
Es necesario configurar las credenciales de la base de datos de la metaconsola, así como el modo de replicación (todos los eventos o solo los validados) y el intervalo de replicación en segundos.
<br><br>
<b>NOTAS:</b>
<br><br>
El visor de eventos se deshabilita cuando se activa esta opción.
<br><br>
Para que los cambios en la configuración de replicación de eventos se hagan efectivos será necesario reiniciar el servidor.
</p>

2
pandora_console/operation/events/events.php
View File

@ -44,7 +44,7 @@ $history = (bool) get_parameter('history', 0);
if(isset($config['event_replication']) && $config['event_replication'] == 1) {
db_pandora_audit("ACL Violation",
"Trying to access event viewer. View disabled due event replication.");
ui_print_error_message('Event viewer is disabled due event replication. For more information, please contact with the administrator');
ui_print_info_message('Event viewer is disabled due event replication. For more information, please contact with the administrator');
return;
}