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

142 commits

Author SHA1 Message Date
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
Melanie Gault
54812010e0 assign where / ignore where : icinga2 do not start if there are multiple conditions 
Signed-off-by: Melanie Gault <melanie.gault@ville-noumea.nc>
Signed-off-by: Nick Chappell <nick@intronic.org>

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

refs#7308: https://dev.icinga.org/issues/7308
 2014-10-10 22:23:50 -07:00
Steven Bambling
2e8770f9cb feature to create/add graphitewriter configurtion 
Signed-off-by: Nick Chappell <nick@intronic.org>

Taken from: https://github.com/Icinga/puppet-icinga2/pull/24
 2014-10-02 21:02:01 -07:00
Steven Bambling
6efc2931cd fixing missing parameter name 
Signed-off-by: Nick Chappell <nick@intronic.org>

Taken from: https://github.com/Icinga/puppet-icinga2/pull/22
 2014-10-02 20:35:43 -07:00
Steven Bambling
c410696090 adding ability to enable command argument processing via nrpe client 
Signed-off-by: Nick Chappell <nick@intronic.org>

Taken from: https://github.com/Icinga/puppet-icinga2/pull/22
 2014-10-02 20:35:13 -07:00