Checkmk git commits January 2014

checkmk-commits@lists.checkmk.com

6 participants
256 discussions

Check_MK Git: check_mk: Fixed usage() after -I

by Mathias Kettner

Module: check_mk Branch: master Commit: 139f21693c6662d189eb7f7628b2d3de3b2d180a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=139f21693c6662… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 27 15:46:49 2014 +0100 Fixed usage() after -I --- modules/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 20bb90b..a09f8d2 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -5933,7 +5933,7 @@ if __name__ == "__main__": make_inventory(checkname, hostnames, False) do_cleanup_autochecks() - + done = True if done: output_profile()

10 years, 8 months

Check_MK Git: check_mk: FIX brocade_fcport: fixed problem on displaying check_parameters in WATO

by Andreas Boesl

Module: check_mk Branch: master Commit: be0953f1c36e97b757083ba684950d081902907c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be0953f1c36e97… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jan 27 13:07:30 2014 +0100 FIX brocade_fcport: fixed problem on displaying check_parameters in WATO The checks parameters stored in the autochecks file could not get processed and displayed correctly by the WATO inventory. --- .werks/269 | 11 +++++++++++ ChangeLog | 3 ++- checks/brocade_fcport | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/269 b/.werks/269 new file mode 100644 index 0000000..adb42a5 --- /dev/null +++ b/.werks/269 @@ -0,0 +1,11 @@ +Title: brocade_fcport: fixed problem on displaying check_parameters in WATO +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1390824236 + +The checks parameters stored in the autochecks file could not get processed and +displayed correctly by the WATO inventory. + diff --git a/ChangeLog b/ChangeLog index b0c4456..80da780 100644 --- a/ChangeLog +++ b/ChangeLog @@ -232,8 +232,9 @@ * 0434 FIX: Fixed wrong count of failed hosts in bulk inventory mode... * 0678 FIX: Move two last global settings of Event Console to proper places * 0268 FIX: wato inventory: fixed missing services... - * 0129 FIX: Fixed permission bug in "Edit user profile" dialog.... * 0686 FIX: Fix replication with WATO if EC is enabled on master and disabled on slave + * 0129 FIX: Fixed permission bug in "Edit user profile" dialog.... + * 0269 FIX: brocade_fcport: fixed problem on displaying check_parameters in WATO... Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/checks/brocade_fcport b/checks/brocade_fcport index 42c5f77..40078c7 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -88,7 +88,7 @@ def inventory_brocade_fcport(info): phystate in brocade_fcport_inventory_phystates: inventory.append(( brocade_fcport_getitem(info[0], index, portname, is_isl), - '{ "phystate": %d, "opstate": %d, "admstate": %d }' + '{ "phystate": [%d], "opstate": [%d], "admstate": [%d] }' % (phystate, opstate, admstate) )) return inventory

10 years, 8 months

Check_MK Git: check_mk: fixed merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: 036d1ab33434a4c546ecc33eaac686b3033ddf3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=036d1ab33434a4… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jan 27 12:46:59 2014 +0100 fixed merge conflict ---

10 years, 8 months

Check_MK Git: check_mk: FIX Fixed permission bug in "Edit user profile" dialog.

by Bastian Kuhn

Module: check_mk Branch: master Commit: 04177e5d099caa0ecd581eb71fd2eff51c5203d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04177e5d099caa… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jan 27 12:45:43 2014 +0100 FIX Fixed permission bug in "Edit user profile" dialog. The Edit user profile dialog has shown even the not user editable custom fields. --- .werks/129 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 9 +++++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.werks/129 b/.werks/129 new file mode 100644 index 0000000..7441ef2 --- /dev/null +++ b/.werks/129 @@ -0,0 +1,9 @@ +Title: Fixed permission bug in "Edit user profile" dialog. +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1390823084 + +The Edit user profile dialog has shown even the not user editable custom fields. diff --git a/ChangeLog b/ChangeLog index 1838d2e..30f4b78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -231,6 +231,7 @@ * 0434 FIX: Fixed wrong count of failed hosts in bulk inventory mode... * 0678 FIX: Move two last global settings of Event Console to proper places * 0268 FIX: wato inventory: fixed missing services... + * 0129 FIX: Fixed permission bug in "Edit user profile" dialog.... Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ab66e2c..db5fdc4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12975,10 +12975,11 @@ def page_user_profile(): if config.may('general.edit_user_attributes'): for name, attr in userdb.get_user_attributes(): - vs = attr['valuespec'] - forms.section(vs.title()) - vs.render_input("ua_" + name, user.get(name, vs.default_value())) - html.help(vs.help()) + if attr['user_editable']: + vs = attr['valuespec'] + forms.section(vs.title()) + vs.render_input("ua_" + name, user.get(name, vs.default_value())) + html.help(vs.help()) # Save button forms.end()

10 years, 8 months

Check_MK Git: check_mk: FIX Fix replication with WATO if EC is enabled on master and disabled on slave

by Mathias Kettner

Module: check_mk Branch: master Commit: a73eb8d8f22f04934b5eb08515efe6026e5f2f69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a73eb8d8f22f04… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 27 11:45:05 2014 +0100 FIX Fix replication with WATO if EC is enabled on master and disabled on slave --- .werks/686 | 9 +++++++++ ChangeLog | 1 + mkeventd/web/plugins/wato/mkeventd.py | 12 ++++++++++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.werks/686 b/.werks/686 new file mode 100644 index 0000000..bab9928 --- /dev/null +++ b/.werks/686 @@ -0,0 +1,9 @@ +Title: Fix replication with WATO if EC is enabled on master and disabled on slave +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1390819484 + + diff --git a/ChangeLog b/ChangeLog index 2f7556e..dc96dcb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -232,6 +232,7 @@ * 0434 FIX: Fixed wrong count of failed hosts in bulk inventory mode... * 0678 FIX: Move two last global settings of Event Console to proper places * 0268 FIX: wato inventory: fixed missing services... + * 0686 FIX: Fix replication with WATO if EC is enabled on master and disabled on slave Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 5aae1a3..74ec05c 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -2014,8 +2014,16 @@ register_rule( # | Stuff for sending monitoring notifications into the event console. | # '----------------------------------------------------------------------' def mkeventd_update_notifiation_configuration(hosts): - contactgroup = config.mkeventd_notify_contactgroup - remote_console = config.mkeventd_notify_remotehost + # Setup notification into the Event Console. Note: If + # the event console is not activated then also the global + # default settings are missing and we must skip this code. + # This can happen in a D-WATO setup where the master has + # enabled the EC and the slave not. + try: + contactgroup = config.mkeventd_notify_contactgroup + remote_console = config.mkeventd_notify_remotehost + except: + return if not remote_console: remote_console = ""

10 years, 8 months

Check_MK Git: check_mk: WATO: Fixed warning about g_folder in Apache logfile

by Mathias Kettner

Module: check_mk Branch: master Commit: bbd12610b3ac669c82fad61870be03398ddda8a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbd12610b3ac66… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 27 11:44:32 2014 +0100 WATO: Fixed warning about g_folder in Apache logfile --- web/htdocs/wato.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index bd729ce..cbce322 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -827,11 +827,12 @@ def get_folder_aliaspath(folder, show_main = True): # '----------------------------------------------------------------------' def mode_folder(phase): + global g_folder + auth_message = check_folder_permissions(g_folder, "read", False) auth_read = auth_message == True auth_write = check_folder_permissions(g_folder, "write", False) == True - global g_folder if phase == "title": return g_folder["title"]

10 years, 8 months

Check_MK Git: check_mk: Disable WATO on remote sites ( werk follows in next commit)

by Mathias Kettner

Module: check_mk Branch: master Commit: b6547aa576d20818e480bae2e0769af4ca5a457c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6547aa576d208… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 27 11:41:39 2014 +0100 Disable WATO on remote sites (werk follows in next commit) --- web/htdocs/wato.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b5226ec..bf3ec27 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6615,6 +6615,11 @@ def save_configuration_settings(vars): continue per_domain.setdefault(domain, {})[varname] = vars[varname] + # The global setting wato_enabled is not registered in the configuration domains + # sind the user must not change it directly. It is set by D-WATO on slave sites. + if "wato_enabled" in vars: + per_domain.setdefault("multisite", {})["wato_enabled"] = vars["wato_enabled"] + for domain, domain_info in g_configvar_domains.items(): if 'save' in domain_info: domain_info['save'](per_domain.get(domain, {})) @@ -7646,6 +7651,13 @@ def create_site_globals_file(siteid, tmp_dir): sites = load_sites() site = sites[siteid] config = site.get("globals", {}) + + # Add global setting for disabling WATO right here. It is not + # available as a normal global option. That would be too dangerous. + # You could disable WATO on the master very easily that way... + # The default value is True - even for sites configured with an + # older version of Check_MK. + config["wato_enabled"] = not site.get("disable_wato", True) file(tmp_dir + "/sitespecific.mk", "w").write("%r\n" % config) @@ -7851,6 +7863,9 @@ def mode_edit_site(phase): # setting is not lost if replication is turned off for a while. new_site["multisiteurl"] = multisiteurl + # Disabling of WATO + new_site["disable_wato"] = html.get_checkbox("disable_wato") + # Handle the insecure replication flag new_site["insecure"] = html.get_checkbox("insecure") @@ -7992,6 +8007,12 @@ def mode_edit_site(phase): "that URL will be fetched by the Apache server of the local " "site itself, whilst the URL-Prefix is used by your local Browser.")) + forms.section(_("WATO"), simple=True) + html.checkbox("disable_wato", site.get("disable_wato", True), label = _('Disable configuration via WATO on this site')) + html.help( _('It is a good idea to disable access to WATO completely on the slave site. ' + 'Otherwise a user who does not now about the replication could make local ' + 'changes that are overridden at the next configuration activation.')) + forms.section(_("SSL"), simple=True) html.checkbox("insecure", site.get("insecure", False), label = _('Ignore SSL certificate errors')) html.help( _('This might be needed to make the synchronization accept problems with '

10 years, 8 months

Check_MK Git: check_mk: Distributed WATO now disabled WATO on slave sites per default

by Mathias Kettner

Module: check_mk Branch: master Commit: f35be4ddb2dd5b691e10e597f9bc8dcb3fbb5fef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f35be4ddb2dd5b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 27 11:43:31 2014 +0100 Distributed WATO now disabled WATO on slave sites per default When pushing a configuration to a slave site on that site WATO is now disabled per default. This can be configured in the site configuration with a new check box <i>Disable configuration via WATO on this site</i>, which is check per default. Disabling WATO on slave sites is a good idea, because any configuration changes via WATO will be lost on the next synchronization. --- .werks/685 | 14 ++++++++++++++ ChangeLog | 1 + 2 files changed, 15 insertions(+) diff --git a/.werks/685 b/.werks/685 new file mode 100644 index 0000000..1482980 --- /dev/null +++ b/.werks/685 @@ -0,0 +1,14 @@ +Title: Distributed WATO now disabled WATO on slave sites per default +Level: 1 +Component: wato +Version: 1.2.5i1 +Date: 1390819312 +Class: feature + +When pushing a configuration to a slave site on that site WATO is +now disabled per default. This can be configured in the site +configuration with a new check box <i>Disable configuration via WATO on this site</i>, +which is check per default. + +Disabling WATO on slave sites is a good idea, because any configuration +changes via WATO will be lost on the next synchronization. diff --git a/ChangeLog b/ChangeLog index c374413..1b82176 100644 --- a/ChangeLog +++ b/ChangeLog @@ -196,6 +196,7 @@ * 0448 New button in WATO service list for displaying check parameters... * 0454 Add output of traceroute to host diagnostic page * 0677 Make title of tags and tag groups localizable... + * 0685 Distributed WATO now disabled WATO on slave sites per default... * 0057 FIX: Fix exception in WATO host editor on custom tag without topic... * 0241 FIX: Improved sorting of WATO folders in dropdown menu... * 0019 FIX: Fixed wording in WATO rule for MSSQL check

10 years, 8 months

Check_MK Git: check_mk: Added two new filters for dowtimes and comments views

by Bastian Kuhn

Module: check_mk Branch: master Commit: bd981352d85fc5ef60d6187b0258793d04c61e38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd981352d85fc5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jan 27 11:33:14 2014 +0100 Added two new filters for dowtimes and comments views --- web/plugins/views/builtin.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 1320e78..cc1436d 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -300,7 +300,7 @@ multisite_builtin_views.update({ ('service_description', 'service'), ('comment_id', None)], 'public': True, - 'show_filters': ['hostregex', 'serviceregex'], + 'show_filters': ['hostregex', 'comment_entry_time', 'serviceregex'], 'sorters': [('comment_type', False), ('comment_author', False)], 'title': _('Comments') }, @@ -383,6 +383,7 @@ multisite_builtin_views.update({ 'public': True, 'show_filters': ['service_scheduled_downtime_depth', 'hostregex', + 'downtime_entry_time', 'serviceregex'], 'sorters': [('downtime_what', False), ('downtime_start_time', False)],

10 years, 8 months

Check_MK Git: check_mk: FIX cmciii_lcp_airin, cmciii_lcp_airout, cmciii_lcp_waterin, cmciii_lcp_waterout: improved handling of warning state

by Götz Golla

Module: check_mk Branch: master Commit: daa1d512c0f309fca3ef48080476d833a0d642a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=daa1d512c0f309… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Jan 27 11:23:25 2014 +0100 FIX cmciii_lcp_airin, cmciii_lcp_airout, cmciii_lcp_waterin, cmciii_lcp_waterout: improved handling of warning state A unit state of warning no longer leads to a critical state of the check itself --- .werks/575 | 8 ++++++++ ChangeLog | 1 + checks/cmciii_lcp_airin | 10 ++++++---- checks/cmciii_lcp_airout | 10 ++++++---- checks/cmciii_lcp_waterin | 10 ++++++---- checks/cmciii_lcp_waterout | 10 ++++++---- 6 files changed, 33 insertions(+), 16 deletions(-) diff --git a/.werks/575 b/.werks/575 new file mode 100644 index 0000000..43fd5dc --- /dev/null +++ b/.werks/575 @@ -0,0 +1,8 @@ +Title: cmciii_lcp_airin, cmciii_lcp_airout, cmciii_lcp_waterin, cmciii_lcp_waterout: improved handling of warning state +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1390818045 +Class: fix + +A unit state of warning no longer leads to a critical state of the check itself diff --git a/ChangeLog b/ChangeLog index 4277172..1838d2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -145,6 +145,7 @@ * 0261 FIX: df_netapp32 / df_netapp: Fixed bug with negative size in check output... * 0262 FIX: ps: Now able to skip disabled "Process Inventory" rules... * 0264 FIX: printer_supply_ricoh: now reports correct filling levels... + * 0575 FIX: cmciii_lcp_airin, cmciii_lcp_airout, cmciii_lcp_waterin, cmciii_lcp_waterout: improved handling of warning state... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checks/cmciii_lcp_airin b/checks/cmciii_lcp_airin index 1f98955..e904885 100644 --- a/checks/cmciii_lcp_airin +++ b/checks/cmciii_lcp_airin @@ -39,10 +39,13 @@ def check_cmciii_lcp_airin(item, params, info): temps = extract_temps(info[0][4:]) state = 0 + sym = "" if status.lower() != "ok" or unit_status.lower() != "ok": - state = 2 - sym = "" - + if status.lower() in ( "ok", "warning" ) and \ + unit_status.lower() in ( "ok", "warning" ): + state = 1 + else: + state = 2 if temps[4] < temps[0] or temps[4] > temps[3] : state = 2 sym = "(!!)" @@ -51,7 +54,6 @@ def check_cmciii_lcp_airin(item, params, info): sym = "(!)" else: state = max(state, 0) - sym = "" info_text = "%s %s %s %s, Temp.Average: %.1f°C%s, Top/Mid/Bottom: %.1f/%.1f/%.1f" % \ (unit_desc, unit_status, desc, status, temps[4], sym, temps[5], temps[6], temps[7]) diff --git a/checks/cmciii_lcp_airout b/checks/cmciii_lcp_airout index 041c16d..b657f15 100644 --- a/checks/cmciii_lcp_airout +++ b/checks/cmciii_lcp_airout @@ -39,10 +39,13 @@ def check_cmciii_lcp_airout(item, params, info): temps = extract_temps(info[0][4:]) state = 0 + sym = "" if status.lower() != "ok" or unit_status.lower() != "ok": - state = 2 - sym = "" - + if status.lower() in ( "ok", "warning" ) and \ + unit_status.lower() in ( "ok", "warning" ): + state = 1 + else: + state = 2 if temps[4] < temps[0] or temps[4] > temps[3] : state = 2 sym = "(!!)" @@ -51,7 +54,6 @@ def check_cmciii_lcp_airout(item, params, info): sym = "(!)" else: state = max(state, 0) - sym = "" info_text = "%s %s %s %s, Temp.Average: %.1f°C%s, Top/Mid/Bottom: %.1f/%.1f/%.1f" % \ (unit_desc, unit_status, desc, status, temps[4], sym, temps[5], temps[6], temps[7]) diff --git a/checks/cmciii_lcp_waterin b/checks/cmciii_lcp_waterin index 009ef5d..632e933 100644 --- a/checks/cmciii_lcp_waterin +++ b/checks/cmciii_lcp_waterin @@ -42,10 +42,13 @@ def check_cmciii_lcp_waterin(item, params, info): status = info[0][9] state = 0 + sym = "" if status.lower() != "ok" or unit_status.lower() != "ok": - state = 2 - sym = "" - + if status.lower() in ( "ok", "warning" ) and \ + unit_status.lower() in ( "ok", "warning" ): + state = 1 + else: + state = 2 if temp < limits[3] or temp > limits[0] : state = 2 sym = "(!!)" @@ -54,7 +57,6 @@ def check_cmciii_lcp_waterin(item, params, info): sym = "(!)" else: state = max(state, 0) - sym = "" info_text = "%s %s, %s %s, Temperature: %.1f°C%s" \ % (unit_desc, unit_status, desc, status, temp, sym) diff --git a/checks/cmciii_lcp_waterout b/checks/cmciii_lcp_waterout index fa3ef91..4f3b213 100644 --- a/checks/cmciii_lcp_waterout +++ b/checks/cmciii_lcp_waterout @@ -42,10 +42,13 @@ def check_cmciii_lcp_waterout(item, params, info): status = info[0][9] state = 0 + sym = "" if status.lower() != "ok" or unit_status.lower() != "ok": - state = 2 - sym = "" - + if status.lower() in ( "ok", "warning" ) and \ + unit_status.lower() in ( "ok", "warning" ): + state = 1 + else: + state = 2 if temp < limits[3] or temp > limits[0] : state = 2 sym = "(!!)" @@ -54,7 +57,6 @@ def check_cmciii_lcp_waterout(item, params, info): sym = "(!)" else: state = max(state, 0) - sym = "" info_text = "%s %s, %s %s, Temperature: %.1f°C%s" \ % (unit_desc, unit_status, desc, status, temp, sym)

10 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2014