From afdc15e7505fbbc2d58dc198f22c90499e34a9df Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Fri, 23 Dec 2011 10:20:43 +0000 Subject: [PATCH] 2011-12-23 Ramon Novoa * conf/pandora_server.conf: Added Netflow server configuration tokens. * lib/PandoraFMS/Core.pm: Added the netflow server type. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5304 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 7 +++++++ pandora_server/conf/pandora_server.conf | 12 ++++++++++++ pandora_server/lib/PandoraFMS/Core.pm | 2 +- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 096ca1a79c..80fb14bd95 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,10 @@ +2011-12-23 Ramon Novoa + + * conf/pandora_server.conf: Added Netflow server configuration + tokens. + + * lib/PandoraFMS/Core.pm: Added the netflow server type. + 2011-12-22 Ramon Novoa * lib/PandoraFMS/Config.pm: Added netflow server configuration diff --git a/pandora_server/conf/pandora_server.conf b/pandora_server/conf/pandora_server.conf index d5cbc34bce..cee2547ad5 100755 --- a/pandora_server/conf/pandora_server.conf +++ b/pandora_server/conf/pandora_server.conf @@ -332,3 +332,15 @@ snmp_threads 2 # Block size for block producer/consumer servers, that is, the number of modules # per block (15 by default) (PANDORA FMS ENTERPRISE ONLY). block_size 15 + +# Enable (1) or disable (0) Pandora FMS Netflow Server (PANDORA FMS ENTERPRISE ONLY). +netflowserver 1 + +# Path to the netflow daemon nfcapd. +netflow_daemon /usr/local/bin/nfcapd + +# Netflow file rotation interval in seconds. +netflow_interval 300 + +# Base directory where netflow files will be stored. +netflow_basedir /tmp diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index c1f8769643..4a2f86b821 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -172,7 +172,7 @@ our @EXPORT = qw( # Some global variables our @DayNames = qw(sunday monday tuesday wednesday thursday friday saturday); -our @ServerTypes = qw (dataserver networkserver snmpconsole reconserver pluginserver predictionserver wmiserver exportserver inventoryserver webserver eventserver icmpserver snmpserver); +our @ServerTypes = qw (dataserver networkserver snmpconsole reconserver pluginserver predictionserver wmiserver exportserver inventoryserver webserver eventserver icmpserver snmpserver netflowserver); our @AlertStatus = ('Execute the alert', 'Do not execute the alert', 'Do not execute the alert, but increment its internal counter', 'Cease the alert', 'Recover the alert', 'Reset internal counter');