Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64450 discussions

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 0755271806013a8b0e6ba6b6d9609d3e073d4769 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0755271806013a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Mar 23 15:50:02 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 6 months

Check_MK Git: check_mk: Updated bug entries #0666

by Andreas Boesl

Module: check_mk Branch: master Commit: 7688f98a1c081645565183a7d12970294d332929 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7688f98a1c0816… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 22 17:51:42 2013 +0100 Updated bug entries #0666 --- .bugs/666 | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/.bugs/666 b/.bugs/666 new file mode 100644 index 0000000..788952d --- /dev/null +++ b/.bugs/666 @@ -0,0 +1,14 @@ +Title: mkeventd combined event messages +Component: ec +State: open +Date: 2013-03-22 17:50:23 +Targetversion: 1.2.2 +Class: bug + +b) Wir bekommen zwei Meldungen als ein Event. Ist das ein Bug? + +Bsp.: +Mount Failed testkai<30>Mar 20 14:25:01 2013-03-20 14 snmptrapd[20133]: 2013-03-20 14:25:01 10.10.1.105(via UDP: [10.10.1.105]:54215->[10.10.4.27]) TRAP, SNMP v1, community V1_UC_1733_R#012#011SNMPv2-SMI::enterprises.311.1.1.3.1.2 Authentication Failure Trap (0) Uptime: 14 days, 5:37:05.20#012 + +Der erste Teil ("Mount Failed testkai") kam via cmk-Logwatcher und +der zweite Teil ("<30>Mar 20 14:25:01 2013-03-20 14 snmptra....") scheinbar via Trapdaemon.

11 years, 6 months

Check_MK Git: check_mk: Minor styling fixes for data tables

by Mathias Kettner

Module: check_mk Branch: master Commit: 36f2e103107eb4c04f505339911f8e54856cddd6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36f2e103107eb4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 22 15:54:18 2013 +0100 Minor styling fixes for data tables --- web/htdocs/status.css | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/web/htdocs/status.css b/web/htdocs/status.css index e80f3b9..2f85382 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -295,6 +295,7 @@ table.data .state0 *, table.data .state2 *, table.data .state3 * { table.data td.number { text-align: right; + white-space: nowrap; } table.data td.nobr { @@ -308,6 +309,9 @@ table.data td.center { td.narrow { width: 10px; } +td.wide { + width: 100%; +} td.icons { white-space: nowrap;

11 years, 6 months

Check_MK Git: check_mk: Allow function keys for context buttons

by Mathias Kettner

Module: check_mk Branch: master Commit: be64ef1985e78b372649a4474e4c0aa254b5788a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be64ef1985e78b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 21 15:09:02 2013 +0100 Allow function keys for context buttons --- web/htdocs/htmllib.py | 21 ++++++++++++--------- web/htdocs/js/checkmk.js | 7 ++++--- web/htdocs/pages.css | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 12 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index d05a70f..c4afaad 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -191,6 +191,13 @@ class html: self.plugged = False self.keybindings = [] + RETURN = 13 + SHIFT = 16 + CTRL = 17 + ALT = 18 + BACKSPACE = 8 + F1 = 112 + def set_buffering(self, b): self.buffering = b @@ -479,7 +486,7 @@ class html: self.write("</td></tr></table>\n") self.context_buttons_open = False - def context_button(self, title, url, icon=None, hot=False, id=None, bestof=None, hover_title=''): + def context_button(self, title, url, icon=None, hot=False, id=None, bestof=None, hover_title='', fkey=None): display = "block" if bestof: counts = config.load_user_file("buttoncounts", {}) @@ -499,7 +506,7 @@ class html: idtext = " id='%s'" % id else: idtext = "" - self.write('<div%s style="display:%s" class="contextlink%s" ' % (idtext, display, hot and " hot" or "")) + self.write('<div%s style="display:%s" class="contextlink%s%s" ' % (idtext, display, hot and " hot" or "", fkey and " button" or "")) self.context_button_hover_code(hot and "_hot" or "") self.write('>') self.write('<a href="%s"' % url) @@ -507,6 +514,9 @@ class html: self.write(' title="%s"' % hover_title) if bestof: self.write(' onmousedown="count_context_button(this); document.location=this.href; " ') + if fkey: + title += '<div class=keysym>F%d</div>' % fkey + self.add_keybinding([html.F1 + (fkey - 1)], "document.location='%s';" % url) self.write('>%s</a></div>\n' % title) def context_button_hover_code(self, what): @@ -1279,13 +1289,6 @@ document.body.onkeyup = keybindings_keyup; self.set_cookie(varname, '', time.time() - 60) # Keyboard control - - RETURN = 13 - SHIFT = 16 - CTRL = 17 - ALT = 18 - BACKSPACE = 8 - def add_keybinding(self, keylist, jscode): self.keybindings.append([keylist, jscode]) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 82f17b4..c196b0c 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1939,7 +1939,7 @@ function keybindings_keydown(e) { if (!e) e = window.event; var keyCode = e.which || e.keyCode; keybindings_pressedkeys.push(keyCode); - keybindings_check(e); + return keybindings_check(e); } function keybindings_keyup(e) { @@ -1956,15 +1956,16 @@ function keybindings_keyup(e) { function keybindings_check(e) { for (var i in keybindings) { var keylist = keybindings[i][0]; - var jscode = keybindings[i][1]; if (keybindings_check_keylist(keylist)) { if (e.stopPropagation) e.stopPropagation(); e.cancelBubble = true; + var jscode = keybindings[i][1]; eval(jscode); - return; + return false; } } + return true; } function keybindings_check_keylist(keylist) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index fd32ce9..12a0006 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -840,3 +840,45 @@ div.help table.help td { div.help table.help td.tt { font-family: courier, monospace; } + +/*--Various----------------------------------------------------------------. +| __ __ _ | +| \ \ / /_ _ _ __(_) ___ _ _ ___ | +| \ \ / / _` | '__| |/ _ \| | | / __| | +| \ V / (_| | | | | (_) | |_| \__ \ | +| \_/ \__,_|_| |_|\___/ \__,_|___/ | +| | +'-------------------------------------------------------------------------*/ + +div.keysym { + text-align: center; + color: white; + /* font-style: italic; */ + border-width: 2px; + border-style: solid; + border-color: #888 #444 #000 #666; + border-radius: 4px; + box-shadow: 0.5px 0.5px 1px #000; + background-color: #333; + padding: 2px 5px; + margin: 0px 1px; + display: inline-block; +} + + +/* Contextlinks with embedded keyboard button */ +div.contextlink div.keysym { + background-color: #467; + border-color: #8ab #245 #134 #79a; + border-width: 2px; + padding: 1px 5px; + font-size: 6pt; + position: absolute; + top: 4px; + right: 5px; +} + +div.contextlink.button a { + width: 135px; +} +

11 years, 6 months

Check_MK Git: check_mk: htmllib: move keybindings from TextArea to htmllib

by Mathias Kettner

Module: check_mk Branch: master Commit: 245229011f79f1f2a3707a7b3ad9c0990f91b1d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=245229011f79f1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 21 09:24:20 2013 +0100 htmllib: move keybindings from TextArea to htmllib --- web/htdocs/htmllib.py | 22 +++++++++++++++++++ web/htdocs/js/checkmk.js | 52 ++++++++++++++++++++++++++++++++++++++++++++++ web/htdocs/valuespec.py | 47 +---------------------------------------- 3 files changed, 75 insertions(+), 46 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index f762f35..7c3361b 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -189,6 +189,7 @@ class html: self.auto_id = 0 self.have_help = False self.plugged = False + self.keybindings = [] def set_buffering(self, b): self.buffering = b @@ -911,6 +912,11 @@ class html: def body_end(self): if self.have_help: self.javascript("help_enable();") + if self.keybindings: + self.javascript("""var keybindings = %r;\n +document.body.onkeydown = keybindings_keydown; +document.body.onkeyup = keybindings_keyup; +""" % self.keybindings) if self.final_javascript_code: self.javascript(self.final_javascript_code); self.write("</body></html>\n") @@ -1269,3 +1275,19 @@ class html: def del_cookie(self, varname): self.set_cookie(varname, '', time.time() - 60) + # Keyboard control + + RETURN = 13 + SHIFT = 16 + CTRL = 17 + ALT = 18 + BACKSPACE = 8 + + def add_keybinding(self, keylist, jscode): + self.keybindings.append([keylist, jscode]) + + def add_keybindings(self, bindings): + self.keybindings += bindings + + + diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 48226d4..82f17b4 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1923,3 +1923,55 @@ function timeline_hover(row_nr, onoff) } } +// .--Keybindings---------------------------------------------------------. +// | _ __ _ _ _ _ | +// | | |/ /___ _ _| |__ (_)_ __ __| (_)_ __ __ _ ___ | +// | | ' // _ \ | | | '_ \| | '_ \ / _` | | '_ \ / _` / __| | +// | | . \ __/ |_| | |_) | | | | | (_| | | | | | (_| \__ \ | +// | |_|\_\___|\__, |_.__/|_|_| |_|\__,_|_|_| |_|\__, |___/ | +// | |___/ |___/ | +// +----------------------------------------------------------------------+ + +// var keybindings will be defined dynamically by htmllib.py +var keybindings_pressedkeys = []; + +function keybindings_keydown(e) { + if (!e) e = window.event; + var keyCode = e.which || e.keyCode; + keybindings_pressedkeys.push(keyCode); + keybindings_check(e); +} + +function keybindings_keyup(e) { + if (!e) e = window.event; + var keyCode = e.which || e.keyCode; + for (var i in keybindings_pressedkeys) { + if (keybindings_pressedkeys[i] == keyCode) { + keybindings_pressedkeys.splice(i, 1); + break; + } + } +} + +function keybindings_check(e) { + for (var i in keybindings) { + var keylist = keybindings[i][0]; + var jscode = keybindings[i][1]; + if (keybindings_check_keylist(keylist)) { + if (e.stopPropagation) + e.stopPropagation(); + e.cancelBubble = true; + eval(jscode); + return; + } + } +} + +function keybindings_check_keylist(keylist) +{ + for (var i in keylist) { + if (keybindings_pressedkeys.indexOf(keylist[i]) < 0) + return false; + } + return true; +} diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 2d91a9f..8b805ca 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -502,19 +502,12 @@ class HTTPUrl(TextAscii): (self._target and 'target="%s" ' % self._target or ""), url, text) -RETURN = 13 -SHIFT = 16 -CTRL = 17 -ALT = 18 -BACKSPACE = 8 - class TextAreaUnicode(TextUnicode): def __init__(self, **kwargs): TextUnicode.__init__(self, **kwargs) self._cols = kwargs.get("cols", 60) self._rows = kwargs.get("rows", 20) # Allowed: "auto" -> Auto resizing self._minrows = kwargs.get("minrows", 0) # Minimum number of initial rows when "auto" - self._submit_keys = kwargs.get("submit_keys", []) def value_to_text(self, value): return "<pre class=ve_textarea>%s</pre>" % value @@ -532,45 +525,7 @@ class TextAreaUnicode(TextUnicode): else: attrs = {} rows = self._rows - if self._submit_keys: - attrs['id'] = "textarea_%s" % varprefix - commit_code = "" - for keylist, code in self._submit_keys: - commit_code += " textarea_%s_trysubmit(e, %r, %s);\n" % ( - varprefix, keylist, repr(code)) - - html.final_javascript(""" -textarea_text_keys = []; -function textarea_%s_keydown(e) { - if (!e) e = window.event; - var keyCode = e.which || e.keyCode; - textarea_%s_keys.push(keyCode); -%s} -function textarea_%s_keyup(e) { - if (!e) e = window.event; - var keyCode = e.which || e.keyCode; - for (var i in textarea_%s_keys) { - if (textarea_%s_keys[i] == keyCode) { - textarea_%s_keys.splice(i, 1); - break; - } - } -} -function textarea_%s_trysubmit(e, keylist, code) { - for (var i in keylist) { - if (textarea_%s_keys.indexOf(keylist[i]) < 0) { - return; - } - } - if (e.stopPropagation) - e.stopPropagation(); - e.cancelBubble = true; - eval(code); -} -var t = document.getElementById("textarea_%s"); -t.onkeydown = function(e) { return textarea_%s_keydown(e); } -t.onkeyup = function(e) { return textarea_%s_keyup(e); } -""" % ((varprefix, varprefix, commit_code) + (varprefix,)*9)) + html.text_area(varprefix, value, rows=rows, cols=self._cols, attrs = attrs)

11 years, 6 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 86ad2a7f0e2ac75ea78d06f3bc8cfc4837e83077 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86ad2a7f0e2ac7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 22 15:53:57 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 6 months

Check_MK Git: check_mk: html: remove duplicate varnames in makeuri

by Mathias Kettner

Module: check_mk Branch: master Commit: 2ad9f49a11f89fc2bc49664e61d3e05096cfe1f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ad9f49a11f89f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 21 12:29:13 2013 +0100 html: remove duplicate varnames in makeuri --- web/htdocs/htmllib.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 7c3361b..d05a70f 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -361,7 +361,10 @@ class html: # [('varname1', value1), ('varname2', value2) ] def makeuri(self, addvars, remove_prefix = None, filename=None): - vars = [ (v, self.var(v)) for v in self.req.vars if v[0] != "_" ] + new_vars = [ nv[0] for nv in addvars ] + vars = [ (v, self.var(v)) + for v in self.req.vars + if v[0] != "_" and v not in new_vars ] if remove_prefix != None: vars = [ i for i in vars if not i[0].startswith(remove_prefix) ] vars = vars + addvars

11 years, 6 months

Check_MK Git: check_mk: FIX: event_simulator now also uses case insensitive matches

by Andreas Boesl

Module: check_mk Branch: master Commit: d20a1eb1c9e449e186769f415ebb170194563ecc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d20a1eb1c9e449… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 21 15:13:45 2013 +0100 FIX: event_simulator now also uses case insensitive matches --- ChangeLog | 1 + mkeventd/web/htdocs/mkeventd.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a22107e..293545f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -111,6 +111,7 @@ Event Console: * FIX: make hostname matching field optional. Otherwise a .* was neccessary for the rule in order to match + * FIX: event_simulator now also uses case insensitive matches 1.2.2b4: Core: diff --git a/mkeventd/web/htdocs/mkeventd.py b/mkeventd/web/htdocs/mkeventd.py index 165fbca..376a1d9 100644 --- a/mkeventd/web/htdocs/mkeventd.py +++ b/mkeventd/web/htdocs/mkeventd.py @@ -239,9 +239,9 @@ def match(pattern, text, complete = True): if complete: if not pattern.endswith("$"): pattern += '$' - m = re.compile(pattern).match(text) + m = re.compile(pattern, re.IGNORECASE).match(text) else: - m = re.compile(pattern).search(text) + m = re.compile(pattern, re.IGNORECASE).search(text) if m: return m.groups() else:

11 years, 6 months

Check_MK Git: check_mk: piggyback: fixed piggyback regex translation

by Andreas Boesl

Module: check_mk Branch: master Commit: 6fb5aafd9b22d240d0d03f453db455643920b92d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fb5aafd9b22d2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 20 18:14:20 2013 +0100 piggyback: fixed piggyback regex translation --- modules/check_mk_base.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 2af97bc..2cabeaf 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -495,7 +495,7 @@ def translate_piggyback_host(sourcehost, backedhost): if mo: backedhost = subst for nr, text in enumerate(mo.groups()): - backedhost = translated.replace("\\%d" % (nr+1), text) + backedhost = backedhost.replace("\\%d" % (nr+1), text) # 3. Explicity mapping for from_host, to_host in translation.get("mapping", []):

11 years, 6 months

Check_MK Git: check_mk: piggyback documentation: fixed display bug in help text

by Andreas Boesl

Module: check_mk Branch: master Commit: bc1a6cc734fee15b3bbea5465b042f6740c3eef8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc1a6cc734fee1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 20 18:12:20 2013 +0100 piggyback documentation: fixed display bug in help text --- web/plugins/wato/check_mk_configuration.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 0a9fcf2..ef4fb86 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1668,7 +1668,7 @@ register_rule(group, ), TextUnicode( title = _("Replacement"), - help = _("Use <tt>\1</tt>, <tt>\2</tt> etc. to replace matched subgroups"), + help = _("Use <tt>\\1</tt>, <tt>\\2</tt> etc. to replace matched subgroups"), size = 30, allow_empty = False, )

11 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits