Commit Graph

488 Commits

Author SHA1 Message Date
Arne Teuke
eb8a92a4b4 fixed typo 2017-07-27 15:54:54 +01:00
Arne Teuke
82ca12e036 fixed typo 2017-07-27 15:48:56 +01:00
12ww1160
b43d7b5c87 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !71
2017-07-27 16:46:50 +02:00
15a189c840 recommit for updates in build 125 2017-07-27 16:55:31 +02:00
fdbc7c2da6 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-27 16:54:22 +02:00
Arne Teuke
34e172d7bd fixed typo 2017-07-27 15:44:07 +01:00
Arne Teuke
54353625e1 fixed typo 2017-07-27 15:43:29 +01:00
Arne Teuke
2d22845814 fixed typo 2017-07-27 15:42:22 +01:00
Arne Teuke
0b2e9241ca added parameter documentation 2017-07-27 15:40:02 +01:00
12ww1160
f5b399a42b Merge branch 'jenkins' into 'master'
Jenkins

See merge request !70
2017-07-27 16:39:19 +02:00
d0a5bbadef recommit for updates in build 124 2017-07-27 16:49:39 +02:00
784da8bf21 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-27 16:48:32 +02:00
12ww1160
f1dafca043 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !69
2017-07-27 16:34:48 +02:00
f8d19b46fd recommit for updates in build 123 2017-07-27 16:44:56 +02:00
7e81016ca5 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-27 16:43:42 +02:00
Arne Teuke
e76e4f857c added and linked add_timeperiods 2017-07-27 15:28:21 +01:00
12ww1160
e5309393e0 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !68
2017-07-27 16:28:00 +02:00
137753dafe recommit for updates in build 120 2017-07-27 16:29:05 +02:00
254c788282 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-27 16:27:56 +02:00
Arne Teuke
82aee3bacd added timeperiod 2017-07-27 14:50:07 +01:00
Arne Teuke
45682bbc67 added timeperiod 2017-07-27 14:46:49 +01:00
Arne Teuke
65e0a0d20e added timeperiods 2017-07-27 14:42:38 +01:00
Arne Teuke
645cb4255a added parameter documentation 2017-07-27 14:33:00 +01:00
12ww1160
0f2d245466 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !67
2017-07-27 15:23:24 +02:00
cba65ddb7c recommit for updates in build 117 2017-07-27 15:33:36 +02:00
c4f2a37587 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-27 15:32:34 +02:00
Arne Teuke
ab8b3878e7 added servicegroup control 2017-07-27 14:22:11 +01:00
12ww1160
360da4f967 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !66
2017-07-27 15:12:45 +02:00
83782a592f recommit for updates in build 116 2017-07-27 15:22:48 +02:00
202f268873 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-27 15:21:43 +02:00
Arne Teuke
25a31ffc1b edited README and fixed template 2017-07-27 13:46:46 +01:00
12ww1160
964640d2d7 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !65
2017-07-27 14:37:16 +02:00
dd4d061fe5 recommit for updates in build 115 2017-07-27 14:47:24 +02:00
1a00d75fbf Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-27 14:46:21 +02:00
Arne Teuke
26e2220ec9 added service description and add_hostgroup_rules 2017-07-27 13:32:48 +01:00
12ww1160
42febc50b8 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !64
2017-07-27 14:23:18 +02:00
5193e6a8d2 recommit for updates in build 114 2017-07-27 14:33:19 +02:00
39e5d7a040 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-27 14:32:21 +02:00
Arne Teuke
842d86a504 added _ to service name 2017-07-27 12:58:30 +01:00
12ww1160
afc4246914 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !63
2017-07-27 13:52:06 +02:00
f4321e6da9 recommit for updates in build 113 2017-07-27 13:58:59 +02:00
1f49860ffd Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-27 13:58:03 +02:00
Arne Teuke
7b27896ccb added and linked hostgroups 2017-07-27 12:44:19 +01:00
12ww1160
0b8935278f Merge branch 'jenkins' into 'master'
Jenkins

See merge request !62
2017-07-27 13:37:46 +02:00
cad8229c08 recommit for updates in build 112 2017-07-27 13:44:51 +02:00
675778753c Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-27 13:43:53 +02:00
12ww1160
eabe403734 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !61
2017-07-27 13:15:44 +02:00
d6267355c6 recommit for updates in build 111 2017-07-27 13:11:57 +02:00
Arne Teuke
3f12bbd92d added and linked add_contactgroups_rules 2017-07-27 12:11:26 +01:00
9efb0bf76b Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-27 13:10:57 +02:00