opuppet/module-icinga2
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
612 commits 2 branches 0 tags 556 KiB
Commit graph

612 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Chappell
17d230eb2b Added a parameter that controls whether non-Puppet managed object files get purged. 2014-11-21 21:49:26 -08:00
Nick Chappell
13e1100d0c Fix the target_file_dir parameters so they're consistent with the other object defined types. 2014-11-21 21:24:05 -08:00
Nick Chappell
1f92973f8c Fix the in-manifest links to the docs pages for some of the object types. 2014-11-21 21:20:48 -08:00
Nick Chappell
c4152dd507 CHANGELOG update. 2014-11-21 21:17:23 -08:00
Nick Chappell
be3da5f07c Merge branch 'feature/checkresultreader_object-7226' into develop 
Merged from: https://github.com/Icinga/puppet-icinga2/pull/55

refs# 7226: https://dev.icinga.org/issues/7226
 2014-11-21 21:15:21 -08:00
Nick Chappell
c10da22594 Merge branch '7226' of github.com:cropalato/puppet-icinga2 into feature/checkresultreader_object-7226 
Adds a CheckResultReader object

Merged from: https://github.com/Icinga/puppet-icinga2/pull/55

refs# 7226: https://dev.icinga.org/issues/7226
 2014-11-21 21:14:02 -08:00
Nick Chappell
429bbdd6bd Merge branch 'feature/compatlogger_object-7225' into develop 
Merged from this PR: https://github.com/Icinga/puppet-icinga2/pull/54

refs# 7225: https://dev.icinga.org/issues/7225
 2014-11-21 21:04:06 -08:00
Nick Chappell
14b58cd739 CHANGELOG update. 2014-11-21 21:03:16 -08:00
ricardo@cropalato.com.br
b15b7fbaaa Adding CompatLogger object. #7225. 
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/54

refs#7225: https://dev.icinga.org/issues/7225
 2014-11-21 21:00:26 -08:00
ricardo@cropalato.com.br
cb88b96207 Adding CheckResultReader object. #7226. 2014-11-20 19:09:25 -05:00
Nick Chappell
41e4072c75 Changed the recommended branch to base pull requests off of. 2014-11-19 22:57:49 -08:00
Nick Chappell
b8fa7d3435 CHANGELOG update for v0.6.0. 2014-11-19 22:47:42 -08:00
Nick Chappell
bf1e6a8aac Added the target_file_ensure to the list of parameters that's mentioned as settable; also added it to the usage example below. 2014-11-19 21:47:05 -08:00
Nick Chappell
c77dbb0080 Typos. 2014-11-19 21:39:22 -08:00
Nick Chappell
fd1d9f1cd9 Refactored the enable/disable feature section. 2014-11-19 21:36:22 -08:00
Nick Chappell
6f95005202 Use the parameter names in the sentence for more clarity. 2014-11-19 21:19:45 -08:00
Nick Chappell
480015e1d5 Say what kind of notifications Icinga 2 needs a mail binary for. 2014-11-19 21:18:03 -08:00
Nick Chappell
b608a91c58 Reword a sentence. 2014-11-19 21:17:33 -08:00
Nick Chappell
6ad8e09489 Say what kind of schema is being loaded. 2014-11-19 21:15:25 -08:00
Nick Chappell
72d9ed9198 Fixed an incomplete sentence. 2014-11-19 21:14:46 -08:00
Nick Chappell
bfe9b10655 CHANGELOG update. 2014-11-18 22:32:53 -08:00
Nick Chappell
5063f6cceb Merge branch 'fix/7715/template_whitespace_fix' 
refs#7715: https://dev.icinga.org/issues/7715
 2014-11-18 22:30:57 -08:00
Nick Chappell
e9a566df3f CHANGELOG update. 2014-11-18 22:30:47 -08:00
Nick Chappell
633e4faef9 Use %> instead of -%> at the end of some ERB tags so that trailing whitespace isn't surpressed. Surpressing the trailing whitespace caused problems where there was one more parameters listed after each other. Each parameter would get squashed onto a single line, causing a syntax error when Icinga2 parsed the object file. 
refs#7715: https://dev.icinga.org/issues/7715
 2014-11-18 22:16:42 -08:00
Nick Chappell
299005edf4 CHANGELOG updates. 2014-11-18 22:09:43 -08:00
Nick Chappell
72a2d22f67 Merge branch 'feature/7716/ensureable_object_params' 
refs#7716: https://dev.icinga.org/issues/7716
 2014-11-18 21:57:44 -08:00
Nick Chappell
a00eecec25 Add a target_file_ensure parameter to each object type and pass it through to the underlying file resource. The parameter default values are 'file', but having the ensure => parameter of the underlying file type be settable by the user lets people do things like setting target_file_ensure to absent so that they can remove object files via Puppet (instead of manually). 
refs#7716 : https://dev.icinga.org/issues/7716
 2014-11-18 21:55:48 -08:00
Nick Chappell
b16a94ef5f Merge branch 'fix/7712-flap-detection-param-rename' 2014-11-17 21:39:18 -08:00
Nick Chappell
6234216847 Change instances of 'enable_flap_detection' to 'enable_flapping'. This is a result of https://dev.icinga.org/issues/6870, which fixed the incorrect parameter name being used in the documentation. 
refs# 7712 : https://dev.icinga.org/issues/7712
 2014-11-17 21:37:06 -08:00
Nick Chappell
5cd1e2e53c Correct variable name mismatches. 2014-11-17 21:29:20 -08:00
Nick Chappell
3493c739d0 Merge branch 'cropalato-7222' 2014-11-17 21:26:35 -08:00
Nick Chappell
76621792f0 Merge branch '7222' of github.com:cropalato/puppet-icinga2 into cropalato-7222 2014-11-17 21:23:12 -08:00
Nick Chappell
96ddda697b Merge branch 'cropalato-7223' 2014-11-17 21:20:06 -08:00
Nick Chappell
4e8b0d16e4 Merge branch '7223' of github.com:cropalato/puppet-icinga2 into cropalato-7223 2014-11-17 21:13:25 -08:00
Nick Chappell
46cc1d1168 Merge branch 'cropalato-7224' 
Merged in from: https://github.com/Icinga/puppet-icinga2/pull/50
 2014-11-17 21:11:41 -08:00
Nick Chappell
2eef9836b9 Merge branch '7224' of github.com:cropalato/puppet-icinga2 into cropalato-7224 2014-11-17 21:08:25 -08:00
ricardo@cropalato.com.br
58edf35726 Merge remote-tracking branch 'upstream/master' into 7222 2014-11-17 06:25:50 -05:00
ricardo@cropalato.com.br
e31c1464de Merge remote-tracking branch 'upstream/master' into 7223 2014-11-17 06:25:22 -05:00
ricardo@cropalato.com.br
dd6cc24543 Merge remote-tracking branch 'upstream/master' into 7224 2014-11-17 06:23:52 -05:00
ricardo@cropalato.com.br
4cb5d19265 Fixed typo 2014-11-17 06:21:39 -05:00
ricardo@cropalato.com.br
ffba0ae38d Fixed typo 2014-11-17 06:17:31 -05:00
ricardo@cropalato.com.br
409be02191 Fixed typo 2014-11-17 06:14:41 -05:00
Nick Chappell
e1f961b474 Merge branch '7224' of github.com:cropalato/puppet-icinga2 into cropalato-7224 2014-11-16 21:52:22 -08:00
Nick Chappell
61b8e44466 Merge branch '7223' of github.com:cropalato/puppet-icinga2 into cropalato-7223 2014-11-16 21:45:05 -08:00
Nick Chappell
893956ded8 Merge branch '7222' of github.com:cropalato/puppet-icinga2 into cropalato-7222 2014-11-16 21:41:32 -08:00
Steven Bambling
e581fd6b6e fixing issue with README example 
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged this from: https://github.com/Icinga/puppet-icinga2/pull/44

refs#7677: https://dev.icinga.org/issues/7677
 2014-11-16 21:37:04 -08:00
Steven Bambling
1c6637252e correctly merge conflicts 
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged this from: https://github.com/Icinga/puppet-icinga2/pull/44

refs#7677: https://dev.icinga.org/issues/7677
 2014-11-16 21:36:58 -08:00
Steven Bambling
ca1f1bbcc8 adding erb template for use with apply_notification_to_service define 
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged this from: https://github.com/Icinga/puppet-icinga2/pull/44

refs#7677: https://dev.icinga.org/issues/7677
 2014-11-16 21:36:52 -08:00
Steven Bambling
9995a40747 adding defined type to apply notifiation to service 
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged this from: https://github.com/Icinga/puppet-icinga2/pull/44

refs#7677: https://dev.icinga.org/issues/7677
 2014-11-16 21:36:37 -08:00
Nick Chappell
89b2ad2931 Merge branch 'cropalato-7218' 
Merging branch for this pull request: https://github.com/Icinga/puppet-icinga2/pull/38

Since there were merge conflicts in the README that `git apply` and the `patch` command couldn't handle, I pulled the PR's code to a local branch and fixed them locally. I'm just merging that branch back into master.

refs#7218: https://dev.icinga.org/issues/7218
 2014-11-16 21:07:18 -08:00