Checkmk git commits January 2011

checkmk-commits@lists.checkmk.com

3 participants
114 discussions

Check_MK Git: check_mk: Fix SNMP scan bug with misc checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 482747a27978a9398ca129a41455ac4e5fd6b4ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=482747a27978a9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 27 09:26:29 2011 +0100 Fix SNMP scan bug with misc checks --- ChangeLog | 1 + modules/check_mk.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7c910c..64f540e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.1.9i6: Core, Setup, etc.: * cmk -D: show ip address of host + * Fix SNMP inventory find snmp misc checks inspite of negative scan function Checks & Agents: * megaraid_ldisks: remove debug output diff --git a/modules/check_mk.py b/modules/check_mk.py index 2a06e50..755bc6e 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -675,7 +675,7 @@ def snmp_scan(hostname, ipaddress): # Now try all checks not having a scan function for checktype in check_info.keys(): datatype = checktype.split('.')[0] - if datatype not in snmp_info: + if not check_uses_snmp(datatype): continue # no snmp check if checktype not in snmp_scan_functions: if opt_verbose:

13 years, 7 months

Check_MK Git: check_mk: Updated bug entries

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 806cdeefa5bb23ce79cec7981b5e86170f94019e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=806cdeefa5bb23… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 28 11:43:51 2011 +0100 Updated bug entries --- .bugs/107 | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.bugs/107 b/.bugs/107 index 6c90e63..39e2759 100644 --- a/.bugs/107 +++ b/.bugs/107 @@ -1,9 +1,13 @@ Title: Snapin Serverperformance: number should be bold Component: multisite +State: done +Class: cleanup +Date: 2011-01-25 10:03:20 Benefit: 1 -State: open Cost: 1 -Date: 2011-01-25 10:03:20 -Class: cleanup +Fun: 0 The numbers had been bold once. This looked better. Make them bold again. + +2011-01-28 11:43:33: changed state open -> done +Don't know exactly why the css definition did not work; Replaced it with <strong> html tag which works over here without problems.

13 years, 7 months

Check_MK Git: check_mk: sidebar Snapin Serverperformance: number is bold again

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d96c9d2a76dcaa2c1674aeac6a95e8928c066d86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d96c9d2a76dcaa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 28 11:44:15 2011 +0100 sidebar Snapin Serverperformance: number is bold again --- web/plugins/sidebar/shipped.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index a24a282..01dae39 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -563,12 +563,12 @@ def render_performance(): ("Process creations", 4, "%.2f/s"), ("New log messages", 5, "%.2f/s"), ("Cached log messages", 6, "%d")]: - html.write(("<tr><td class=left>%s:</td><td class=right>" + format + "</td></tr>\n") % (what, sum([row[col] for row in data]))) + html.write(("<tr><td class=left>%s:</td><td class=right><strong>" + format + "</strong></td></tr>\n") % (what, sum([row[col] for row in data]))) data = html.live.query("GET status\nColumns: external_command_buffer_slots external_command_buffer_max\n") size = sum([row[0] for row in data]) maxx = sum([row[1] for row in data]) html.write("<tr><td class=left>Com. buf. max/total</td>" - "<td class=right>%d / %d</td></tr>" % (maxx, size)) + "<td class=right><strong>%d / %d</strong></td></tr>" % (maxx, size)) html.write("</table>\n") sidebar_snapins["performance"] = { @@ -586,11 +586,11 @@ table.performance { background-color: #589; border-style: solid; border-color: #444 #bbb #eee #666; - /* The border needs to be substracted from the width */ + /* The border needs to be substracted from the width */ border-width: 1px; } table.performance td { padding: 0px; } -table.Performance td.right { text-align: right; font-weight: bold; padding: 0px; } +table.Performance td.right { text-align: right; padding: 0px; } """ % (snapin_width - 2) }

13 years, 7 months

Check_MK Git: check_mk: Updated bug entries

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 703b94603938a123184eaf3201e013fee4b82eb1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=703b94603938a1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 28 13:44:14 2011 +0100 Updated bug entries --- .bugs/103 | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.bugs/103 b/.bugs/103 index be39ebf..68622c2 100644 --- a/.bugs/103 +++ b/.bugs/103 @@ -1,10 +1,11 @@ Title: Snapin Hostmatrix: mouse hover title not working Component: multisite +State: done +Class: bug +Date: 2011-01-24 15:40:40 Benefit: 1 -State: open Cost: 1 -Date: 2011-01-24 15:40:40 -Class: bug +Fun: 0 If you hover of a host square the name of the host should popup in a small windows (via title attribute). This is @@ -13,3 +14,6 @@ about 790 hosts. Das alles ist in Firefox. In Chrome funktioniert es, aber dort sind dumme Abstände zwischen den Zeilen. + +2011-01-28 13:44:06: changed state open -> done +Fixed mouse over and links in hostmatrix snapin by setting an explicit width/height for each column;

13 years, 7 months

Check_MK Git: check_mk: Removed jquery hover menus, replaced with own hover code

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: c6a446fb616ddb3406765e914e2d40abd161774f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6a446fb616ddb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 28 15:22:12 2011 +0100 Removed jquery hover menus, replaced with own hover code --- ChangeLog | 1 + web/htdocs/htmllib.py | 11 +- web/htdocs/js/hover.js | 129 +++++++++ web/htdocs/js/jquery-min.js | 154 ----------- web/htdocs/js/jquery.cluetip.js | 558 --------------------------------------- web/plugins/views/painters.py | 5 +- 6 files changed, 135 insertions(+), 723 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c6a446fb61…

13 years, 7 months

Check_MK Git: check_mk: Fixed links and border-styling of host matrix snapin

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e75fea747510210529aa7e936c389a2571d41428 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e75fea74751021… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 28 13:43:05 2011 +0100 Fixed links and border-styling of host matrix snapin --- ChangeLog | 3 ++- web/plugins/sidebar/shipped.py | 29 ++++++++++++++++++++--------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 75737ef..bf0bb61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,7 +16,8 @@ (Thanks to Andreas Behler) Multisite: - * Fixed aligns/widths of snapin contents + * Fixed aligns/widths of snapin contents and several small styling issues + * Fixed links and border-styling of host matrix snapin 1.1.9i5: diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 01dae39..2d7cac4 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -306,10 +306,19 @@ def render_hostmatrix(): if lastcols > 0: rows += 1 - style = 'height: %dpx; ' % (snapin_width) - if rows > 10: - style += "border-collapse: collapse;" - html.write('<table class="content_center hostmatrix" style="%s">\n' % style) + # Calculate cell size (Automatic sizing with 100% does not work here) + # - Get cell spacing: 1px between each cell + # - Substract the cell spacing for each column from the total width + # - Then divide the total width through the number of columns + # - Then get the full-digit width of the cell and summarize the rest + # to be substracted from the cell width + # This is not a 100% solution but way better than having no links + cell_spacing = 1 + cell_size = ((snapin_width - cell_spacing * (n+1)) / n) + cell_size, cell_size_rest = divmod(cell_size, 1) + style = 'width:%spx' % (snapin_width - n * cell_size_rest) + + html.write('<table class="content_center hostmatrix" cellspacing="0" style="border-collapse:collapse;%s">\n' % style) col = 1 row = 1 for site, host, state, has_been_checked, worstsvc, downtimedepth in hosts: @@ -328,7 +337,8 @@ def render_hostmatrix(): else: s = 0 url = "view.py?view_name=host&site=%s&host=%s" % (htmllib.urlencode(site), htmllib.urlencode(host)) - html.write('<td class="state state%s"><a href="%s" title="%s" target="main"></a></td>' % (s, url, host)) + html.write('<td class="state state%s"><a href="%s" title="%s" target="main" style="width:%spx;height:%spx;"></a></td>' % + (s, url, host, cell_size, cell_size)) if col == n or (row == rows and n == lastcols): html.write("<tr>\n") col = 1 @@ -346,10 +356,11 @@ sidebar_snapins["hostmatrix"] = { "allowed" : [ "user", "admin", "guest" ], "refresh" : 10, "styles" : """ -table.hostmatrix { width: %dpx; border-spacing: 1px; } -table.hostmatrix a { display: block; width: 100%%; height: 100%%; } -table.hostmatrix td { border: 1px solid white; } -""" % snapin_width +table.hostmatrix { border-spacing: 0; } +table.hostmatrix tr { padding: 0; border-spacing: 0; } +table.hostmatrix a { display: block; width: 100%%; height: 100%%; line-height: 100%%; } +table.hostmatrix td { border: 1px solid white; padding: 0; border-spacing: 0; } +""" }

13 years, 7 months

Check_MK Git: check_mk: Fixed aligns/widths of snapin contents

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 495f7becfabd29cb254abd0f8447181a9471603b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=495f7becfabd29… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 28 11:27:27 2011 +0100 Fixed aligns/widths of snapin contents --- .bugs/91 | 4 ++++ ChangeLog | 3 +++ web/htdocs/check_mk.css | 35 ++++++++++++++++++++++------------- web/htdocs/sidebar.py | 2 +- web/plugins/sidebar/search.py | 20 ++++++++++++++------ web/plugins/sidebar/shipped.py | 21 +++++++++++---------- 6 files changed, 55 insertions(+), 30 deletions(-) diff --git a/.bugs/91 b/.bugs/91 index d829eb5..2d035b6 100644 --- a/.bugs/91 +++ b/.bugs/91 @@ -10,3 +10,7 @@ Since shortly the small blue bullets lefts to links like in "Site status" are indented too much left (on Firefox). This could be the effect of fixing this for IE and Chrome. + +-- + + diff --git a/ChangeLog b/ChangeLog index c7c910c..75737ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,9 @@ * drbd: Fixed var typo which prevented inventory of drbd general check (Thanks to Andreas Behler) + Multisite: + * Fixed aligns/widths of snapin contents + 1.1.9i5: Multisite: diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index fce269c..583f1d4 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -107,7 +107,7 @@ body.side { font-size: 9pt; padding: 0; margin: 0; - width: 100%; + width: 280px; height: 100%; overflow:hidden; } @@ -160,7 +160,6 @@ div#check_mk_sidebar div#side_content { height: 500px; overflow: hidden; color: #000000; - padding-left: 5px; padding-top: 60px; padding-bottom: 5px; } @@ -187,7 +186,7 @@ div#check_mk_sidebar div#side_footer div.button { top: 10px; left: 15px; float: left; -padding: 0px; + padding: 0px; } div#check_mk_sidebar div#side_footer div.button a { width: 75px; @@ -200,7 +199,7 @@ div#check_mk_sidebar div#side_footer div.button a { text-decoration: none; background-repeat: repeat; background-image: url("images/sidebar_button_lo.png"); -margin: 0px; + margin: 0px; } div#check_mk_sidebar div#side_footer div.button a:hover { background-image: url("images/sidebar_button_hi.png"); @@ -223,8 +222,8 @@ color: white; /* General layout of snapins */ div.snapin { - width: 100%; - margin: 0; + width: 275px; + margin: 0 0 0 5px; padding: 0; } @@ -233,7 +232,7 @@ div.snapin div.head { width: 260px; text-align: center; color: white; - padding-top: 9px; + padding-top: 9px; } div.snapin div.head.open { @@ -257,11 +256,12 @@ div.snapin div.content { background-image: url("images/snapin_background.png"); background-repeat: repeat-y; background-position: left; - padding-top: 10px; - padding-left: 12px; - padding-right: 12px; - padding-bottom: 5px; - width: 240px; + + /* It's important for the left/right padding to be substracted + * from the width defined below. The regular width would be 260px. */ + padding: 10px 15px 5px; + width: 230px; + margin: 0; } div.snapin div.foot { @@ -272,7 +272,15 @@ div.snapin div.foot { line-height: 10px; } -/* General styles for snapin contents */ +/* + * General styles for snapin contents + */ + +div.snapin .content_center { + margin-left: auto; + margin-right: auto; +} + div.snapin { font-family: arial, helvetica, sans-serif; } @@ -280,6 +288,7 @@ div.snapin { div.snapin td { color: #fff; } + div.snapin h3 { margin: 2px 0px; color: #fff; diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 1403ebe..2e3e553 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -30,7 +30,7 @@ from lib import * sidebar_snapins = {} # Constants to be used in snapins -snapin_width = 229 +snapin_width = 230 # Load all snapins snapins_dir = defaults.web_dir + "/plugins/sidebar" diff --git a/web/plugins/sidebar/search.py b/web/plugins/sidebar/search.py index 18e84b0..a89b806 100644 --- a/web/plugins/sidebar/search.py +++ b/web/plugins/sidebar/search.py @@ -45,7 +45,7 @@ def render_searchform(): except: limit = 80 - html.write('<div id="mk_side_search" onclick="mkSearchClose();">') + html.write('<div id="mk_side_search" class="content_center" onclick="mkSearchClose();">') html.write('<input id="mk_side_search_field" type="text" name="search" autocomplete="off" />') html.write('</div>') html.write("<script type='text/javascript' src='js/search.js'></script>\n") @@ -96,14 +96,22 @@ sidebar_snapins["search"] = { "allowed" : [ "user", "admin", "guest" ], "styles" : """ div#mk_side_search { - padding-left: 1px; width: %dpx; + padding: 0; } -div#mk_side_search input{ - margin: 0px 1px 0px 0px; - width: 100%%; +div#mk_side_search input { + margin: 0; + padding: 0; font-size: 8pt; + /* The padding and border defined below stretch the object by 2px in each + * direction. This needs to be substracted from the width to position the + * field correctly + */ + width: %dpx; + padding: 1px; + border: 1px #73767A solid; + outline: 1px solid #fff; } div#mk_side_search #mk_search_results { @@ -129,5 +137,5 @@ div#mk_side_search #mk_search_results a:hover, div#mk_side_search #mk_search_res background-color: #BFBFBF; } -""" % (snapin_width - 1) +""" % (snapin_width - 4, snapin_width - 8) } diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index b8b2704..a24a282 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -309,7 +309,7 @@ def render_hostmatrix(): style = 'height: %dpx; ' % (snapin_width) if rows > 10: style += "border-collapse: collapse;" - html.write('<table class=hostmatrix style="%s">\n' % style) + html.write('<table class="content_center hostmatrix" style="%s">\n' % style) col = 1 row = 1 for site, host, state, has_been_checked, worstsvc, downtimedepth in hosts: @@ -495,7 +495,7 @@ def render_tactical_overview(): except livestatus.MKLivestatusNotFoundError: html.write("<center>No data from any site</center>") return - html.write("<table class=tacticaloverview cellspacing=2 cellpadding=0 border=0>\n") + html.write("<table class=\"content_center tacticaloverview\" cellspacing=2 cellpadding=0 border=0>\n") for title, data, view, what in [ ("Hosts", hstdata, 'hostproblems', 'host'), ("Services", svcdata, 'svcproblems', 'service'), @@ -535,12 +535,12 @@ table.tacticaloverview { * border-spacing: 5px 2px; */ width: %dpx; - margin-top: 0px; + margin-top: 0; } -table.tacticaloverview th { font-size: 7pt; text-align: left; font-weight: normal; padding: 0px; padding-top: 2px; } +table.tacticaloverview th { font-size: 7pt; text-align: left; font-weight: normal; padding: 0; padding-top: 2px; } table.tacticaloverview td { text-align: right; border: 1px solid #444; padding: 0px; } table.tacticaloverview td a { display: block; margin-right: 2px; } -""" % (snapin_width + 8) +""" % snapin_width } # table.tacticaloverview td.prob { font-weight: bold; } @@ -554,7 +554,7 @@ table.tacticaloverview td a { display: block; margin-right: 2px; } # -------------------------------------------------------------- def render_performance(): data = html.live.query("GET status\nColumns: service_checks_rate host_checks_rate external_commands_rate connections_rate forks_rate log_messages_rate cached_log_messages\n") - html.write("<table class=performance>\n") + html.write("<table class=\"content_center performance\">\n") for what, col, format in \ [("Service checks", 0, "%.2f/s"), ("Host checks", 1, "%.2f/s"), @@ -580,19 +580,19 @@ sidebar_snapins["performance"] = { "allowed" : [ "admin", ], "styles" : """ table.performance { + width: %dpx; -moz-border-radius: 5px; font-size: 8pt; - width: %dpx; - border-style: solid; background-color: #589; + border-style: solid; border-color: #444 #bbb #eee #666; + /* The border needs to be substracted from the width */ border-width: 1px; - padding: 2px; } table.performance td { padding: 0px; } table.Performance td.right { text-align: right; font-weight: bold; padding: 0px; } -""" % snapin_width +""" % (snapin_width - 2) } # -------------------------------------------------------------- @@ -619,6 +619,7 @@ div.time { text-align: center; font-size: 18pt; font-weight: bold; + /* The border needs to be substracted from the width */ border: 1px solid #8cc; -moz-border-radius: 10px; background-color: #588;

13 years, 7 months

Check_MK Git: check_mk: Updated bug entries

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 35fdf2af76557c1f74eb9e8ef647acddcb2bb9cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35fdf2af76557c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 28 11:37:49 2011 +0100 Updated bug entries --- .bugs/91 | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.bugs/91 b/.bugs/91 index 2d035b6..89ba83a 100644 --- a/.bugs/91 +++ b/.bugs/91 @@ -1,10 +1,11 @@ Title: bulletlink in sidebarsnapin: broken layout Component: multisite +State: done +Class: bug +Date: 2011-01-08 11:22:25 Benefit: 1 -State: open Cost: 1 -Date: 2011-01-08 11:22:25 -Class: bug +Fun: 0 Since shortly the small blue bullets lefts to links like in "Site status" are indented too much left (on @@ -14,3 +15,7 @@ IE and Chrome. -- + +2011-01-28 11:29:26: changed state open -> done +This should be solved now. I attached a ruler to the left contents of the snapins and even +on the right side of the centered snapins and it seems to be ok now in common browsers.

13 years, 7 months

Check_MK Git: check_mk: hpux_if: new check for NICs on HP-UX

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0eb52afb5aeac8d082fa0a4cc75196ae33207d3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0eb52afb5aeac8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 25 16:48:56 2011 +0100 hpux_if: new check for NICs on HP-UX --- ChangeLog | 3 +- agents/check_mk_agent.hpux | 5 +- checkman/hpux_if | 131 +++++++++++++++++++++++++++++++++ checks/hpux_if | 132 ++++++++++++++++++++++++++++++++++ pnp-rraconf/check_mk-hpux_if.rra.cfg | 1 + pnp-templates/check_mk-hpux_if.php | 1 + web/plugins/perfometer/check_mk.py | 2 + 7 files changed, 271 insertions(+), 4 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0eb52afb5a…

13 years, 7 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 002a9913e35808928f1241d0f45563c59ceae661 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=002a9913e35808… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 26 08:38:14 2011 +0100 Updated bug entries --- .bugs/108 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/108 b/.bugs/108 new file mode 100644 index 0000000..d016389 --- /dev/null +++ b/.bugs/108 @@ -0,0 +1,10 @@ +Title: WATO: link hosts to view in Multisite +Component: wato +Benefit: 1 +State: open +Cost: 1 +Date: 2011-01-25 16:53:59 +Class: feature + +A host should show a link directly to the correct view in Multisite +(if this is possible).

13 years, 7 months

← Newer
1
2
3
4
5
6
7
...
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2011