Commit Graph

253 Commits

Author SHA1 Message Date
12ww1160
070dc41e42 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !52
2017-07-26 14:16:21 +02:00
039523e1f6 recommit for updates in build 99 2017-07-26 13:30:54 +02:00
a42ae740bb Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-26 13:30:06 +02:00
Arne Teuke
a99920d788 linting 2017-07-26 12:30:34 +01:00
Arne Teuke
1ed1db6e8f linting 2017-07-26 12:26:16 +01:00
Arne Teuke
2e52ec411c added base contacts and additional contacts 2017-07-26 12:24:31 +01:00
Arne Teuke
85ade68820 added base contacts and additional contacts 2017-07-26 12:16:25 +01:00
12ww1160
1eb3b2d734 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !51
2017-07-26 13:06:44 +02:00
d395b5f60d recommit for updates in build 97 2017-07-26 13:16:49 +02:00
223ca945a2 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-26 13:16:00 +02:00
Arne Teuke
099828e47a testing templates 2017-07-25 19:02:29 +01:00
Arne Teuke
336e03f609 testing templates 2017-07-25 19:01:03 +01:00
Arne Teuke
a04f079a6c testing templates 2017-07-25 18:56:18 +01:00
12ww1160
91df6d463c Merge branch 'jenkins' into 'master'
Jenkins

See merge request !50
2017-07-25 19:54:21 +02:00
62feddee64 recommit for updates in build 96 2017-07-25 20:04:08 +02:00
7876ce5527 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-25 20:03:24 +02:00
12ww1160
95cf5c84bd Merge branch 'jenkins' into 'master'
Jenkins

See merge request !49
2017-07-25 19:47:28 +02:00
a23722a67a recommit for updates in build 93 2017-07-25 19:56:39 +02:00
5ed04d8e4c Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-25 19:55:56 +02:00
Arne Teuke
b4e4ceb9b0 added parameter documentation 2017-07-25 17:15:21 +01:00
Arne Teuke
e03a5d9475 added parameter documentation 2017-07-25 17:13:25 +01:00
12ww1160
5d2565e1f0 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !48
2017-07-25 18:05:47 +02:00
445db500b3 recommit for updates in build 92 2017-07-25 18:15:39 +02:00
33dd4d53b6 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-25 18:14:56 +02:00
12ww1160
6f56271fdc Merge branch 'jenkins' into 'master'
Jenkins

See merge request !47
2017-07-25 18:04:29 +02:00
a3517b81e6 recommit for updates in build 91 2017-07-25 18:13:43 +02:00
8432bc5784 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-25 18:13:01 +02:00
Arne Teuke
6a57847a12 added contact stanza 2017-07-25 16:57:10 +01:00
12ww1160
9914a5e0f6 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !46
2017-07-25 17:47:31 +02:00
cc2d2cbf29 recommit for updates in build 90 2017-07-25 17:57:28 +02:00
c80477007a Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-25 17:56:45 +02:00
Arne Teuke
8a97768e4b added template concat 2017-07-25 16:46:00 +01:00
Arne Teuke
53e7b9d0b2 added template concat 2017-07-25 16:39:28 +01:00
Arne Teuke
f5657930f6 added and linked template_rules 2017-07-25 16:32:38 +01:00
Arne Teuke
633f59375b added and linked template_rules 2017-07-25 16:30:03 +01:00
Arne Teuke
0f8cf13c3e linked commands.pp 2017-07-25 15:56:52 +01:00
Arne Teuke
3327f6d869 added commands.pp 2017-07-25 15:48:39 +01:00
12ww1160
335f8b0292 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !45
2017-07-25 16:40:40 +02:00
b4b3de53a3 recommit for updates in build 84 2017-07-25 16:48:58 +02:00
12ww1160
107ca450c7 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !44
2017-07-25 16:24:45 +02:00
4ae4a05690 recommit for updates in build 83 2017-07-25 16:34:30 +02:00
7dc5b80c02 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-25 16:33:52 +02:00
Arne Teuke
f2a243b7c2 checked and documented all parameters, fixed template syntaxes 2017-07-25 15:34:14 +01:00
Arne Teuke
66d7dbd91c template syntax 2017-07-25 15:28:08 +01:00
Arne Teuke
d57274747a template syntax 2017-07-25 15:25:50 +01:00
Arne Teuke
e8dc9c43f2 template syntax 2017-07-25 15:24:34 +01:00
Arne Teuke
b59eff871f template syntax 2017-07-25 15:23:29 +01:00
Arne Teuke
616d0c3e9f template syntax 2017-07-25 15:21:38 +01:00
Arne Teuke
a902f3441b template syntax 2017-07-25 15:15:07 +01:00
Arne Teuke
c00ece4cb6 template syntax 2017-07-25 15:13:38 +01:00