Checkmk git commits June 2015

checkmk-commits@lists.checkmk.com

8 participants
227 discussions

Check_MK Git: check_mk: Better help text for active SQL check

by Mathias Kettner

Module: check_mk Branch: master Commit: 48b4896d2ad73331c02db7aa70f3fc48a7342828 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48b4896d2ad733… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 18 15:10:22 2015 +0200 Better help text for active SQL check --- web/plugins/wato/active_checks.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 9488a31..e0b4253 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -437,7 +437,13 @@ register_rule(group, ), ( "sql", TextAscii(title = _("SQL-statement or procedure name"), allow_empty = False, - help = _('The SQL-statement or procedure name which is executed on the DBMS')) + help = _('The SQL-statement or procedure name which is executed on the DBMS. It must return ' + 'a result table with one row and at least two columns. The first column must be ' + 'an integer and is interpreted as the state (0 is OK, 1 is WARN, 2 is CRIT). ' + 'Alternatively the first column can be interpreted as number value and you can ' + 'define levels for this number. The ' + 'second column is used as check output. The third column is optional and can ' + 'contain performance data.')) ), ( "procedure", Dictionary(

9 years

Check_MK Git: check_mk: #2356 FIX Fixed exception in Multisite JSON output

by Mathias Kettner

Module: check_mk Branch: master Commit: 77e99de0f5fa6babec54a00ac39908773edfd3dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77e99de0f5fa6b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 18 11:34:29 2015 +0200 #2356 FIX Fixed exception in Multisite JSON output --- .werks/2356 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/painters.py | 1 - 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/2356 b/.werks/2356 new file mode 100644 index 0000000..f23cfaf --- /dev/null +++ b/.werks/2356 @@ -0,0 +1,10 @@ +Title: Fixed exception in Multisite JSON output +Level: 2 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i2 +Date: 1434620049 + + diff --git a/ChangeLog b/ChangeLog index 78fb1bc..acca58e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ * 2338 FIX: Logging internal GUI exceptions to web.log instead of apache error_log... * 2340 FIX: Email validation: Top level domains can now have a maximum length of 24 characters * 2353 FIX: Fix showing options for availability in BI mode, where above header + * 2356 FIX: Fixed exception in Multisite JSON output WATO: * 1254 The target address for crash reports can now be configured in wato global settings diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 7b3c517..b29692f 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -202,7 +202,6 @@ def process_multisite_icons(what, row, tags, custom_vars): n = n[:-4] elif n.endswith(".gif"): n = n[:-4] - output += ' '+n.encode('utf-8') icons.append((toplevel, sort_index, n.encode('utf-8'), None, None)) continue

9 years

Check_MK Git: check_mk: Fixed color of frequency metrics

by Mathias Kettner

Module: check_mk Branch: master Commit: b8c0325b06f0297fdafc70a98050b8dd7fdd5c70 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8c0325b06f029… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 18 11:10:09 2015 +0200 Fixed color of frequency metrics --- web/plugins/metrics/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 2ee18de..0c6ba42 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1200,7 +1200,7 @@ metric_info["channel_utilization"] = { metric_info["frequency"] = { "title" : _("Frequency"), "unit" : "hz", - "color" : "10/c", + "color" : "11/c", } #.

9 years

Check_MK Git: check_mk: #2355 FIX docsis_channels_upstream: Fix graph definitions

by Mathias Kettner

Module: check_mk Branch: master Commit: 0040674ded37dbe9b77cf7849799416a1a780bf2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0040674ded37db… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 18 11:07:41 2015 +0200 #2355 FIX docsis_channels_upstream: Fix graph definitions --- .werks/2355 | 9 +++ ChangeLog | 1 + web/htdocs/metrics.py | 7 ++- web/plugins/metrics/check_mk.py | 115 +++++++++++++++++++++++++++++---------- 4 files changed, 102 insertions(+), 30 deletions(-) diff --git a/.werks/2355 b/.werks/2355 new file mode 100644 index 0000000..c79cfea --- /dev/null +++ b/.werks/2355 @@ -0,0 +1,9 @@ +Title: docsis_channels_upstream: Fix graph definitions +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i2 +Date: 1434618449 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index b77d77c..78fb1bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,7 @@ * 1258 FIX: fileinfo solaris: Fixed configuration crash... * 2221 FIX: cisco_temperature: Fixed order of device levels for some devices... * 2329 FIX: windows_intel_bonding: Fix exception in case of no existing bonding device + * 2355 FIX: docsis_channels_upstream: Fix graph definitions Multisite: * 2260 Improved load time of Check_MK GUI... diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index a67848b..f38ed1d 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -154,6 +154,10 @@ def metric_to_text(metric, value=None): # '----------------------------------------------------------------------' cmk_color_palette = { + "10" : (0.3, 1.0, 1.0), + "12" : (0.5, 1.0, 1.0), + "14" : (0.6, 1.0, 1.0), + "16" : (0.8, 1.0, 1.0), "24" : (0.5, 1.0, 1.0), "25" : (0.7, 1.0, 1.0), } @@ -309,7 +313,8 @@ def translate_metrics(perf_data, check_command): "color" : "#888888", } else: - mi = metric_info[metric_name] + mi = metric_info[metric_name].copy() + mi["color"] = parse_color_into_hexrgb(mi["color"]) # Optional scaling scale = translation_entry.get("scale", 1.0) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 12d2d9c..2ee18de 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -80,6 +80,13 @@ unit_info["1/s"] = { "render" : lambda v: "%s%s" % (drop_dotzero(v), _("/s")), } +unit_info["hz"] = { + "title" : _("Hz"), + "symbol" : _("Hz"), + "render" : lambda v : physical_precision(v, 3, _("Hz")), +} + + unit_info["bytes"] = { "title" : _("Bytes"), "symbol" : _("B"), @@ -717,9 +724,7 @@ metric_info["disk_average_read_wait"] = { } metric_info["disk_average_write_wait"] = { - "title" : _("Write wait time"), - "unit" : "s", - "color" : "#20c0e8", + "title" : _("Write wait time"), "unit" : "s", "color" : "#20c0e8", } metric_info["disk_average_wait"] = { @@ -1090,83 +1095,114 @@ metric_info["mail_queue_active_size"] = { for ty, unit in [ ("requests", "1/s"), ("bytes", "bytes/s"), ("secs", "1/s") ]: metric_info[ty+"_cmk_views"] = { - "title" : "Check_MK: Views", + "title" : _("Check_MK: Views"), "unit" : unit, "color" : "#ff8080", } - metric_info[ty+"_cmk_wato"] = { - "title" : "Check_MK: WATO", + metric_info[ty + "_cmk_wato"] = { + "title" : _("Check_MK: WATO"), "unit" : unit, "color" : "#377cab", } - metric_info[ty+"_cmk_bi"] = { - "title" : "Check_MK: BI", + metric_info[ty + "_cmk_bi"] = { + "title" : _("Check_MK: BI"), "unit" : unit, "color" : "#4eb0f2", } - metric_info[ty+"_cmk_snapins"] = { - "title" : "Check_MK: Snapins", + metric_info[ty + "_cmk_snapins"] = { + "title" : _("Check_MK: Snapins"), "unit" : unit, "color" : "#ff4040", } - metric_info[ty+"_cmk_dashboards"] = { - "title" : "Check_MK: Dashboards", + metric_info[ty + "_cmk_dashboards"] = { + "title" : _("Check_MK: Dashboards"), "unit" : unit, "color" : "#4040ff", } - metric_info[ty+"_cmk_other"] = { - "title" : "Check_MK: Other", + metric_info[ty + "_cmk_other"] = { + "title" : _("Check_MK: Other"), "unit" : unit, "color" : "#5bb9eb", } - metric_info[ty+"_nagvis_snapin"] = { - "title" : "NagVis: Snapin", + metric_info[ty + "_nagvis_snapin"] = { + "title" : _("NagVis: Snapin"), "unit" : unit, "color" : "#f2904e", } - metric_info[ty+"_nagvis_ajax"] = { - "title" : "NagVis: AJAX", + metric_info[ty + "_nagvis_ajax"] = { + "title" : _("NagVis: AJAX"), "unit" : unit, "color" : "#af91eb", } - metric_info[ty+"_nagvis_other"] = { - "title" : "NagVis: Other", + metric_info[ty + "_nagvis_other"] = { + "title" : _("NagVis: Other"), "unit" : unit, "color" : "#f2df40", } - metric_info[ty+"_images"] = { - "title" : "Image", + metric_info[ty + "_images"] = { + "title" : _("Image"), "unit" : unit, "color" : "#91cceb", } - metric_info[ty+"_styles"] = { - "title" : "Styles", + metric_info[ty + "_styles"] = { + "title" : _("Styles"), "unit" : unit, "color" : "#c6f24e", } - metric_info[ty+"_scripts"] = { - "title" : "Scripts", + metric_info[ty + "_scripts"] = { + "title" : _("Scripts"), "unit" : unit, "color" : "#4ef26c", } - metric_info[ty+"_other"] = { - "title" : "Other", + metric_info[ty + "_other"] = { + "title" : _("Other"), "unit" : unit, "color" : "#4eeaf2", } + +metric_info["total_modems"] = { + "title" : _("Total number of modems"), + "unit" : "count", + "color" : "12/c", +} + +metric_info["active_modems"] = { + "title" : _("Active modems"), + "unit" : "count", + "color" : "14/c", +} + +metric_info["registered_modems"] = { + "title" : _("Registered modems"), + "unit" : "count", + "color" : "16/c", +} + +metric_info["channel_utilization"] = { + "title" : _("Channel utilization"), + "unit" : "%", + "color" : "24/c", +} + +metric_info["frequency"] = { + "title" : _("Frequency"), + "unit" : "hz", + "color" : "10/c", +} + #. # .--Checks--------------------------------------------------------------. # | ____ _ _ | @@ -1409,7 +1445,13 @@ check_metrics["check_mk-bluenet_meter"] = {} check_metrics["check_mk-bluecoat_sensors"] = {} check_metrics["check_mk-zfs_arc_cache"] = { "hit_ratio" : { "scale" : 0.01 }} -check_metrics["check_mk-docsis_channels_upstream"] = {} +check_metrics["check_mk-docsis_channels_upstream"] = { + "total" : { "name" : "total_modems" }, + "active" : { "name" : "active_modems" }, + "registered" : { "name" : "registered_modems" }, + "util" : { "name" : "channel_utilization" }, + "frequency" : { "scale" : 1000000.0 }, +} check_metrics["check_mk-postgres_bloat"] = {} check_metrics["check_mk-postgres_connections"] = {} @@ -2234,3 +2276,18 @@ graph_info.append({ ( "mail_queue_active_length", "stack" ), ], }) + + + +graph_info.append({ + "title" : _("Modems"), + "metrics" : [ + ( "active_modems", "area" ), + ( "registered_modems", "line" ), + ( "total_modems", "line" ), + ], +}) + +define_generic_graph("channel_utilization") +define_generic_graph("signal_noise") +define_generic_graph("frequency")

9 years

Check_MK Git: check_mk: edited cmk_color_palette in htdocs/metrics.py

by Simon Betz

Module: check_mk Branch: master Commit: 122a4a4cd72a474ba92aa3f8ddb1925239fe6cbe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=122a4a4cd72a47… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jun 18 10:47:07 2015 +0200 edited cmk_color_palette in htdocs/metrics.py --- web/htdocs/metrics.py | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index a67848b..3fa3092 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -154,10 +154,45 @@ def metric_to_text(metric, value=None): # '----------------------------------------------------------------------' cmk_color_palette = { - "24" : (0.5, 1.0, 1.0), - "25" : (0.7, 1.0, 1.0), +# do not use: +# "0" : (0.33, 1, 1), # green +# "1" : (0.167, 1, 1), # yellow +# "2" : (0, 1, 1), # red +# red area + "11" : (0.775, 1, 1), + "12" : (0.8, 1, 1), + "13" : (0.83, 1, 1), + "14" : (0.05, 1, 1), + "15" : (0.08, 1, 1), + "16" : (0.105, 1, 1), +# yellow area + "21" : (0.13, 1, 1), + "22" : (0.14, 1, 1), + "23" : (0.155, 1, 1), + "24" : (0.185, 1, 1), + "25" : (0.21, 1, 1), + "26" : (0.25, 1, 1), +# green area + "31" : (0.45, 1, 1), + "32" : (0.5, 1, 1), + "33" : (0.515, 1, 1), + "34" : (0.53, 1, 1), + "35" : (0.55, 1, 1), + "36" : (0.57, 1, 1), +# blue area + "41" : (0.59, 1, 1), + "42" : (0.62, 1, 1), + "43" : (0.66, 1, 1), + "44" : (0.71, 1, 1), + "45" : (0.73, 1, 1), + "46" : (0.75, 1, 1), +# special colors + "51" : (0, 0, 0.5), # grey_50 + "52" : (0.067, 0.7, 0.5), # brown 1 + "53" : (0.083, 0.8 0.55), # brown 2 } + # 23/c -> #ff8040 # #ff8040 -> #ff8040 def parse_color_into_hexrgb(color_string):

9 years

Check_MK Git: check_mk: Allow new color specifications in metrics - palette still missing, though

by Mathias Kettner

Module: check_mk Branch: master Commit: d5f883ad87b1a5470efe4f65915a583f49d4fc12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5f883ad87b1a5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 17 16:44:55 2015 +0200 Allow new color specifications in metrics - palette still missing, though --- web/htdocs/metrics.py | 48 ++++++++++++++++++++++++++++++++++++--- web/plugins/metrics/check_mk.py | 2 +- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 1e7882d..a67848b 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -34,7 +34,7 @@ # unit: The definition-dict of a unit like in unit_info # graph_template: Template for a graph. Essentially a dict with the key "metrics" -import math, time +import math, time, colorsys import config, defaults, pagetypes, table from lib import * from valuespec import * @@ -141,6 +141,48 @@ def metric_to_text(metric, value=None): # A few helper function to be used by the definitions +#. +# .--Colors--------------------------------------------------------------. +# | ____ _ | +# | / ___|___ | | ___ _ __ ___ | +# | | | / _ \| |/ _ \| '__/ __| | +# | | |__| (_) | | (_) | | \__ \ | +# | \____\___/|_|\___/|_| |___/ | +# | | +# +----------------------------------------------------------------------+ +# | Functions and constants dealing with colors | +# '----------------------------------------------------------------------' + +cmk_color_palette = { + "24" : (0.5, 1.0, 1.0), + "25" : (0.7, 1.0, 1.0), +} + +# 23/c -> #ff8040 +# #ff8040 -> #ff8040 +def parse_color_into_hexrgb(color_string): + if color_string[0] == "#": + return color_string + elif "/" in color_string: + cmk_color_index, color_shading = color_string.split("/") + hsv = list(cmk_color_palette[cmk_color_index]) + if color_shading == 'a': + hsv[2] *= 0.6 + elif color_shading == 'b': + hsv[2] *= 0.8 + elif color_shading == 'd': + hsv[1] *= 0.8 + elif color_shading == 'e': + hsv[1] *= 0.6 + color_hexrgb = hsv_to_hexrgb(hsv) + return color_hexrgb + else: + return "#808080" + + +def hsv_to_hexrgb(hsv): + return render_color(colorsys.hsv_to_rgb(*hsv)) + # "#ff0080" -> (1.0, 0.0, 0.5) def parse_color(color): @@ -459,7 +501,7 @@ def evaluate_literal(expression, translated_metrics): unit = translated_metrics[varname]["unit"] if color == None: - color = metric_info[varname]["color"] + color = parse_color_into_hexrgb(metric_info[varname]["color"]) return value, unit, color @@ -912,7 +954,7 @@ def render_graph_pnp(graph_template, translated_metrics): mi = metric_info[metric_name] if not title: title = mi["title"] - color = mi["color"] + color = parse_color_into_hexrgb(mi["color"]) unit = unit_info[mi["unit"]] if custom_color: diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 48735ec..12d2d9c 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -433,7 +433,7 @@ metric_info["mem_lnx_vmalloc_chunk"] = { metric_info["load1"] = { "title" : _("CPU load average of last minute"), "unit" : "", - "color" : "#60c0e0", + "color" : "24/e", } metric_info["load5"] = {

9 years

Check_MK Git: check_mk: #2354 BI aggregations now also consider the service period

by Mathias Kettner

Module: check_mk Branch: master Commit: e716278c68d46250234ca902f58e0393cb6621f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e716278c68d462… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 17 15:55:45 2015 +0200 #2354 BI aggregations now also consider the service period BI aggregations now also consider the service period of their contained services and hosts - just like for downtimes and acknowledgements. A BI aggregate is thus considered to be within its service period if its state would be OK under the assumption that all objects that are currently out of their service period are CRIT and the rest is OK. Or otherwise stated: If all things that are not in their service period are switched off: if the BI aggregate would get CRIT - well then it is not in its service period. Yet in other words that means that the service period of something can only cover times where all of its vital parts also are in service period. The information "within/out of service period" is now also available for the availability computations. That allows you now to base availability reporting for BI aggregates to be based on certain time periods. --- .werks/2354 | 21 ++++++++++ ChangeLog | 1 + livestatus/src/ServicelistColumn.cc | 15 +++++++ livestatus/src/ServicelistColumn.h | 2 + web/htdocs/availability.py | 8 ++-- web/htdocs/bi.py | 77 +++++++++++++++++++++++------------ web/plugins/views/bi.py | 6 ++- 7 files changed, 99 insertions(+), 31 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e716278c68…

9 years

Check_MK Git: check_mk: #2353 FIX Fix showing options for availability in BI mode, where above header

by Mathias Kettner

Module: check_mk Branch: master Commit: f7c1e29d448fe9d0c0465b27f8fc4bbc1a1fea6f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7c1e29d448fe9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 17 14:52:22 2015 +0200 #2353 FIX Fix showing options for availability in BI mode, where above header --- .werks/2353 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/availability.py | 8 +++----- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.werks/2353 b/.werks/2353 new file mode 100644 index 0000000..86dfa1b --- /dev/null +++ b/.werks/2353 @@ -0,0 +1,10 @@ +Title: Fix showing options for availability in BI mode, where above header +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i2 +Date: 1434545517 + + diff --git a/ChangeLog b/ChangeLog index 517a535..b6854c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ * 2337 FIX: Fixed problem with long hanging pnp graph rendering calls * 2338 FIX: Logging internal GUI exceptions to web.log instead of apache error_log... * 2340 FIX: Email validation: Top level domains can now have a maximum length of 24 characters + * 2353 FIX: Fix showing options for availability in BI mode, where above header WATO: * 1254 The target address for crash reports can now be configured in wato global settings diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 1904a14..7220aaa 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -469,11 +469,8 @@ def render_timeline_bar(timeline_layout, style): def render_bi_availability(title, aggr_rows): av_mode = html.var("av_mode", "availability") - html.plug() - avoptions = render_availability_options() + avoptions = get_availability_options_from_url() time_range, range_title = avoptions["range"] - avoptions_html = html.drain() - html.unplug() if av_mode == "timeline": title = _("Timeline of ") + title @@ -481,7 +478,6 @@ def render_bi_availability(title, aggr_rows): title = _("Availability of ") + title if html.output_format != "csv_export": - html.write(avoptions_html) html.body_start(title, stylesheets=["pages","views","status", "bi"], javascripts=['bi']) html.top_heading(title) html.begin_context_buttons() @@ -502,6 +498,8 @@ def render_bi_availability(title, aggr_rows): html.context_button(_("Timeline"), timeline_url, "timeline") html.end_context_buttons() + avoptions = render_availability_options() + if not html.has_user_errors(): spans = []

9 years

Check_MK Git: check_mk: Reserved 25 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: b28006ff72e32481e539cc241a9b8dff158d57fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b28006ff72e324… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 17 14:51:46 2015 +0200 Reserved 25 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index eebd43c..c712c95 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2353 +2378

9 years

Check_MK Git: check_mk: WATO: disallow invalid host names when specifying list of explicit hosts

by Mathias Kettner

Module: check_mk Branch: master Commit: e027a5fe4bf56ea8ab2cc4b9bf681ca46406f2d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e027a5fe4bf56e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 17 14:14:02 2015 +0200 WATO: disallow invalid host names when specifying list of explicit hosts --- web/htdocs/valuespec.py | 3 ++- web/htdocs/wato.py | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 12ea130..1373c81 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -591,7 +591,8 @@ class Hostname(TextAscii): def __init__(self, **kwargs): TextAscii.__init__(self, **kwargs) self._regex = re.compile('^[-0-9a-zA-Z_.]+$') - self._regex_error = _("Please enter a valid hostname or IPv4 address.") + self._regex_error = _("Please enter a valid hostname or IPv4 address. " + "Only only letters, digits, dash, underscore and dot are allowed.") class AbsoluteDirname(TextAscii): def __init__(self, **kwargs): diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b085225..a6caa57 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2179,9 +2179,8 @@ def check_new_hostname(varname, hostname): if not hostname: raise MKUserError(varname, _("Please specify a host name.")) elif hostname in g_folder[".hosts"]: - raise MKUserError(varname, _("A host with this name already exists.")) - elif not re.match("^[a-zA-Z0-9-_.]+$", hostname): - raise MKUserError(varname, _("Invalid host name: must contain only characters, digits, dash, underscore and dot.")) + raise MKUserError(varname, _("A host with this name already exists in this folder.")) + Hostname().validate_value(hostname, varname) def check_new_host_permissions(folder, host, hostname): config.need_permission("wato.manage_hosts") @@ -14834,7 +14833,9 @@ def get_rule_conditions(ruleset): else: negate = html.get_checkbox("negate_hosts") nr = 0 - host_list = ListOfStrings().from_html_vars("hostlist") + vs = ListOfStrings(valuespec=Hostname()) + host_list = vs.from_html_vars("hostlist") + vs.validate_value(host_list, "hostlist") if negate: host_list = [ "!" + h for h in host_list ] # append ALL_HOSTS to negated host lists

9 years

← Newer
1
...
8
9
10
11
12
13
14
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2015