diff --git a/CHANGES b/CHANGES index 65d0e96364..b7f33ee3f5 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +3.3.0-dev.490 | 2020-10-27 13:41:27 -0700 + + * updated to mention notice_alarm.log by name. That has taken the place of the + file formerly named alarm.log (Duffy O'Craven) + 3.3.0-dev.488 | 2020-10-26 11:03:51 -0700 * Improve how Zeekygen generated record/enum redefinition docs @@ -25033,5 +25038,3 @@ v0.2 Sat Oct 25 11:22:37 PDT 1997 - Better usage() information (again thanks to Scott), -h and -v flags. - README, CHANGES files created. - - diff --git a/VERSION b/VERSION index 1c295388c6..7b72f3d487 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.3.0-dev.488 +3.3.0-dev.490 diff --git a/scripts/base/frameworks/notice/actions/pp-alarms.zeek b/scripts/base/frameworks/notice/actions/pp-alarms.zeek index a5e058a89f..8a26d57ec1 100644 --- a/scripts/base/frameworks/notice/actions/pp-alarms.zeek +++ b/scripts/base/frameworks/notice/actions/pp-alarms.zeek @@ -1,4 +1,4 @@ -##! Notice extension that mails out a pretty-printed version of alarm.log +##! Notice extension that mails out a pretty-printed version of notice_alarm.log ##! in regular intervals, formatted for better human readability. If activated, ##! that replaces the default summary mail having the raw log output. diff --git a/scripts/base/frameworks/notice/main.zeek b/scripts/base/frameworks/notice/main.zeek index 93519cd403..cc43ec331d 100644 --- a/scripts/base/frameworks/notice/main.zeek +++ b/scripts/base/frameworks/notice/main.zeek @@ -45,8 +45,8 @@ export { ## variable. ACTION_EMAIL, ## Indicates that the notice should be alarmed. A readable - ## ASCII version of the alarm log is emailed in bulk to the - ## address(es) configured in :zeek:id:`Notice::mail_dest`. + ## ASCII version is saved in notice_alarm log, and emailed + ## in bulk to the address(es) configured in :zeek:id:`Notice::mail_dest`. ACTION_ALARM, ## Indicates that the notice should result in a drop action. ## The exact action taken depends on loaded policy scripts;