diff --git a/scripts/base/frameworks/cluster/nodes/manager.bro b/scripts/base/frameworks/cluster/nodes/manager.bro index 22d9d539ca..c0f68ed136 100644 --- a/scripts/base/frameworks/cluster/nodes/manager.bro +++ b/scripts/base/frameworks/cluster/nodes/manager.bro @@ -15,6 +15,8 @@ redef Log::enable_remote_logging = F; redef Log::default_rotation_interval = 1 hrs; +redef Log::default_alarm_mail_interval = 24 hrs; + ## Use the cluster's archive logging script. redef Log::default_rotation_postprocessor_cmd = "archive-log"; diff --git a/scripts/base/frameworks/logging/main.bro b/scripts/base/frameworks/logging/main.bro index bec5f31dc6..26a3ff9cad 100644 --- a/scripts/base/frameworks/logging/main.bro +++ b/scripts/base/frameworks/logging/main.bro @@ -60,6 +60,9 @@ export { ## Default rotation interval. Zero disables rotation. const default_rotation_interval = 0secs &redef; + ## Default alarm mail interval. Zero disables alarm mails. + const default_alarm_mail_interval = 0secs &redef; + ## Default naming format for timestamps embedded into filenames. ## Uses a ``strftime()`` style. const default_rotation_date_format = "%Y-%m-%d-%H-%M-%S" &redef; diff --git a/scripts/base/frameworks/notice/actions/pp-alarms.bro b/scripts/base/frameworks/notice/actions/pp-alarms.bro index 82fda6db6c..0acd775cc3 100644 --- a/scripts/base/frameworks/notice/actions/pp-alarms.bro +++ b/scripts/base/frameworks/notice/actions/pp-alarms.bro @@ -101,7 +101,7 @@ event bro_init() # This replaces the standard non-pretty-printing filter. Log::add_filter(Notice::ALARM_LOG, [$name="alarm-mail", $writer=Log::WRITER_NONE, - $interv=Log::default_rotation_interval, + $interv=Log::default_alarm_mail_interval, $postprocessor=pp_postprocessor]); }