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

533 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Nick Chappell
4f2b4370c6 Fixed merge conflicts in README. 2014-11-16 21:03:35 -08:00
ricardo@cropalato.com.br
14925ea9ef Merge remote-tracking branch 'upstream/master' into 7224 2014-11-16 09:23:55 -05:00
ricardo@cropalato.com.br
519f16568e Merge remote-tracking branch 'upstream/master' into 7222 2014-11-14 10:09:45 -05:00
ricardo@cropalato.com.br
e168266b21 Merge branch '7223' of https://github.com/cropalato/puppet-icinga2 into 7223 2014-11-14 08:57:59 -05:00
Ricardo Cropalato de Melo
9494c55bb7 Adding StatusDataWriter object. #7223 2014-11-14 08:38:44 -05:00
Nick Chappell
31f467babd CHANGELOG updates. 2014-11-13 22:21:52 -08:00
Ricardo Cropalato de Melo
1047213430 * fixed typo 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7220: https://dev.icinga.org/issues/7220
 2014-11-13 22:02:13 -08:00
Ricardo Cropalato de Melo
5b289000e2 Adding PerfdataWriter object. #7220 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7220: https://dev.icinga.org/issues/7220
 2014-11-13 22:02:03 -08:00
Steven Bambling
21b374923f cleaning up readme 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7676: https://dev.icinga.org/issues/7676
 2014-11-13 21:53:54 -08:00
Steven Bambling
afe86ed648 adding readme section for new define 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7676: https://dev.icinga.org/issues/7676
 2014-11-13 21:50:38 -08:00
Steven Bambling
4b269e4b25 adding erb template for use with adding notifications to host define 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7676: https://dev.icinga.org/issues/7676
 2014-11-13 21:50:33 -08:00
Steven Bambling
ade087a21b adding define to apply notifications to hosts 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7676: https://dev.icinga.org/issues/7676
 2014-11-13 21:50:23 -08:00
Nick Chappell
6f006a3820 Added some contributors to the AUTHORs file. 2014-11-13 21:43:19 -08:00
Nick Chappell
b03908116a CHANGELOG update for PR-40: https://github.com/Icinga/puppet-icinga2/pull/40 2014-11-13 21:37:21 -08:00
Josh Holland
5f1e23e00d Escape backslash 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7675: https://dev.icinga.org/issues/7675
 2014-11-13 21:34:49 -08:00
Josh Holland
f74aab291b Further fix the quoting of PostgreSQL password 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7675: https://dev.icinga.org/issues/7675
 2014-11-13 21:34:44 -08:00
Josh Holland
27988d88dc Quote PostgreSQL database password properly 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7675: https://dev.icinga.org/issues/7675
 2014-11-13 21:34:29 -08:00
Nick Chappell
71d9b1beb2 CHANGELOG updates for PR-41: https://github.com/Icinga/puppet-icinga2/pull/41 2014-11-13 21:16:17 -08:00
Devon Mizelle
7242b7b07c more readme warnings about centos 5 requirements 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7674: https://dev.icinga.org/issues/7674
 2014-11-13 21:12:40 -08:00
Devon Mizelle
b139f775a6 adding specific pgsql instructions for centos5 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7674: https://dev.icinga.org/issues/7674
 2014-11-13 21:12:33 -08:00
Devon Mizelle
bf5440fb3e more README puppet DSL fixing 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7674: https://dev.icinga.org/issues/7674
 2014-11-13 21:12:25 -08:00
Devon Mizelle
fb9e17f7b8 fixing some missing commas in the Server usage example puppet DSL 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7674: https://dev.icinga.org/issues/7674
 2014-11-13 21:12:20 -08:00
Devon Mizelle
a5ae5b49ef forgot a line to define service name for centos5 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7674: https://dev.icinga.org/issues/7674
 2014-11-13 21:12:10 -08:00
Devon Mizelle
08324d46bd noting centos5 support in metadata.json 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7674: https://dev.icinga.org/issues/7674
 2014-11-13 21:12:03 -08:00
Devon Mizelle
36f9104c3b adding CentOS 5 information to README.md 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7674: https://dev.icinga.org/issues/7674
 2014-11-13 21:11:57 -08:00
Devon Mizelle
6377816ff8 well, looks like we have to provide server support for centos5 anywayss 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7674: https://dev.icinga.org/issues/7674
 2014-11-13 21:11:49 -08:00
Devon Mizelle
40228fddb5 add CentOS5 client package support 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7674: https://dev.icinga.org/issues/7674
 2014-11-13 21:11:38 -08:00
Nick Chappell
33939a7137 CHANGELOG updates. 2014-11-13 21:03:45 -08:00
Tom De Vylder
f48d22d309 Add nrpe_purge_unmanaged parameter to nrpe class 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7673: https://dev.icinga.org/issues/7673
 2014-11-13 20:33:27 -08:00