Checkmk git commits June 2011

checkmk-commits@lists.checkmk.com

2 participants
128 discussions

Check_MK Git: check_mk: Multisite: fix service columns in host tables

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2f936721fbb4b5b327c2e4a7ca6f4079368db35c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f936721fbb4b5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 22 10:01:52 2011 +0200 Multisite: fix service columns in host tables In special case where a host group filter is set the service columns did not work --- web/plugins/views/filters.py | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 3213b94..2bd1d33 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -123,10 +123,7 @@ class FilterGroupCombo(Filter): if current_value == None: return "" # no {what}group exists! - if self.what + "s" == infoname: - col = "groups" - else: - col = self.what + "_groups" + col = self.what + "_groups" if not self.enforce and html.var(self.htmlvars[1]): negate = "!" else:

13 years, 5 months

Check_MK Git: check_mk: Multisite: dashboard finalized

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 726074f158870498ed66371a775f90b0c5dc3ea5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=726074f1588704… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 21 17:20:02 2011 +0200 Multisite: dashboard finalized --- web/htdocs/check_mk.css | 13 ++++- web/htdocs/dashboard.py | 79 ++++++++++++++++++----------- web/htdocs/htmllib.py | 2 +- web/htdocs/images/check_mk.trans.120.png | Bin 0 -> 10774 bytes web/htdocs/js/dashboard.js | 18 ++++--- web/htdocs/sidebar.py | 9 ++-- web/plugins/dashboard/builtin.py | 36 +++++++++----- web/plugins/pages/shipped.py | 1 + web/plugins/views/dashboard.py | 3 +- 9 files changed, 102 insertions(+), 59 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=726074f158…

13 years, 5 months

Check_MK Git: check_mk: Dashboard: fixed positioning bug

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8780b8b598c54174ebbc9af17d2e33af676175b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8780b8b598c541… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 20 20:34:46 2011 +0200 Dashboard: fixed positioning bug --- web/htdocs/dashboard.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 630c794..6284a27 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -167,7 +167,7 @@ def ajax_resize(): n = [] for i in [0, 1]: if self._data[i] < 0: - n.append(size[i] - self._data[i] - 1) + n.append(size[i] + self._data[i] + 1) # Here was a bug fixed by Markus Lengler else: n.append(self._data[i] - 1) # make begin from 0 return vec(n)

13 years, 5 months

Check_MK Git: check_mk: Dashboard: fixed dashlet positioning bug

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c5b6a14f1193ea08a5692654fe8e365804f334f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5b6a14f1193ea… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 20 20:29:47 2011 +0200 Dashboard: fixed dashlet positioning bug --- web/htdocs/dashboard.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 630c794..924f844 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -167,7 +167,9 @@ def ajax_resize(): n = [] for i in [0, 1]: if self._data[i] < 0: - n.append(size[i] - self._data[i] - 1) + # The following line had a bug that has been fixed thanks + # to Markus Lengler! + n.append(size[i] + self._data[i] - 1) else: n.append(self._data[i] - 1) # make begin from 0 return vec(n) @@ -201,6 +203,7 @@ def ajax_resize(): # Compute the absolute position, this time from 0 to rastersize-1 abs_position = rel_position.make_absolute(rastersize) + file("/tmp/hirni", "a").write("D: %s: Rastersize: %s, rel: %s, Pos: %s\n" % (dashlet.get("title"), rastersize, rel_position, abs_position)) # The size in raster-elements. A 0 for a dimension means growth. No negative values here. size = vec(dashlet["size"])

13 years, 5 months

Check_MK Git: check_mk: Better output of low NIC speeds in checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1491f90130f5847ba8d8673ef12765663c07df32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1491f90130f584… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 20 16:41:18 2011 +0200 Better output of low NIC speeds in checks --- modules/check_mk_base.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index afe44e0..b4897a9 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1094,7 +1094,11 @@ def get_nic_speed_human_readable(speed): speed = "100MBit/s" elif speedi == 1000000000: speed = "1GBit/s" - elif speed < 1500000000: + elif speed < 1500: + speed = "%dBit/s" % speedi + elif speed < 1000000: + speed = "%.1fKBit/s" % (speedi / 1000.0) + elif speed < 1000000000: speed = "%.2fMBit/s" % (speedi / 1000000.0) else: speed = "%.2fGBit/s" % (speedi / 1000000000.0)

13 years, 5 months

Check_MK Git: check_mk: lnx_if: inventorize nics without speed again

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1c8b43bfe5d3b112b8df97972219514891f704f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c8b43bfe5d3b1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 20 16:41:49 2011 +0200 lnx_if: inventorize nics without speed again --- checks/lnx_if | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/checks/lnx_if b/checks/lnx_if index 6af982f..0a9e776 100644 --- a/checks/lnx_if +++ b/checks/lnx_if @@ -85,7 +85,6 @@ def if_lnx_convert_to_if64(info): speed_text = attr.get("Speed") if speed_text == None: ifSpeed = '' - ifType = 24 else: if speed_text == '65535Mb/s': # unknown ifSpeed = '' @@ -97,7 +96,6 @@ def if_lnx_convert_to_if64(info): ifSpeed = int(speed_text[:-4]) * 1000000000 else: ifSpeed = '' - ifType = 24 # Link state from ethtool. If ethtool has no information about # this NIC, we set the state to unknown.

13 years, 5 months

Check_MK Git: check_mk: FIX: lnx_if/if/if64: ignore perc. levels on NICs without speed info

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: abea3de65901e8ea9fc3cf2526b5f2654be087b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abea3de65901e8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 20 16:42:54 2011 +0200 FIX: lnx_if/if/if64: ignore perc. levels on NICs without speed info --- ChangeLog | 2 ++ checks/if.include | 31 +++++++++++++++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index b1f0a39..08aaceb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ * FIX: apc_symmetra: fix remaining runtime calculation (by factor 100) * FIX: Added PNP-template for winperf_phydisk * FIX: if64: fix UNKNOWN in case of non-unique ifAlias + * FIX: lnx_if/if/if64: ignore percentual traffic levels on NICs without + speed information. * brocade_port: check for Brocade FC ports has been rewritten with lots of new features. * AIX agent now simulates <<<netctr>>> output (by Jörg Linge) diff --git a/checks/if.include b/checks/if.include index e4893cd..8213c17 100644 --- a/checks/if.include +++ b/checks/if.include @@ -177,14 +177,8 @@ def check_if_common(item, params, info): infotext += "(%s) " % operstatus - # Check speed + # prepare reference speed for computing relative bandwidth usage speed = saveint(ifSpeed) - infotext += get_nic_speed_human_readable(speed) - if not targetspeed is None and speed != targetspeed: - infotext += " (wrong speed! expected: %s)" % get_nic_speed_human_readable(targetspeed) - state = max(state, 1) - - # convert percentages to absolute values and vice verca - if possible if speed: ref_speed = speed / 8.0 elif targetspeed: @@ -192,13 +186,34 @@ def check_if_common(item, params, info): else: ref_speed = None - # convert percentages to absolute values if reference speed available + # Check speed settings of interface, but only if speed information + # is available. This is not always the case. + if speed: + infotext += get_nic_speed_human_readable(speed) + if not targetspeed is None and speed != targetspeed: + infotext += " (wrong speed! expected: %s)" % get_nic_speed_human_readable(targetspeed) + state = max(state, 1) + elif targetspeed: + infotext += "assuming %s" % get_nic_speed_human_readable(targetspeed) + else: + infotext += "speed unknown" + + # convert percentages to absolute values if levels are float + # this is only possible if a reference speed is available. if ref_speed: if bw_warn != None and type(bw_warn) == float: bw_warn = bw_warn / 100.0 * ref_speed if bw_crit != None and type(bw_crit) == float: bw_crit = bw_crit / 100.0 * ref_speed + # Ignore percentual levels if no reference speed is available + else: + if bw_warn != None and type(bw_warn) == float: + bw_warn = None + + if bw_crit != None and type(bw_crit) == float: + bw_crit = None + # Performance counters this_time = time.time() rates = []

13 years, 5 months

Check_MK Git: check_mk: Multisite: improve layout of dashboard

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 93fbcdfc3cee3223a43213fc6e7fe85c6fac88c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93fbcdfc3cee32… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 18 16:33:44 2011 +0200 Multisite: improve layout of dashboard --- web/htdocs/check_mk.css | 13 +++- web/plugins/views/builtin.py | 136 +-------------------------------- web/plugins/views/dashboard.py | 167 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 179 insertions(+), 137 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=93fbcdfc3c…

13 years, 5 months

Check_MK Git: check_mk: Dashboard basically working

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 488d4c7f6d7bdd9885813a6016fa08cd84263ae7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=488d4c7f6d7bdd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 18 15:59:15 2011 +0200 Dashboard basically working --- ChangeLog | 1 + web/htdocs/check_mk.css | 44 ++++++++--- web/htdocs/dashboard.py | 23 ++++-- web/htdocs/htmllib.py | 7 +- web/htdocs/js/dashboard.js | 12 +++- web/plugins/dashboard/builtin.py | 62 ++++++---------- web/plugins/sidebar/shipped.py | 3 +- web/plugins/views/builtin.py | 156 ++++++++++++++++++++++++++++++++++++-- 8 files changed, 237 insertions(+), 71 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=488d4c7f6d…

13 years, 5 months

Check_MK Git: check_mk: sidebar: fix malfunctioning buttons

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ee57c752fb295d3329c661801645ddbf68b3fa9e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee57c752fb295d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 18 14:17:52 2011 +0200 sidebar: fix malfunctioning buttons --- web/plugins/sidebar/shipped.py | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 96f387a..1e772d8 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -805,9 +805,7 @@ div#check_mk_sidebar table.master_control td.disabled a { """ % snapin_width } -def ajax_switch_masterstate(h): - global html - html = h +def ajax_switch_masterstate(): site = html.var("site") column = html.var("switch") state = int(html.var("state")) @@ -905,18 +903,14 @@ def page_edit_bookmark(): html.footer() -def ajax_del_bookmark(h): - global html - html = h +def ajax_del_bookmark(): num = int(html.var("num")) bookmarks = load_bookmarks() del bookmarks[num] save_bookmarks(bookmarks) render_bookmarks() -def ajax_add_bookmark(h): - global html - html = h +def ajax_add_bookmark(): title = html.var("title") href = html.var("href") if title and href:

13 years, 5 months

← Newer
1
...
5
6
7
8
9
10
11
12
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2011