Robin Sommer
e5a42e8a85
Merge branch 'topic/script-reference' of ssh://git.bro-ids.org/bro into topic/script-reference
...
Conflicts:
scripts/base/frameworks/notice/actions/pp-alarms.bro
scripts/base/frameworks/notice/main.bro
src/bro.bif
src/const.bif
src/event.bif
src/strings.bif
src/types.bif
2012-01-09 18:07:43 -08:00
Jon Siwek
69a0206a82
Merge branch 'master' into topic/script-reference
...
Conflicts:
scripts/base/frameworks/notice/actions/pp-alarms.bro
scripts/base/frameworks/notice/main.bro
scripts/base/init-bare.bro
src/event.bif
2012-01-09 15:49:14 -06:00
Seth Hall
1afe8b011c
Fixing a warning from the documentation generation.
2012-01-06 16:50:20 -05:00
Seth Hall
f603d0121b
This completes framework documentation package 4.
...
- Closes ticket #709
2012-01-06 16:36:22 -05:00
Robin Sommer
7646ef1aed
Merge remote-tracking branch 'origin/master' into topic/script-reference
...
Conflicts:
scripts/base/frameworks/notice/actions/pp-alarms.bro
scripts/base/frameworks/notice/main.bro
scripts/base/init-bare.bro
src/event.bif
2012-01-06 12:11:49 -08:00
Seth Hall
f8ec98625d
Merge remote-tracking branch 'origin/topic/robin/pp-alarms'
...
* origin/topic/robin/pp-alarms:
The silliest, tiniest little whitespace fixes.
Update missing in last commit to this branch.
Adding test for alarm mail.
Tuning the pretty-printed alarms output.
2012-01-04 13:41:28 -05:00
Seth Hall
adfbed8e56
The silliest, tiniest little whitespace fixes.
2012-01-04 13:37:07 -05:00
Robin Sommer
5e9153d7d6
Merge remote-tracking branch 'origin/topic/bernhard/notice-proto'
...
* origin/topic/bernhard/notice-proto:
log protocol in notices.
Conflicts:
scripts/base/frameworks/notice/main.bro
Closes #718 .
2012-01-03 14:52:07 -08:00
Jon Siwek
275420dd29
Minor notice documentation tweaks.
2011-12-19 16:28:30 -06:00
Jon Siwek
a4117016e9
Merge branch 'master' into topic/script-reference
...
Conflicts:
aux/broccoli
aux/broctl
scripts/base/frameworks/notice/main.bro
src/event.bif
2011-12-19 16:17:58 -06:00
Robin Sommer
c81477d9d3
Executive decision: empty fields are now logged as "(empty)" by default.
2011-12-19 08:49:30 -08:00
Robin Sommer
26ff8e1dab
Merge remote branch 'origin/topic/seth/notice-email-delay'
...
* origin/topic/seth/notice-email-delay:
The hostname notice email extension works now.
Fixed more bugs with delayed emails.
Working around a problem with setting default container types.
Ugh, still major failure. I'm just cutting the timeout handling for now.
Fixed a small bug major problem with email delay timeout catching.
Initial fixes for the problem of async actions with notice email extensions.
Closes #727 .
2011-12-19 07:10:28 -08:00
Jon Siwek
cc1459ef35
Fix some malformed Broxygen xref roles.
2011-12-16 14:30:36 -06:00
Seth Hall
8399d28c2e
The hostname notice email extension works now.
2011-12-16 10:59:30 -05:00
Robin Sommer
8c53446292
Merge remote branch 'origin/fastpath'
...
* origin/fastpath:
Fixed major bug with cluster synchronization (it was broken!)
2011-12-16 02:37:56 -08:00
Seth Hall
0b8b14a0ed
Fixed major bug with cluster synchronization (it was broken!)
2011-12-15 15:59:51 -05:00
Seth Hall
b66c73baaa
Fixed more bugs with delayed emails.
2011-12-15 15:57:42 -05:00
Seth Hall
667dcb251a
Working around a problem with setting default container types.
2011-12-15 12:51:14 -05:00
Seth Hall
cb904cec4f
Ugh, still major failure. I'm just cutting the timeout handling for now.
2011-12-15 12:46:15 -05:00
Seth Hall
f1f5719f83
Fixed a small bug major problem with email delay timeout catching.
2011-12-15 12:41:05 -05:00
Seth Hall
2d97e25eeb
Initial fixes for the problem of async actions with notice email extensions.
2011-12-15 12:27:41 -05:00
Jon Siwek
303993254e
Add more DPD and packet filter framework docs.
2011-12-14 16:07:36 -06:00
Jon Siwek
d89658c19b
Add more signature framework documentation.
2011-12-14 12:50:54 -06:00
Jon Siwek
a543ebbea5
Add more notice framework documentation.
2011-12-14 10:05:52 -06:00
Jon Siwek
86cba4c33f
Fix missing action in notice policy for looking up GeoIP data.
2011-12-13 16:17:44 -06:00
Seth Hall
76a0b9ad3c
Fixed some DPD signatures for IRC. Fixes ticket #311 .
...
- The larger issue from ticket 313 still stands.
2011-12-10 22:33:49 -05:00
Jon Siwek
8e89d78788
Add more cluster and communication framework documentation.
2011-12-09 17:31:47 -06:00
Jon Siwek
1f57827e54
Add more logging framework documentation.
2011-12-09 14:30:21 -06:00
Bernhard Amann
0313039977
log protocol in notices.
2011-12-08 14:44:45 -08:00
Jon Siwek
5126b65493
Add reporter bif/framework documentation.
2011-12-07 16:54:40 -06:00
Jon Siwek
506a42638a
Omit loading local-<node>.bro scripts from base cluster framework.
...
The loading of these is better handled by BroControl and it seems
odd to load them from a base/ script anyway since they'll contain
site/policy specific code.
Addresses #663
2011-12-05 13:02:39 -06:00
Jon Siwek
0c8b5a712d
Add a remote_log_peer event which contains an event_peer record param.
...
Addresses #493 .
2011-12-01 14:07:08 -06:00
Robin Sommer
c35094ea0b
Update missing in last commit to this branch.
2011-11-15 16:42:23 -08:00
Robin Sommer
2dc04b2ce5
Merge remote-tracking branch 'origin/master' into topic/robin/pp-alarms
2011-11-15 08:36:44 -08:00
Seth Hall
4942767c4d
More default "weird" tuning for the "SYN_with_data" notice.
...
- I think the default tuning should be that anything not requiring
a session to be established should use ACTION_LOG_PER_ORIG.
- We need to get some tie-in with the metrics framework in place
so that we can find when lots of these values are being suppressed.
2011-11-14 16:12:38 -05:00
Robin Sommer
e0692b898e
Merge branch 'master' into topic/robin/pp-alarms
2011-11-03 15:30:41 -07:00
Robin Sommer
41a443677b
Merge remote-tracking branch 'origin/fastpath'
...
* origin/fastpath:
No longer write to the PacketFilter::LOG stream if not reading traffic.
2011-11-03 15:27:23 -07:00
Robin Sommer
c4d6f814ff
Tuning the pretty-printed alarms output.
...
- Now including the included time range into the subject.
- With some notices, it got confused who's the orginator.
2011-11-02 18:09:09 -07:00
Seth Hall
507b51c957
No longer write to the PacketFilter::LOG stream if not reading traffic.
2011-11-02 15:09:57 -04:00
Robin Sommer
f3ed235ba7
Tuning the format of the pretty-printed alarm summaries.
...
Turns out the old format doesn't work well with the new scripts.
2011-10-26 21:12:16 -07:00
Robin Sommer
5b79d2b15f
Baseline updates.
...
Also a small tweak to the genDocSourcesList.sh as I was seein
non-consistent output order.
2011-10-26 15:27:03 -07:00
Robin Sommer
ec2a8d7904
Merge remote-tracking branch 'origin/topic/robin/pp-alarms'
...
* origin/topic/robin/pp-alarms:
Removing debugging code.
Now actually pretty-printing the notices.
Small fixes, and new option to specify a different dest address.
A new notice script that pretty-prints alarms in the summary email.
Adding a dummy log writer WRITER_NONE that just discards everything.
2011-10-26 14:44:46 -07:00
Robin Sommer
314e9c41f9
Removing debugging code.
2011-10-26 14:39:07 -07:00
Robin Sommer
eb6313adcb
Now actually pretty-printing the notices.
...
Output is similar to Bro 1.x.
2011-10-26 13:42:42 -07:00
Robin Sommer
39ed489028
Small fixes, and new option to specify a different dest address.
2011-10-26 11:12:50 -07:00
Robin Sommer
73d5643302
A new notice script that pretty-prints alarms in the summary email.
...
It works already, but the actual pretty-printing is still missing.
2011-10-26 10:40:12 -07:00
Seth Hall
b2323305f8
Adding sub messages to emails.
2011-10-25 11:36:24 -04:00
Seth Hall
320739e183
Updated/fixed MSIE version parsing in the software framework.
2011-10-25 09:30:06 -04:00
Seth Hall
7f838b6181
Merge branch 'topic/seth/weird-updates'
2011-10-24 23:47:31 -04:00
Seth Hall
ff51068598
Fixing a bug with handling downgrade from weird conn to orig.
2011-10-22 01:13:15 -04:00