Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64209 discussions

Check_MK Git: check_mk: Resize treeangle for folding

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: ea93e4a014f02a55fe14bc029a43922f29cbb644 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea93e4a014f02a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 14 16:57:00 2012 +0100 Resize treeangle for folding --- web/htdocs/check_mk.css | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 52f5bef..a4a04a7 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -145,8 +145,8 @@ div.livestatus.message { '-------------------------------------------------------------------------*/ img.treeangle { - width: 14px; - height: 14px; + width: 9px; + height: 9px; margin-right: 3px; margin-top: 2px; }

12 years, 7 months

Check_MK Git: check_mk: Fix sizing of dashlet contents

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 76dc11884e817206ae587024b812a1364e516ac2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76dc11884e8172… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 6 15:06:02 2012 +0100 Fix sizing of dashlet contents --- web/htdocs/dashboard.css | 2 ++ web/htdocs/js/dashboard.js | 4 ++-- web/htdocs/sidebar.py | 12 ++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/web/htdocs/dashboard.css b/web/htdocs/dashboard.css index 7af9b30..e90e8b2 100644 --- a/web/htdocs/dashboard.css +++ b/web/htdocs/dashboard.css @@ -45,6 +45,8 @@ div.dashlet div.dashlet_inner { position: absolute; padding: 0px; margin: 0px; + top: 21px; + left: 11px; } /* Dashlets with "background" set to True */ diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index 927fb44..64a1a89 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -93,9 +93,9 @@ function resize_dashlets(id, code) oDash.style.position = 'absolute'; oDash.style.left = dashlet_padding[3] + "px"; oDash.style.top = dashlet_padding[0] + "px"; - if((d_width - 2*dashlet_padding) > 0) + if (netto_width > 0) oDash.style.width = netto_width + "px"; - if((d_height - 2*dashlet_padding) > 0) + if (netto_height > 0) oDash.style.height = netto_height + "px"; } } diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 10f4359..c57c3b6 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -206,12 +206,12 @@ def render_snapin(name, state): html.write('<div class="closesnapin">') iconbutton("closesnapin", "sidebar_openclose.py?name=%s&state=off" % name, "side", "removeSnapin", 'snapin_'+name) html.write('</div>') - # Show reload button, but only for reloadable Snapins - if snapin.get("reload") or snapin.get("restart"): - html.write('<div class="reloadsnapin">') - iconbutton("reloadsnapin", url="sidebar_snapin.py?name=" + name, handler="updateContents", - name = "snapin_" + name); - html.write('</div>') + # # Show reload button, but only for reloadable Snapins + # if snapin.get("reload") or snapin.get("restart"): + # html.write('<div class="reloadsnapin">') + # iconbutton("reloadsnapin", url="sidebar_snapin.py?name=" + name, handler="updateContents", + # name = "snapin_" + name); + # html.write('</div>') html.write("<b class=heading onclick=\"toggle_sidebar_snapin(this,'%s')\" onmouseover=\"this.style.cursor='pointer'\" " "onmouseout=\"this.style.cursor='auto'\">%s</b>" % (url, snapin["title"])) html.write("</div>")

12 years, 7 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk into tobi

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9407a8239e32020060d6e987dc5556e1fbf73bac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9407a8239e3202… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 6 15:55:07 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk into tobi ---

12 years, 7 months

Check_MK Git: check_mk: Relayouting dashboard - part 1

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5f3cfaf66cacf15844ed38a7bb1d5435d6229050 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f3cfaf66cacf1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 6 14:59:27 2012 +0100 Relayouting dashboard - part 1 --- web/htdocs/dashboard.css | 71 ++++++++++++------------- web/htdocs/dashboard.py | 12 ++-- web/htdocs/images/contentframe_background.jpg | Bin 252025 -> 2091 bytes web/htdocs/images/dashadow-e.png | Bin 197 -> 127 bytes web/htdocs/images/dashadow-n.png | Bin 202 -> 133 bytes web/htdocs/images/dashadow-ne.png | Bin 371 -> 313 bytes web/htdocs/images/dashadow-nw.png | Bin 333 -> 289 bytes web/htdocs/images/dashadow-s.png | Bin 199 -> 131 bytes web/htdocs/images/dashadow-se.png | Bin 363 -> 305 bytes web/htdocs/images/dashadow-sw.png | Bin 363 -> 273 bytes web/htdocs/images/dashadow-w.png | Bin 200 -> 126 bytes web/htdocs/images/dashlet_linkarrow.png | Bin 0 -> 298 bytes web/htdocs/images/sidebar_background.jpg | Bin 49576 -> 2091 bytes web/htdocs/images/snapin_background.png | Bin 223 -> 189 bytes web/htdocs/images/snapin_closed.png | Bin 878 -> 848 bytes web/htdocs/images/snapin_footer.png | Bin 511 -> 458 bytes web/htdocs/images/snapin_header.png | Bin 629 -> 506 bytes web/htdocs/js/dashboard.js | 46 +++++++++------- web/htdocs/pages.css | 2 +- 19 files changed, 68 insertions(+), 63 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5f3cfaf66c…

12 years, 7 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 77e976aa720f1ffe666545ba6572265275b06fb2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77e976aa720f1f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 20 14:38:47 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 7 months

Check_MK Git: check_mk: ps: output node a process is running on

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dd7a4cc90a5916331cc44ee182a8b36ac5fc0a66 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd7a4cc90a5916… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 20 14:38:39 2012 +0100 ps: output node a process is running on This is only done if the check is run on a cluster --- ChangeLog | 1 + checks/ps | 53 +++++++++++++++++++++++++++++++---------- modules/check_mk.py | 7 +++++ web/plugins/views/painters.py | 21 +++++++++++---- 4 files changed, 63 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f0d46a..0e7fdf6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,7 @@ is needed on Cisco WLC 21xx series (thanks to Ralf Ertzinger) * FIX: fix inventory of f5_bigip_temp * mk_oracle (lnx+win): Fixed TEMP tablespace size calculations + * ps: output node process is running on (only for clusters) Multisite: * Added several missing localization stringsw diff --git a/checks/ps b/checks/ps index aa3c799..e2ce176 100644 --- a/checks/ps +++ b/checks/ps @@ -40,13 +40,14 @@ inventory_processes_perf = [] ANY_USER = None GRAB_USER = False +def inventory_ps(info): + return inventory_ps_common(inventory_processes, info) -def inventory_ps(check_name, info): +def inventory_ps_perf(info): + return inventory_ps_common(inventory_processes_perf, info) + +def inventory_ps_common(invdata, info): inventory = [] - if check_name == "ps": - invdata = inventory_processes - else: - invdata = inventory_processes_perf for inventry in invdata: # New in 1.1.7i1: inventory_processes may be prefixed with list of @@ -69,7 +70,9 @@ def inventory_ps(check_name, info): servicedesc, pattern, userspec, warnmin, okmin, okmax, warnmax = inventry num_perc_s = servicedesc.count("%s") - for ps in info: + for line in info: + # First entry in line is the node name or None for non-clusters + ps = line[1:] l_user = [userspec] matches = process_matches(ps, pattern, l_user) if matches != False: @@ -171,9 +174,14 @@ def check_procs(item, params, info, with_perfdata): percent_cpu = 0.0 extended_perfdata = False - for ps in info: + running_on = set([]) # collect information about nodes the processes run on + for line in info: + node_name = line[0] + ps = line[1:] if process_matches(ps, procname, [user]) != False: count += 1 + if node_name != None: + running_on.add(node_name) if ps[0][0] == '(': addinfo = ps[0][1:-1].split(",") if len(addinfo) >= 4: # extended performance data @@ -201,12 +209,31 @@ def check_procs(item, params, info, with_perfdata): else: perfdata = [] + infotext = " - %d processes" % count + if running_on: + infotext += " [running on %s]" % ", ".join(running_on) + if count > warnmax or count < warnmin: - return (2, "CRIT - %d processes (ok from %d to %d)" % (count, okmin, okmax), perfdata) + return (2, "CRIT" + infotext + " (ok from %d to %d)" % (okmin, okmax), perfdata) elif count > okmax or count < okmin: - return (1, "WARN - %d processes (ok from %d to %d)" % (count, okmin, okmax), perfdata) + return (1, "WARN" + infotext + " (ok from %d to %d)" % (okmin, okmax), perfdata) else: - return (0, "OK - %d processes" % count, perfdata) - -check_info['ps'] = (lambda i,p,n: check_procs(i,p,n,False), "proc_%s", 0, inventory_ps) -check_info['ps.perf'] = (lambda i,p,n: check_procs(i,p,n,True), "proc_%s", 1, inventory_ps) + return (0, "OK" + infotext, perfdata) + +check_info['ps'] = { + "check_function" : lambda i,p,n: check_procs(i,p,n,False), + "inventory_function" : inventory_ps, + "service_description" : "proc_%s", + "has_perfdata" : False, + "node_info" : True, # add first column with actual host name + "group" : "ps", +} + +check_info['ps.perf'] = { + "check_function" : lambda i,p,n: check_procs(i,p,n,True), + "inventory_function" : inventory_ps_perf, + "service_description" : "proc_%s", + "has_perfdata" : True, + "node_info" : True, # add first column with actual host name + "group" : "ps", +} diff --git a/modules/check_mk.py b/modules/check_mk.py index 73a27e9..9a7e5ed 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2032,6 +2032,13 @@ def make_inventory(checkname, hostnamelist, check_only=False, include_state=Fals checkname_base = checkname.split('.')[0] # make e.g. 'lsi' from 'lsi.arrays' try: info = get_realhost_info(hostname, ipaddress, checkname_base, inventory_max_cachefile_age) + # Add information about nodes if check wants this + if check_info[checkname]["node_info"]: + if cluster_of(hostname): + add_host = hostname + else: + add_host = None + info = [ [add_host] + line for line in info ] except MKAgentError, e: # This special handling is needed for the inventory check. It needs special # handling for WATO. diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 2aa0991..bc6e828 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -308,16 +308,25 @@ warn_marker = '<b class="stmark state1">WARN</b>' crit_marker = '<b class="stmark state2">CRIT</b>' unknown_marker = '<b class="stmark state3">UNKN</b>' -def format_plugin_output(output): - return output.replace("(!)", warn_marker) \ - .replace("(!!)", crit_marker) \ - .replace("(?)", unknown_marker) +def format_plugin_output(row, output): + output = output.replace("(!)", warn_marker) \ + .replace("(!!)", crit_marker) \ + .replace("(?)", unknown_marker) + if "[running on" in output: + a = output.index("[running on") + e = output.index("]", a) + hosts = output[a+12:e].replace(" ","").split(",") + css, h = paint_host_list(row["site"], hosts) + output = output[:a] + "running on " + h + output[e+1:] + + return output + multisite_painters["svc_plugin_output"] = { "title" : _("Output of check plugin"), "short" : _("Status detail"), "columns" : ["service_plugin_output"], - "paint" : lambda row: ("", format_plugin_output(row["service_plugin_output"])), + "paint" : lambda row: ("", format_plugin_output(row, row["service_plugin_output"])), "sorter" : 'svcoutput', } multisite_painters["svc_long_plugin_output"] = { @@ -1549,7 +1558,7 @@ multisite_painters["log_plugin_output"] = { "title" : _("Log: output of check plugin"), "short" : _("Check output"), "columns" : ["log_plugin_output"], - "paint" : lambda row: ("", format_plugin_output(row["log_plugin_output"])), + "paint" : lambda row: ("", format_plugin_output(row, row["log_plugin_output"])), } multisite_painters["log_attempt"] = {

12 years, 7 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: a48da53010d92d73d46cea7b828b0de0523ac388 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a48da53010d92d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 20 14:10:47 2012 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 7 months

Check_MK Git: check_mk: FIX: Fixed preview table styling in view editor

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 558c43be87e8b83551736b62244f64b47d63040d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=558c43be87e8b8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 20 12:33:16 2012 +0100 FIX: Fixed preview table styling in view editor --- .bugs/655 | 9 ++++++--- ChangeLog | 1 + web/htdocs/views.py | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.bugs/655 b/.bugs/655 index d4d5361..ccf3bec 100644 --- a/.bugs/655 +++ b/.bugs/655 @@ -1,9 +1,12 @@ Title: "Table" preview styles broken in view editor preview +Effort: 10 Component: multisite -State: open +Class: bug +State: done Date: 2012-02-15 08:51:28 Targetversion: future -Effort: 10 -Class: bug The background colors are broken in the view editor. + +2012-02-20 12:32:44: changed state open -> done +Added missing style diff --git a/ChangeLog b/ChangeLog index 308cc2c..25e3b1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,6 +50,7 @@ * check_bi_local.py: works now with cookie based authentication * FIX: Fixed wrong redirection after login in some cases * FIX: Fixed missing stats grouping in alert statistics view + * FIX: Fixed preview table styling in view editor BI: * New column (painter) for simplistic box display of tree. diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 08e1a6e..1f7d9af 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -500,7 +500,7 @@ def page_edit_view(): html.write("<div class=error>%s</div>\n" % e.message) html.add_user_error(e.varname, e.message) - html.header(_("Edit view"), stylesheets=["pages","views"]) + html.header(_("Edit view"), stylesheets=["pages", "views", "status"]) html.write("<table class=navi><tr>\n") html.write('<td class="left open">%s</td>\n' % _('Edit')) html.write("<td class=gap></td>\n")

12 years, 7 months

Check_MK Git: check_mk: Fixed typo

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: af9456e0d66c53ffc5e1fcbbc099b9cacf4161d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af9456e0d66c53… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 20 12:39:52 2012 +0100 Fixed typo --- .bugs/648 | 7 +++++-- web/htdocs/wato.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.bugs/648 b/.bugs/648 index e8de827..a5ed7c8 100644 --- a/.bugs/648 +++ b/.bugs/648 @@ -1,9 +1,9 @@ Title: WATO API in multisite.mk einbinden Component: multisite -State: open +Class: nastiness +State: wontfix Date: 2012-02-08 10:34:20 Targetversion: future -Class: nastiness Momentan muss man ziemliche Verrenkungen machen um aus der multisite.mk auf die WATO API zugreifen zu können. @@ -22,3 +22,6 @@ import wato wato.load_plugins() ausreichen. + +2012-02-20 12:34:58: changed state open -> wontfix +this is kind of a hack. wont implement that. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1080098..aea6e16 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6849,7 +6849,7 @@ def mode_edit_user(phase): # Roles html.write("<tr><td class=legend colspan=2>") html.write(_("Roles<br><i>By assigning roles to a user he obtains permissions. " - "If a user has more then one role, he gets the maximum of all " + "If a user has more than one role, he gets the maximum of all " "permissions of his roles. " "Users without any role have no permissions to use Multisite at all " "but still can be monitoring contacts and receive notifications.</i>"))

12 years, 7 months

Check_MK Git: check_mk: FIX: Multisite authed users without permission to multisite are

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 17d19fff6002e7d5274b57e316b172a7bb295197 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17d19fff6002e7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 20 14:10:40 2012 +0100 FIX: Multisite authed users without permission to multisite are automatically logged out after showing the error messag --- ChangeLog | 2 ++ web/htdocs/index.py | 5 +++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 25e3b1a..7c114de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,8 @@ * FIX: Fixed wrong redirection after login in some cases * FIX: Fixed missing stats grouping in alert statistics view * FIX: Fixed preview table styling in view editor + * FIX: Multisite authed users without permission to multisite are + automatically logged out after showing the error message BI: * New column (painter) for simplistic box display of tree. diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 25916e5..4c13de4 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -284,6 +284,11 @@ def handler(req, profiling = True): reason += _("<b>You do not have any roles.</b> ") reason += _("If you think this is an error, " "please ask your administrator to check the permissions configuration.") + + if config.auth_type == 'cookie': + reason += _('<p>You have been logged out. Please reload the page to re-authenticate.</p>') + login.del_auth_cookie() + raise MKAuthException(reason) # General access allowed. Now connect to livestatus

12 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits