Checkmk git commits January 2012

checkmk-commits@lists.checkmk.com

2 participants
334 discussions

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

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: b700ba033631201cd470da2883504f16033c001d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b700ba03363120… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Mon Jan 9 15:22:17 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 8 months

Check_MK Git: check_mk: ValueSpec Integer: thousand separator

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 74b66535d404d86154e2427614ab6987d0f969d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74b66535d404d8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 9 15:19:04 2012 +0100 ValueSpec Integer: thousand separator --- web/htdocs/valuespec.py | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index cbefb10..aab449a 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -167,11 +167,13 @@ class Age(ValueSpec): class Integer(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) - self._size = kwargs.get("size", 5) - self._minvalue = kwargs.get("minvalue") - self._maxvalue = kwargs.get("maxvalue") - self._label = kwargs.get("label") - self._unit = kwargs.get("unit", "") + self._size = kwargs.get("size", 5) + self._minvalue = kwargs.get("minvalue") + self._maxvalue = kwargs.get("maxvalue") + self._label = kwargs.get("label") + self._unit = kwargs.get("unit", "") + self._thousand_sep = kwargs.get("thousand_sep") + if "size" not in kwargs and "maxvalue" in kwargs: self._size = 1 + int(math.log10(self._maxvalue)) @@ -199,6 +201,15 @@ class Integer(ValueSpec): def value_to_text(self, value): text = str(value) + if self._thousand_sep: + sepped = "" + rest = text + while len(rest) > 3: + sepped = self._thousand_sep + rest[-3:] + sepped + rest = rest[:-3] + sepped = rest + sepped + text = sepped + if self._unit: text += " " + self._unit return text

12 years, 8 months

← Newer
1
...
27
28
29
30
31
32
33
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2012