Merge branch '2.1' into develop

Documentation/Filters/Database-Firewall-Filter.md

@@ -134,13 +134,29 @@ apply multiple mandatory rules to a query.
 
 #### `wildcard`
 
-This rule blocks all queries that use the wildcard character *.
+This rule blocks all queries that use the wildcard character `*`.
+
+##### Example
+
+Use of the wildcard is not allowed:
+
+```
+rule examplerule deny wildcard
+```
 
 #### `columns`
 
 This rule expects a list of values after the `columns` keyword. These values are
 interpreted as column names and if a query targets any of these, it is matched.
 
+##### Example
+
+Deny name and salary columns:
+
+```
+rule examplerule deny columns name salary
+```
+
 #### `function`
 
 This rule expects a list of values after the `function` keyword. These values
@@ -149,6 +165,14 @@ matched. The symbolic comparison operators (`<`, `>`, `>=` etc.) are also
 considered functions whereas the text versions (`NOT`, `IS`, `IS NOT` etc.) are
 not considered functions.
 
+##### Example
+
+Deny SUM and COUNT functions:
+
+```
+rule examplerule deny function sum count
+```
+
 #### `regex`
 
 This rule blocks all queries matching a regex enclosed in single or double
@@ -156,15 +180,31 @@ quotes.  The regex string expects a PCRE2 syntax regular expression. For more
 information about the PCRE2 syntax, read the [PCRE2
 documentation](http://www.pcre.org/current/doc/html/pcre2syntax.html).
 
+##### Example
+
+Block selects to accounts:
+
+```
+rule examplerule deny regex '.*select.*from.*accounts.*'
+```
+
 #### `limit_queries`
 
 The limit_queries rule expects three parameters. The first parameter is the
 number of allowed queries during the time period. The second is the time period
-in seconds and the third is the amount of time for which the rule is considered
-active and blocking.
+in seconds and the third is the amount of time in seconds for which the rule is
+considered active and blocking.
 
 **WARNING:** Using `limit_queries` in `action=allow` is not supported.
 
+##### Example
+
+Over 50 queries within a window of 5 seconds will block for 100 seconds:
+
+```
+rule examplerule deny limit_queries 50 5 100
+```
+
 #### `no_where_clause`
 
 This rule inspects the query and blocks it if it has no WHERE clause. For
@@ -172,6 +212,14 @@ example, this would disallow a `DELETE FROM ...` query without a `WHERE`
 clause. This does not prevent wrongful usage of the `WHERE` clause e.g. `DELETE
 FROM ... WHERE 1=1`.
 
+##### Example
+
+Queries must have a where clause:
+
+```
+rule examplerule deny no_where_clause
+```
+
 ### Optional rule parameters
 
 Each mandatory rule accepts one or more optional parameters. These are to be

Documentation/Filters/Luafilter.md

@@ -49,7 +49,7 @@ The entry points for the Lua script expect the following signatures:
     - The `closeSession` function in the Lua scripts will be called.
 
   - `(nil | bool | string) routeQuery(string)` - query is being routed
-  
+
     - The Luafilter calls the `routeQuery` functions of both the session and the
       global script.  The query is passed as a string parameter to the
       routeQuery Lua function and the return values of the session specific

Documentation/Filters/RabbitMQ-Consumer-Client.md

@@ -67,7 +67,7 @@ configured into the separate `consumer.cnf` file.
 | user		| Username for the RabbitMQ server             |
 | passwd	| Password for the RabbitMQ server             |
 | queue		| Queue to consume from                        |
-| dbserver	| Hostname of the SQL server                   | 
+| dbserver	| Hostname of the SQL server                   |
 | dbport	| Port of the SQL server                       |
 | dbname	| Name of the SQL database to use              |
 | dbuser	| Database username                            |

Documentation/Filters/Regex-Filter.md

@@ -30,7 +30,7 @@ filters=MyRegexfilter
 
 ## Filter Options
 
-The Regex filter accepts the options ignorecase or case. These define if the pattern text should take the case of the string it is matching against into consideration or not. 
+The Regex filter accepts the options ignorecase or case. These define if the pattern text should take the case of the string it is matching against into consideration or not.
 
 ## Filter Parameters
 

Documentation/Filters/Top-N-Filter.md

@@ -210,6 +210,6 @@ Average statement execution time     1.488 seconds
 
 Total connection time               46.500 seconds
 
--bash-4.1$ 
+-bash-4.1$
 
 ```