From 22c04135e2ede0e683bc880c1ffc940c5012ffe1 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Thu, 17 Jan 2013 14:38:55 +0000 Subject: [PATCH] 2013-01-17 Ramon Novoa * 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 --- pandora_server/ChangeLog | 5 +++++ pandora_server/lib/PandoraFMS/Config.pm | 4 ++++ pandora_server/lib/PandoraFMS/DataServer.pm | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index c402d679d1..b9271d35fc 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,8 @@ +2013-01-17 Ramon Novoa + + * lib/PandoraFMS/Config.pm, + lib/PandoraFMS/DataServer.pm: Added support for log modules. + 2013-01-16 Sergio Martin * util/pandora_db.pl: Added the history events to the diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index aaa984c3e2..9994c4828f 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -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); } ########################################################################## diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm index b03512983b..9fe39e6602 100644 --- a/pandora_server/lib/PandoraFMS/DataServer.pm +++ b/pandora_server/lib/PandoraFMS/DataServer.pm @@ -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]); } ##########################################################################