Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

by Roland Halbig

Module: check_mk Branch: master Commit: 36a3dfe9afdc1a5a9d7d2810e674bfb6f983e850 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36a3dfe9afdc1a… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Dec 15 11:08:54 2016 +0100 Refactored views.py. Change-Id: Iacefd509c4937d0743fa511bb9bb62779f0af6fd Refactoring views.py Change-Id: I94cb16fed3f53a1d46f730cf416fde53fbc35114 Refactoring views.py: reverted toggle button changes. Change-Id: I3a89f73e2276edc6ab31799b592868caf55aca27 Refactored views.py Change-Id: Ib8351ce039154925f1b462a70db20ef998fa8d94 --- web/htdocs/views.py | 115 +++++++++++++++++++++++++++++----------------------- 1 file changed, 65 insertions(+), 50 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index f6ceeb8..174572b 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -441,7 +441,7 @@ class PainterOptions(object): if not display_options.enabled(display_options.D) or not self.painter_option_form_enabled(): return - html.write('<div class="view_form" id="painteroptions" style="display: none">') + html.open_div(id_="painteroptions", class_=["view_form"], style="display: none;") html.begin_form("painteroptions") forms.header(_("Display Options")) for name in self._used_option_names: @@ -459,7 +459,7 @@ class PainterOptions(object): html.hidden_fields() html.end_form() - html.write('</div>') + html.close_div() @@ -669,9 +669,9 @@ class Cell(object): if is_last_column_header: classes.append("last_col") - thclass = classes and (" class=\"%s\"" % " ".join(classes)) or "" - - html.write("<th%s%s%s>%s</th>" % (thclass, onclick, title, self.title())) + html.open_th(class_=classes, onclick=onclick, title=title) + html.write(self.title()) + html.close_th() #html.guitest_record_output("view", ("header", title)) @@ -834,9 +834,13 @@ class Cell(object): tdclass += " last_col" if tdclass: - html.write("<td %s class=\"%s\">%s</td>\n" % (tdattrs, tdclass, content)) + html.write("<td %s class=\"%s\">" % (tdattrs, tdclass)) + html.write(content) + html.close_td() else: - html.write("<td %s>%s</td>" % (tdattrs, content)) + html.write("<td %s>" % (tdattrs)) + html.write(content) + html.close_td() #html.guitest_record_output("view", ("cell", content)) return has_content @@ -974,7 +978,7 @@ def page_create_view(next_url = None): return except MKUserError, e: - html.write("<div class=error>%s</div>\n" % e) + html.div(e, class_=["error"]) html.add_user_error(e.varname, e) html.begin_form('create_view') @@ -1359,20 +1363,21 @@ def create_view_from_valuespec(old_view, view): def show_filter(f): if not f.visible(): - html.write('<div style="display:none">') + html.open_div(style="display:none;") f.display() - html.write('</div>') + html.close_div() else: visuals.show_filter(f) def show_filter_form(is_open, filters): # Table muss einen anderen Namen, als das Formular - html.write('<div class="view_form" id="filters" %s>' - % (not is_open and 'style="display: none"' or '') ) + html.open_div(id_="filters", class_=["view_form"], style="display: none;" if not is_open else None) html.begin_form("filter") - html.write("<table border=0 cellspacing=0 cellpadding=0 class=filterform><tr><td>") + html.open_table(class_=["filterform"], cellpadding="0", cellspacing="0", border="0") + html.open_tr() + html.open_td() # sort filters according to title s = [(f.sort_index, f.title, f) for f in filters if f.available()] @@ -1389,14 +1394,20 @@ def show_filter_form(is_open, filters): if not f.double_height(): show_filter(f) - html.write("</td></tr><tr><td>") + html.close_td() + html.close_tr() + + html.open_tr() + html.open_td() html.button("search", _("Search"), "submit") - html.write("</td></tr></table>") + html.close_td() + html.close_tr() + + html.close_table() html.hidden_fields() html.end_form() - - html.write("</div>") + html.close_div() def page_view(): @@ -1823,7 +1834,7 @@ def render_view(view, rows, datasource, group_painters, painters, # The refreshing content container if display_options.enabled(display_options.R): - html.write("<div id=data_container>\n") + html.open_div(id_="data_container") if not has_done_actions: # Limit exceeded? Show warning @@ -1864,9 +1875,9 @@ def render_view(view, rows, datasource, group_painters, painters, for sitename, info in sites.live().deadsites.items(): html.show_error("<b>%s - %s</b><br>%s" % (info["site"]["alias"], _('Livestatus error'), info["exception"])) - # FIXME: Sauberer wäre noch die Status Icons hier mit aufzunehmen + # FIXME: Sauberer waere noch die Status Icons hier mit aufzunehmen if display_options.enabled(display_options.R): - html.write("</div>\n") + html.close_div() if show_footer: pid = os.getpid() @@ -1986,13 +1997,17 @@ def view_optiondial(view, option, choices, help): html.begin_context_buttons() # just to be sure # Remove unicode strings choices = [ [c[0], str(c[1])] for c in choices ] - html.write('<div title="%s" id="optiondial_%s" class="optiondial %s val_%s" ' - 'onclick="view_dial_option(this, \'%s\', \'%s\', %r);"><div>%s</div></div>' % ( - help, option, option, value, view["name"], option, choices, title)) + html.open_div(id_="optiondial_%s" % option, + class_=["optiondial", option, "val_%s" % value], + title=help, + onclick="view_dial_option(this, \'%s\', \'%s\', %r)" + % (view["name"], option, choices)) + html.div(title) + html.close_div() html.final_javascript("init_optiondial('optiondial_%s');" % option) def view_optiondial_off(option): - html.write('<div class="optiondial off %s"></div>' % option) + html.div('', class_=["optiondial", "off", option]) # FIXME: Consolidate with html.toggle_button() rendering functions def toggler(id, icon, help, onclick, value, hidden = False): @@ -2192,8 +2207,10 @@ def do_query_data(query, columns, add_columns, merge_column, sites.live().set_limit(limit + 1) # + 1: We need to know, if limit is exceeded if config.debug_livestatus_queries \ and html.output_format == "html" and display_options.enabled(display_options.W): - html.write('<div class="livestatus message">' - '<tt>%s</tt></div>\n' % (query.replace('\n', '<br>\n'))) + html.open_div(class_=["livestatus", "message"]) + html.tt(query.replace('\n', '<br>\n')) + html.close_div() + if only_sites: sites.live().set_only_sites(only_sites) @@ -2425,8 +2442,9 @@ def show_command_form(is_open, datasource): # will be one of "host", "service", "command" or "downtime". what = datasource["infos"][0] - html.write('<div class="view_form" id="commands" %s>' % - (not is_open and 'style="display: none"' or '') ) + html.open_div(id_="commands", + class_=["view_form"], + style="display:none;" if not is_open else None) html.begin_form("actions") html.hidden_field("_do_actions", "yes") html.hidden_field("actions", "yes") @@ -2453,7 +2471,7 @@ def show_command_form(is_open, datasource): forms.end() html.end_form() - html.write("</div>") + html.close_div() # Examine the current HTML variables in order determine, which # command the user has selected. The fetch ids from a data row @@ -3005,40 +3023,37 @@ def ajax_popup_action_menu(): row = query_action_data(what, host, site, svcdesc) icons = get_icons(what, row, toplevel=False) - html.write('<ul>\n') + html.open_ul() for icon in icons: - html.write('<li>\n') - if len(icon) == 4: + if len(icon) != 4: + html.open_li() + html.write(icon[1]) + html.close_li() + else: + html.open_li() icon_name, title, url_spec = icon[1:] + if url_spec: url, target_frame = sanitize_action_url(url_spec) - url = replace_action_url_macros(url, what, row) - - onclick = '' + onclick = None if url.startswith('onclick:'): - onclick = ' onclick="%s"' % url[8:] - url = 'javascript:void(0)' - - target = "" + onclick = url[8:] + url = 'javascript:void(0);' + target = None if target_frame and target_frame != "_self": - target = " target=\"%s\"" % target_frame - - html.write('<a href="%s"%s%s>' % (url, target, onclick)) + target = target_frame + html.open_a(href=url, target=target, onclick=onclick) html.icon('', icon_name) - if title: html.write(title) else: - html.write(_("No title")) - + html.write_text(_("No title")) if url_spec: - html.write('</a>') - else: - html.write(icon[1]) - html.write('</li>\n') - html.write('</ul>\n') + html.close_a() + html.close_li() + html.close_ul() def sanitize_action_url(url_spec):

7 years, 9 months

TextAscii and TextUnicode now support try_max_width

by Mathias Kettner

Module: check_mk Branch: master Commit: a2820238299ba3d567936794423f6b0b58a541db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2820238299ba3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 22 13:10:42 2016 +0100 TextAscii and TextUnicode now support try_max_width Change-Id: I93e56b7dcb43147a1ce3fffd04846c9bcafe724e --- web/htdocs/htmllib.py | 10 +++++++++- web/htdocs/valuespec.py | 3 ++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index e88687c..423d334 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1886,7 +1886,15 @@ class html(DeprecationWrapper): # View style, size = None, None - if "size" in args and args["size"]: + if args.get("try_max_width"): + style = "width: calc(100% - 10px); " + if "size" in args: + cols = int(args["size"]) + else: + cols = 16 + style += "min-width: %d.8ex; " % cols + + elif "size" in args and args["size"]: if args["size"] == "max": style = "width: 100%;" else: diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 8657d60..91c797a 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -366,6 +366,7 @@ class TextAscii(ValueSpec): super(TextAscii, self).__init__(**kwargs) self._label = kwargs.get("label") self._size = kwargs.get("size", 25) # also possible: "max" + self._try_max_width = kwargs.get("try_max_width", False) # If set, uses calc(100%-10px) self._cssclass = kwargs.get("cssclass", "text") self._strip = kwargs.get("strip", True) self._attrencode = kwargs.get("attrencode", True) @@ -410,6 +411,7 @@ class TextAscii(ValueSpec): html.text_input(varprefix, value, size=self._size, + try_max_width=self._try_max_width, read_only=self._read_only, cssclass=self._cssclass, type=type_, @@ -956,7 +958,6 @@ class TextAreaUnicode(TextUnicode): def __init__(self, **kwargs): TextUnicode.__init__(self, **kwargs) self._cols = kwargs.get("cols", 60) - self._try_max_width = kwargs.get("try_max_width", False) # If set, uses calc(100%-10px) self._rows = kwargs.get("rows", 20) # Allowed: "auto" -> Auto resizing self._minrows = kwargs.get("minrows", 0) # Minimum number of initial rows when "auto" self._monospaced = kwargs.get("monospaced", False) # select TT font

7 years, 9 months

Better styling of EC event simulator

by Mathias Kettner

Module: check_mk Branch: master Commit: 39d22fb6db2db338da28b7ecc77ec88f2c4966e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39d22fb6db2db3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 22 13:10:53 2016 +0100 Better styling of EC event simulator Change-Id: I21f061b24c58603f330164097f22fc450a890a23 --- web/plugins/wato/mkeventd.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index df7674f..b60409c 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -826,15 +826,16 @@ vs_mkeventd_event = Dictionary( elements = [ ( "text", TextUnicode( - title = _("Message Text"), - size = 80, + title = _("Message text"), + size = 30, + try_max_width = True, allow_empty = False, default_value = _("Still nothing happened."), attrencode = True), ), ( "application", TextUnicode( - title = _("Application Name"), + title = _("Application name"), help = _("The syslog tag"), size = 40, default_value = _("Foobar-Daemon"),

7 years, 9 months

Tested Exception conversation for html functions.

by Roland Halbig

Module: check_mk Branch: master Commit: acf0d6c171173d8ee1353f0c7d2bdef0f79ce7a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=acf0d6c171173d… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Dec 22 12:32:14 2016 +0100 Tested Exception conversation for html functions. Change-Id: I599f7e75261de2fd8bede92222a81544798348ea --- tests/web/test_generator.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/web/test_generator.py b/tests/web/test_generator.py index 6650119..c4ec1a6 100644 --- a/tests/web/test_generator.py +++ b/tests/web/test_generator.py @@ -39,3 +39,10 @@ def test_HTMLGenerator(): html.close_table() assert html.drain() == "<table><tr><td>1</td><td>2</td></tr></table>" +def test_exception_handling(): + html = HTMLGenerator() + html.plug() + try: + raise Exception("Test") + except Exception, e: + assert html.render_div(e) == "<div>%s</div>" % e

7 years, 9 months

Autorefactor: Added comments and prioritized id and class attribute.

by Roland Halbig

Module: check_mk Branch: master Commit: 4665bc454c16f2b53d61047f5080abc54c1e6baf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4665bc454c16f2… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Dec 22 12:11:51 2016 +0100 Autorefactor: Added comments and prioritized id and class attribute. Change-Id: If13fe49b13c5ea934007e0dace5124cb2130df43 --- tests/web/auto_refactor.py | 107 +++++++++++++++++++++++++++++++-------------- 1 file changed, 74 insertions(+), 33 deletions(-) diff --git a/tests/web/auto_refactor.py b/tests/web/auto_refactor.py index 0e4ae30..249583d 100644 --- a/tests/web/auto_refactor.py +++ b/tests/web/auto_refactor.py @@ -8,21 +8,6 @@ def append_to_html(html, indent, addendum): return "%s\n%s%s" %(html, ' ' * indent, "%s" % addendum) -def split_html(text): - index = 1 - while index < len(text) and text[index - 1] != "(": - index += 1 - open_braces = 1 - while index < len(text) and open_braces > 0: - if text[index] == "(": - open_braces += 1 - elif text[index] == ")": - open_braces -= 1 - index += 1 - while index < len(text) and text[index] != "\n": - index += 1 - return text[:index], text[index:] - def stripper(x): x = re.sub(r' %\s+\(.*', '', x) @@ -48,9 +33,25 @@ def preprocess_tag(tag_str): return tag_str -def eval_tag(tag_str, next_one, next_inbetween): +def add_to_formated_attr_string(attrs, key, val): + + if key in ["class", "id", "type", "for"]: + key += '_' + + if attrs and key and val: + attrs += ", " + + if isinstance(val, list): + val = "[\"" + "\", \"".join(val) + "\"]" + attrs += "%s=%s" % (key, val) + else: + attrs += "%s=\"%s\"" % (key, val) + + return attrs +# Evaluate a tag and its attributes +def eval_tag(tag_str, next_one, next_inbetween): skip_next = False children = list(bs(tag_str, 'html5lib').body.children) @@ -63,20 +64,20 @@ def eval_tag(tag_str, next_one, next_inbetween): tag = children[0] tag_name = tag.name + if "id" in tag.attrs: + val = tag.attrs.pop("id") + attrs = add_to_formated_attr_string(attrs, "id", val) + + if "class" in tag.attrs: + val = tag.attrs.pop("class") + attrs = add_to_formated_attr_string(attrs, "class", val) + for key, val in tag.attrs.iteritems(): - if key in ["class", "id", "type", "for"]: - key += '_' - if attrs and key and val: - attrs += ", " - if isinstance(val, list): - val = "[\"" + "\", \"".join(val) + "\"]" - attrs += "%s=%s" % (key, val) - else: - attrs += "%s=\"%s\"" % (key, val) + attrs = add_to_formated_attr_string(attrs, key, val) # See if we can close the tag right away if next_one and next_one == ("</%s>" % tag_name): - addendum = "html.%s(%s%s)" % (tag_name, next_inbetween, ", " + attrs if attrs else '') + addendum = "html.%s(%s%s)" % (tag_name, next_inbetween if next_inbetween else "\'\'", ", " + attrs if attrs else '') skip_next = True elif tag_name in ['br', 'hr', 'img']: addendum = "html.%s(%s)" % (tag_name, attrs) @@ -94,12 +95,15 @@ def eval_tag(tag_str, next_one, next_inbetween): return addendum, skip_next +# replace the input string modulo operator with [[[i]]] where i is the number +# of the current string modulo operator def replace_inputs(text, inputs): for index, input in enumerate(inputs): text = re.sub("%" + "s", '[[[%s]]]' % index, text, 1) return text +# insert the inputs into the fields where the [[[i]]] space holders are def insert_inputs(text, inputs): if not inputs: return text @@ -116,12 +120,36 @@ def insert_inputs(text, inputs): text = re.sub(r"[[]{3}%s[]]{3}" % counter, '%' + 's' + '\" % ' + input + "\"", text, 1) return text + def test_replace_inputs(): text = "<tag class=\"ein %s\" id=%s>%s</tag>" inputs = ["test", "id", "Hallo Welt!"] print replace_inputs(text, inputs) +# Text extraction +def find_end_of_first_expression(text): + index = 1 + while index < len(text) and text[index - 1] != "(": + index += 1 + open_braces = 1 + while index < len(text) and open_braces > 0: + if text[index] == "(": + open_braces += 1 + elif text[index] == ")": + open_braces -= 1 + index += 1 + while index < len(text) and text[index] != "\n": + index += 1 + return index + + +# Split text into a part to refactor and a rest part +def split_html(text): + index = find_end_of_first_expression(text) + return text[:index], text[index:] + + # this function does a big chunk of the refactoring for me def replace_tags(html, indent = 0): @@ -138,9 +166,11 @@ def replace_tags(html, indent = 0): if " % " in html and len(html.split(" % ")) != 2: return html + # split into code to refactor and rest html, rest = split_html(html) orig_html = html + # for string inputs find the input arguments inputs = [] if " % " in html or ' %\n' in html: if " % " in html: @@ -155,9 +185,11 @@ def replace_tags(html, indent = 0): inbetween = re.split(r'<[^<]*>', re.sub(r'\s*html\.write\([\'|"]?', '', html, 1)) inbetween = map(stripper, inbetween) + # if no tags are found, then return unchanged code if len(tags) == 0: return orig_html + rest + # First result which is not a tag html = '' if inbetween[0].strip(' ') not in ['', '\n']: html = append_to_html(html, indent, "html.write(%s)" % inbetween[0]) @@ -178,12 +210,13 @@ def replace_tags(html, indent = 0): elif skip_next and addendum.strip(' '): counter += 1 + # Now indest the pipes html = insert_inputs(html, inputs) for index, input in enumerate(inputs): if "[[[%s]]]" % index in html: html = re.sub("[[[%s]]]" % index, input, html) - + # Print string try: return orig_html + "\n(new)" + html + rest except: @@ -195,27 +228,35 @@ def replace_tags(html, indent = 0): return orig_html + "\n(new)" + html + "\n" + rest +# indent of a text part which was created using split(html.write). +# This means the indent of the next code block is to be found at the end of the previous block. +def get_indent(text): + indent = 0 + while indent < len(text) and text[len(text) - 1 - indent] == ' ': + indent += 1 + return indent + if __name__ == "__main__": html = sys.argv[1] if html.endswith('.py'): + whole_text = '' with open(html, 'r') as rfile: whole_text = "".join(line for line in rfile) + parts = whole_text.split("html.write(") with open("refactored_file.py", "w") as wfile: part = parts.pop(0) wfile.write(part) - indent = 0 - while indent < len(part) and part[len(part) - 1 - indent] == ' ': - indent += 1 + + indent = get_indent(part) for part in parts: part = "html.write(" + part wfile.write(replace_tags(part, indent)) - indent = 0 - while indent < len(part) and part[len(part) - 1 - indent] == ' ': - indent += 1 + indent = get_indent(part) + elif html == "test": test_replace_inputs() else:

7 years, 9 months

Remove monospace gray background from regex fields for the while

by Mathias Kettner

Module: check_mk Branch: master Commit: 438049f7eec030502c737d1e68426df34e3eade8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=438049f7eec030… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 22 10:17:16 2016 +0100 Remove monospace gray background from regex fields for the while Change-Id: I9982f8f76390674be14d16daf35d3e8e093fcc46 --- web/htdocs/check_mk.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 840b641..69ee727 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -168,8 +168,7 @@ input.button.hot:active { /* pattern / regex input styling */ input.regexp { - font-family: monospace; - background-color: #eee; + /* font-family: monospace; */ } a.button {

7 years, 9 months

4219: Trap processing with community "public" is now only default and not accepted in all cases anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: eb8236280e179f3cfb0341015a828d7bc73e8a15 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb8236280e179f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 22 09:51:10 2016 +0100 4219: Trap processing with community "public" is now only default and not accepted in all cases anymore Change-Id: I40052ccaff7db6d3c1525c3337ec5ba3a0380f5f --- .werks/4219 | 15 +++++++++++++++ ChangeLog | 2 ++ bin/mkeventd | 10 ++++++---- web/plugins/wato/mkeventd.py | 6 ++++++ 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/.werks/4219 b/.werks/4219 new file mode 100644 index 0000000..1ee574f --- /dev/null +++ b/.werks/4219 @@ -0,0 +1,15 @@ +Title: Trap processing with community "public" is now only default and not accepted in all cases anymore +Level: 1 +Component: ec +Compatible: incomp +Version: 1.4.0i4 +Date: 1482396336 +Class: fix + +Since several versions you can configure the Event Console to receive only SNMP traps having +specific SNMP communities set. Previous versions were simply processing all traps. + +The community "public" was somehow special since traps with this community were accepted in +any cases. We have now changed the community public to just be accepted by default. In case +you add additional communities, these will also be accepted. But in the moment you remove +the public community, the traps containing this community will not be accepted anymore. diff --git a/ChangeLog b/ChangeLog index 2bee0d3..2b44839 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,8 @@ * 4156 FIX: Fix off-by-one error in EC limit handling... * 4199 FIX: Fix detection of replication mode if EC is distributed... * 4200 FIX: Fix computation of Event Console performance snapin in distributed mode... + * 4219 FIX: Trap processing with community "public" is now only default and not accepted in all cases anymore... + NOTE: Please refer to the migration notes! 1.4.0i3: diff --git a/bin/mkeventd b/bin/mkeventd index c18d043..9bad547 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -468,9 +468,6 @@ def initialize_snmptrap_engine(): def initialize_snmp_credentials(): - # Add default v1/v2 config to make v1/v2 trap porcessing work - snmp_config.addV1System(g_snmp_engine, 'my-area', 'public') - user_num = 0 for spec in g_config["snmp_credentials"]: credentials = spec["credentials"] @@ -4501,7 +4498,12 @@ def default_config(): "archive_orphans" : False, "archive_mode" : "file", "translate_snmptraps" : False, - "snmp_credentials" : [], + "snmp_credentials" : [ + { + "description": "\"public\" default for receiving SNMPv1/v2 traps", + "credentials": "public", + }, + ], "event_limit" : { 'by_host': { 'action': 'stop_overflow_notify', diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 2542c02..df7674f 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -2677,6 +2677,12 @@ if mkeventd_enabled: help = _("When you want to process SNMP traps with the Event Console it is " "necessary to configure the credentials to decrypt the incoming traps."), text_if_empty = _("SNMP traps not configured"), + default_value = [ + { + "description": _("\"public\" default for receiving SNMPv1/v2 traps"), + "credentials": "public", + }, + ], ), domain = ConfigDomainEventConsole, )

7 years, 9 months

bandit: Fixed list of files to scan

by Lars Michelsen

Module: check_mk Branch: master Commit: 4dd093c607189e1cbb78f71dc918bba543812668 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4dd093c607189e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 18:00:56 2016 +0100 bandit: Fixed list of files to scan Change-Id: I20f336b1f288114b678a80995cd2bb6a62b56665 --- bandit.yaml | 1 + tests/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bandit.yaml b/bandit.yaml index 986976a..de91751 100644 --- a/bandit.yaml +++ b/bandit.yaml @@ -6,6 +6,7 @@ exclude_dirs: - '/doc/treasures/localchecks' - '/doc/treasures/notifications' - '/scripts' + - '/agents/windows/plugins/build' ### Bandit config file generated from: # '/usr/local/bin/bandit-config-generator -o ../bandit.yaml' diff --git a/tests/Makefile b/tests/Makefile index 8d1be6c..bbf1ccb 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -35,10 +35,10 @@ test-bandit: -lll \ $(OUTPUT_ARGS) \ "$$CMK_DIR" \ - "$$CMK_DIR/bin/*" \ + $$(grep -l python "$$CMK_DIR"/bin/*) \ "$$CMK_DIR"/{checks,inventory}/* \ "$$CMC_DIR" \ - "$$CMC_DIR/bin/*" \ + $$(grep -l python "$$CMC_DIR"/bin/*) \ "$$CMC_DIR"/agents/{plugins,bakery}/*

7 years, 9 months

mkbackup: Cleaned up subprocess calls involving shell

by Lars Michelsen

Module: check_mk Branch: master Commit: b15f1aa168d534d0b6aba1c2fff91a0e641f776d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b15f1aa168d534… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 18:11:46 2016 +0100 mkbackup: Cleaned up subprocess calls involving shell Change-Id: If0f452058d7e26a1229a9470b2e585f4a25e74f0 --- bin/mkbackup | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/bin/mkbackup b/bin/mkbackup index 5b5a7f2..f0da654 100755 --- a/bin/mkbackup +++ b/bin/mkbackup @@ -668,20 +668,26 @@ def do_site_backup(opts, site=None, try_stop=True): def stop_site(site): - omd_command("stop", site) + site_arg = [ site ] if is_root() else [] + + omd_command("stop", *site_arg) for c in range(5): - if os.system("omd status --bare %s >/dev/null" % site) >> 8 == 1: + if subprocess.call(["omd", "status", "--bare" ] + site_arg, + stdout=open(os.devnull, "w")) == 1: break elif c == 4: raise MKGeneralException("Failed to stop site") def start_site(site): - omd_command("start", site) + site_arg = [ site ] if is_root() else [] + + omd_command("start", *site_arg) for c in range(5): - if os.system("omd status --bare %s >/dev/null" % site) >> 8 == 0: + if subprocess.call(["omd", "status", "--bare", ] + site_arg, + stdout=open(os.devnull, "w")) == 0: break elif c == 4: raise MKGeneralException("Failed to start site")

7 years, 9 months

Fixed duplicate slash in path

by Lars Michelsen

Module: check_mk Branch: master Commit: 91e9fe2128c29ce6c65a2b76ef49e797c04cdc1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91e9fe2128c29c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 22 08:16:34 2016 +0100 Fixed duplicate slash in path Change-Id: I73702c4fa527ae011d376723c551d3982aea2173 --- web/htdocs/watolib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index cd0cff9..776fc0f 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3640,7 +3640,7 @@ def clear_site_replication_status(site_id): def site_replication_status_path(site_id): - return "%s/replication_status_%s.mk" % (var_dir, site_id) + return "%sreplication_status_%s.mk" % (var_dir, site_id) def load_replication_status(lock=False):

7 years, 9 months

← Newer
1
...
4
5
6
7
8
9
10
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016