Commit Graph

310 Commits

Author SHA1 Message Date
202f268873 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-27 15:21:43 +02:00
Arne Teuke
ab8b3878e7 added servicegroup control 2017-07-27 14:22:11 +01: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
Arne Teuke
a90da5d3ed added and linked add_contactgroups_rules 2017-07-27 11:59:39 +01:00
Arne Teuke
672f61d994 added and linked add_contactgroups_rules 2017-07-27 11:56:09 +01:00
12ww1160
443b8f464e Merge branch 'jenkins' into 'master'
Jenkins

See merge request !60
2017-07-27 12:52:20 +02:00
14a1e7412f recommit for updates in build 110 2017-07-27 13:00:10 +02:00
fa59fef3ef Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-27 12:59:10 +02:00
12ww1160
03c933b184 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !59
2017-07-27 12:46:24 +02:00
699586d7d8 recommit for updates in build 109 2017-07-27 12:56:34 +02:00
cfca88c797 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-27 12:55:41 +02:00
Arne Teuke
e02276ecc7 added and linked add_contactgroups_rules 2017-07-27 11:41:22 +01:00
Arne Teuke
26ef9aac81 added and linked add_contactgroups_rules 2017-07-27 11:39:45 +01:00
12ww1160
78b0b5ec9a Merge branch 'jenkins' into 'master'
Jenkins

See merge request !58
2017-07-27 12:38:37 +02:00
2b24ed6918 recommit for updates in build 108 2017-07-27 12:41:48 +02:00
1c6dd6858f Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-27 12:40:54 +02:00
Arne Teuke
5108aab0dc added add_contactgroups 2017-07-27 11:05:58 +01:00
12ww1160
6d09beb8f9 Merge branch 'jenkins' into 'master'
Jenkins

See merge request !57
2017-07-27 11:55:04 +02:00
0564cc970b recommit for updates in build 105 2017-07-26 16:27:43 +02:00
Arne Teuke
12f835aa4f added and linked base contactgroups 2017-07-26 15:27:16 +01:00
6b3bd0eecc Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-26 16:26:53 +02:00
Arne Teuke
6094321d4f sorted deprecated syntax 2017-07-26 14:04:39 +01:00
12ww1160
428abe511c Merge branch 'jenkins' into 'master'
Jenkins

See merge request !56
2017-07-26 15:00:04 +02:00
af34a0587d recommit for updates in build 104 2017-07-26 15:05:02 +02:00
016dd178e6 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-26 15:04:14 +02:00
Arne Teuke
6ee49a5e33 fixed typo 2017-07-26 13:47:45 +01:00
Arne Teuke
6955770373 fixed typo 2017-07-26 13:40:23 +01:00
12ww1160
1cc679595d Merge branch 'jenkins' into 'master'
Jenkins

See merge request !55
2017-07-26 14:38:52 +02:00
4dd15fea28 recommit for updates in build 103 2017-07-26 14:48:06 +02:00
572e8ba3c1 Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nagios into HEAD 2017-07-26 14:47:18 +02:00
Arne Teuke
8fafc260c8 finalizing contacts 2017-07-26 13:36:14 +01:00