Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64623 discussions

Check_MK Git: check_mk: FIX cmciii checks: more general scan function plus perf-o-meters for humidity and temperature checks

by Götz Golla

Module: check_mk Branch: master Commit: ae0278abc1d669e74c84203c67a3afe84e8a6482 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae0278abc1d669… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Apr 9 12:07:06 2014 +0200 FIX cmciii checks: more general scan function plus perf-o-meters for humidity and temperature checks --- .werks/603 | 8 ++++++++ ChangeLog | 1 + checks/cmciii | 2 +- web/plugins/perfometer/check_mk.py | 6 ++++-- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/603 b/.werks/603 new file mode 100644 index 0000000..6fb6acb --- /dev/null +++ b/.werks/603 @@ -0,0 +1,8 @@ +Title: cmciii checks: more general scan function plus perf-o-meters for humidity and temperature checks +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1397037965 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 6f647db..9eb594a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection * 0787 FIX: df: fixed problems on some filesystem checks when legacy check parameters where used... + * 0603 FIX: cmciii checks: more general scan function plus perf-o-meters for humidity and temperature checks Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/checks/cmciii b/checks/cmciii index d608b54..c14fb41 100644 --- a/checks/cmciii +++ b/checks/cmciii @@ -199,7 +199,7 @@ cmciii_snmp_info = [ ] ] -cmciii_scan = lambda oid: "Rittal CMC III PU" in oid(".1.3.6.1.2.1.1.1.0") +cmciii_scan = lambda oid: ".1.3.6.1.4.1.2606.7" in oid(".1.3.6.1.2.1.1.2.0") # .--psm current---------------------------------------------------------. # | _ | diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 6e18c5c..8bf89ba 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -286,6 +286,7 @@ perfometers["check_mk-hitachi_hnas_temp"] = perfometer_temperature perfometers["check_mk-dell_poweredge_temp"] = perfometer_temperature perfometers["check_mk-dell_chassis_temp"] = perfometer_temperature perfometers["check_mk-innovaphone_temp"] = perfometer_temperature +perfometers["check_mk-cmciii.temp"] = perfometer_temperature def perfometer_temperature_multi(row, check_command, perf_data): display_value = -1 @@ -769,11 +770,12 @@ def perfometer_cmc_lcp(row, check_command, perf_data): perfometers["check_mk-cmc_lcp"] = perfometer_cmc_lcp -def perfometer_carel_uniflair_cooling(row, check_command, perf_data): +def perfometer_humidity(row, check_command, perf_data): humidity = float(perf_data[0][1]) return "%3.1f%%" % humidity, perfometer_linear(humidity, '#6f2') -perfometers['check_mk-carel_uniflair_cooling'] = perfometer_carel_uniflair_cooling +perfometers['check_mk-carel_uniflair_cooling'] = perfometer_humidity +perfometers['check_mk-cmciii.humidity'] = perfometer_humidity def perfometer_eaton(row, command, perf): return u"%s°C" % str(perf[0][1]), perfometer_linear(float(perf[0][1]), 'silver')

10 years, 6 months

Check_MK Git: check_mk: ibm_svc_mdiskgrp: free capacity of 0 bytes was not handled correctly

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: bcb9ccc88c583995f40836856b0504d05db3a565 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bcb9ccc88c5839… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Apr 8 16:14:43 2014 +0200 ibm_svc_mdiskgrp: free capacity of 0 bytes was not handled correctly --- checks/ibm_svc_mdiskgrp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/checks/ibm_svc_mdiskgrp b/checks/ibm_svc_mdiskgrp index c28ba6d..dda631a 100644 --- a/checks/ibm_svc_mdiskgrp +++ b/checks/ibm_svc_mdiskgrp @@ -51,6 +51,8 @@ def ibm_svc_mdiskgrp_to_mb(size): size = int(float(size.replace("PB", ""))) * 1024 * 1024 * 1024 elif size.endswith("EB"): size = int(float(size.replace("EB", ""))) * 1024 * 1024 * 1024 * 1024 + else: + size = int(float(size)) return size def inventory_ibm_svc_mdiskgrp(info):

10 years, 6 months

Check_MK Git: check_mk: Linux multipath check can now use the alias instead of the UUID as item

by Mathias Kettner

Module: check_mk Branch: master Commit: cff9d866636c5e555e10e137bec995796161797c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cff9d866636c5e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 8 12:20:55 2014 +0200 Linux multipath check can now use the alias instead of the UUID as item If you have set useful aliasses for you Linux multipath devices then you can now have Check_MK use these instead of the UUIDs for the service description. This makes alerting, BI aggregates and other stuff easier. The configuration is via a new rule set <i>Linux Multipath Inventory</i>. If you are now using WATO then please refer to the check's man page for details. --- .werks/757 | 12 ++++++++++++ ChangeLog | 1 + checkman/multipath | 13 ++++++++++++- checks/multipath | 18 ++++++++++++++++-- web/plugins/wato/check_parameters.py | 19 +++++++++++++++++++ 5 files changed, 60 insertions(+), 3 deletions(-) diff --git a/.werks/757 b/.werks/757 new file mode 100644 index 0000000..5bc19d1 --- /dev/null +++ b/.werks/757 @@ -0,0 +1,12 @@ +Title: Linux multipath check can now use the alias instead of the UUID as item +Level: 2 +Component: checks +Version: 1.2.5i3 +Date: 1396952369 +Class: feature + +If you have set useful aliasses for you Linux multipath devices then you can +now have Check_MK use these instead of the UUIDs for the service description. +This makes alerting, BI aggregates and other stuff easier. The configuration +is via a new rule set <i>Linux Multipath Inventory</i>. If you are now using +WATO then please refer to the check's man page for details. diff --git a/ChangeLog b/ChangeLog index 05ade8e..91d1403 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ NOTE: Please refer to the migration notes! * 0802 ibm_svc_nodestats.iops, ibm_svc_systemstats.iops: new checks for IO operations/sec on IBM SVC / V7000 devices * 0602 cmciii.humidity: new check for Rittals CMC III humidity sensors + * 0757 Linux multipath check can now use the alias instead of the UUID as item... * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection diff --git a/checkman/multipath b/checkman/multipath index 0543f80..7b4a13d 100644 --- a/checkman/multipath +++ b/checkman/multipath @@ -24,9 +24,20 @@ item: alias as item. inventory: - One check for each multipath device is created. + One check for each multipath device is created. Via {iventory_multipath_rules} + you can specify wether an alias should be used as item instead of the UUID. + +examples: + # Use the alias as item if one is being set + inventory_multipath_rules = [ + ( {'use_alias': True}, [], ALL_HOSTS ), + ] + [parameters] numpaths(int): The only parameter is the number of expected paths. This is not a tuple but a simple integer value. +[configuration] +inventory_multipath_rules(ruleset): A dictionary ruleset with currently the only possible + key being {use_alias}. See section inventory for details. diff --git a/checks/multipath b/checks/multipath index 6457f69..5247647 100644 --- a/checks/multipath +++ b/checks/multipath @@ -24,6 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# Configuration for using alias instead of UUID +inventory_multipath_rules = [] # Output from multipath -l has the following format: @@ -252,11 +254,17 @@ def parse_multipath_output(info, only_uuid = None): # Get list of UUIDs of all multipath devices # Length of UUID is 360a9800043346937686f456f59386741 def inventory_multipath(info): + settings = host_extra_conf_merged(g_hostname, inventory_multipath_rules) + inventory = [] parsed = parse_multipath_output(info) for uuid, info in parsed.items(): # take current number of paths as target value - inventory.append( (uuid, " ".join(info['luns']), info['numpaths']) ) + if "alias" in info and settings.get("use_alias"): + item = info["alias"] + else: + item = uuid + inventory.append( (item, info['numpaths']) ) return inventory # item is UUID (e.g. '360a9800043346937686f456f59386741') or alias (e.g. 'mpath0') @@ -269,9 +277,15 @@ def check_multipath(item, target_numpaths, info): return (3, "no map with uuid/alias %s" % item) mmap = parsed.values()[0] + # If the item is the alias, then show the UUID in the plugin output. + # If the item is the UUID, then vice versa. alias = mmap.get('alias') - if alias: + uuid = mmap.get('uuid') + + if item == uuid and alias: aliasinfo = "(%s) " % alias + elif item == alias and uuid: + aliasinfo = "(%s) " % uuid else: aliasinfo = "" diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 2d2c845..3b6d28f 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3437,6 +3437,25 @@ register_check_parameters( "first" ) +register_rule( + "checkparams/" + subgroup_storage, + varname = "inventory_multipath_rules", + title = _("Linux Multipath Inventory"), + valuespec = Dictionary( + elements = [ + ("use_alias", Checkbox( + title = _("Use the multipath alias as service name, if one is set"), + label = _("use alias"), + help = _("If a multipath device has an alias then you can use that for specifying " + "the device instead of the UUID. The alias will then be part of the service " + "description. The UUID will be output in the pluging outpout.")) + ), + ], + help = _('This rule controls the inventory of Multipath devices on Linux.'), + ), + match = 'dict', +) + register_check_parameters( subgroup_storage, "multipath_count",

10 years, 6 months

Check_MK Git: check_mk: oracle_tablespaces: improved formatting of levels text in check output

by Andreas Boesl

Module: check_mk Branch: master Commit: 7c84300b6756cb44c21cad8dcbe8502330ba6030 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c84300b6756cb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 8 11:56:56 2014 +0200 oracle_tablespaces: improved formatting of levels text in check output If you configure percentage levels within WATO the check will display them as percentage in the check output, as well. Previously these values were always displayed as bytes --- .werks/829 | 10 ++++++++++ ChangeLog | 1 + checks/oracle_tablespaces | 16 +++++++++++----- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.werks/829 b/.werks/829 new file mode 100644 index 0000000..d711ace --- /dev/null +++ b/.werks/829 @@ -0,0 +1,10 @@ +Title: oracle_tablespaces: improved formatting of levels text in check output +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1396950872 +Class: feature + +If you configure percentage levels within WATO the check will display them +as percentage in the check output, as well. Previously these values were always +displayed as bytes diff --git a/ChangeLog b/ChangeLog index 05ade8e..7deac55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ NOTE: Please refer to the migration notes! * 0802 ibm_svc_nodestats.iops, ibm_svc_systemstats.iops: new checks for IO operations/sec on IBM SVC / V7000 devices * 0602 cmciii.humidity: new check for Rittals CMC III humidity sensors + * 0829 oracle_tablespaces: improved formatting of levels text in check output... * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index ca850cf..05cb437 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -107,8 +107,9 @@ def get_tablespace_levels_in_bytes(size_bytes, params): warn, crit = this_levels break else: - return (None, None) + return None, None, "" + levels_text = "levels at " if magic: # convert warn/crit to percentage if type(warn) != float: @@ -131,19 +132,25 @@ def get_tablespace_levels_in_bytes(size_bytes, params): crit_scaled = lowest_critical_level warn_bytes = savefloat(size_bytes * warn_scaled / 100) crit_bytes = savefloat(size_bytes * crit_scaled / 100) + levels_text += get_bytes_human_readable(warn_bytes) + levels_text += "/%s" % get_bytes_human_readable(crit_bytes) else: # warn/crit level are float => percentages of max size, otherwise MB if type(warn) == float: warn_bytes = warn / 100.0 * size_bytes + levels_text += "%.1f%%" % warn else: warn_bytes = warn * 1024 * 1024 + levels_text += get_bytes_human_readable(warn_bytes) if type(crit) == float: crit_bytes = crit / 100.0 * size_bytes + levels_text += "/%.1f%%" % crit else: crit_bytes = crit * 1024 * 1024 + levels_text += "/%s" % get_bytes_human_readable(crit_bytes) - return warn_bytes, crit_bytes + return warn_bytes, crit_bytes, levels_text def check_oracle_tablespaces(item, params, info): @@ -242,15 +249,14 @@ def check_oracle_tablespaces(item, params, info): infotext += ", no autoextend" - warn, crit = get_tablespace_levels_in_bytes(max_size, params) + warn, crit, levels_text = get_tablespace_levels_in_bytes(max_size, params) # Check free space, but only if status is not READONLY if ts_status != "READONLY": if (crit is not None and free_space <= crit) \ or (warn is not None and free_space <= warn): infotext += ", only %s left" % get_bytes_human_readable(free_space) - infotext += " (levels at %s/%s)" % ( - get_bytes_human_readable(warn), get_bytes_human_readable(crit)) + infotext += " (%s)" % levels_text if free_space <= crit: status = 2 else:

10 years, 6 months

Check_MK Git: check_mk: Reserved 50 Werk IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: a8628306cf560382a97d3efaaac78cd1dc6ea3b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8628306cf5603… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 8 11:54:24 2014 +0200 Reserved 50 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 5755750..180bd24 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -829 +879

10 years, 6 months

Check_MK Git: check_mk: FIX oracle_tablespaces: fixed bug when using dynamic filesystem levels

by Andreas Boesl

Module: check_mk Branch: master Commit: 126e1422af3f6615ab251e638e7245567a0a83f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=126e1422af3f66… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 8 11:02:02 2014 +0200 FIX oracle_tablespaces: fixed bug when using dynamic filesystem levels The check did not process the dynamic levels correctly. If there was a rule with dynamic filesystem levels, e.g. <ul> <li>1 TB - 5%/2% free</li> <li>500 GB - 6%/3% free</li> <li>200 GB - 10%/4% free</li> <li>500 MB - 20%/15% free</li> </ul> and the filesystems size was 700GB, the levels of the 500 MB rule were actually used. --- .werks/789 | 18 ++++++++++++++++++ ChangeLog | 1 + checks/oracle_tablespaces | 5 ++--- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.werks/789 b/.werks/789 new file mode 100644 index 0000000..fda3da3 --- /dev/null +++ b/.werks/789 @@ -0,0 +1,18 @@ +Title: oracle_tablespaces: fixed bug when using dynamic filesystem levels +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i3 +Date: 1396947332 + +The check did not process the dynamic levels correctly. +If there was a rule with dynamic filesystem levels, e.g. +<ul> +<li>1 TB - 5%/2% free</li> +<li>500 GB - 6%/3% free</li> +<li>200 GB - 10%/4% free</li> +<li>500 MB - 20%/15% free</li> +</ul> +and the filesystems size was 700GB, the levels of the 500 MB rule were actually used. + diff --git a/ChangeLog b/ChangeLog index c2abeee..05ade8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * 0787 FIX: df: fixed problems on some filesystem checks when legacy check parameters where used... * 0803 FIX: agent_ibmsvc: raw data for System Info Check and License Check now in correct format... * 0788 FIX: oracle_tablespaces: now able to bear None values as warn/crit levels... + * 0789 FIX: oracle_tablespaces: fixed bug when using dynamic filesystem levels... Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index 7ed2eec..ca850cf 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -102,12 +102,11 @@ def get_tablespace_levels_in_bytes(size_bytes, params): else: # A list of levels. Choose the correct one depending on the # size of the current tablespace - found = False for to_size, this_levels in params.get("levels"): if size_bytes > to_size: warn, crit = this_levels - found = True - if not found: + break + else: return (None, None) if magic:

10 years, 6 months

Check_MK Git: check_mk: FIX Availability: fixed memory leak in table statehist

by Andreas Boesl

Module: check_mk Branch: master Commit: e820d79af2bc40cb806b3a479d67089524646346 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e820d79af2bc40… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Apr 4 15:09:54 2014 +0200 FIX Availability: fixed memory leak in table statehist The cleanup procedure of the livestatus table statehist missed some items.. This has been fixed. --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 73459b4..c2abeee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,8 +19,8 @@ * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection - * 0803 FIX: agent_ibmsvc: raw data for System Info Check and License Check now in correct format... * 0787 FIX: df: fixed problems on some filesystem checks when legacy check parameters where used... + * 0803 FIX: agent_ibmsvc: raw data for System Info Check and License Check now in correct format... * 0788 FIX: oracle_tablespaces: now able to bear None values as warn/crit levels... Multisite:

10 years, 6 months

Check_MK Git: check_mk: FIX oracle_tablespaces: now able to bear None values as warn/crit levels

by Andreas Boesl

Module: check_mk Branch: master Commit: e8a79db20d1fce7a3abea3ee07922fb43c5c5527 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8a79db20d1fce… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 8 10:46:52 2014 +0200 FIX oracle_tablespaces: now able to bear None values as warn/crit levels The levels in the oracle_tablespaces parameters could be set to None if dynamic levels were used, but the filesystem was not within the limits of the dynamic levels. This caused an invalid check output. --- .werks/788 | 11 +++++++++++ ChangeLog | 1 + checks/oracle_tablespaces | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/788 b/.werks/788 new file mode 100644 index 0000000..f692950 --- /dev/null +++ b/.werks/788 @@ -0,0 +1,11 @@ +Title: oracle_tablespaces: now able to bear None values as warn/crit levels +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1396946661 +Class: fix + +The levels in the oracle_tablespaces parameters could be set to None +if dynamic levels were used, but the filesystem was not within the limits +of the dynamic levels. +This caused an invalid check output. diff --git a/ChangeLog b/ChangeLog index 6f647db..ac71639 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection * 0787 FIX: df: fixed problems on some filesystem checks when legacy check parameters where used... + * 0788 FIX: oracle_tablespaces: now able to bear None values as warn/crit levels... Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index a8c01c6..7ed2eec 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -257,7 +257,7 @@ def check_oracle_tablespaces(item, params, info): else: status = max(1, status) - perfdata = [ ("size", current_size, max_size - warn, max_size - crit), + perfdata = [ ("size", current_size, max_size - (warn or 0), max_size - (crit or 0)), ("used", used), ("max_size", max_size) ]

10 years, 6 months

Check_MK Git: check_mk: Allow availability of multisite BI aggregates at once

by Mathias Kettner

Module: check_mk Branch: master Commit: b74d6fb6df0a81e73c6403b2b736f85f52de7a38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b74d6fb6df0a81… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 8 10:09:15 2014 +0200 Allow availability of multisite BI aggregates at once Views containing multisite BI aggregates now also have the button <i>Availability</i> at the top of the view. Multisite BI aggregates can thus be displayed in one availability table - just as for hosts and services. --- .werks/756 | 10 ++ ChangeLog | 3 + web/htdocs/bi.py | 9 +- web/htdocs/check_mk.css | 38 ------- web/htdocs/pages.css | 35 ++++++ web/htdocs/views.py | 20 +++- web/plugins/pages/shipped.py | 1 - web/plugins/views/availability.py | 215 +++++++++++++++++++++++++------------ web/plugins/views/bi.py | 4 +- 9 files changed, 220 insertions(+), 115 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b74d6fb6df…

10 years, 6 months

Check_MK Git: check_mk: Display HTML variables in debug mode in a nicer way

by Mathias Kettner

Module: check_mk Branch: master Commit: 1555e6797b752f105b5b2755d3f20125551c698a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1555e6797b752f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 8 10:07:40 2014 +0200 Display HTML variables in debug mode in a nicer way --- web/htdocs/htmllib.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index ae524a8..6862841 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -752,7 +752,12 @@ class html: _("<a href=\"http://mathias-kettner.de\"><img src=\"images/mk_logo_small.gif\"/></a>")) self.write("<hr class=header>\n") if self.enable_debug: - self.write("<div class=urldebug>%s</div>" % self.makeuri([])) + self.dump_get_vars() + + def dump_get_vars(self): + self.begin_foldable_container("html", "debug_vars", True, _("GET/POST variables of this page")) + self.debug_vars(hide_with_mouse = False) + self.end_foldable_container() def body_start(self, title='', **args): self.html_head(title, **args) @@ -1081,13 +1086,17 @@ class html: self.lowlevel_write("<pre>%s</pre>\n" % pprint.pformat(element)) - def debug_vars(self, prefix = None): - self.lowlevel_write('<table onmouseover="this.style.display=\'none\';" class=debug_vars>') + def debug_vars(self, prefix=None, hide_with_mouse=True): + if hide_with_mouse: + hover = ' onmouseover="this.style.display=\'none\';"' + else: + hover = "" + self.lowlevel_write('<table %s class=debug_vars>' % hover) self.lowlevel_write("<tr><th colspan=2>POST / GET Variables</th></tr>") for name, value in sorted(self.vars.items()): if not prefix or name.startswith(prefix): self.write("<tr><td class=left>%s</td><td class=right>%s</td></tr>\n" % (name, value)) - self.write("</ul>") + self.write("</table>") def var(self, varname, deflt = None): return self.vars.get(varname, deflt)

10 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits