Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64557 discussions

Check_MK Git: check_mk: Cleaned up source code of a few checks

by Mathias Kettner

Module: check_mk Branch: master Commit: 1befcf519fd8bce536fe87e867f95c34866a0d94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1befcf519fd8bc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 19 17:34:49 2013 +0100 Cleaned up source code of a few checks --- checks/cisco_fantray | 48 +++++++++++++++++++++++++----------------------- checks/uptime | 22 ++++++++++++++-------- checks/uptime.include | 37 ++++++++++++++++++++----------------- checks/viprinet_serial | 17 ++++++++++++----- 4 files changed, 71 insertions(+), 53 deletions(-) diff --git a/checks/cisco_fantray b/checks/cisco_fantray index 6c3fc18..752ea1c 100644 --- a/checks/cisco_fantray +++ b/checks/cisco_fantray @@ -24,33 +24,35 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -cisco_fan_states = ('', 'unknown', 'up', 'down', 'warning') + +cisco_fantray_state_names = { + '1': 3, "status is reported as 'unknown'", + '2': 0, "powered on", + '3': 2, "powered down", + '4': 2, "partial failure, needs replacement as soon as possible." +} def inventory_cisco_fantray(info): - if info and info[0]: - #Some Cisco switches reporting not available fans as down, - #so we cant invenorize fans reported as down - return [ (line[0], None) for line in info if line[1] != '3' ] + inventory = [] + for fan_id, state in info: + if state != '3': # skip fans reported as down (might be missing) + inventory.append((fan_id, None)) + return inventory + +def check_cisco_fantray(item, _no_params, info): + for fan_id, state in info: + if fan_id == item: + result, state_name = \ + cisco_fantray_state_names.get(state, (3, "unexpected(%s)" % state)) + return result, state_name -def check_cisco_fantray(item, params, info): - for line in info: - if line[0] == item: - state = saveint(line[1]) - status = [ "", "unknown", "up", "down", "warning" ] - if state == 2: - return (0, "State is %s (%d)" % (status[state], state)) - elif state in ( 0, 1, 4 ): - return (1, "State is %s (%d)" % (status[state], state)) - else: - return (2, "State is %s (%d)" % (status[state], state)) - return (3, "item not found in snmp data") + return (3, "No information about fan with this ID") check_info["cisco_fantray"] = { - 'check_function': check_cisco_fantray, - 'inventory_function': inventory_cisco_fantray, - 'service_description': 'FAN %s', - 'snmp_info': ('.1.3.6.1.4.1.9.9.117.1.4.1.1.1',[ OID_END, '' ]), - 'snmp_scan_function': \ - lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower(), + 'check_function' : check_cisco_fantray, + 'inventory_function' : inventory_cisco_fantray, + 'service_description' : 'FAN %s', + 'snmp_info' : ('.1.3.6.1.4.1.9.9.117.1.4.1.1.1', [ OID_END, '' ]), + 'snmp_scan_function' : lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower(), } diff --git a/checks/uptime b/checks/uptime index f95ab5c..3f35469 100644 --- a/checks/uptime +++ b/checks/uptime @@ -24,19 +24,25 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + +# Example output from agent: +# <<<uptime>>> +# 15876.96 187476.72 + def inventory_uptime(info): - if len(info) >= 1 and len(info[0]) >= 1: + if info: return [ (None, {}) ] def check_uptime(_no_item, params, info): - return check_uptime_seconds(params, float(info[0][0])) + uptime_sec = float(info[0][0]) + return check_uptime_seconds(params, uptime_sec) check_info["uptime"] = { - 'check_function': check_uptime, - 'inventory_function': inventory_uptime, - 'service_description': 'Uptime', - 'has_perfdata': True, - 'includes': [ 'uptime.include' ], - 'group': 'uptime', + 'check_function' : check_uptime, + 'inventory_function' : inventory_uptime, + 'service_description' : 'Uptime', + 'has_perfdata' : True, + 'includes' : [ 'uptime.include' ], + 'group' : 'uptime', } diff --git a/checks/uptime.include b/checks/uptime.include index 1404750..0d7a43c 100644 --- a/checks/uptime.include +++ b/checks/uptime.include @@ -31,37 +31,40 @@ # "max" : ( 86400 * 7, 86400 * 14), # Maximum required uptime (warn, crit) # } -def check_uptime_seconds(params, uptime): - seconds = uptime % 60 - rem = uptime / 60 - minutes = rem % 60 - hours = (rem % 1440) / 60 - days = rem / 1440 - now = int(time.time()) - since = time.strftime("%c", time.localtime(now - uptime)) - state = 0 - infotext = "up since %s (%dd %02d:%02d:%02d)" % (since, days, hours, minutes, seconds) +def check_uptime_sec(params, uptime_sec): + seconds = uptime_sec % 60 + rem = uptime_sec / 60 + minutes = rem % 60 + hours = (rem % 1440) / 60 + days = rem / 1440 + since = time.strftime("%c", time.localtime(time.time() - uptime_sec)) - if params == None: # legacy + state = 0 + infotext = "up since %s (%dd %02d:%02d:%02d)" % \ + (since, days, hours, minutes, seconds) + + if params == None: # legacy: support older versions of parameters params = {} if "min" in params: warn, crit = params["min"] - if uptime < crit: + if uptime_sec < crit: state = 2 - elif uptime < warn: + elif uptime_sec < warn: state = max(state, 1) + if state: infotext += ", not up long enough!" if "max" in params: warn, crit = params["max"] - if uptime > crit: + if uptime_sec > crit: state = 2 - elif uptime > warn: + elif uptime_sec > warn: state = max(state, 1) - if uptime > warn: + + if uptime_sec > warn: infotext += ", up too long!" - return (state, infotext, [ ("uptime", uptime) ]) + return (state, infotext, [ ("uptime", uptime_sec) ]) diff --git a/checks/viprinet_serial b/checks/viprinet_serial index 0106fb4..d9d4240 100644 --- a/checks/viprinet_serial +++ b/checks/viprinet_serial @@ -24,12 +24,19 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + +def inventory_viprinet_serial(info): + if info: + return [(None, None)] + +def check_viprinet_serial(_no_item, _no_params, info): + return 0, info[0][0] + + check_info["viprinet_serial"] = { - 'check_function' : lambda _no_item, _no_params, info: (0, info[0][0]), - 'inventory_function' : lambda info: len(info) > 0 and [(None, None)] or [], + 'check_function' : check_viprinet_serial, + 'inventory_function' : inventory_viprinet_serial, 'service_description' : "Serial Number", - 'has_perfdata' : False, 'snmp_info' : (".1.3.6.1.4.1.35424.1.1", [2]), - 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.35424", } -

10 years, 9 months

Check_MK Git: check_mk: Removed two obsolete checks

by Mathias Kettner

Module: check_mk Branch: master Commit: 0a1339591a95762ab5aadad4fcf1f09887f9be09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a1339591a9576… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 19 16:23:57 2013 +0100 Removed two obsolete checks --- checkman/blade_misc | 10 ---------- checkman/snia_sml | 13 ------------- checks/blade_misc | 35 ----------------------------------- checks/snia_sml | 37 ------------------------------------- 4 files changed, 95 deletions(-) diff --git a/checkman/blade_misc b/checkman/blade_misc deleted file mode 100644 index 2a216f2..0000000 --- a/checkman/blade_misc +++ /dev/null @@ -1,10 +0,0 @@ -title: IBM Blade Center: Hardware Sensors -agents: snmp -catalog: hw/server/ibm -license: GPL -distribution: check_mk -description: - This check monitors hardware sensors of an IBM Blade Center. -inventory: - Fully supported. - diff --git a/checkman/snia_sml b/checkman/snia_sml deleted file mode 100644 index e40582e..0000000 --- a/checkman/snia_sml +++ /dev/null @@ -1,13 +0,0 @@ -title: IBM Tapelib 3584: Various Sensors -agents: snmp -catalog: hw/storagehw/ibm -license: GPL -distribution: check_mk -description: - This check monitors state of chassis locks, changer, media access - devices, SCSI protocol controllers and FC port controllers of - IBM tape libraries. -inventory: - Fully supported. - - diff --git a/checks/blade_misc b/checks/blade_misc deleted file mode 100644 index a524a57..0000000 --- a/checks/blade_misc +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/python -# -*- encoding: utf-8; py-indent-offset: 4 -*- -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | -# +------------------------------------------------------------------+ -# -# This file is part of Check_MK. -# The official homepage is at http://mathias-kettner.de/check_mk. -# -# check_mk is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation in version 2. check_mk is distributed -# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- -# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU General Public License for more de- -# ails. You should have received a copy of the GNU General Public -# License along with GNU Make; see the file COPYING. If not, write -# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, -# Boston, MA 02110-1301 USA. - - -def check_blade_misc(item, params, info): - return (3, "Sorry. Check not implemented in this version.") - - -check_info["blade_misc"] = { - 'check_function': check_blade_misc, - 'service_description': '%s', -} diff --git a/checks/snia_sml b/checks/snia_sml deleted file mode 100644 index 97ea4c5..0000000 --- a/checks/snia_sml +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/python -# -*- encoding: utf-8; py-indent-offset: 4 -*- -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | -# +------------------------------------------------------------------+ -# -# This file is part of Check_MK. -# The official homepage is at http://mathias-kettner.de/check_mk. -# -# check_mk is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation in version 2. check_mk is distributed -# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- -# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU General Public License for more de- -# ails. You should have received a copy of the GNU General Public -# License along with GNU Make; see the file COPYING. If not, write -# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, -# Boston, MA 02110-1301 USA. - - -def check_snia_sml(item, params, info): - return (3, "Sorry. Check not implemented in this version.") - - - -check_info["snia_sml"] = { - 'check_function': check_snia_sml, - 'service_description': '%s', - 'group': 'obsolete', -}

10 years, 9 months

Check_MK Git: check_mk: FIX LDAP: Fixed "Sync-Plugin: Roles"

by Lars Michelsen

test with OpenLDAP Message-ID: <52b30a15.lAdH+dzZKeN74yP+%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: e87b4ec7e5bc8bc2dc0696d1c805f242edc8da21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e87b4ec7e5bc8b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 19 16:00:17 2013 +0100 FIX LDAP: Fixed "Sync-Plugin: Roles" test with OpenLDAP --- .werks/417 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- web/plugins/userdb/ldap.py | 16 ++++++++++++---- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/.werks/417 b/.werks/417 new file mode 100644 index 0000000..22d8633 --- /dev/null +++ b/.werks/417 @@ -0,0 +1,10 @@ +Title: LDAP: Fixed "Sync-Plugin: Roles" test with OpenLDAP +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387465190 +Targetversion: future + + diff --git a/ChangeLog b/ChangeLog index f4b2bfe..7ec66dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -119,6 +119,7 @@ * 0392 FIX: LDAP: Improved error messages of LDAP configuration test... * 0415 FIX: LDAP: The LDAP Settings dialog is now disabled when the LDAP Connector is disabled * 0416 FIX: When doing user sync on user page rendering, contact group memberships are shown correctly now... + * 0417 FIX: LDAP: Fixed "Sync-Plugin: Roles" test with OpenLDAP Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ead6a25..b99c916 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6171,7 +6171,7 @@ def mode_ldap_config(phase): if isinstance(dn, str): num += 1 try: - ldap_groups = userdb.ldap_get_groups('(distinguishedName=%s)' % dn) + ldap_groups = userdb.ldap_get_groups(dn) if not ldap_groups: return False, _('Could not find the group specified for role %s') % role_id except Exception, e: diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 644c56b..5f85267 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -547,11 +547,19 @@ def ldap_group_base_dn_exists(): else: return len(result) == 1 -def ldap_get_groups(add_filt = None): +def ldap_get_groups(specific_dn = None): filt = ldap_filter('groups') - if add_filt: - filt = '(&%s%s)' % (filt, add_filt) - return ldap_search(ldap_replace_macros(config.ldap_groupspec['dn']), filt, ['cn']) + dn = ldap_replace_macros(config.ldap_groupspec['dn']) + + if specific_dn: + # When using AD, the groups can be filtered by the DN attribute. With + # e.g. OpenLDAP this is not possible. In that case, change the DN. + if config.ldap_connection['type'] == 'ad': + filt = '(&%s(distinguishedName=%s))' % (filt, specific_dn) + else: + dn = specific_dn + + return ldap_search(dn, filt, ['cn']) def ldap_group_members(filters, filt_attr = 'cn', nested = False): cache_key = '%s-%s-%s' % (filters, nested and 'n' or 'f', filt_attr)

10 years, 9 months

Check_MK Git: check_mk: hitachi_hnas_fpga: new check for Hitachi HNAS storage systems

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 854573fc6fd0286c22f8a6cf4e21a526fdf5783b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=854573fc6fd028… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Dec 19 15:58:27 2013 +0100 hitachi_hnas_fpga: new check for Hitachi HNAS storage systems --- .werks/320 | 8 ++++ ChangeLog | 1 + checkman/hitachi_hnas_fpga | 45 +++++++++++++++++++ checks/hitachi_hnas_fpga | 61 ++++++++++++++++++++++++++ pnp-templates/check_mk-hitachi_hnas_fpga.php | 39 ++++++++++++++++ web/plugins/perfometer/check_mk.py | 1 + web/plugins/wato/check_parameters.py | 30 +++++++++++-- 7 files changed, 182 insertions(+), 3 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=854573fc6f…

10 years, 9 months

Check_MK Git: check_mk: Fixed displaying of the users groups on users page after sync

by Lars Michelsen

Module: check_mk Branch: master Commit: 4f89197abd1a4af0bb50b4cf48aebeadef8053a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f89197abd1a4a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 19 15:48:01 2013 +0100 Fixed displaying of the users groups on users page after sync --- web/htdocs/userdb.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 6e23468..e584e43 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -473,10 +473,10 @@ def save_users(profiles): release_lock(root_dir + "contacts.mk") # populate the users cache - html.set_cache('users', users) + html.set_cache('users', profiles) # Call the users_saved hook - hooks.call("users-saved", users) + hooks.call("users-saved", profiles) #. # .-Roles----------------------------------------------------------------.

10 years, 9 months

Check_MK Git: check_mk: FIX When doing user sync on user page rendering, contact group memberships are shown correctly now

by Lars Michelsen

Module: check_mk Branch: master Commit: 2beca802cdb2973cce5d556ad85e76a94145c83e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2beca802cdb297… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 19 15:49:30 2013 +0100 FIX When doing user sync on user page rendering, contact group memberships are shown correctly now When performing user syncs on user configuration page, the memberships of users were not displayed correctly. This has been fixed now --- .werks/416 | 12 ++++++++++++ ChangeLog | 1 + 2 files changed, 13 insertions(+) diff --git a/.werks/416 b/.werks/416 new file mode 100644 index 0000000..619eb70 --- /dev/null +++ b/.werks/416 @@ -0,0 +1,12 @@ +Title: When doing user sync on user page rendering, contact group memberships are shown correctly now +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387464490 +Targetversion: future + +When performing user syncs on user configuration page, the memberships of users were not displayed +correctly. This has been fixed now + diff --git a/ChangeLog b/ChangeLog index b4eb283..5c581e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -116,6 +116,7 @@ * 0400 FIX: WATO BI editor now supports percentages for count_ok... * 0392 FIX: LDAP: Improved error messages of LDAP configuration test... * 0415 FIX: LDAP: The LDAP Settings dialog is now disabled when the LDAP Connector is disabled + * 0416 FIX: When doing user sync on user page rendering, contact group memberships are shown correctly now... Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands...

10 years, 9 months

Check_MK Git: check_mk: wato backup&restore: you can now preview uploaded snapshots before applying them

by Andreas Boesl

Module: check_mk Branch: master Commit: 48a92952cd4ff316b9d95d8f2091ede12aaff626 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48a92952cd4ff3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Dec 19 15:37:49 2013 +0100 wato backup&restore: you can now preview uploaded snapshots before applying them --- web/htdocs/wato.py | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2f6a0a5..ead6a25 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5501,7 +5501,10 @@ def effective_attributes(host, folder): def get_snapshot_status(name): status = {} try: - status["name"] = "%s %s" % (name[14:24], name[25:33].replace("-",":")) + if name == "uploaded_snapshot": + status["name"] = _("uploaded snapshot") + else: + status["name"] = "%s %s" % (name[14:24], name[25:33].replace("-",":")) path_status = "%s/workdir/%s.status" % (snapshot_dir, name) path_pid = "%s/workdir/%s.pid" % (snapshot_dir, name) # Check if this process is still running @@ -5612,10 +5615,11 @@ def mode_snapshot_detail(phase): html.write("<td align='right'>%s</td></tr>" % files[key]["size"]) html.write("</table>") forms.end() - delete_url = make_action_link([("mode", "snapshot"), ("_delete_file", snapshot_name)]) - html.buttonlink(delete_url, _("Delete Snapshot")) - download_url = make_action_link([("mode", "snapshot"), ("_download_file", snapshot_name)]) - html.buttonlink(download_url, _("Download Snapshot")) + if snapshot_name != "uploaded_snapshot": + delete_url = make_action_link([("mode", "snapshot"), ("_delete_file", snapshot_name)]) + html.buttonlink(delete_url, _("Delete Snapshot")) + download_url = make_action_link([("mode", "snapshot"), ("_download_file", snapshot_name)]) + html.buttonlink(download_url, _("Download Snapshot")) if not status.get("progress_status") and not status.get("broken"): restore_url = make_action_link([("mode", "snapshot"), ("_restore_snapshot", snapshot_name)]) html.buttonlink(restore_url, _("Restore Snapshot")) @@ -5633,6 +5637,8 @@ def mode_snapshot(phase): snapshots = [] if os.path.exists(snapshot_dir): + if not html.var("_restore_snapshot") and os.path.exists("%s/uploaded_snapshot" % snapshot_dir): + os.remove("%s/uploaded_snapshot" % snapshot_dir) for f in os.listdir(snapshot_dir): snapshots.append(f) snapshots.sort(reverse=True) @@ -5712,19 +5718,9 @@ def mode_snapshot(phase): if uploaded_file[0] == "": raise MKUserError(None, _("Please select a file for upload.")) if html.check_transaction(): - # Legacy snapshot support - stream = StringIO.StringIO() - stream.write(uploaded_file[2]) - stream.seek(0) - tar = tarfile.open(None, "r", stream) - if "comment" in map(lambda x: x.name, tar.getmembers()): # new version - multitar.extract_from_buffer(uploaded_file[2], backup_domains) - else: - multitar.extract_from_buffer(uploaded_file[2], backup_paths) - - log_pending(SYNCRESTART, None, "snapshot-restored", - _("Restored from uploaded file")) - return None, _("Successfully restored configuration.") + file("%s/uploaded_snapshot" % snapshot_dir, "w").write(uploaded_file[2]) + html.set_var("_snapshot_name", "uploaded_snapshot") + return "snapshot_detail" # delete file elif html.has_var("_delete_file"): @@ -5811,6 +5807,8 @@ def mode_snapshot(phase): table.begin("snapshots", _("Snapshots"), empty_text=_("There are no snapshots available.")) for name in snapshots: + if name == "uploaded_snapshot": + continue status = get_snapshot_status(name) table.row() # Snapshot name

10 years, 9 months

Check_MK Git: check_mk: FIX Fix broken Site status switching via sidebar snapin

by Mathias Kettner

Module: check_mk Branch: master Commit: 64d90c8fce3c97b4848b855be0db12defba3d6e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64d90c8fce3c97… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 19 15:22:29 2013 +0100 FIX Fix broken Site status switching via sidebar snapin The bug was introduced in 1.2.4b1 due to the new handling (and avoiding) of unneccessary livestatus connects. --- .werks/436 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/main.py | 8 ++++---- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.werks/436 b/.werks/436 new file mode 100644 index 0000000..e70d293 --- /dev/null +++ b/.werks/436 @@ -0,0 +1,11 @@ +Title: Fix broken Site status switching via sidebar snapin +Level: 2 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387462864 +Targetversion: future + +The bug was introduced in 1.2.4b1 due to the new handling +(and avoiding) of unneccessary livestatus connects. diff --git a/ChangeLog b/ChangeLog index 3d213c0..d6f450b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -92,6 +92,7 @@ * 0246 FIX: brocade_fcport: fixed error in pnp-template... * 0393 FIX: LDAP: Enabled paged LDAP search by default now with a page size of 1000... * 0394 FIX: LDAP: Auth expiration plugin now checks users for being disabled (in AD)... + * 0436 FIX: Fix broken Site status switching via sidebar snapin... WATO: * 0308 Multisite can now set rotation view permissions for NagVis... diff --git a/web/htdocs/main.py b/web/htdocs/main.py index a01a82f..c0e4815 100644 --- a/web/htdocs/main.py +++ b/web/htdocs/main.py @@ -50,8 +50,8 @@ def page_index(): </html> """ % (heading, start_url)) -# This function does nothing. The sites have already -# been reconfigured according to the variable _site_switch, -# because that variable is processed by connect_to_livestatus() +# This function does almost nothing. It just makes sure that +# a livestatus-connection is built up, since connect_to_livestatus() +# handles the _site_switch variable. def ajax_switch_site(): - pass + html.live

10 years, 9 months

Check_MK Git: check_mk: FIX esx_vsphere_sensors: Fix garbled output in case of placeholder VMs

by Mathias Kettner

Module: check_mk Branch: master Commit: d974bbc70c20c410c5ff548e84c0741f9dc968da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d974bbc70c20c4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 19 14:56:38 2013 +0100 FIX esx_vsphere_sensors: Fix garbled output in case of placeholder VMs When using placeholder VMs in the section of <tt>esx_vsphere_sensors</tt> appeared some debug output. That lead to assuming an <tt>UNKNOWN</tt> state for the sensors check. This has been fixed. --- .werks/435 | 12 ++++++++++++ ChangeLog | 1 + agents/special/agent_vsphere | 1 - 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/435 b/.werks/435 new file mode 100644 index 0000000..4dd98ac --- /dev/null +++ b/.werks/435 @@ -0,0 +1,12 @@ +Title: esx_vsphere_sensors: Fix garbled output in case of placeholder VMs +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387461316 +Targetversion: future + +When using placeholder VMs in the section of <tt>esx_vsphere_sensors</tt> appeared +some debug output. That lead to assuming an <tt>UNKNOWN</tt> state for the sensors +check. This has been fixed. diff --git a/ChangeLog b/ChangeLog index b4eb283..3d213c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,7 @@ * 0351 FIX: local: Catch invalid state codes and map to 3 (UNKNOWN)... * 0397 FIX: mrpe: tolerate performance variable names with spaces... * 0399 FIX: check_ftp: cleanup configuration via WATO, remove Hostname field... + * 0435 FIX: esx_vsphere_sensors: Fix garbled output in case of placeholder VMs... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 525c1dd..f65eae0 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -544,7 +544,6 @@ if not error: def is_placeholder_vm(devices): elements = get_pattern("<VirtualDevice xsi:type=\"([^\"]+)", devices) - pprint.pprint(elements) if "VirtualDisk" not in elements: return True return False

10 years, 9 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 52b8eab663cb3a51b5df64d62e449bbaa92a7c8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52b8eab663cb3a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 19 14:55:05 2013 +0100 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 5910394..4930863 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -435 +455

10 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits