Merge branch 'topic/jazoff/reorg-integration'

bro · Oct 26, 2016 · 158a852 · 158a852
2 parents 8e82d98 + d3b5640
commit 158a852
Show file tree

Hide file tree

Showing 103 changed files with 220 additions and 196 deletions.
diff --git a/manager/static/examples/bro-types/main.bro → ...static/examples/basics/bro-types/main.bro b/manager/static/examples/bro-types/main.bro → ...static/examples/basics/bro-types/main.bro
diff --git a/...static/examples/bro-types/readme.markdown → ...examples/basics/bro-types/readme.markdown b/...static/examples/bro-types/readme.markdown → ...examples/basics/bro-types/readme.markdown
@@ -1,7 +1,5 @@
 title: Bro Datatypes
 pcaps: 
-pred: redefinitions 
-succ: script-exercise-2
 
 Bro Datatypes
 ===================

diff --git a/.../static/examples/composite-types/main.bro → .../composite-types/comp-type-intro/main.bro b/.../static/examples/composite-types/main.bro → .../composite-types/comp-type-intro/main.bro
diff --git a/.../examples/composite-types/readme.markdown → ...ite-types/comp-type-intro/readme.markdown b/.../examples/composite-types/readme.markdown → ...ite-types/comp-type-intro/readme.markdown
@@ -1,7 +1,5 @@
 title: Composite Datatypes
 pcaps: 
-pred: hook
-succ: set
 
 Composite Datatypes
 ===================

diff --git a/manager/static/examples/basics/composite-types/index b/manager/static/examples/basics/composite-types/index
@@ -0,0 +1,4 @@
+set
+table
+vector
+record
diff --git a/manager/static/examples/record/main.bro → ...es/basics/composite-types/record/main.bro b/manager/static/examples/record/main.bro → ...es/basics/composite-types/record/main.bro
diff --git a/...er/static/examples/record/readme.markdown → ...cs/composite-types/record/readme.markdown b/...er/static/examples/record/readme.markdown → ...cs/composite-types/record/readme.markdown
@@ -1,7 +1,5 @@
 title: record
 pcaps: 
-pred: vector
-succ: redefinitions
 
 Record
 =======

diff --git a/manager/static/examples/set/main.bro → ...mples/basics/composite-types/set/main.bro b/manager/static/examples/set/main.bro → ...mples/basics/composite-types/set/main.bro
diff --git a/manager/static/examples/set/readme.markdown → ...asics/composite-types/set/readme.markdown b/manager/static/examples/set/readme.markdown → ...asics/composite-types/set/readme.markdown
@@ -1,7 +1,5 @@
 title: Set	
 pcaps: 
-pred: composite-types
-succ: table
 
 Set
 ===================

diff --git a/manager/static/examples/table/main.bro → ...les/basics/composite-types/table/main.bro b/manager/static/examples/table/main.bro → ...les/basics/composite-types/table/main.bro
diff --git a/...ger/static/examples/table/readme.markdown → ...ics/composite-types/table/readme.markdown b/...ger/static/examples/table/readme.markdown → ...ics/composite-types/table/readme.markdown
@@ -1,7 +1,5 @@
 title: Table
 pcaps: 
-pred: set
-succ: vector
 
 Table
 ===================

diff --git a/manager/static/examples/vector/main.bro → ...es/basics/composite-types/vector/main.bro b/manager/static/examples/vector/main.bro → ...es/basics/composite-types/vector/main.bro
diff --git a/...er/static/examples/vector/readme.markdown → ...cs/composite-types/vector/readme.markdown b/...er/static/examples/vector/readme.markdown → ...cs/composite-types/vector/readme.markdown
@@ -1,7 +1,5 @@
 title: Vector	
 pcaps: 
-pred: table
-succ: record
 
 Vector
 =======

diff --git a/manager/static/examples/if/main.bro → .../examples/basics/control-flow/if/main.bro b/manager/static/examples/if/main.bro → .../examples/basics/control-flow/if/main.bro
diff --git a/manager/static/examples/if/readme.markdown → ...es/basics/control-flow/if/readme.markdown b/manager/static/examples/if/readme.markdown → ...es/basics/control-flow/if/readme.markdown
diff --git a/manager/static/examples/basics/control-flow/index b/manager/static/examples/basics/control-flow/index
@@ -0,0 +1 @@
+if
diff --git a/manager/static/examples/event/main.bro → ...ger/static/examples/basics/event/main.bro b/manager/static/examples/event/main.bro → ...ger/static/examples/basics/event/main.bro
diff --git a/...ger/static/examples/event/readme.markdown → ...tic/examples/basics/event/readme.markdown b/...ger/static/examples/event/readme.markdown → ...tic/examples/basics/event/readme.markdown
@@ -1,7 +1,5 @@
 title: Event	
 pcaps: 
-pred: solution-switch-exercise
-succ: hook
 
 Event
 ===================

diff --git a/...tatic/examples/script-exercise-1/main.bro → ...amples/basics/exercise1/exercise/main.bro b/...tatic/examples/script-exercise-1/main.bro → ...amples/basics/exercise1/exercise/main.bro
diff --git a/...xamples/script-exercise-1/readme.markdown → ...basics/exercise1/exercise/readme.markdown b/...xamples/script-exercise-1/readme.markdown → ...basics/exercise1/exercise/readme.markdown
@@ -1,7 +1,5 @@
 title: Exercise
 pcaps:
-pred: if
-succ: solution-script-exercise-1
 
 Exercise
 ==========================

diff --git a/manager/static/examples/basics/exercise1/index b/manager/static/examples/basics/exercise1/index
@@ -0,0 +1,2 @@
+exercise
+solution
diff --git a/...mples/solution-script-exercise-1/main.bro → ...amples/basics/exercise1/solution/main.bro b/...mples/solution-script-exercise-1/main.bro → ...amples/basics/exercise1/solution/main.bro
diff --git a/...olution-script-exercise-1/readme.markdown → ...basics/exercise1/solution/readme.markdown b/...olution-script-exercise-1/readme.markdown → ...basics/exercise1/solution/readme.markdown
@@ -1,9 +1,7 @@
 title: Exercise 1: Solution
 pcaps:
-pred: script-exercise-1
-succ: switch
 
-Exercise: Solution
+Exercise 1 Solution
 =====================================
 
 Here is the solution for the first exercise.

diff --git a/manager/static/examples/basics/exercise2/index b/manager/static/examples/basics/exercise2/index
@@ -0,0 +1,3 @@
+script-exercise-2
+solution-script-exercise-2
+
diff --git a/...tatic/examples/script-exercise-2/main.bro → ...sics/exercise2/script-exercise-2/main.bro b/...tatic/examples/script-exercise-2/main.bro → ...sics/exercise2/script-exercise-2/main.bro
diff --git a/...xamples/script-exercise-2/readme.markdown → ...ercise2/script-exercise-2/readme.markdown b/...xamples/script-exercise-2/readme.markdown → ...ercise2/script-exercise-2/readme.markdown
@@ -1,7 +1,6 @@
-title: Exercise 2
+title: Exercise
 pcaps: exercise\_traffic.pcap
-pred: bro-types
-succ: solution-script-exercise-2
+order:
 
 Exercise
 ==========================

diff --git a/...mples/solution-script-exercise-2/main.bro → ...cise2/solution-script-exercise-2/main.bro b/...mples/solution-script-exercise-2/main.bro → ...cise2/solution-script-exercise-2/main.bro
diff --git a/...olution-script-exercise-2/readme.markdown → ...olution-script-exercise-2/readme.markdown b/...olution-script-exercise-2/readme.markdown → ...olution-script-exercise-2/readme.markdown
@@ -1,7 +1,5 @@
 title: Exercise 2
 pcaps: exercise_traffic.pcap
-pred: script-exercise-2
-succ: module
 
 Exercise: Solution
 ==========================

diff --git a/manager/static/examples/functions/main.bro → ...static/examples/basics/functions/main.bro b/manager/static/examples/functions/main.bro → ...static/examples/basics/functions/main.bro
diff --git a/...static/examples/functions/readme.markdown → ...examples/basics/functions/readme.markdown b/...static/examples/functions/readme.markdown → ...examples/basics/functions/readme.markdown
@@ -1,7 +1,5 @@
 title: Functions
 pcaps: 
-pred: loading
-succ: variables
 
 Functions
 ==========

diff --git a/manager/static/examples/hook/main.bro → manager/static/examples/basics/hook/main.bro b/manager/static/examples/hook/main.bro → manager/static/examples/basics/hook/main.bro
diff --git a/manager/static/examples/hook/readme.markdown → ...atic/examples/basics/hook/readme.markdown b/manager/static/examples/hook/readme.markdown → ...atic/examples/basics/hook/readme.markdown
@@ -1,7 +1,5 @@
 title: hook
 pcaps: 
-pred: event
-succ: composite-types
 
 Hook
 =======

diff --git a/manager/static/examples/basics/index b/manager/static/examples/basics/index
@@ -0,0 +1,15 @@
+loading
+functions
+variables
+primitive-datatypes
+operators
+control-flow
+loops
+exercise1
+switches
+event
+hook
+composite-types
+redefinitions
+bro-types
+exercise2
diff --git a/manager/static/examples/dump-events/main.bro → ...r/static/examples/basics/loading/main.bro b/manager/static/examples/dump-events/main.bro → ...r/static/examples/basics/loading/main.bro
diff --git a/...r/static/examples/loading/readme.markdown → ...c/examples/basics/loading/readme.markdown b/...r/static/examples/loading/readme.markdown → ...c/examples/basics/loading/readme.markdown
@@ -1,7 +1,5 @@
-title: Loading
+title: Loading Scripts
 pcaps: 
-pred: hello
-succ: functions
 
 Loading Scripts
 ===============

diff --git a/manager/static/examples/loops/main.bro → ...static/examples/basics/loops/for/main.bro b/manager/static/examples/loops/main.bro → ...static/examples/basics/loops/for/main.bro
diff --git a/...ger/static/examples/loops/readme.markdown → ...examples/basics/loops/for/readme.markdown b/...ger/static/examples/loops/readme.markdown → ...examples/basics/loops/for/readme.markdown
@@ -1,12 +1,10 @@
-title: Loops
+title: For Loops
 pcaps:
-pred: operators
-succ: while
 
-Loops: For
+For Loops
 ================
 
-Bro uses a "foreach" style loop.
+Bro provides a "foreach" style loop.
 In the given example we simply iterate through the string "abc"
 and print the current character.
 

diff --git a/manager/static/examples/basics/loops/index b/manager/static/examples/basics/loops/index
@@ -0,0 +1,2 @@
+for
+while
diff --git a/manager/static/examples/while/main.bro → ...atic/examples/basics/loops/while/main.bro b/manager/static/examples/while/main.bro → ...atic/examples/basics/loops/while/main.bro
diff --git a/...ger/static/examples/while/readme.markdown → ...amples/basics/loops/while/readme.markdown b/...ger/static/examples/while/readme.markdown → ...amples/basics/loops/while/readme.markdown
@@ -1,7 +1,5 @@
 title: Loops: While
 pcaps:
-pred: loops
-succ: if
 
 Loops: While
 ================

diff --git a/manager/static/examples/operators/main.bro → ...static/examples/basics/operators/main.bro b/manager/static/examples/operators/main.bro → ...static/examples/basics/operators/main.bro
diff --git a/...static/examples/operators/readme.markdown → ...examples/basics/operators/readme.markdown b/...static/examples/operators/readme.markdown → ...examples/basics/operators/readme.markdown
@@ -1,7 +1,5 @@
 title: Operators
 pcaps:
-pred: primitive_datatypes
-succ: loops 
 
 Operators
 ==========

diff --git a/...tic/examples/primitive_datatypes/main.bro → ...mples/basics/primitive-datatypes/main.bro b/...tic/examples/primitive_datatypes/main.bro → ...mples/basics/primitive-datatypes/main.bro
diff --git a/...mples/primitive_datatypes/readme.markdown → ...asics/primitive-datatypes/readme.markdown b/...mples/primitive_datatypes/readme.markdown → ...asics/primitive-datatypes/readme.markdown
@@ -1,7 +1,5 @@
 title: Primitive Datatypes
 pcaps: 
-pred: variables
-succ: operators 
 
 Primitive Datatypes
 ===================

diff --git a/manager/static/examples/basics/redefinitions/index b/manager/static/examples/basics/redefinitions/index
@@ -0,0 +1 @@
+redef-records
diff --git a/...er/static/examples/redef-records/main.bro → ...sics/redefinitions/redef-records/main.bro b/...er/static/examples/redef-records/main.bro → ...sics/redefinitions/redef-records/main.bro
diff --git a/...ic/examples/redef-records/readme.markdown → ...definitions/redef-records/readme.markdown b/...ic/examples/redef-records/readme.markdown → ...definitions/redef-records/readme.markdown
@@ -1,7 +1,5 @@
 title: Redefinitions
 pcaps: 
-pred: redefinitions
-succ: bro-types
 
 Redefinitions for records
 ============================

diff --git a/...er/static/examples/redefinitions/main.bro → ...mples/basics/redefinitions/redef/main.bro b/...er/static/examples/redefinitions/main.bro → ...mples/basics/redefinitions/redef/main.bro
diff --git a/...ic/examples/redefinitions/readme.markdown → ...asics/redefinitions/redef/readme.markdown b/...ic/examples/redefinitions/readme.markdown → ...asics/redefinitions/redef/readme.markdown
@@ -1,7 +1,5 @@
 title: Redefinitions
 pcaps: 
-pred: record
-succ: redef-records
 
 Redefinitions
 ============================

diff --git a/manager/static/examples/basics/switches/index b/manager/static/examples/basics/switches/index
@@ -0,0 +1,3 @@
+switch
+switch-exercise
+solution-switch-exercise
diff --git a/...xamples/solution-switch-exercise/main.bro → ...witches/solution-switch-exercise/main.bro b/...xamples/solution-switch-exercise/main.bro → ...witches/solution-switch-exercise/main.bro
diff --git a/.../solution-switch-exercise/readme.markdown → .../solution-switch-exercise/readme.markdown b/.../solution-switch-exercise/readme.markdown → .../solution-switch-exercise/readme.markdown
@@ -1,7 +1,5 @@
 title: Switch Exercise: Solution
 pcaps:
-pred: switch-exercise
-succ: event
 
 Switch Exercise: Solution
 ==========================================

diff --git a/.../static/examples/switch-exercise/main.bro → .../basics/switches/switch-exercise/main.bro b/.../static/examples/switch-exercise/main.bro → .../basics/switches/switch-exercise/main.bro
diff --git a/.../examples/switch-exercise/readme.markdown → .../switches/switch-exercise/readme.markdown b/.../examples/switch-exercise/readme.markdown → .../switches/switch-exercise/readme.markdown
@@ -1,7 +1,5 @@
 title: Switch Exercise
 pcaps:
-pred: switch
-succ: solution-switch-exercise
 
 Switch Exercise
 ================================

diff --git a/manager/static/examples/switch/main.bro → .../examples/basics/switches/switch/main.bro b/manager/static/examples/switch/main.bro → .../examples/basics/switches/switch/main.bro
diff --git a/...er/static/examples/switch/readme.markdown → ...es/basics/switches/switch/readme.markdown b/...er/static/examples/switch/readme.markdown → ...es/basics/switches/switch/readme.markdown
@@ -1,9 +1,7 @@
 title: The switch statement
 pcaps:
-pred: solution-script-exercise-1
-succ: switch-exercise
 
-Switch Statement
+The Switch Statement
 =====================
 
 Sometimes a switch statement is a more convenient way to organize code.

diff --git a/manager/static/examples/variables/main.bro → ...static/examples/basics/variables/main.bro b/manager/static/examples/variables/main.bro → ...static/examples/basics/variables/main.bro
diff --git a/...static/examples/variables/readme.markdown → ...examples/basics/variables/readme.markdown b/...static/examples/variables/readme.markdown → ...examples/basics/variables/readme.markdown
@@ -1,7 +1,5 @@
 title: Variables
 pcaps:
-pred: functions
-succ: primitive_datatypes 
 
 Variables
 ===========

diff --git a/manager/static/examples/congrats/readme.markdown b/manager/static/examples/congrats/readme.markdown
@@ -1,7 +1,5 @@
 title: Congrats
 pcaps:
-pred: intel
-succ: 
 
 Congratulations
 ==========================

diff --git a/manager/static/examples/dump-events.json b/manager/static/examples/dump-events.json
diff --git a/manager/static/examples/examples.json b/manager/static/examples/examples.json
diff --git a/manager/static/examples/hello.json b/manager/static/examples/hello.json
diff --git a/manager/static/examples/hello/readme.markdown b/manager/static/examples/hello/readme.markdown
@@ -1,14 +1,12 @@
 title: Hello World
 pcaps: 
-pred:
-succ: loading
 
-Hello
-=======
+Hello World
+============
 
 Welcome to our interactive Bro tutorial.
 
-Now click run and see the Bro magic happen. You may need to scroll
+Click run and see the Bro magic happen. You may need to scroll
 down a bit to get to the output.
 
 In this simple example you can see already a specialty of Bro, the "event". Bro is event-driven.
@@ -25,4 +23,11 @@ In this tutorial we will come back to events in the lesson about [complex data t
 
 Other than that, all this script does is sending warm greetings to new Bro users by printing to STDOUT.
 
+Try.bro allows you to hide the text if you want to script console to be full width. Find the button "hide" and give it a try.
+
+Every example can be run with a pcap file, you can select one below the script area. You can also
+upload your own pcap-examples. Select a pcap and click run again. Below the print-output you will find tabs
+with the familar log-file names. You can click on each row inside a log file and get more details. If Bro logs are not yet
+familiar to you please go to the documentation on [log files](https://www.bro.org/sphinx/script-reference/log-files.html).
+
 When you are ready you can just click on next below and start the next example.
diff --git a/manager/static/examples/index b/manager/static/examples/index
@@ -0,0 +1,8 @@
+hello
+basics
+modules
+logs
+new-notice
+sumstats
+intel
+congrats
diff --git a/manager/static/examples/intel.json b/manager/static/examples/intel.json
diff --git a/manager/static/examples/intel/index b/manager/static/examples/intel/index
@@ -0,0 +1 @@
+intel-1
diff --git a/manager/static/examples/intel/intel-1.dat → ...static/examples/intel/intel-1/intel-1.dat b/manager/static/examples/intel/intel-1.dat → ...static/examples/intel/intel-1/intel-1.dat
diff --git a/manager/static/examples/intel/main.bro → ...er/static/examples/intel/intel-1/main.bro b/manager/static/examples/intel/main.bro → ...er/static/examples/intel/intel-1/main.bro
diff --git a/...ger/static/examples/intel/readme.markdown → ...ic/examples/intel/intel-1/readme.markdown b/...ger/static/examples/intel/readme.markdown → ...ic/examples/intel/intel-1/readme.markdown
@@ -1,7 +1,5 @@
 title: Intel
 pcaps: http.pcap
-pred: sumstats3
-succ: congrats
 
 The Intel Framework
 ====================
@@ -28,9 +26,3 @@ all seen matches. As always the uid allows you to investigate further which conn
 It is also possible to raise notices based on intel data. To see how this works have a look at the 
 documentation mentioned above.
 
-
-
-
-
-This is about intel. and stuff.
-
diff --git a/manager/static/examples/loading/main.bro b/manager/static/examples/loading/main.bro
diff --git a/manager/static/examples/log.json b/manager/static/examples/log.json
diff --git a/manager/static/examples/log/main.bro b/manager/static/examples/log/main.bro
diff --git a/...static/examples/filter-logs/factorial.bro → ...c/examples/logs/filter-logs/factorial.bro b/...static/examples/filter-logs/factorial.bro → ...c/examples/logs/filter-logs/factorial.bro
diff --git a/manager/static/examples/filter-logs/main.bro → ...static/examples/logs/filter-logs/main.bro b/manager/static/examples/filter-logs/main.bro → ...static/examples/logs/filter-logs/main.bro
diff --git a/...atic/examples/filter-logs/readme.markdown → ...examples/logs/filter-logs/readme.markdown b/...atic/examples/filter-logs/readme.markdown → ...examples/logs/filter-logs/readme.markdown
diff --git a/manager/static/examples/logs/index b/manager/static/examples/logs/index
@@ -0,0 +1,2 @@
+filter-logs
+rename-logs
diff --git a/manager/static/examples/rename-logs/main.bro → ...static/examples/logs/rename-logs/main.bro b/manager/static/examples/rename-logs/main.bro → ...static/examples/logs/rename-logs/main.bro
diff --git a/...atic/examples/rename-logs/readme.markdown → ...examples/logs/rename-logs/readme.markdown b/...atic/examples/rename-logs/readme.markdown → ...examples/logs/rename-logs/readme.markdown
@@ -1,7 +1,5 @@
 title: Rename Logs
 pcaps: exercise_traffic.pcap
-pred: log-factorial
-succ: filter-logs
 
 Rename Logs
 =============

diff --git a/manager/static/examples/export/factorial.bro → ...tic/examples/modules/export/factorial.bro b/manager/static/examples/export/factorial.bro → ...tic/examples/modules/export/factorial.bro
diff --git a/manager/static/examples/export/main.bro → ...r/static/examples/modules/export/main.bro b/manager/static/examples/export/main.bro → ...r/static/examples/modules/export/main.bro
diff --git a/...er/static/examples/export/readme.markdown → ...c/examples/modules/export/readme.markdown b/...er/static/examples/export/readme.markdown → ...c/examples/modules/export/readme.markdown
@@ -1,7 +1,5 @@
-title: The Export Statement
+title: Writing a Module: Export
 pcaps: 
-pred: module
-succ: log-factorial 
 
 Writing a Module: Export
 =========================

diff --git a/manager/static/examples/modules/index b/manager/static/examples/modules/index
@@ -0,0 +1,3 @@
+module
+export
+log-factorial
diff --git a/...atic/examples/log-factorial/factorial.bro → ...mples/modules/log-factorial/factorial.bro b/...atic/examples/log-factorial/factorial.bro → ...mples/modules/log-factorial/factorial.bro
diff --git a/...er/static/examples/log-factorial/main.bro → ...c/examples/modules/log-factorial/main.bro b/...er/static/examples/log-factorial/main.bro → ...c/examples/modules/log-factorial/main.bro
diff --git a/...ic/examples/log-factorial/readme.markdown → ...les/modules/log-factorial/readme.markdown b/...ic/examples/log-factorial/readme.markdown → ...les/modules/log-factorial/readme.markdown
@@ -1,7 +1,5 @@
-title: Logging the Factorial
+title: Writing a Module: Logging
 pcaps: 
-pred: export
-succ: rename-logs 
 
 Writing a Module: Logging
 =========================

diff --git a/manager/static/examples/module/main.bro → ...r/static/examples/modules/module/main.bro b/manager/static/examples/module/main.bro → ...r/static/examples/modules/module/main.bro
diff --git a/...er/static/examples/module/readme.markdown → ...c/examples/modules/module/readme.markdown b/...er/static/examples/module/readme.markdown → ...c/examples/modules/module/readme.markdown
@@ -1,12 +1,9 @@
-title: Module
+title: Writing a Module
 pcaps: 
-pred: solution-script-exercise-2 
-succ: export 
 
 Writing a Module
 =====================
 
-In the next lessons of this tutorial you will learn how to write your own module step by step.
 A module in Bro is a semantic entity that defines a new name space.
 The work flow usually is that solving a problem results in a new module.
 A module can be a file or a bundle of files, a package. See below on this page.