Checkmk git commits October 2011

checkmk-commits@lists.checkmk.com

2 participants
109 discussions

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])]

13 years

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 ---

13 years

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)

13 years

Check_MK Git: check_mk: FIX: mbg_lantime_state: Fixed output UOM to really be miliseconds

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0155f3b2ead4df7fc8bdcd9ef9ad207f68bc4ccb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0155f3b2ead4df… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 5 16:08:49 2011 +0200 FIX: mbg_lantime_state: Fixed output UOM to really be miliseconds --- ChangeLog | 1 + checkman/mbg_lantime_state | 6 +++--- checks/mbg_lantime_state | 16 ++++++---------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5eaa53a..cb5b7f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * mrpe: make check cluster-aware and work as clustered_service * cups_queues: Run agent part only on directly on CUPS servers, not on clients + * FIX: mbg_lantime_state: Fixed output UOM to really be miliseconds Multisite: diff --git a/checkman/mbg_lantime_state b/checkman/mbg_lantime_state index f5befac..266e06a 100644 --- a/checkman/mbg_lantime_state +++ b/checkman/mbg_lantime_state @@ -25,13 +25,13 @@ stratum_warn (int): stratums above this value will raise a {WARNING} state. stratum_warn (int): stratums above this value will raise a {CRITICAL} state. The default is set to {0}. The threshold can be disabled by setting to {None}. ref_offset_warn (int): refclock offsets above this value will raise a {WARNING} state. - The default is set to {5}. The threshold can be disabled by setting to {None}. + The default is set to {500} microseconds. The threshold can be disabled by setting to {None}. ref_offset_crit (int): refclock offsets above this value will raise a {CRITICAL} state. - The default is set to {10}. The threshold can be disabled by setting to {None}. + The default is set to {1000} microseconds. The threshold can be disabled by setting to {None}. [configuration] mbg_lantime_state_default_levels (int, int, int, int): A tuple of four floats or integers: The default levels. These levels are used for inventorized checks. This variable - is preset to {(0, 0, 5, 10)} + is preset to {(0, 0, 500, 1000)} diff --git a/checks/mbg_lantime_state b/checks/mbg_lantime_state index af5b042..6c0fd13 100644 --- a/checks/mbg_lantime_state +++ b/checks/mbg_lantime_state @@ -34,8 +34,8 @@ mbg_lantime_state_statemap = { '5': 'normalOperationRefclock', } -# stratum, refclock_offset -mbg_lantime_state_default_levels = (0, 0, 5, 10) +# stratum, refclock_offset (in microseconds) +mbg_lantime_state_default_levels = (0, 0, 500, 1000) def inventory_mbg_lantime_state(info): if len(info) > 0 and len(info[0]) == 5: @@ -70,18 +70,14 @@ def check_mbg_lantime_state(item, params, info): thr_txt = '' - if refclock_offset < 0: - pos_refclock_offset = refclock_offset * -1 - else: - pos_refclock_offset = refclock_offset - - if params[2] is not None and int(pos_refclock_offset) > params[3]: + pos_refclock_offset = abs(savefloat(refclock_offset)) + if params[2] is not None and pos_refclock_offset > params[3]: state = max(state, 2) thr_txt = ' (!!)' - elif params[3] is not None and int(pos_refclock_offset) > params[2]: + elif params[3] is not None and pos_refclock_offset > params[2]: state = max(state, 1) thr_txt = ' (!)' - state_txt.append('Refclock Offset: %sms%s' % (refclock_offset, thr_txt)) + state_txt.append('Refclock Offset: %0.4fms%s' % (pos_refclock_offset / 1000, thr_txt)) perfdata = [('offset', refclock_offset, params[2], params[3])]

13 years

Check_MK Git: check_mk: FIX: fix permission computation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b54e97424959515d476a3a0a2ebd7524d05f32ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b54e9742495951… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 4 11:20:02 2011 +0200 FIX: fix permission computation --- ChangeLog | 2 +- web/htdocs/config.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a98ade4..c3faacd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,11 +10,11 @@ * cups_queues: Run agent part only on directly on CUPS servers, not on clients - Multisite: * FIX: fix rescheduling of host check * FIX: fix exception when using status_host while local site is offline * FIX: fix URL-too-long in permissions page + * FIX: fix permission computation * Cleanup permissions page optically, add comments for views and snapins * Added some missing i18n strings in general HTML functions * Added display_option "w" to disable limit messages and livestatus errors in views diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 0994832..3ba6f2c 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -224,9 +224,9 @@ def login(u): if users != None: all += users if all.count(user) > 1: - raise MKConfigError("Your username (<b>%s</b>) is listed more than once " + raise MKConfigError(_("Your username (<b>%s</b>) is listed more than once " "in multisite.mk. This is not allowed. " - "Please check your config." % user) + "Please check your config.") % user) role = role_of_user(user) @@ -262,7 +262,7 @@ def role_of_user(u): def may(permname): # handle case where declare_permission is done after login # and permname also not contained in save configuration - if permname not in user_permissions: + if permname not in permissions: perm = permissions_by_name.get(permname) if not perm: # Object does not exists, e.g. sidesnap.multisite if not is_multisite() return False

13 years

Check_MK Git: check_mk: FIX: fix saving permissions bug

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3e9d5bc15cf71b2914795105d0c37d9128b1353d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e9d5bc15cf71b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 4 11:08:08 2011 +0200 FIX: fix saving permissions bug --- ChangeLog | 2 + web/htdocs/check_mk.css | 44 +----------------------------------------- web/htdocs/permissions.py | 46 +++++++++++++++++++++++++------------------- web/htdocs/sidebar.py | 4 +- web/htdocs/views.py | 2 +- 5 files changed, 33 insertions(+), 65 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1550f66..a98ade4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,8 @@ Multisite: * FIX: fix rescheduling of host check * FIX: fix exception when using status_host while local site is offline + * FIX: fix URL-too-long in permissions page + * Cleanup permissions page optically, add comments for views and snapins * 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/check_mk.css b/web/htdocs/check_mk.css index 166392c..8867279 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1407,48 +1407,8 @@ img.siteicon { These styles are used on the "Edit Permissions" page */ -table.permissions { - border-collapse: collapse; - empty-cells: show; - border-spacing: 0px; -} - -table.permissions td, table.permissions th { - border: 1px solid #fff; - padding: 3px 0.5ex; -} -table.permissions th { - text-align: left; - background-color: #98a; - color: #fff; -} - -table.permissions td.legend { - background-color: #769; - color: #fff; -} -table.permissions td.legend.sub { - border-top-style: none; - border-bottom-style: none; - background-color: #87a; - padding-left: 1em; - padding-top: 2px; - padding-bottom: 0px; -} -table.permissions td.content { - text-align: center; - width: 6ex; - vertical-align: middle; -} - -table.permissions td.content.user { - background-color: #b84; -} -table.permissions td.content.admin { - background-color: #c85; -} -table.permissions td.content.guest { - background-color: #d86; +table.permissions td.legend { + width: 500px; } /* diff --git a/web/htdocs/permissions.py b/web/htdocs/permissions.py index a1a4e21..6cdb06e 100644 --- a/web/htdocs/permissions.py +++ b/web/htdocs/permissions.py @@ -53,9 +53,9 @@ def page_view_permissions(): def page_edit_permissions(): if not config.may("edit_permissions"): - raise MKAuthException("You are not allowed to edit permissions.") + raise MKAuthException(_("You are not allowed to edit permissions.")) - html.header("Edit permissions") + html.header(_("Edit permissions")) permissions = {} if html.var("save"): @@ -65,15 +65,23 @@ def page_edit_permissions(): config.save_permissions(permissions) config.load_permissions() - html.message("Permissions have been saved.") + html.message(_("Permissions have been saved.")) + def section_header(section_title, is_open=False): + html.begin_foldable_container('permissions', section_title, is_open, section_title, indent=False) + html.write('<table class="form permissions">\n') + html.write("<th>Permission</th>\n") + for role in config.roles: + html.write("<th>%s</th>" % role) + html.write("</tr>\n") + + def section_footer(): + html.write("</table>") + html.end_foldable_container() - html.begin_form("permissions") - html.write('<table class="form">\n') - html.write("<th>Permission</th>\n") - for role in config.roles: - html.write("<th>%s</th>" % role) - html.write("</tr>\n") + + html.begin_form("permissions", method="POST") + section_header(_("General permissions"), True) current_section = None for perm in config.permissions_by_order: @@ -82,15 +90,12 @@ def page_edit_permissions(): section = pname.split(".")[0] section_title = config.permission_sections[section] if section != current_section: + section_footer() + section_header(section_title) current_section = section - html.write('<tr><td class="legend border hilite" colspan=%d><b>%s</b></td></tr>\n' % (len(config.roles) + 1, section_title)) - if current_section == None: - title = "<b>%s</b><br><i>%s</i>" % (perm["title"], perm["description"]) - classes="legend border" - else: - title = perm["title"] - classes="legend border sub" + title = "<b>%s</b><br><i>%s</i>" % (perm["title"], perm["description"]) + classes="legend border" html.write("<tr><td class=\"%s\">%s</td>" % (classes, title)) for role in config.roles: @@ -100,9 +105,10 @@ def page_edit_permissions(): html.write("</td>") html.write("</tr>\n") - html.write('<tr><td class="legend border button" colspan=%d>' % (1 + len(config.roles))) - html.button("save", "Save") - html.write("</td></tr>\n") - html.write("</table>\n") + section_footer() + + + html.write("<br>") + html.button("save", _("Save")) html.end_form() html.footer() diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 3a37d67..3a2bf72 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -45,11 +45,11 @@ def load_plugins(): load_web_plugins("sidebar", globals()) # Declare permissions: each snapin creates one permission - config.declare_permission_section("sidesnap", "Sidebar snapins") + config.declare_permission_section("sidesnap", _("Sidebar snapins")) for name, snapin in sidebar_snapins.items(): config.declare_permission("sidesnap.%s" % name, snapin["title"], - "", + snapin["description"], snapin["allowed"]) # Helper functions to be used by snapins diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 8e54353..a59a8fa 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -99,7 +99,7 @@ def load_plugins(): for name, view in multisite_builtin_views.items(): config.declare_permission("view.%s" % name, view["title"], - "", + view["description"], config.roles) # Add painter names to painter objects (e.g. for JSON web service)

13 years

Check_MK Git: check_mk: Minor cleanup in default dashboard

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e6f7c014d9fb80e07ba496b49618afddeb1f9e9b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6f7c014d9fb80… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 1 11:28:47 2011 +0200 Minor cleanup in default dashboard --- ChangeLog | 1 + web/htdocs/dashboard.py | 5 +++++ web/plugins/dashboard/builtin.py | 8 ++++---- web/plugins/pages/shipped.py | 1 + web/plugins/views/dashboard.py | 11 ++++++----- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0e4a5eb..1550f66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ * Service Perfdata Sorters are sorting correctly now * Added "Administration" snapin to default sidebar * Tactical Overview: make link clickable even if count is zero + * Minor cleanup in default dashboard Livestatus: * Write messages after initialization into an own livestatus.log diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index dbf649c..15458e0 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -391,6 +391,11 @@ def dashlet_overview(): html.write('</tr></table>') +def dashlet_mk_logo(): + html.write('<a href="http://mathias-kettner.de/check_mk.html">' + '<img style="margin-right: 30px;" src="images/check_mk.trans.120.png"></a>') + + def dashlet_hoststats(): table = [ diff --git a/web/plugins/dashboard/builtin.py b/web/plugins/dashboard/builtin.py index 02392ae..7fc6cdc 100644 --- a/web/plugins/dashboard/builtin.py +++ b/web/plugins/dashboard/builtin.py @@ -29,16 +29,16 @@ builtin_dashboards = { "title" : _("Main Overview"), "dashlets" : [ { - "url" : "dashlet_overview.py", + "url" : "dashlet_mk_logo.py", "position" : (1, 1), - "size" : (10, 5), + "size" : (4, 5), "shadow" : False, "background" : False, }, { "title" : _("Host Statistics"), "url" : "dashlet_hoststats.py", - "position" : (11, 1), + "position" : (6, 1), "size" : (10, 6), "shadow" : True, "background" : True, @@ -47,7 +47,7 @@ builtin_dashboards = { { "title" : _("Service Statistics"), "url" : "dashlet_servicestats.py", - "position" : (21, 1), + "position" : (16, 1), "size" : (10, 6), "shadow" : True, "background" : True, diff --git a/web/plugins/pages/shipped.py b/web/plugins/pages/shipped.py index d6ddc71..b29dcf1 100644 --- a/web/plugins/pages/shipped.py +++ b/web/plugins/pages/shipped.py @@ -64,6 +64,7 @@ pagehandlers.update({ "dashboard" : dashboard.page_dashboard, "dashboard_resize" : dashboard.ajax_resize, "dashlet_overview" : dashboard.dashlet_overview, + "dashlet_mk_logo" : dashboard.dashlet_mk_logo, "dashlet_hoststats" : dashboard.dashlet_hoststats, "dashlet_servicestats" : dashboard.dashlet_servicestats, "dashlet_pnpgraph" : dashboard.dashlet_pnpgraph, diff --git a/web/plugins/views/dashboard.py b/web/plugins/views/dashboard.py index 7543430..e0da15c 100644 --- a/web/plugins/views/dashboard.py +++ b/web/plugins/views/dashboard.py @@ -60,14 +60,15 @@ multisite_builtin_views.update({ ('host_state', None), ('host', 'host'), ('host_icons', None), - ('host_plugin_output', None), ('host_state_age', None), + ('host_plugin_output', None), # ('host_check_age', None), # save space # ('num_services_ok', 'host_ok'), # save space - ('num_services_warn', 'host_warn'), - ('num_services_crit', 'host_crit'), - ('num_services_unknown', 'host_unknown'), - ('num_services_pending', 'host_pending')], + #('num_services_warn', 'host_warn'), + #('num_services_crit', 'host_crit'), + #('num_services_unknown', 'host_unknown'), + #('num_services_pending', 'host_pending'), + ], 'public': True, 'show_filters': [], 'sorters': [('hoststate', True)],

13 years

Check_MK Git: check_mk: mrpe: fixed error output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3270ac483e5283f94f14659398d6e8888a7ac250 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3270ac483e5283… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 30 13:03:41 2011 +0200 mrpe: fixed error output --- checks/mrpe | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/mrpe b/checks/mrpe index a79eff5..46c11bd 100644 --- a/checks/mrpe +++ b/checks/mrpe @@ -78,7 +78,7 @@ def check_mrpe(item, params, info): best_state = state if best_state == None: - return (3, "Check output not found in local checks") + return (3, "Check output not found in output of MRPE") else: return best_result

13 years

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ee92f1d82f402ccd9953605f2da24f899950e34e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee92f1d82f402c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 30 11:24:12 2011 +0200 Updated bug entries --- .bugs/394 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/394 b/.bugs/394 new file mode 100644 index 0000000..d5f0ebb --- /dev/null +++ b/.bugs/394 @@ -0,0 +1,9 @@ +Title: Sites status snapin should sort according to Alias +Component: multisite +Benefit: 1 +State: open +Cost: 1 +Date: 2011-09-30 11:23:36 +Class: cleanup + +Simply sort the sites after their Alias.

13 years

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2011