Checkmk git commits September 2012

checkmk-commits@lists.checkmk.com

1 participants
212 discussions

Check_MK Git: check_mk: FIX: Fixed error in printer_supply valuespec which lead to exception

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1f24272def9b77f105013352c8c0e19cbd356eb9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f24272def9b77… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 19 16:09:38 2012 +0200 FIX: Fixed error in printer_supply valuespec which lead to exception when defining host/service specific rules --- ChangeLog | 2 ++ web/plugins/wato/check_parameters.py | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 53126f6..2be65c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,6 +97,8 @@ * FIX: complex list widgets (ListOf) failed back to old value when complaining * FIX: complex list widgets (ListOf) lost remaining entries after deleting one + * FIX: Fixed error in printer_supply valuespec which lead to an exception + when defining host/service specific rules BI: * Great speed up of rule compilation in large environments diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index c14ec5a..1a65a74 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -971,11 +971,13 @@ checkgroups.append(( help = _("Levels for printer cardridges."), elements = [ Float(title = _("Warning remaining")), - Float(title = _("Critical remaining"))]), + Float(title = _("Critical remaining"))] + ), TextAscii( title = _("cardridge specification"), - allow_empty = True), - "dict", + allow_empty = True + ), + None, )) checkgroups.append((

11 years, 12 months

Check_MK Git: check_mk: FIX: Made printer_supply perfometer a bit more robust against bad perfdata

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9c0279347252afd55dcca56670ad6970d83f0d48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c0279347252af… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 19 15:03:31 2012 +0200 FIX: Made printer_supply perfometer a bit more robust against bad perfdata --- ChangeLog | 1 + web/plugins/perfometer/check_mk.py | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7656e51..6fa173f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -123,6 +123,7 @@ This is especially conveniant for scripting. * FIX: fixed layout of login dialog when showing up error messages * FIX: Fixed styling of wato quickaccess snapin preview + * FIX: Made printer_supply perfometer a bit more robust against bad perfdata Livecheck: * FIX: Compile livecheck also if diet libc is missing diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 9f4cfdf..32992ce 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -395,16 +395,16 @@ perfometers["check_mk-mysql.innodb_io"] = perfometer_check_mk_diskstat def perfometer_check_mk_printer_supply(row, check_command, perf_data): - left = float(perf_data[0][1]) - warn = float(perf_data[0][3]) - crit = float(perf_data[0][4]) - mini = float(perf_data[0][5]) - maxi = float(perf_data[0][6]) + left = savefloat(perf_data[0][1]) + warn = savefloat(perf_data[0][3]) + crit = savefloat(perf_data[0][4]) + mini = savefloat(perf_data[0][5]) + maxi = savefloat(perf_data[0][6]) if maxi < 0: return "", "" # Printer does not supply a max value # If there is no 100% given, calculate the percentage - if maxi != 100.0: + if maxi != 100.0 and maxi != 0.0: left = left * 100 / maxi s = row['service_description'].lower()

11 years, 12 months

Check_MK Git: check_mk: WATO: Fixed button url icon in docu-url link

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b3976a5eb1b793bdb357fd56883a0bd65a6d4cfa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3976a5eb1b793… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 20 12:14:18 2012 +0200 WATO: Fixed button url icon in docu-url link --- ChangeLog | 1 + web/htdocs/wato.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ac516c9..fb05d56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -99,6 +99,7 @@ * FIX: complex list widgets (ListOf) lost remaining entries after deleting one * FIX: Fixed error in printer_supply valuespec which lead to an exception when defining host/service specific rules + * FIX: Fixed button url icon in docu-url link BI: * Great speed up of rule compilation in large environments diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index eb5b17e..2ed80c0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9349,7 +9349,7 @@ vs_rule_options = Dictionary( TextAscii( title = _("Docu-URL"), help = _("An optional URL pointing to documentation or any other page. This will be displayed " - "as an icon <img class=icon src='images/icon_url.png'> and open a new page when clicked. " + "as an icon <img class=icon src='images/button_url_lo.png'> and open a new page when clicked. " "You can use either global URLs (beginning with <tt>http://</tt>), absolute local urls " "(beginning with <tt>/</tt>) or relative URLs (that are relative to <tt>check_mk/</tt>)."), size = 80,

11 years, 12 months

Check_MK Git: check_mk: FIX: Fixed styling of wato quickaccess snapin preview

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7d4359853a3e84fb79702f0544dfd68c0a454962 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d4359853a3e84… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 19 14:08:22 2012 +0200 FIX: Fixed styling of wato quickaccess snapin preview --- ChangeLog | 1 + web/plugins/sidebar/wato.py | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 743eb0b..7656e51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -122,6 +122,7 @@ * Downtimes: new conveniance function for downtime from now for ___ minutes. This is especially conveniant for scripting. * FIX: fixed layout of login dialog when showing up error messages + * FIX: Fixed styling of wato quickaccess snapin preview Livecheck: * FIX: Compile livecheck also if diet libc is missing diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 98fa617..704bfca 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -85,6 +85,7 @@ sidebar_snapins["admin_mini"] = { height: 18px; position: relative; left: 3px; + padding: 0; } #snapin_admin_mini div.footnotelink {

11 years, 12 months

Check_MK Git: check_mk: Reverted change of localization of reschedule string

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3cfb303c8e137e28256200a7c150e9edb1f62187 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3cfb303c8e137e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 20 11:46:19 2012 +0200 Reverted change of localization of reschedule string --- web/plugins/icons/builtin.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 7cc9de4..df244ef 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -94,7 +94,7 @@ def paint_reschedule(what, row, tags, custom_vars): servicedesc = '' wait_svc = '' icon = 'icon_reload' - txt = _('Reschedule an immediate check of this %(obj)s') % {'obj': _(what)} + txt = _('Reschedule an immediate check of this %s') % _(what) if what == 'service': servicedesc = row['service_description']

11 years, 12 months

Check_MK Git: check_mk: * FIX: Removed duplicate url parameters e.g. in dashboard (display_options)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6c01c85a781f04d2b8df9b90ca4f9c18a0fdf7ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c01c85a781f04… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 19 15:48:16 2012 +0200 * FIX: Removed duplicate url parameters e.g. in dashboard (display_options) * FIX: Dashboard: If original request showed no "max rows"-message, the page rendered during reload does not show the message anymore --- ChangeLog | 3 +++ web/htdocs/js/checkmk.js | 15 +++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6fa173f..53126f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -124,6 +124,9 @@ * FIX: fixed layout of login dialog when showing up error messages * FIX: Fixed styling of wato quickaccess snapin preview * FIX: Made printer_supply perfometer a bit more robust against bad perfdata + * FIX: Removed duplicate url parameters e.g. in dashboard (display_options) + * FIX: Dashboard: If original request showed no "max rows"-message, the + page rendered during reload does not show the message anymore Livecheck: * FIX: Compile livecheck also if diet libc is missing diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 83bb22f..dd43ee0 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -270,7 +270,9 @@ function makeuri(addvars) { // Skip unwanted parmas for(var i = 0; i < tmp.length; i++) { pair = tmp[i].split('='); - if(pair[0][0] == '_') + if(pair[0][0] == '_') // Skip _<vars> + continue; + if(addvars.hasOwnProperty(pair[0])) // Skip vars present in addvars continue; params.push(tmp[i]); } @@ -758,7 +760,8 @@ function handleReload(url) { window.location.href = url; } else { - // Enforce specific display_options to get only the content data + // Enforce specific display_options to get only the content data. + // All options in "opts" will be forced. Existing upper-case options will be switched. var display_options = getUrlParam('display_options'); // Removed 'w' to reflect original rengering mechanism during reload // For example show the "Your query produced more than 1000 results." message @@ -772,6 +775,14 @@ function handleReload(url) { } opts = null; + // Add optional display_options if not defined in original display_options + var opts = [ 'w' ]; + for (var i = 0; i < opts.length; i++) { + if (display_options.indexOf(opts[i].toUpperCase()) == -1) + display_options += opts[i]; + } + opts = null; + var params = {'_display_options': display_options}; var real_display_options = getUrlParam('display_options'); if(real_display_options !== '')

11 years, 12 months

Check_MK Git: check_mk: Changed localization of reschedule string

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ba726e8e7b06608c6851d4904bf3c7d25b9ac06f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba726e8e7b0660… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 20 11:43:11 2012 +0200 Changed localization of reschedule string --- web/plugins/icons/builtin.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index df244ef..7cc9de4 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -94,7 +94,7 @@ def paint_reschedule(what, row, tags, custom_vars): servicedesc = '' wait_svc = '' icon = 'icon_reload' - txt = _('Reschedule an immediate check of this %s') % _(what) + txt = _('Reschedule an immediate check of this %(obj)s') % {'obj': _(what)} if what == 'service': servicedesc = row['service_description']

11 years, 12 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f6feeec184e8e71ddc351207d45f49e37a613ce1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6feeec184e8e7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 20 12:19:41 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 12 months

Check_MK Git: check_mk: FIX: Fixed bug in alert statistics view ( only last 1000 lines were

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 53b59e0f1d773b1825976c5d03745309774ce73b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53b59e0f1d773b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 20 11:37:37 2012 +0200 FIX: Fixed bug in alert statistics view (only last 1000 lines were processed for calculating the statistics) --- ChangeLog | 2 ++ web/htdocs/views.py | 12 ++++++++++-- web/plugins/views/datasources.py | 18 +++++++++++------- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2be65c2..ac516c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -129,6 +129,8 @@ * FIX: Removed duplicate url parameters e.g. in dashboard (display_options) * FIX: Dashboard: If original request showed no "max rows"-message, the page rendered during reload does not show the message anymore + * FIX: Fixed bug in alert statistics view (only last 1000 lines were + processed for calculating the statistics) Livecheck: * FIX: Compile livecheck also if diet libc is missing diff --git a/web/htdocs/views.py b/web/htdocs/views.py index efddf44..502866f 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1228,6 +1228,14 @@ def show_view(view, show_heading = False, show_buttons = True, colset.remove("site") columns = list(colset) + # We had a problem with stats queries on the logtable where + # the limit was not applied on the resulting rows but on the + # lines of the log processed. This resulted in wrong stats. + # For these datasources we ignore the query limits. + limit = None + if not datasource.get('ignore_limit', False): + limit = get_limit() + # Get list of painter options we need to display (such as PNP time range # or the format being used for timestamp display) painter_options = [] @@ -1246,9 +1254,9 @@ def show_view(view, show_heading = False, show_buttons = True, # In that case that function is used to compute the result. if type(tablename) == type(lambda x:None): - rows = tablename(columns, query, only_sites, get_limit(), all_active_filters) + rows = tablename(columns, query, only_sites, limit, all_active_filters) else: - rows = query_data(datasource, columns, add_columns, query, only_sites, get_limit()) + rows = query_data(datasource, columns, add_columns, query, only_sites, limit) # Now add join information, if there are join columns if len(join_painters) > 0: diff --git a/web/plugins/views/datasources.py b/web/plugins/views/datasources.py index 1357c39..8755312 100644 --- a/web/plugins/views/datasources.py +++ b/web/plugins/views/datasources.py @@ -35,6 +35,9 @@ # idkeys: these are used to generate a key which is uniq for each data row +# ignore_limit: Ignore the soft/hard query limits in view.py/query_data(). This +# fixes stats queries on e.g. the log table. + multisite_datasources["hosts"] = { "title" : _("All hosts"), "table" : "hosts", @@ -155,11 +158,12 @@ multisite_datasources["log_host_events"] = { } multisite_datasources["alert_stats"] = { - "title" : _("Alert Statistics"), - "table" : "log", - "add_headers" : "Filter: class = 1\nStats: state = 0\nStats: state = 1\nStats: state = 2\nStats: state = 3\nStats: state != 0\n", - "add_columns" : [ "alerts_ok", "alerts_warn", "alerts_crit", "alerts_unknown", "alerts_problem" ], - "infos" : [ "log", "host", "service", "contact", "command" ], - "keys" : [], - "idkeys" : [ 'host_name', 'service_description' ], + "title" : _("Alert Statistics"), + "table" : "log", + "add_headers" : "Filter: class = 1\nStats: state = 0\nStats: state = 1\nStats: state = 2\nStats: state = 3\nStats: state != 0\n", + "add_columns" : [ "alerts_ok", "alerts_warn", "alerts_crit", "alerts_unknown", "alerts_problem" ], + "infos" : [ "log", "host", "service", "contact", "command" ], + "keys" : [], + "idkeys" : [ 'host_name', 'service_description' ], + "ignore_limit" : True, }

11 years, 12 months

Check_MK Git: check_mk: Removed (hopefully) debug text

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 63badc919f93d29e6ac4ffaaa1fb313327c42853 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63badc919f93d2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 19 14:00:14 2012 +0200 Removed (hopefully) debug text --- web/htdocs/valuespec.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 8fce87b..0ed7ab5 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -614,7 +614,7 @@ class ListOf(ValueSpec): "down" : _("down"), } html.empty_icon_button() # needed as placeholder - html.icon_button("#", _("Move this entry %s %s") % (where_name[where],self._movable), + html.icon_button("#", _("Move this entry %s") % (where_name[where]), where, onclick=js, style = (not self._movable) and "display: none" or "") # Implementation idea: we render our element-valuespec

11 years, 12 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2012