From 05d0d88317692791f84780abd92e44999b7bb80d Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Mon, 24 Mar 2014 12:01:56 +0100 Subject: [PATCH] Update documentation. Refs #5846 --- doc/4.1-configuration-syntax.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/doc/4.1-configuration-syntax.md b/doc/4.1-configuration-syntax.md index cbdf913c7..56b6b5ff6 100644 --- a/doc/4.1-configuration-syntax.md +++ b/doc/4.1-configuration-syntax.md @@ -24,8 +24,8 @@ define objects the `object` keyword is used: Each object is uniquely identified by its type (`Host`) and name (`host1.example.org`). Objects can contain a comma-separated list of -property declarations. The following data types are available for -property values: +property declarations. Instead of commas semi-colons may also be used. +The following data types are available for property values: ### Expressions @@ -52,6 +52,9 @@ Example: Supported suffixes include ms (milliseconds), s (seconds), m (minutes), h (hours) and d (days). +Duration literals are converted to seconds by the config parser and +are treated like numeric literals. + #### String Literals A string. @@ -170,7 +173,7 @@ in | "foo" in [ "foo", "bar" ] (true) | Element contained in !in | "foo" !in [ "bar", "baz" ] (true) | Element not contained in array () | (3 + 3) * 5 | Groups sub-expressions -Constants may be used in constant expressions: +Constants may be used in expressions: const MyCheckInterval = 10m @@ -200,7 +203,7 @@ intersection(array, array, ...) | Returns an array containing all unique element string(value) | Converts the value to a string. number(value) | Converts the value to a number. bool(value) | Converts to value to a bool. -log(string) | Writes a message to the log. +log(value) | Writes a message to the log. Non-string values are converted to a JSON string. ### Dictionary Operators @@ -353,13 +356,11 @@ override its value by setting it explicitely to `null`. custom = null } - The same method applies for disabling services defined in the inline `services` dictionary by explicitly overriding their value with `null`. services["ping6"] = null - ### Constants Global constants can be set using the `const` keyword: -- 2.40.0