Commit graph

146 commits

Author SHA1 Message Date
Nick Chappell
221db2b331 Squashed commit of the following:
commit 11075072f476dd857d190d26cdb1091e2a8cb6f4
Merge: ca583a8 8e24b03
Author: Nick Chappell <nick@intronic.org>
Date:   Thu Jan 29 21:20:21 2015 -0800

    Merge branch 'fix_apply_service_to_host_period' of https://github.com/arioch/puppet-icinga2 into arioch-fix_apply_service_to_host_period

commit 8e24b03958c50a36a8ceaab2ce89b8876d89f6ed
Author: Tom De Vylder <tom@penumbra.be>
Date:   Wed Jan 28 14:28:10 2015 +0100

    Fix undefined script variable error
2015-01-29 21:46:02 -08:00
Nick Chappell
ca583a8a82 Add an @ to the severity variable so that the template doesn't break in future versions of Puppet. 2015-01-25 20:02:58 -08:00
Nick Chappell
232d8bea75 Merged in from: https://github.com/Icinga/puppet-icinga2/pull/59
Squashed commit of the following:

commit 3485ced372df47d22c5495f188746a767448b301
Merge: 9ddb696 cd0cd09
Author: Nick Chappell <nick@intronic.org>
Date:   Sat Jan 24 21:05:50 2015 -0800

    Merge branch '7227' of https://github.com/cropalato/puppet-icinga2 into cropalato-7227

commit cd0cd09733c0881e62b57cef871fa7898e47c186
Author: Ricardo Melo <ricardo.melo@gameloft.com>
Date:   Tue Dec 2 15:09:49 2014 -0500

    * fixed default parameter value

commit 1a01e8f68dd8ac2f6bbf8ffa040673d97bec9280
Author: ricardo@cropalato.com.br <ricardo@cropalato.com.br>
Date:   Tue Nov 25 18:01:18 2014 -0500

    * fixed typo.

commit e23aafc87877617ee1faba1b9d4b4c595d84ae8e
Author: ricardo@cropalato.com.br <ricardo@cropalato.com.br>
Date:   Tue Nov 25 17:44:58 2014 -0500

    Adding CheckerComponent Object. #7227
2015-01-24 21:11:45 -08:00
Nick Chappell
0a9dd7dff3 Squashed commit of the following:
commit d0bbdbd2011b4941150d3aff00306e7b7cc15b02
Merge: 65c7422 e12b55c
Author: Nick Chappell <nick@intronic.org>
Date:   Sat Jan 24 20:25:50 2015 -0800

    Merge branch '7228' of https://github.com/cropalato/puppet-icinga2 into cropalato-7228

commit e12b55cf8c2ca266572d809a540ce9064e3d97b2
Merge: 58b2cd8 ad3b05d
Author: Ricardo Melo <ricardo.melo@gameloft.com>
Date:   Mon Jan 12 11:42:58 2015 -0500

    Merge branch '7228' of https://github.com/cropalato/puppet-icinga2 into 7228

commit 58b2cd8f2dc4a06b1450bb246c83d484b29903b9
Author: ricardo@cropalato.com.br <ricardo@cropalato.com.br>
Date:   Tue Nov 25 18:22:51 2014 -0500

    Added enable_ha parameter.

    * fixed default parameter value

    Fix the exec resource commands so they use the new commands in 2.2 to enable/disable features instead of the old ones from 2.1 and before.

    refs#7714 : https://dev.icinga.org/issues/7714

    Fixed a bug where features were not actually being enabled/disabled because the order of the words in the subcommands was wrong.

    refs#7916 : https://dev.icinga.org/issues/7916

    Added refresh_icinga2_service parameters to each of the object defined types so that they can be used by themselves if the module isn't being used to also manage the Icinga 2 service.

    refs# 7856 : https://dev.icinga.org/issues/7856

    CHANGELOG update for https://dev.icinga.org/issues/7856

    refs #7856 : https://dev.icinga.org/issues/7856

    Added a README note about the refresh_icinga2_service parameter.

    refs#7856 : https://dev.icinga.org/issues/7856

    CHANGELOG release version date.

    Added refresh_icinga2_service parameters to each of the object defined types so that they can be used by themselves if the module isn't being used to also manage the Icinga 2 service.

    refs# 7856 : https://dev.icinga.org/issues/7856

    CHANGELOG update for https://dev.icinga.org/issues/7856

    refs #7856 : https://dev.icinga.org/issues/7856

    Added a README note about the refresh_icinga2_service parameter.

    refs#7856 : https://dev.icinga.org/issues/7856

    CHANGELOG release version date.

    Update object_host.conf.erb

    Added routine for cases where the value of a vars variable is a hash.

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

    refs#8156: https://dev.icinga.org/issues/8156

    Changelog update.

    refs#8156: https://dev.icinga.org/issues/8156

    Removed an extra .each line.

    Adding EndPoint Object. #7232

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

    refs#7232: https://dev.icinga.org/issues/7232

    * fixed typo

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

    refs#7232: https://dev.icinga.org/issues/7232

    * fixed typo

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

    refs#7232: https://dev.icinga.org/issues/7232

    * fixed default parameter value

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

    refs#7232: https://dev.icinga.org/issues/7232

    Fixed a typo in the ERB template for the Endpoint object. 'Endpoint' should only have a capital E, not a capital P.

    Fixed typo in file path.

    Changelog update.

    Adding IcingaStatusWriter object. #7230

    * fixed typo

    Changelog update.

    Adding FileLogger object. #7229.

    * fixed default parameter value

    Changelog update.

    typo.

    updating validation of interval to allow resending of alerts to be disabled

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

    refs#8153: https://dev.icinga.org/issues/8153

    fixing typo in interval name in templates

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

    refs#8153: https://dev.icinga.org/issues/8153

    Adding IcingaStatusWriter object. #7230

    * fixed typo

    Changelog update.

    Adding FileLogger object. #7229.

    * fixed default parameter value

    typo.

    Changelog update.

    Adding support for RedHat

    Changelog update.

    Updated metadata.json to reflect that Red Hat is supported.

    Updated the version number in metadata.json to reflect the current version.

    Typo.

    Added a Gemfile that has gems listed for basic Puppet unit tests.

    Added a .gitignore rule.

    Added a Rake file with a unit_tests task that runs the lint task.

    Added some config options for puppet-lint.

    Added an ApiListener object defined type.

    refs#7231 : https://dev.icinga.org/issues/7231

    Changelog update.

    Fixed typo in README.md

    Add a target_file_ensure parameter to the ApiListener object defined type.

    Added a full variable scope.

    Fix C/C++ style comments so they use # instead.

    Use 2 spaces instead of a tab character.

    Removed a trailing space.

    Removed trailing whitespace.

    Fixed whitespace alignment in the icinga2::server::config class.

    Fixed whitespace alignment in the icinga2::server::install class.

    Disable puppet-lint variable scope checks.

    Disable puppet-lint class autoloader layout checks.

    Fixing target_dir defult value.

commit ad3b05dd39bba6b5f82211cccbb0aca209bd777e
Author: Ricardo Melo <ricardo.melo@gameloft.com>
Date:   Mon Jan 12 11:25:57 2015 -0500

    Fixing target_dir defult value.

commit 0cdb176f6920dde33b91207ac3ecb0457de7fb08
Merge: 88b3fb1 f238155
Author: Ricardo Melo <ricardo.melo@gameloft.com>
Date:   Mon Jan 12 11:19:57 2015 -0500

    Merge remote-tracking branch 'upstream/develop' into 7228

commit 88b3fb1e3ed4d5d7a2c98b0e43e10ee4e1dbc1b2
Author: Ricardo Melo <ricardo.melo@gameloft.com>
Date:   Tue Dec 2 15:14:21 2014 -0500

    * fixed default parameter value

commit d369b81f8472c5931b8a073cc26518bf1ecb84a4
Author: ricardo@cropalato.com.br <ricardo@cropalato.com.br>
Date:   Tue Nov 25 18:22:51 2014 -0500

    Added enable_ha parameter.

commit 6bf34cb4af2322020c7553016af17b84effd6dc3
Author: ricardo@cropalato.com.br <ricardo@cropalato.com.br>
Date:   Tue Nov 25 18:07:52 2014 -0500

    Adding NotificationComponent Object. #7228.
2015-01-24 20:45:09 -08:00
Alexandre Beche
b5b8ecadd3 Fixing interval typo in object_notification.conf.erb
Signed-off-by: Alexandre Beche <alexandre.beche@gmail.com>
2015-01-15 14:28:15 +01:00
Alexandre Beche
05f479d4f8 Fixing hash ordering in erb templates
Signed-off-by: Alexandre Beche <alexandre.beche@gmail.com>
2015-01-13 16:35:31 +01:00
Nick Chappell
a807ffe90a Added an ApiListener object defined type.
refs#7231 : https://dev.icinga.org/issues/7231
2015-01-06 22:44:48 -08:00
Steven Bambling
b4797124b1 fixing typo in interval name in templates
Merged from: https://github.com/Icinga/puppet-icinga2/pull/70

refs#8153: https://dev.icinga.org/issues/8153
2015-01-04 17:54:31 -08:00
ricardo@cropalato.com.br
9ed54ac1c4 Adding FileLogger object. #7229. 2015-01-04 17:54:14 -08:00
ricardo@cropalato.com.br
38d1ac911a Adding IcingaStatusWriter object. #7230 2015-01-04 17:54:14 -08:00
Nick Chappell
a429a76527 Fixed a typo in the ERB template for the Endpoint object. 'Endpoint' should only have a capital E, not a capital P. 2015-01-04 15:28:34 -08:00
ricardo@cropalato.com.br
6646b3b392 Adding EndPoint Object. #7232
Merged from: https://github.com/Icinga/puppet-icinga2/pull/63

refs#7232: https://dev.icinga.org/issues/7232
2015-01-04 15:27:52 -08:00
Nick Chappell
ce3bd25fe9 Removed an extra .each line. 2015-01-03 22:29:30 -08:00
Nicolas Bigler
cab5245c14 Update object_host.conf.erb
Added routine for cases where the value of a vars variable is a hash.

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

refs#8156: https://dev.icinga.org/issues/8156
2015-01-03 21:36:25 -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
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
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
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
3493c739d0 Merge branch 'cropalato-7222' 2014-11-17 21:26:35 -08:00
Nick Chappell
96ddda697b Merge branch 'cropalato-7223' 2014-11-17 21:20:06 -08: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
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
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 de Melo
9494c55bb7 Adding StatusDataWriter object. #7223 2014-11-14 08:38:44 -05: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
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
Ricardo Cropalato de Melo
40185dc565 Adding ExternalCommandListener object. 2014-11-13 15:14:39 -05:00
Ricardo Cropalato de Melo
d34c8a6274 fixed typo 2014-11-13 14:56:59 -05:00
Ricardo Cropalato de Melo
382bb05b5f + Added Livestatus Listener object. #7222 2014-11-13 13:06:47 -05:00
Ricardo Melo
b126dd5686 + Added scheduleddowntime object. #7218 2014-11-12 08:37:02 -05: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
ae65c9766b updating erb to use timeperiod methods
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:00 -08:00
Steven Bambling
a8eb0b841b fixing typo in import and extra >
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:20:59 -08:00
Steven Bambling
12bd1a9f44 adding define and template to generate timeperiods
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:20:42 -08:00
Ricardo Melo
09db5bba18 Adding notification object. #2716
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7216: https://dev.icinga.org/issues/7216
2014-11-11 21:10:37 -08:00
Ricardo Melo
4dfe6fa664 added default value to arguments, env and vars and moved check to the template.
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7215: https://dev.icinga.org/issues/7215
2014-11-01 21:39:10 -07:00
Ricardo Melo
6af3b7b9ae * fixed typos, changed default values and changed parameters validation.
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7215: https://dev.icinga.org/issues/7215
2014-11-01 21:39:10 -07:00
Ricardo Melo
f9a4feb746 Add a EventCommand object defined type, refs#7215
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7215: https://dev.icinga.org/issues/7215
2014-11-01 21:38:59 -07:00
Ricardo Melo
d55c055682 added default value to arguments, env and vars and moved check to the template.
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7228: https://dev.icinga.org/issues/7228
2014-11-01 21:19:06 -07:00
Ricardo Melo
537735a486 * fixed typos and mistakes. thanks nickchappell.
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7228: https://dev.icinga.org/issues/7228
2014-11-01 21:18:43 -07:00
Ricardo Melo
f0415a6c5a + Adding notificationcommand object
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7228: https://dev.icinga.org/issues/7228
2014-11-01 21:17:16 -07:00
Ricardo Melo
f1b88abebf * fixed #7213
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged in from Github PR29: https://github.com/Icinga/puppet-icinga2/pull/29

refs#7213: https://dev.icinga.org/issues/7213
2014-10-18 19:42:08 -07:00
Nick Chappell
7d9525bdd5 Whitespace cleanup. 2014-10-14 22:00:29 -07:00
Nick Chappell
b6271837e3 Fix little typos. 2014-10-14 21:59:09 -07:00
Melanie Gault
80c87b0ad1 add dependency and apply dependency objects
Signed-off-by: Nick Chappell <nick@intronic.org>

Icinga refs#7219: https://dev.icinga.org/issues/7219
2014-10-14 21:52:18 -07:00