Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Small fixes, and new option to specify a different dest address.

Browse source
This commit is contained in:
Robin Sommer 2011-10-26 10:52:14 -07:00
parent 73d5643302
commit 39ed489028
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
scripts/base/frameworks/notice/actions/pp-alarms.bro
View file

@ -8,6 +8,10 @@ export {
## Activate pretty-printed alarm summaries. ## Activate pretty-printed alarm summaries.
const pretty_print_alarms = T &redef; const pretty_print_alarms = T &redef;
## Address to send the pretty-printed reports to. Default if not set is
## :bro:id:`Notice::mail_dest`.
const mail_dest_pretty_printed = "" &redef;
## Function that renders a single alarm. Can be overidden. ## Function that renders a single alarm. Can be overidden.
global pretty_print_alarm: function(out: file, n: Info) &redef; global pretty_print_alarm: function(out: file, n: Info) &redef;
} }
@ -20,9 +24,8 @@ global pp_alarms_open: bool = F;
# Returns True if pretty-printed alarm summaries are activated. # Returns True if pretty-printed alarm summaries are activated.
function want_pp() : bool function want_pp() : bool
{ {
# return (pretty_print_alarms && ! reading_traces() && mail_dest != ""); return (pretty_print_alarms && ! reading_traces()
print (pretty_print_alarms && mail_dest != ""); && (mail_dest != "" || mail_dest_pretty_printed != ""));
return (pretty_print_alarms && mail_dest != "");
} }
# Opens and intializes the output file. # Opens and intializes the output file.
@ -34,7 +37,10 @@ function pp_open()
pp_alarms_open = T; pp_alarms_open = T;
pp_alarms = open(pp_alarms_name); pp_alarms = open(pp_alarms_name);
local headers = email_headers("Alarm Summary", mail_dest); local dest = mail_dest_pretty_printed != "" ? mail_dest_pretty_printed
: mail_dest;
local headers = email_headers("Alarm summary", dest);
write_file(pp_alarms, headers + "\n"); write_file(pp_alarms, headers + "\n");
} }
@ -45,6 +51,7 @@ function pp_send()
return; return;
write_file(pp_alarms, "\n\n--\n[Automatically generated]\n\n"); write_file(pp_alarms, "\n\n--\n[Automatically generated]\n\n");
close(pp_alarms);
system(fmt("/bin/cat %s | %s -t -oi && /bin/rm %s", system(fmt("/bin/cat %s | %s -t -oi && /bin/rm %s",
pp_alarms_name, sendmail, pp_alarms_name)); pp_alarms_name, sendmail, pp_alarms_name));
@ -57,6 +64,8 @@ function pp_postprocessor(info: Log::RotationInfo): bool
{ {
if ( want_pp() ) if ( want_pp() )
pp_send(); pp_send();
return T;
} }
event bro_init() event bro_init()