Skip to content

Commit

Permalink
Remove duplicate target parameter section in icinga2::object::timeper…
Browse files Browse the repository at this point in the history
…iod documentation.

Also, there is no "update" parameter on timeperiod objects.
  • Loading branch information
kwisatz committed Nov 27, 2016
1 parent ae60306 commit 851bee4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 20 deletions.
16 changes: 6 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -336,11 +336,11 @@ Strings are parsed in chunks, by splitting the original string into separate sub
such as `+`, `-`, `in`, `&&`, `||`, etc.

**NOTICE**: This splitting only works for keywords that are surrounded by whitespace, e.g.:
```
```
attr => 'string1 + string2 - string3'
```

The algorithm will loop over the parameter and start by splitting it into 'string1' and 'string2 - string3'.
The algorithm will loop over the parameter and start by splitting it into 'string1' and 'string2 - string3'.
'string1' will be passed to the sub function 'value_types' and then the algorithm will continue parsing the rest of the
string ('string2 - string3'), splitting it, passing it to value_types, etc.

Expand Down Expand Up @@ -419,7 +419,7 @@ icinga2::object::notification { 'testnotification':
ignore => [ 'host.vars.os == Windows' ],
user_groups => ['icingaadmins']
}
```
```

Assign all Linux hosts to a hostgroup:
``` puppet
Expand Down Expand Up @@ -1363,9 +1363,8 @@ Set to present enables the endpoint object, absent disabled it. Defaults to `pre
##### `display_name`
A short description of the time period.

##### `update`
The "update" script method takes care of updating the internal representation of the time period. In virtually all cases
you should import the "legacy-timeperiod" template to take care of this setting.
##### `import`
Sorted List of templates to include. Defaults to [ "legacy-timeperiod" ].

##### `ranges`
A dictionary containing information which days and durations apply to this timeperiod.
Expand All @@ -1383,10 +1382,7 @@ An array of timeperiods, which should include into your timerange
Set to true creates a template instead of an object. Defaults to `false`

##### `target`
Destination config file to store in this object. File will be declared the first time.

##### `target`
Destination config file to store in this object. File will be declared at the first time.
Destination config file to store this object in. File will be declared on the first run.

##### `order`
String to control the position in the target file, sorted alpha numeric.
Expand Down
13 changes: 3 additions & 10 deletions manifests/object/timeperiod.pp
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@
# [*display_name*]
# A short description of the time period.
#
# [*update*]
# The "update" script method takes care of updating the internal
# representation of the time period. In virtually all cases you should import
# the "legacy-timeperiod" template to take care of this setting.
# [*import*]
# Sorted List of templates to include. Defaults to [ "legacy-timeperiod" ].
#
# [*ranges*]
# A dictionary containing information which days and durations apply to this
Expand All @@ -32,12 +30,7 @@
# Set to true creates a template instead of an object. Defaults to false.
#
# [*target*]
# Destination config file to store in this object. File will be declared the
# first time.
#
# [*target*]
# Destination config file to store in this object. File will be declared at the
# first time.
# Destination config file to store this object in. File will be declared on the first run.
#
# [*order*]
# String to control the position in the target file, sorted alpha numeric.
Expand Down

0 comments on commit 851bee4

Please sign in to comment.