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

508 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Tom De Vylder
23a7a6075c Document $nrpe_purge_unmanaged parameter 
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:21 -08:00
Tom De Vylder
48d5bfb0ce Add previously unmanaged directory 
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:16 -08:00
Tom De Vylder
bda1a2089d Parametrize purging of unmanaged nrpe configs 
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:09 -08:00
Tom De Vylder
4c3c603350 Purge unmanaged files from nrpe.d 
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:32:47 -08:00
Ricardo Cropalato de Melo
18147f9dc2 * fixed conflict. 2014-11-13 12:09:50 -05:00
Nick Chappell
86b9acf090 CHANGELOG updates. 2014-11-12 21:12:22 -08:00
Ricardo Melo
eaa76e78a4 Fixed internal links. 
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/42/
 2014-11-12 20:58:39 -08:00
Ricardo Melo
fce7f11ff1 * fixed typo 2014-11-12 09:21:18 -05:00
Ricardo Melo
a21bc9f9f6 * removed empty lines. 2014-11-12 08:48:40 -05:00
Ricardo Melo
2dca509573 * removed duplication. 2014-11-12 08:47:26 -05:00
Ricardo Melo
7ed2bd5add Merge branch '7218' of https://github.com/cropalato/puppet-icinga2 into 7218 2014-11-12 08:38:06 -05:00
Ricardo Melo
5d71ca8e3b * fixed typo 2014-11-12 08:37:02 -05:00
Ricardo Melo
b126dd5686 + Added scheduleddowntime object. #7218 2014-11-12 08:37:02 -05:00
Steven Bambling
e7710c6d2d only check some params if the "default" erb template is used. Also allow for "static" templates and files to be set in pace of "default" erb 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7628: https://dev.icinga.org/issues/7628
 2014-11-11 21:47:23 -08:00
Steven Bambling
46298909ed adding ability to call a static checkcommand template 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7628: https://dev.icinga.org/issues/7628
 2014-11-11 21:47:08 -08:00
Steven Bambling
6e5dd00438 missed removing timeperiod_ from a validate entry 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7217: https://dev.icinga.org/issues/7217
 2014-11-11 21:23:13 -08:00
Steven Bambling
82c1930974 fixing readme to remove timeperiod_ for ranges param 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7217: https://dev.icinga.org/issues/7217
 2014-11-11 21:23:06 -08:00
Steven Bambling
4e5c31b955 removeing timeperiod_ reference from params from template 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7217: https://dev.icinga.org/issues/7217
 2014-11-11 21:23:01 -08:00
Steven Bambling
e4ec0c03a8 removing timeperiod_ from non specifc params 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7217: https://dev.icinga.org/issues/7217
 2014-11-11 21:22:54 -08:00
Steven Bambling
9180f9a17e removing timeperiod_ from target/dir/file and mode 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7217: https://dev.icinga.org/issues/7217
 2014-11-11 21:22:48 -08:00
Steven Bambling
2059489c11 fixing param specific names for timeperiod in readme 
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7217: https://dev.icinga.org/issues/7217
 2014-11-11 21:22:39 -08:00