Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64161 discussions

Check_MK Git: check_mk: New ValueSpec for list of strings

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5aa063fc3a61d50e278036fd7329deaf08edc2e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5aa063fc3a61d5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 10 09:54:33 2012 +0100 New ValueSpec for list of strings --- web/htdocs/js/checkmk.js | 36 ++++++++++++++++++++++++++++++++ web/htdocs/pages.css | 4 +- web/htdocs/valuespec.py | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 2 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 3c6382c..e908f9e 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1383,3 +1383,39 @@ function valuespec_toggle_dropdownn(oDropdown, divid) { oDiv = null; } +function list_of_strings_init(tableid) { + var oTable = document.getElementById(tableid); + var oTBody = oTable.childNodes[0]; + var oTr = oTBody.childNodes[oTBody.childNodes.length - 1]; + var oTd = oTr.childNodes[0]; + for (var j in oTd.childNodes) { + var o = oTd.childNodes[j]; + if (o.tagName == "INPUT") { + o.onfocus = function(e) { return list_of_strings_extend(this); }; + } + } +} + +function list_of_strings_extend(oInput, j) { + var oldName = oInput.name; + // Transform e.g extra_emails_12 -> extra_emails_13 + var splitted = oldName.split("_"); + var num = 1 + parseInt(splitted[splitted.length-1]); + splitted[splitted.length-1] = "" + num; + var newName = splitted.join("_"); + + var oTr = oInput.parentNode.parentNode; + var oTBody = oTr.parentNode; + var oNewTr = document.createElement("TR"); + oNewTr.innerHTML = oTr.innerHTML.replace('"' + oldName + '"', '"' + newName + '"'); + oTBody.appendChild(oNewTr); + var oNewTd = oNewTr.childNodes[0]; + for (var j in oNewTd.childNodes) { + var o = oNewTd.childNodes[j]; + if (o.tagName == "INPUT") { + o.onfocus = function(e) { return list_of_strings_extend(this); }; + } + } + // Remove handle from old last element + oInput.onfocus = null; +} diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index d682e79..d2bf545 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -374,10 +374,10 @@ table.form.nomargin td.title { border-top-style: solid; } -table.form td { +table.form > tbody > tr > td { padding: 4px 10px; } -table.form th { +table.form > tbody > tr > th { border-width: 1px; border-color: #fff; border-style: solid solid none solid; diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index aab449a..e0bfcef 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -329,6 +329,57 @@ class Filename(TextAscii): # permissions and the file might be created with Nagios permissions (on OMD this # is the same, but for others not) +class ListOfStrings(ValueSpec): + def __init__(self, **kwargs): + ValueSpec.__init__(self, **kwargs) + self._valuespec = kwargs.get("valuespec", TextAscii()) + + def render_input(self, vp, value): + # Form already submitted? + if html.has_var(vp + "_0"): + value = self.from_html_vars(vp) + # Remove variables from URL, so that they do not appear + # in hidden_fields() + nr = 0 + while html.has_var(vp + "_%d" % nr): + html.del_var(vp + "_%d" % nr) + nr += 1 + html.write('<table border=0 cellspacing=0 cellpadding=0 id="%s">' % vp) + + for nr, s in enumerate(value + [""]): + html.write('<tr><td>') + self._valuespec.render_input(vp + "_%d" % nr, s) + html.write('</td></tr>') + + html.write('</table>') + html.javascript("list_of_strings_init('%s');" % vp); + + def canonical_value(self): + return [] + + def value_to_text(self, value): + return ", ".join([self._valuespec.value_to_text(v) for v in value]) + + def from_html_vars(self, vp): + value = [] + nr = 0 + while html.has_var(vp + "_%d" % nr): + s = html.var(vp + "_%d" % nr).strip() + if s: + value.append(s) + nr += 1 + return value + + def validate_datatype(self, value, vp): + if type(value) != list: + raise MKUserError(varprefix, _("Expected data type is " + "list, but your type is %s." % type(value))) + for nr, s in enumerate(value): + self._valuespec.validate_datatype(s, vp + "_%d" % nr) + + def validate_value(self, value, vp): + for nr, s in enumerate(value): + self._valuespec.validate_value(s, vp + "_%d" % nr) # Same but for floating point values class Float(Integer):

12 years, 8 months

Check_MK Git: check_mk: WATO: Api call for getting users

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 98927c46f286e5e985839af35a79f08ab5d229d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98927c46f286e5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 9 18:01:58 2012 +0100 WATO: Api call for getting users --- web/htdocs/wato.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8396078..a88a18c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9019,6 +9019,9 @@ class API: def register_hook(self, name, func): g_hooks.setdefault(name, []).append(func) + def get_all_users(self): + return load_users() + # Get a (flat) dictionary containing all hosts with their *effective* # attributes (containing all inherited and default values where appropriate) # of the given folder. If folder is None, returns all hosts from the root folder

12 years, 8 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ed4e7863017182843be223e8d120b126e0b89e7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed4e7863017182… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 9 18:02:00 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 8 months

Check_MK Git: check_mk: Site filter shows "(local)" in case of non multi-site setup

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9253e03e5c8082d7896881f82d3f0e3076553ed8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9253e03e5c8082… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 9 16:18:48 2012 +0100 Site filter shows "(local)" in case of non multi-site setup --- ChangeLog | 1 + web/htdocs/pagefunctions.py | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e9af24..81df73b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ to disable sounds. * Added filter for log state (UP,DOWN,OK,CRIT...) to all log views * New painter for normal and retry check interval (added to detail views) + * Site filter shows "(local)" in case of non multi-site setup WATO: * Removed IP-Address attribute from folders diff --git a/web/htdocs/pagefunctions.py b/web/htdocs/pagefunctions.py index 742c885..4ff5d33 100644 --- a/web/htdocs/pagefunctions.py +++ b/web/htdocs/pagefunctions.py @@ -34,11 +34,14 @@ def add_site_icon(html, sitename): return False def site_selector(html, htmlvar, enforce = True): - if enforce: - choices = [] + if not config.is_multisite(): + choices = [("", _("(local)"))] else: - choices = [("","")] - for sitename, state in html.site_status.items(): - if state["state"] == "online": - choices.append((sitename, config.site(sitename)["alias"])) + if enforce: + choices = [] + else: + choices = [("","")] + for sitename, state in html.site_status.items(): + if state["state"] == "online": + choices.append((sitename, config.site(sitename)["alias"])) html.sorted_select(htmlvar, choices)

12 years, 8 months

Check_MK Git: check_mk: WATO Host Tags: Fixed default value of select fields

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5ae06f54e32aaf61090ecab66e2b27682b806801 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ae06f54e32aaf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 9 15:44:37 2012 +0100 WATO Host Tags: Fixed default value of select fields --- web/htdocs/wato.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8396078..1b50823 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3557,8 +3557,8 @@ class HostTagAttribute(Attribute): else: secondary_tags = [] choices.append(("|".join([ tagvalue ] + secondary_tags), e[1])) - if value != "" and value == tagvalue: - value = value + "|" + "|".join(secondary_tags) + if value != "" and value == tagvalue and secondary_tags: + value = value + "|" + "|".join(secondary_tags) if len(choices) == 1: html.checkbox(varname, value != "", cssclass = '', onclick='wato_fix_visibility();', add_attr = ["tags=%s"%choices[0][0]])

12 years, 8 months

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: a78dcb7312d069338fff4e6ff9eefd91836796f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a78dcb7312d069… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 9 15:44:43 2012 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 8 months

Check_MK Git: check_mk: Reserved 10 bug IDS

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ec055adbeaddca4123da3400c85e5c5ca908e137 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec055adbeaddca… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Mon Jan 9 15:31:03 2012 +0100 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.bugs/first_free b/.bugs/first_free index f27ce70..af368af 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -574 +584

12 years, 8 months

Check_MK Git: check_mk: Update version MegaCLI of to more current one.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fd112db4f2a099c0b459b3ed7430d8083c6fcf69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd112db4f2a099… Author: Florian Heigl <floh(a)klappstuhl.(none)> Date: Mon Jan 9 12:26:13 2012 +0100 Update version MegaCLI of to more current one. --- agents/check_mk_agent.linux | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 96384f1..474f374 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -264,7 +264,8 @@ then fi # State of LSI MegaRAID controller via MegaCli. You can download that tool from: -# http://www.lsi.com/DistributionSystem/AssetDocument/support/downloads/megar… +# http://www.lsi.com/downloads/Public/MegaRAID%20Common%20Files/8.02.16_MegaC… + if which MegaCli >/dev/null ; then echo '<<<megaraid_pdisks>>>' for part in $(MegaCli -EncInfo -aALL -NoLog < /dev/null | egrep 'Enclosure|Device ID'); do

12 years, 8 months

Check_MK Git: check_mk: Pass varprefix to error handler

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bb8344ecc1db39e3d50c861176d0de27d9cf27ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb8344ecc1db39… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Mon Jan 9 15:12:55 2012 +0100 Pass varprefix to error handler --- web/htdocs/wato.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9fc43ae..a74c910 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4922,12 +4922,12 @@ def mode_edit_timeperiod(phase): if not end: end = "24:00" - begin, end = [ parse_bound(w, b) for (w,b) in [ ("from", begin), ("to", end) ]] + begin, end = [ parse_bound(varprefix, w, b) for (w,b) in [ ("from", begin), ("to", end) ]] ranges.append((begin, end)) return ranges - def parse_bound(what, bound): + def parse_bound(vp, what, bound): # Fully specified if re.match("^(24|[0-1][0-9]|2[0-3]):[0-5][0-9]$", bound): return bound

12 years, 8 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: 18ef1c8832918632a15b289a60af3f823a945cc9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18ef1c88329186… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Mon Jan 9 15:14:39 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits