[checkmk-commits] Check_MK Git: check_mk: Nagios: use hostgroups instead of host_groups

Module: check_mk Branch: master Commit: e73f711b5bf09b42bfd9ff2746ba8b995e7208c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e73f711b5bf09b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 7 14:22:28 2011 +0200 Nagios: use hostgroups instead of host_groups This fixes a problem when using Shinken --- ChangeLog | 4 ++++ modules/check_mk.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e1a49c..50e7586 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ 1.1.11i4 + Core, Setup, etc.: + * FIX: use hostgroups instead of host_groups in Nagios configuration. + This fixes a problem with Shinken + Checks & Agents: * Added 4 new checks dell_powerconnect_* by Chris Bowlby diff --git a/modules/check_mk.py b/modules/check_mk.py index 642449b..899458c 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1390,7 +1390,7 @@ def create_nagios_hostdefs(outfile, hostname): hostgroups_to_define.add(default_host_group) elif define_hostgroups: hostgroups_to_define.update(hgs) - outfile.write(" host_groups\t\t\t+%s\n" % hostgroups) + outfile.write(" hostgroups\t\t\t+%s\n" % hostgroups) # Contact groups cgrs = host_contactgroups_of([hostname]) @@ -1452,7 +1452,7 @@ def create_nagios_hostdefs(outfile, hostname): hostgroups_to_define.add(default_host_group) elif define_hostgroups: hostgroups_to_define.update(hgs) - outfile.write(" host_groups\t\t\t+%s\n" % hostgroups) + outfile.write(" hostgroups\t\t\t+%s\n" % hostgroups) # host gets same contactgroups as real host if len(cgrs) > 0: