Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64160 discussions

Check_MK Git: check_mk: FIX: "move to" dropdown in IE9 works again

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 56486f5a6da0ca89cab965aba7ac03aab4b77183 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56486f5a6da0ca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 6 14:29:39 2011 +0200 FIX: "move to" dropdown in IE9 works again --- ChangeLog | 1 + web/htdocs/js/check_mk.js | 3 ++- web/htdocs/wato.py | 5 ++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index eeec1c6..7af2c5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ WATO: * FIX: "bulk move to" at the top of wato hostlists works again * FIX: IE<9: Fixed problem with checkbox events when editing a host + * FIX: "move to" dropdown in IE9 works again 1.1.11i4: Core, Setup, etc.: diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 0439168..f1e8e16 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -1025,6 +1025,7 @@ function highlight_row(elem, on) { }); checkbox = null; } + return false; } function highlight_elem(elem, on) { @@ -1040,7 +1041,7 @@ function highlight_elem(elem, on) { var childs = elem.childNodes; for(var i = 0; i < childs.length; i++) - if(childs[i].nodeName !== '#text') + if(childs[i].nodeName !== '#text' && childs[i].nodeName !== 'OPTION') highlight_elem(childs[i], on); } diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c1ee266..e30e7c0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2547,10 +2547,9 @@ def host_move_combo(host = None, top = False): onchange = "update_bulk_moveto(this.value)", attrs = {'class': 'bulk_moveto'}) else: - html.hidden_field("host", host) uri = html.makeuri([("host", host), ("_transid", html.current_transid() )]) - html.sorted_select(None, selections, "", - "location.href='%s&_move_host_to=' + this.value;" % uri); + html.sorted_select("_move_%s" % host, selections, "", + "location.href='%s&_move_host_to=' + this.value;return true;" % uri); def move_hosts_to(hostnames, target_filename):

12 years, 11 months

Check_MK Git: check_mk: wato: minor code formating

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 42f8ce6e9f8e7d62d798750b3fad2dc5f7130419 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42f8ce6e9f8e7d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 6 13:08:20 2011 +0200 wato: minor code formating --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 93536bc..c1ee266 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2550,7 +2550,7 @@ def host_move_combo(host = None, top = False): html.hidden_field("host", host) uri = html.makeuri([("host", host), ("_transid", html.current_transid() )]) html.sorted_select(None, selections, "", - "location.href='%s' + '&_move_host_to=' + this.value;" % uri); + "location.href='%s&_move_host_to=' + this.value;" % uri); def move_hosts_to(hostnames, target_filename):

12 years, 11 months

Check_MK Git: check_mk: New dummy dashlet as replacement if not data

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bcff444034dba4411293b3c97c7c0370d10f3217 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bcff444034dba4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 6 13:24:29 2011 +0200 New dummy dashlet as replacement if not data --- web/htdocs/check_mk.css | 8 ++++++++ web/htdocs/dashboard.py | 5 +++++ web/plugins/pages/shipped.py | 1 + 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 379b197..974e4ea 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1790,7 +1790,15 @@ div.dashlet table.hoststats th, table.hoststats td { vertical-align: middle; } +div.dashlet div.nograph { + background-color: white; + width: 100%; + height: 100%; +} +div.dashlet div.nograph div.msg { + padding: 10px; +} /* _ _ _ ____ _ diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 358b981..ab31ee4 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -548,6 +548,11 @@ if(has_canvas_support()) { def dashlet_pnpgraph(): render_pnpgraph(html.var("site"), html.var("host"), html.var("service"), int(html.var("source", 0))) +def dashlet_nodata(): + html.write("<div class=nograph><div class=msg>") + html.write(html.var("message", _("No data available."))) + html.write("</div></div>") + def render_pnpgraph(site, host, service=None, source=0): if not host: html.message("Invalid URL to this dashlet. Missing <tt>host</tt>") diff --git a/web/plugins/pages/shipped.py b/web/plugins/pages/shipped.py index b29dcf1..dc90bb7 100644 --- a/web/plugins/pages/shipped.py +++ b/web/plugins/pages/shipped.py @@ -68,5 +68,6 @@ pagehandlers.update({ "dashlet_hoststats" : dashboard.dashlet_hoststats, "dashlet_servicestats" : dashboard.dashlet_servicestats, "dashlet_pnpgraph" : dashboard.dashlet_pnpgraph, + "dashlet_nodata" : dashboard.dashlet_nodata, })

12 years, 11 months

Check_MK Git: check_mk: Dashboard: make numbers match "Tactical Overview" snapin

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 427e5b3d67802a5534cf26f2a521d1468df12c9b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=427e5b3d67802a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 6 12:37:15 2011 +0200 Dashboard: make numbers match "Tactical Overview" snapin --- ChangeLog | 1 + web/htdocs/check_mk.css | 6 ++++++ web/htdocs/dashboard.py | 41 +++++++++++++++++++++++++---------------- 3 files changed, 32 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1975652..dc39a5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ * Tactical Overview: make link clickable even if count is zero * Minor cleanup in default dashboard * Dashboard: new dashlet attribute title_url lets you make a title into a link + * Dashboard: make numbers match "Tactical Overview" snapin Livestatus: * Write messages after initialization into an own livestatus.log diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 3daf5ce..379b197 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1760,6 +1760,11 @@ div.dashlet table.hoststats { border-collapse: collapse; border-spacing: 0px; } +div.dashlet table.hoststats.narrow { + margin-top: 4px; +} + + div.dashlet table.hoststats td { text-align: right; padding-right: 6px; @@ -1767,6 +1772,7 @@ div.dashlet table.hoststats td { background-image: url("images/form_background.png"); background-repeat: repeat; } + div.dashlet table.hoststats th { text-align: left; background-color: transparent; diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 9c41ee5..358b981 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -404,22 +404,22 @@ def dashlet_mk_logo(): def dashlet_hoststats(): table = [ - ( _("Up"), "#0b3", + ( _("up"), "#0b3", "Stats: state = 0\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "StatsAnd: 2\n"), - ( _("Down"), "#f00", + ( _("down"), "#f00", "Stats: state = 1\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "StatsAnd: 2\n"), - ( _("Unreachable"), "#f80", + ( _("unreachable"), "#f80", "Stats: state = 2\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "StatsAnd: 2\n"), - ( _("In downtime"), "#0af", + ( _("in downtime"), "#0af", "Stats: scheduled_downtime_depth > 0\n" \ ) ] @@ -429,35 +429,44 @@ def dashlet_hoststats(): def dashlet_servicestats(): table = [ - ( _("Ok"), "#0b3", + ( _("OK"), "#0b3", "Stats: state = 0\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "Stats: host_scheduled_downtime_depth = 0\n" \ - "StatsAnd: 3\n"), + "Stats: host_state = 0\n" \ + "StatsAnd: 4\n"), - ( _("Warning"), "#ff0", + ( _("warning"), "#ff0", "Stats: state = 1\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "Stats: host_scheduled_downtime_depth = 0\n" \ - "StatsAnd: 3\n"), + "Stats: host_state = 0\n" \ + "StatsAnd: 4\n"), - ( _("Unknown"), "#f80", + ( _("unknown"), "#f80", "Stats: state = 3\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "Stats: host_scheduled_downtime_depth = 0\n" \ - "StatsAnd: 3\n"), + "Stats: host_state = 0\n" \ + "StatsAnd: 4\n"), - ( _("Critical"), "#f00", + ( _("critical"), "#f00", "Stats: state = 2\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "Stats: host_scheduled_downtime_depth = 0\n" \ - "StatsAnd: 3\n"), + "Stats: host_state = 0\n" \ + "StatsAnd: 4\n"), - ( _("In downtime"), "#0af", + ( _("in downtime"), "#0af", "Stats: scheduled_downtime_depth > 0\n" \ "Stats: host_scheduled_downtime_depth > 0\n" \ - "StatsOr: 2\n" \ - ) + "StatsOr: 2\n"), + + ( _("on down host"), "#048", + "Stats: scheduled_downtime_depth = 0\n" \ + "Stats: host_scheduled_downtime_depth = 0\n" \ + "Stats: host_state != 0\n" \ + "StatsAnd: 3\n"), ] filter = "Filter: host_custom_variable_names < _REALNAME\n" @@ -484,7 +493,7 @@ def render_statistics(what, table, filter): html.write('<canvas class=pie width=%d height=%d id=%s_stats style="float: left"></canvas>' % (pie_diameter, pie_diameter, what)) - html.write('<table class=hoststats style="float:left">') + html.write('<table class="hoststats narrow" style="float:left">') for (name, color, query), count in pies + [ ((_("Total"), "", ""), total) ]: html.write('<tr><th>%s</th><td class=color style="background-color: %s">' '</td><td>%d</td></tr>' % (name, color, count))

12 years, 11 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: dbf22b484274287644332874cc528b1456514c9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dbf22b48427428… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 6 11:56:17 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 11 months

Check_MK Git: check_mk: Dashboard: new dashlet attribute title_url

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2ecd50649b891774b2d13ea68950c3269d5d49db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ecd50649b8917… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 6 11:56:12 2011 +0200 Dashboard: new dashlet attribute title_url --- ChangeLog | 1 + web/htdocs/check_mk.css | 8 ++++++++ web/htdocs/dashboard.py | 7 ++++++- web/plugins/dashboard/builtin.py | 3 +++ 4 files changed, 18 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c3faacd..6c81f22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * Added "Administration" snapin to default sidebar * Tactical Overview: make link clickable even if count is zero * Minor cleanup in default dashboard + * Dashboard: new dashlet attribute title_url lets you make a title into a link Livestatus: * Write messages after initialization into an own livestatus.log diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 8867279..3daf5ce 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1680,6 +1680,14 @@ div.dashlet div.title { font-size: 10pt; font-weight: bold; } +div.dashlet div.title a { + text-decoration: none; + border-bottom: 1px dotted white; + color: white; +} +div.dashlet div.title a:hover { + color: #00f; +} div.dashlet img.shadow { position: absolute; diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 15458e0..ddf77ef 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -173,7 +173,12 @@ def render_dashlet(nr, dashlet, filename): (p, nr, p, p)) if dashlet.get("title"): - html.write('<div class="title" id="dashlet_title_%d">%s</div>' % (nr, dashlet["title"])) + url = dashlet.get("title_url", None) + if url: + title = '<a href="%s">%s</a>' % (url, dashlet["title"]) + else: + title = dashlet["title"] + html.write('<div class="title" id="dashlet_title_%d">%s</div>' % (nr, title)) if dashlet.get("background", True): bg = " background" else: diff --git a/web/plugins/dashboard/builtin.py b/web/plugins/dashboard/builtin.py index 7fc6cdc..9064434 100644 --- a/web/plugins/dashboard/builtin.py +++ b/web/plugins/dashboard/builtin.py @@ -55,18 +55,21 @@ builtin_dashboards = { }, { "title" : _("Host Problems"), + "title_url" : "view.py?view_name=hostproblems", "view" : "hostproblems_dash", # "view.py?view_name=hostproblems_dash&display_options=SIXHR&_body_class=dashlet", "position" : (-1, 1), "size" : (GROW, 6), }, { "title" : _("Service Problems"), + "title_url" : "view.py?view_name=svcproblems", "view" : "svcproblems_dash", # "view.py?view_name=svcproblems_dash&display_options=SIXHR&_body_class=dashlet", "position" : (1, 7), "size" : (GROW, MAX), }, { "title" : _("Events of recent 4 hours"), + "title_url" : "view.py?view_name=events_dash", "view" : "events_dash", # "view.py?view_name=events_dash&display_options=SIXHR&_body_class=dashlet", "position" : (-1, -1), "size" : (GROW, GROW),

12 years, 11 months

Check_MK Git: check_mk: Made profile output file configurable (Variable: g_profile_path)

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 690bf2ef1985114e0428c6006cddc7fed8e6d710 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=690bf2ef198511… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 5 16:09:51 2011 +0200 Made profile output file configurable (Variable: g_profile_path) --- ChangeLog | 1 + modules/check_mk.py | 16 +++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb5b7f2..843154f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.1.12b1: Core, Setup, etc.: * FIX: fix cmk -D on cluster hosts + * Made profile output file configurable (Variable: g_profile_path) Checks & Agents: * FIX: j4p_performance: fix inventory functions diff --git a/modules/check_mk.py b/modules/check_mk.py index a6bb428..e69761c 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -34,7 +34,8 @@ check_mk_version = '(inofficial)' # Some things have to be done before option parsing and might # want to output some verbose messages. -g_profile = None +g_profile = None +g_profile_path = 'profile.out' if __name__ == "__main__": opt_debug = '--debug' in sys.argv[1:] @@ -3975,15 +3976,16 @@ def read_all_autochecks(): def output_profile(): if g_profile: - g_profile.dump_stats("profile.out") - file("show_profile.py", "w")\ + g_profile.dump_stats(g_profile_path) + show_profile = os.path.join(os.path.dirname(g_profile_path), 'show_profile.py') + file(show_profile, "w")\ .write("#!/usr/bin/python\n" "import pstats\n" - "stats = pstats.Stats('profile.out')\n" - "stats.sort_stats('time').print_stats()\n") - os.chmod("show_profile.py", 0755) + "stats = pstats.Stats('%s')\n" + "stats.sort_stats('time').print_stats()\n" % g_profile_path) + os.chmod(show_profile, 0755) - sys.stderr.write("Profile 'profile.out' written. Please run ./show_profile.py.\n") + sys.stderr.write("Profile '%s' written. Please run %s.\n" % (g_profile_path, show_profile)) # +----------------------------------------------------------------------+ # | __ __ _ |

12 years, 11 months

Check_MK Git: check_mk: mbg_lantime_state Not using absolute offset time in status output

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: f8f5fc5a6056498eb999d1d3f7a4322e48b873b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8f5fc5a605649… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 5 16:12:03 2011 +0200 mbg_lantime_state Not using absolute offset time in status output --- checks/mbg_lantime_state | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/mbg_lantime_state b/checks/mbg_lantime_state index 6c0fd13..c6a0030 100644 --- a/checks/mbg_lantime_state +++ b/checks/mbg_lantime_state @@ -77,7 +77,7 @@ def check_mbg_lantime_state(item, params, info): elif params[3] is not None and pos_refclock_offset > params[2]: state = max(state, 1) thr_txt = ' (!)' - state_txt.append('Refclock Offset: %0.4fms%s' % (pos_refclock_offset / 1000, thr_txt)) + state_txt.append('Refclock Offset: %0.4fms%s' % (savefloat(refclock_offset) / 1000, thr_txt)) perfdata = [('offset', refclock_offset, params[2], params[3])]

12 years, 11 months

Check_MK Git: check_mk: Merged Changelog

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: f37fdcf5618e2944632d7aa7fdc3e2c2d6125081 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f37fdcf5618e29… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 6 08:14:39 2011 +0200 Merged Changelog ---

12 years, 11 months

Check_MK Git: check_mk: FIX: Fixed not updating pnp graphs on dashboard in some browsers (like chrome)

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 82f5acdb5efe6f76023d18549d90875b506f754a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82f5acdb5efe6f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 30 15:17:55 2011 +0200 FIX: Fixed not updating pnp graphs on dashboard in some browsers (like chrome) --- ChangeLog | 1 + web/htdocs/dashboard.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0e4a5eb..5eaa53a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ Multisite: * FIX: fix rescheduling of host check * FIX: fix exception when using status_host while local site is offline + * FIX: Fixed not updating pnp graphs on dashboard in some browsers (like chrome) * Added some missing i18n strings in general HTML functions * Added display_option "w" to disable limit messages and livestatus errors in views * Service Perfdata Sorters are sorting correctly now diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index dbf649c..3c67735 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import config, defaults, htmllib, pprint +import config, defaults, htmllib, pprint, time from lib import * import wato @@ -541,7 +541,7 @@ def render_pnpgraph(site, host, service=None, source=0): else: base_url = html.site_status[site]["site"]["url_prefix"] - img_url = base_url + "image?host=%s&srv=%s&view=0&source=%d&theme=multisite" % \ - (pnp_cleanup(host), pnp_cleanup(service), source) + img_url = base_url + "image?host=%s&srv=%s&view=0&source=%d&theme=multisite&_t=%d" % \ + (pnp_cleanup(host), pnp_cleanup(service), source, int(time.time())) html.write('<img src="%s">' % img_url)

12 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits