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

2013-01-17 Ramon Novoa <rnovoa@artica.es> 

* lib/PandoraFMS/Config.pm,
	  lib/PandoraFMS/DataServer.pm: Added support for log modules.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7499 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2013-01-17 14:38:55 +00:00
parent c44500e229
commit 22c04135e2
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_server/ChangeLog
View File

@ -1,3 +1,8 @@
2013-01-17 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Config.pm,
lib/PandoraFMS/DataServer.pm: Added support for log modules.
2013-01-16 Sergio Martin <sergio.martin@artica.es>
* util/pandora_db.pl: Added the history events to the

4
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -148,6 +148,10 @@ sub pandora_get_sharedconfig ($$) {
$pa_config->{"netflow_path"} = pandora_get_tconfig_token ($dbh, 'netflow_path', '/var/spool/pandora/data_in/netflow');
$pa_config->{"netflow_interval"} = pandora_get_tconfig_token ($dbh, 'netflow_interval', 300);
$pa_config->{"netflow_daemon"} = pandora_get_tconfig_token ($dbh, 'netflow_daemon', '/usr/bin/nfcapd');
# Log module configuration
$pa_config->{"log_dir"} = pandora_get_tconfig_token ($dbh, 'log_dir', '/var/spool/pandora/data_in/log');
$pa_config->{"log_interval"} = pandora_get_tconfig_token ($dbh, 'log_interval', 3600);
}
##########################################################################

4
pandora_server/lib/PandoraFMS/DataServer.pm
View File

@ -503,6 +503,10 @@ sub process_xml_data ($$$$$) {
# Process inventory modules
enterprise_hook('process_inventory_data', [$pa_config, $data, $server_id, $agent_name,
$interval, $timestamp, $dbh]);
# Process log modules
enterprise_hook('process_log_data', [$pa_config, $data, $server_id, $agent_name,
$interval, $timestamp, $dbh]);
}
##########################################################################