[checkmk-commits] 3846 FIX Nagios: define_contactgroups = False is handled correctly again

Module: check_mk Branch: master Commit: 118a6e974a0fdef57bde36f308e9aa841ffc1c8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=118a6e974a0fde… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 1 13:26:48 2016 +0200 3846 FIX Nagios: define_contactgroups = False is handled correctly again --- .werks/3846 | 10 ++++++++++ ChangeLog | 1 + modules/nagios.py | 41 ++++++++++++++++++++++++----------------- 3 files changed, 35 insertions(+), 17 deletions(-) diff --git a/.werks/3846 b/.werks/3846 new file mode 100644 index 0000000..74d469b --- /dev/null +++ b/.werks/3846 @@ -0,0 +1,10 @@ +Title: Nagios: define_contactgroups = False is handled correctly again +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1472729184 + + diff --git a/ChangeLog b/ChangeLog index d43b52f..80f23c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ * 3617 FIX: cmk -I without host specification now (again) always uses cache files... * 3149 FIX: fixed rare crash if alert handling tried to long non-latin characters * 3843 FIX: Fixed reporting of crashes when using Nagios core + * 3846 FIX: Nagios: define_contactgroups = False is handled correctly again Checks & Agents: * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller diff --git a/modules/nagios.py b/modules/nagios.py index 01ecda6..21b1765 100644 --- a/modules/nagios.py +++ b/modules/nagios.py @@ -709,24 +709,31 @@ define servicegroup { """ % (make_utf8(sg), make_utf8(alias))) def create_nagios_config_contactgroups(outfile): + if define_contactgroups == False: + return + cgs = list(contactgroups_to_define) - cgs.sort() - if cgs: - outfile.write("\n# ------------------------------------------------------------\n") - outfile.write("# Contact groups (controlled by define_contactgroups)\n") - outfile.write("# ------------------------------------------------------------\n\n") - for name in cgs: - if type(define_contactgroups) == dict: - alias = define_contactgroups.get(name, name) - else: - alias = name - outfile.write("\ndefine contactgroup {\n" - " contactgroup_name\t\t%s\n" - " alias\t\t\t\t%s\n" % (make_utf8(name), make_utf8(alias))) - members = contactgroup_members.get(name) - if members: - outfile.write(" members\t\t\t%s\n" % ",".join(members)) - outfile.write("}\n") + if not cgs: + return + + outfile.write("\n# ------------------------------------------------------------\n") + outfile.write("# Contact groups (controlled by define_contactgroups)\n") + outfile.write("# ------------------------------------------------------------\n\n") + for name in sorted(cgs): + if type(define_contactgroups) == dict: + alias = define_contactgroups.get(name, name) + else: + alias = name + + outfile.write("\ndefine contactgroup {\n" + " contactgroup_name\t\t%s\n" + " alias\t\t\t\t%s\n" % (make_utf8(name), make_utf8(alias))) + + members = contactgroup_members.get(name) + if members: + outfile.write(" members\t\t\t%s\n" % ",".join(members)) + + outfile.write("}\n") def create_nagios_config_commands(outfile):