Checkmk git commits September 2015

checkmk-commits@lists.checkmk.com

8 participants
275 discussions

Check_MK Git: check_mk: Cleaned up multisite popup menu data structures a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: ed725c75a62f294a8cb050a70100986c276e922c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed725c75a62f29… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 10 15:01:47 2015 +0200 Cleaned up multisite popup menu data structures a bit --- web/htdocs/htmllib.py | 16 ++++++++-------- web/htdocs/js/checkmk.js | 6 +++--- web/htdocs/valuespec.py | 8 ++++---- web/htdocs/visuals.py | 6 +----- web/plugins/icons/builtin.py | 2 +- 5 files changed, 17 insertions(+), 21 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index ebd1663..635b70e 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -45,7 +45,7 @@ # input to str or unicode must happen as early as possible, # directly when reading from file or URL. -import time, os, pwd, urllib, random, re, __builtin__ +import time, os, pwd, urllib, random, re, __builtin__, json from lib import * # Python 2.3 does not have 'set' in normal namespace. @@ -981,18 +981,20 @@ class html: else: self.status_icons[img] = tooltip - def render_popup_trigger(self, content, ident, what, data=None, params=None): + def render_popup_trigger(self, content, ident, what, data=None, url_vars=None): src = '<div class="popup_trigger">\n' onclick = 'toggle_popup(event, this, \'%s\', \'%s\', %s, %s)' % \ - (ident, what, data or 'null', params and "'"+params+"'" or 'null') + (ident, what, + data and self.attrencode(json.dumps(data)) or 'null', + url_vars and "'"+self.urlencode_vars(url_vars)+"'" or 'null') src += '<a class="popup_trigger" href="javascript:void(0)" onclick="%s">\n' % onclick src += content src += '</a>\n' src += '</div>\n' return src - def popup_trigger(self, content, ident, what, data=None, params=None): - self.write(self.render_popup_trigger(content, ident, what, data, params)) + def popup_trigger(self, content, ident, what, data=None, url_vars=None): + self.write(self.render_popup_trigger(content, ident, what, data, url_vars)) def write_status_icons(self): self.write('<a target="_top" href="%s"><img class=statusicon src="images/status_frameurl.png" title="%s"></a>\n' % \ @@ -1019,9 +1021,7 @@ class html: self.popup_trigger( '<img class=statusicon src="images/icon_menu.png" title="%s">\n' % _("Add this view to..."), - 'add_visual', 'add_visual', data='[\'%s\', %s, {\'name\': \'%s\'}]' % - (mode_name, self.attrencode(repr(encoded_vars)), - self.attrencode(self.var('view_name')))) + 'add_visual', 'add_visual', data=[mode_name, encoded_vars, {'name': self.var('view_name')}]) for img, tooltip in self.status_icons.items(): if type(tooltip) == tuple: diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index fd8392a..64436ff 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -2409,9 +2409,9 @@ function handle_popup_close(event) { close_popup(); } -function toggle_popup(event, trigger_obj, ident, what, data, params) +function toggle_popup(event, trigger_obj, ident, what, data, url_vars) { - var params = typeof(params) === "undefined" ? '' : '?'+params; + var url_vars = typeof(url_vars) === "undefined" ? '' : '?'+url_vars; if(!event) event = window.event; @@ -2447,7 +2447,7 @@ function toggle_popup(event, trigger_obj, ident, what, data, params) //if (ident in popup_contents) // menu.innerHTML = popup_contents[ident]; //else - get_url('ajax_popup_'+what+'.py'+params, handle_render_popup_contents, [ident, event]); + get_url('ajax_popup_'+what+'.py'+url_vars, handle_render_popup_contents, [ident, event]); } function handle_render_popup_contents(data, response_text) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 49743ea..89d6363 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3329,10 +3329,10 @@ class IconSelector(ValueSpec): else: content = _('Select an Icon') html.popup_trigger(content, varprefix+'_icon_selector', 'icon_selector', - params=html.urlencode_vars([('value', value), - ('varprefix', varprefix), - ('allow_empty', self._allow_empty and '1' or '0'), - ('back', html.makeuri([]))])) + params=[('value', value), + ('varprefix', varprefix), + ('allow_empty', self._allow_empty and '1' or '0'), + ('back', html.makeuri([]))]) def render_popup_input(self, varprefix, value): html.write('<div class="icons">') diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index e497645..7b9a7d8 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -1407,12 +1407,8 @@ def ajax_add_visual(): # type of the visual to add (e.g. view) element_type = html.var("type") - # Context and params are | separated lists of : separated triples - # of name, datatype and value. Datatype is int or string extra_data = [] for what in [ 'context', 'params' ]: - value = html.var(what) - if value: - extra_data.append(json.loads(value)) + extra_data.append(json.loads(html.var(what))) handler(visual_name, element_type, *extra_data) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 2e10c19..86e22ce 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -86,7 +86,7 @@ def paint_action_menu(what, row, tags, host_custom_vars): return html.render_popup_trigger( html.render_icon('menu', _('Open the action menu')), - 'action_menu', 'action_menu', params=html.urlencode_vars(url_vars)) + 'action_menu', 'action_menu', url_vars=url_vars) multisite_icons_and_actions['action_menu'] = { 'columns': [],

9 years

Check_MK Git: check_mk: Ldap: only creating pending log entries in WATO when WATO is enabled

by Lars Michelsen

Module: check_mk Branch: master Commit: b3dae8ab49396f564b07938e6414593afa52750d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3dae8ab49396f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 10 14:09:43 2015 +0200 Ldap: only creating pending log entries in WATO when WATO is enabled --- web/plugins/userdb/ldap.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 5964621..e784117 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -833,8 +833,9 @@ class LDAPUserConnector(UserConnector): user_connection_id = cleanup_connection_id(user.get('connector')) if user_connection_id == connection_id and user_id not in ldap_users: del users[user_id] # remove the user - wato.log_pending(wato.SYNCRESTART, None, "edit-users", - _("LDAP [%s]: Removed user %s") % (connection_id, user_id), user_id = '') + if config.wato_enabled: + wato.log_pending(wato.SYNCRESTART, None, "edit-users", + _("LDAP [%s]: Removed user %s") % (connection_id, user_id), user_id = '') for user_id, ldap_user in ldap_users.items(): if user_id in users: @@ -866,8 +867,9 @@ class LDAPUserConnector(UserConnector): users[user_id] = user # Update the user record if mode_create: - wato.log_pending(wato.SYNCRESTART, None, "edit-users", - _("LDAP [%s]: Created user %s") % (connection_id, user_id), user_id = '') + if config.wato_enabled: + wato.log_pending(wato.SYNCRESTART, None, "edit-users", + _("LDAP [%s]: Created user %s") % (connection_id, user_id), user_id = '') else: details = [] if added: @@ -893,7 +895,7 @@ class LDAPUserConnector(UserConnector): if changed: details.append(('Changed: %s') % ', '.join(changed)) - if details: + if details and config.wato_enabled: wato.log_pending(wato.SYNCRESTART, None, "edit-users", _("LDAP [%s]: Modified user %s (%s)") % (connection_id, user_id, ', '.join(details)), user_id = '') @@ -1487,9 +1489,10 @@ def synchronize_profile_to_sites(connection, user_id, profile): num_failed += 1 connection.log(' FAILED [%s]: %s' % (site_id, result)) # Add pending entry to make sync possible later for admins - wato.update_replication_status(site_id, {"need_sync": True}) - wato.log_pending(wato.AFFECTED, None, "edit-users", - _('Password changed (sync failed: %s)') % result, user_id = '') + if config.wato_enabled: + wato.update_replication_status(site_id, {"need_sync": True}) + wato.log_pending(wato.AFFECTED, None, "edit-users", + _('Password changed (sync failed: %s)') % result, user_id = '') connection.log(' Disabled: %d, Succeeded: %d, Failed: %d' % (num_disabled, num_succeeded, num_failed))

9 years

Check_MK Git: check_mk: #2603 FIX Git integration: Preventing issues with *.mk.new files

by Lars Michelsen

Module: check_mk Branch: master Commit: cecfae34c2bafbbe53217c66253bffac4bf174e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cecfae34c2bafb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 10 11:41:23 2015 +0200 #2603 FIX Git integration: Preventing issues with *.mk.new files Ignoring *.mk.new files in git. These are temporary files which are being created during saving of changed configs files like the users.mk.new. --- .werks/2603 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2603 b/.werks/2603 new file mode 100644 index 0000000..1479f97 --- /dev/null +++ b/.werks/2603 @@ -0,0 +1,10 @@ +Title: Git integration: Preventing issues with *.mk.new files +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i3 +Date: 1441878037 +Class: fix + +Ignoring *.mk.new files in git. These are temporary files which are being created +during saving of changed configs files like the users.mk.new. diff --git a/ChangeLog b/ChangeLog index 61ba267..c30f93e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -245,6 +245,7 @@ * 2550 FIX: Catching exception when having name conflicts while moving a folder * 2552 FIX: API: Service Discovery action is now creating missing pending log entry and marks the site dirty * 2560 FIX: Fixed rare exception when using bulk host move... + * 2603 FIX: Git integration: Preventing issues with *.mk.new files... Notifications: * 2478 Integrated notification plugin for mobile phone push messages via Pushover... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 82ada36..f83dfb6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -399,7 +399,7 @@ def do_git_commit(): git_command(["config", "user.name", "check_mk"]) # Make sure that .gitignore-files are present and uptodate - file(defaults.default_config_dir + "/.gitignore", "w").write("*\n!*.d\n!.gitignore\n*swp\n") + file(defaults.default_config_dir + "/.gitignore", "w").write("*\n!*.d\n!.gitignore\n*swp\n*.mk.new\n") for subdir in os.listdir(defaults.default_config_dir): if subdir.endswith(".d"): file(defaults.default_config_dir + "/" + subdir + "/.gitignore", "w").write("*\n!wato\n!wato/*\n")

9 years

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 4c7468e95b16ed14eb946e75f09a59d04639aa24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c7468e95b16ed… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 10 11:39:39 2015 +0200 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 737acea..13d7e77 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2603 +2623

9 years

Check_MK Git: check_mk: aix_hacmp_resource: tweaked behaviour, now always reports CRIT when first node is not online

by Andreas Boesl

Module: check_mk Branch: master Commit: 6e30137657dbc3db91a7fe5d4a673e1ee2e15552 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e30137657dbc3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 10 10:58:25 2015 +0200 aix_hacmp_resource: tweaked behaviour, now always reports CRIT when first node is not online --- checks/aix_hacmp_resources | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/checks/aix_hacmp_resources b/checks/aix_hacmp_resources index da125bb..61c7157 100644 --- a/checks/aix_hacmp_resources +++ b/checks/aix_hacmp_resources @@ -61,12 +61,10 @@ def check_aix_hacmp_resources(item, params, parsed): resource_stats.append(resource_status) infotext += "%s on node %s, " % (resource_status, node_name) - if 'online' in resource_stats: - state = 0 - else: - state = 1 - - if 'error' in resource_stats: + # The first node is always online in an OK scenario + # Something is wrong if an other node is online + state = 0 + if resource_stats[0] != "online": state = 2 return state, infotext[:-2]

9 years

Check_MK Git: check_mk: #2562 SNMP trap translation can now be configured to put trap description into event text

by Lars Michelsen

Module: check_mk Branch: master Commit: bb90da777d55cab92fa4f787fbe354a09ae8e36f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb90da777d55ca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 10 08:37:44 2015 +0200 #2562 SNMP trap translation can now be configured to put trap description into event text The trap translation was only translating keys, values and units of OIDs provided with a trap. You can now configure the Event Console to append the description of the OIDs (if available via the MIB) to the event texts. To make this work you may need to re-upload your MIB files you want to have a translation for. This translation option can be enabled using the global settings of the Event Console. Please note that if you have existing rules to machting SNMP traps and you change this option, the texts of incoming events will change. So you might have to adapt your events text matching patterns. --- .werks/2562 | 18 ++++++++++++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 22 +++++++++++++++++----- mkeventd/web/plugins/wato/mkeventd.py | 33 +++++++++++++++++++++++++-------- 4 files changed, 61 insertions(+), 13 deletions(-) diff --git a/.werks/2562 b/.werks/2562 new file mode 100644 index 0000000..f5779e5 --- /dev/null +++ b/.werks/2562 @@ -0,0 +1,18 @@ +Title: SNMP trap translation can now be configured to put trap description into event text +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.7i3 +Date: 1441866846 +Class: feature + +The trap translation was only translating keys, values and units of OIDs provided with a trap. +You can now configure the Event Console to append the description of the OIDs (if available +via the MIB) to the event texts. + +To make this work you may need to re-upload your MIB files you want to have a translation for. + +This translation option can be enabled using the global settings of the Event Console. Please +note that if you have existing rules to machting SNMP traps and you change this option, the +texts of incoming events will change. So you might have to adapt your events text matching +patterns. diff --git a/ChangeLog b/ChangeLog index fa16bb5..61ba267 100644 --- a/ChangeLog +++ b/ChangeLog @@ -264,6 +264,7 @@ * 2411 Check check_mkevents: Now able to look for events matching the host alias... * 2533 Allow inverted match in Event Console rules * 2508 It is now possible to upload multiple zipped MIB files at once... + * 2562 SNMP trap translation can now be configured to put trap description into event text... * 2322 FIX: mkeventd: MIBs are now only loaded if SNMP Traps translation is activated... * 2460 FIX: Slightly more robust SNMP trap translation... * 2534 FIX: Fixed implementation of skipping rule packs diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index c01e81b..3794562 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1235,9 +1235,16 @@ class EventServer: value = node.getSyntax().clone(value) units = node.getUnits() - var_binds.append((translated_oid, value.prettyPrint() + ' ' + units)) + translated_value = value.prettyPrint() + ' ' + units else: - var_binds.append((translated_oid, value)) + translated_value = value + + if hasattr(node, "getDescription") \ + and type(g_config["translate_snmptraps"]) == tuple \ + and "add_description" in g_config["translate_snmptraps"][1]: + translated_value += "(%s)" % node.getDescription() + + var_binds.append((translated_oid, translated_value)) return var_binds def process_snmptrap(self, (whole_msg, (ipaddress, port))): @@ -1265,7 +1272,7 @@ class EventServer: else: break # Skip unhandled version - if g_config['translate_snmptraps']: + if snmptrap_translation_enabled(): trap = self.snmptrap_translate_varbinds(proto.apiPDU.getVarBinds(pdu)) else: trap = self.snmptrap_convert_var_binds(proto.apiPDU.getVarBinds(pdu)) @@ -2639,7 +2646,7 @@ class StatusServer: def handle_command_reload(self): with lock_configuration: load_configuration() - if opt_snmptrap and g_config['translate_snmptraps']: + if opt_snmptrap and snmptrap_translation_enabled(): g_event_server.load_mibs() g_event_server.compile_rules(g_config["rules"], g_config["rule_packs"]) g_status_server.reload_configuration() @@ -3596,6 +3603,7 @@ def load_slave_status(): # +----------------------------------------------------------------------+ # | Loading of the configuration files | # '----------------------------------------------------------------------' + def load_configuration(): global g_config, g_last_config_reload g_config = { @@ -3653,6 +3661,10 @@ def load_configuration(): g_last_config_reload = time.time() +def snmptrap_translation_enabled(): + return g_config["translate_snmptraps"] != False + + #. # .--Help & Usage--------------------------------------------------------. # | _ _ _ ___ _ _ | @@ -3883,7 +3895,7 @@ try: g_event_status.load_status() g_status_server = StatusServer() g_event_server = EventServer() - if opt_snmptrap and g_config['translate_snmptraps']: + if opt_snmptrap and snmptrap_translation_enabled(): g_event_server.load_mibs() g_event_server.compile_rules(g_config["rules"], g_config["rule_packs"]) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index f2c0e28..22e6ab6 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1994,7 +1994,7 @@ def validate_and_compile_mib(mibname, content): if not content.strip(): raise Exception(_("The file is empty")) - results = compiler.compile(mibname, ignoreErrors=True) + results = compiler.compile(mibname, ignoreErrors=True, genTexts=True) errors = [] for name, state in sorted(results.items()): @@ -2498,13 +2498,30 @@ if mkeventd_enabled: register_configvar(group, "translate_snmptraps", - Checkbox(title = _("Translate SNMP traps"), - label = _("Use the available SNMP MIBs to translate contents of the SNMP traps"), - help = _("When this option is enabled all available SNMP MIB files will be used " - "to translate the incoming SNMP traps. Information which can not be " - "translated, e.g. because a MIB is missing, are written untouched to " - "the event message."), - default_value = False), + Transform( + CascadingDropdown( + choices = [ + (False, _("Do not translate SNMP traps")), + (True, _("Translate SNMP traps using the available MIBs"), + Dictionary( + elements = [ + ("add_description", FixedValue(True, + title = _("Add OID descriptions"), + totext = _("Append descriptions of OIDs to message texts"), + )), + ], + ), + ), + ], + ), + title = _("Translate SNMP traps"), + label = _("Use the available SNMP MIBs to translate contents of the SNMP traps"), + help = _("When this option is enabled all available SNMP MIB files will be used " + "to translate the incoming SNMP traps. Information which can not be " + "translated, e.g. because a MIB is missing, are written untouched to " + "the event message."), + forth = lambda v: v == True and (v, {}) or v, + ), domain = "mkeventd", )

9 years

Check_MK Git: check_mk: dell_om_vdisks: fixed naming

by Sebastian Herbord

Module: check_mk Branch: master Commit: 926d0ccfc206fe5dc2b9280186e3668c7f2e308d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=926d0ccfc206fe… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Sep 9 12:04:16 2015 +0200 dell_om_vdisks: fixed naming --- agents/plugins/mk_omreport | 2 +- checks/dell_om_vdisks | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/agents/plugins/mk_omreport b/agents/plugins/mk_omreport index fb84fc5..b97dfbe 100755 --- a/agents/plugins/mk_omreport +++ b/agents/plugins/mk_omreport @@ -25,6 +25,6 @@ if which omreport >/dev/null then - echo "<<<omreport_vdisk>>>" + echo "<<<dell_om_vdisks>>>" omreport storage vdisk fi diff --git a/checks/dell_om_vdisks b/checks/dell_om_vdisks index 5158137..83fa1b6 100644 --- a/checks/dell_om_vdisks +++ b/checks/dell_om_vdisks @@ -48,11 +48,11 @@ # Disk Cache Policy : Unchanged -def inventory_omreport_vdisk(parsed): +def inventory_dell_om_vdisks(parsed): return [(key, None) for key in parsed.keys()] -def check_omreport_vdisk(item, params, parsed): +def check_dell_om_vdisks(item, params, parsed): if item in parsed: status = status_translate_omreport(parsed[item]["Status"]) if parsed[item]["State"] != "Ready": @@ -63,9 +63,9 @@ def check_omreport_vdisk(item, params, parsed): parsed[item]["State"], parsed[item]["Layout"]) -check_info["omreport_vdisk"] = { - "check_function" : check_omreport_vdisk, - "inventory_function" : inventory_omreport_vdisk, +check_info["dell_om_vdisks"] = { + "check_function" : check_dell_om_vdisks, + "inventory_function" : inventory_dell_om_vdisks, "parse_function" : parse_omreport, "service_description" : "Virtual Disk %s", "includes" : ["dell_om.include"]

9 years

Check_MK Git: check_mk: #2586 check ibm_imm_fan: lower and upper levels are now configurable

by Simon Betz

Module: check_mk Branch: master Commit: 03a8318231937c6cc717d8bc9664685708cf2d89 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03a8318231937c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 9 10:16:03 2015 +0200 #2586 check ibm_imm_fan: lower and upper levels are now configurable --- .werks/2586 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/2586 b/.werks/2586 new file mode 100644 index 0000000..3d780b0 --- /dev/null +++ b/.werks/2586 @@ -0,0 +1,9 @@ +Title: check ibm_imm_fan: lower and upper levels are now configurable +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1441786482 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 77284c1..fa16bb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -73,6 +73,7 @@ * 2583 new check datapower_tcp: monitors the number of TCP connections in the various possible states * 2565 dell_om_disks now warns if SMART predicts disk failure * 2572 dell_om_vdisks: New check for virtual disks on Dell OpenManage supported devices + * 2586 check ibm_imm_fan: lower and upper levels are now configurable * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space...

9 years

Check_MK Git: check_mk: Improved error output of WATO git commands

by Lars Michelsen

Module: check_mk Branch: master Commit: 8fca7ec74f563526857422a84562e3a141d112bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fca7ec74f5635… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 9 10:13:17 2015 +0200 Improved error output of WATO git commands --- web/htdocs/wato.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e2f11ea..82ada36 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -380,8 +380,8 @@ def git_command(args): output = p.read() status = p.close() if status != None: - raise MKGeneralException(_("Error executing GIT command %s: %s") % - (command.decode('utf-8'), output)) + raise MKGeneralException(_("Error executing GIT command <tt>%s</tt>:<br><br>%s") % + (command.decode('utf-8'), output.replace("\n", "<br>\n"))) def shell_quote(s): return "'" + s.replace("'", "'\"'\"'") + "'"

9 years

Check_MK Git: check_mk: ibm_imm_fan, slight update

by Mathias Kettner

Module: check_mk Branch: master Commit: b0d9c81e5fa40f3fc9784497cae9671a423908bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0d9c81e5fa40f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 9 10:12:43 2015 +0200 ibm_imm_fan, slight update --- checks/ibm_imm_fan | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/ibm_imm_fan b/checks/ibm_imm_fan index 5930e59..b14992b 100644 --- a/checks/ibm_imm_fan +++ b/checks/ibm_imm_fan @@ -62,7 +62,7 @@ def check_ibm_imm_fan(item, params, info): else: state = 0 if state > 0: - yield state, "(warn/crit below %d%%/%d%%)" % (warn_lower, crit_lower) + yield state, "too low (warn/crit below %d%%/%d%%)" % (warn_lower, crit_lower) if warn: if rpm_perc >= crit: @@ -72,7 +72,7 @@ def check_ibm_imm_fan(item, params, info): else: state = 0 if state > 0: - yield state, "(warn/crit at %d%%/%d%%)" % (warn, crit) + yield state, "too high (warn/crit at %d%%/%d%%)" % (warn, crit)

9 years

← Newer
1
...
17
18
19
20
21
22
23
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2015