Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64359 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: d66a19b4304574efee173144211a6fa58af7f40d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d66a19b4304574… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 12 15:52:26 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 2 months

Check_MK Git: check_mk: Fixed localization bug in site filter

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a90359ee325886e4c6340463b55a4d67b053927c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a90359ee325886… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 15:44:50 2012 +0200 Fixed localization bug in site filter --- web/plugins/views/filters.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 08f9d97..4fe3a1b 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -337,11 +337,11 @@ class FilterSite(Filter): if config.is_multisite(): site = html.var("site") if site: - return "%s: %s\n" % (_('Sites'), html.var("site", "")) + return "Sites: %s\n" % (html.var("site", "")) elif not self.enforce: return "" else: - return "%s:\n" % _('Sites') # no site at all + return "Sites:\n" # no site at all else: return ""

12 years, 2 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: 852bff085d7b066567e3c9f2e23fe24249477b01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=852bff085d7b06… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 15:37:31 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 2 months

Check_MK Git: check_mk: Fixed problem after latest BI improvement

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4acd89ee724954ef5bf7d235e5c978754d34cb90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4acd89ee724954… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 15:37:27 2012 +0200 Fixed problem after latest BI improvement --- web/htdocs/bi.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 14689d3..d293ab3 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -121,7 +121,7 @@ def load_services(): tags = vars.get("TAGS", "").split(" ") entry = (tags, svcs, childs, parents) services[(site, host)] = entry - services_by_hostname.setdefault(host, []).append(entry) + services_by_hostname.setdefault(host, []).append((site, entry)) return services, services_by_hostname @@ -288,10 +288,10 @@ def find_matching_services(what, calllist): if host_re.startswith("^(") and host_re.endswith(")$"): middle = host_re[2:-2] if middle in g_user_cache["services_by_hostname"]: - entries = [ (("", host_re), entry) for entry in g_user_cache["services_by_hostname"][middle] ] + entries = [ ((e[0], host_re), e[1]) for e in g_user_cache["services_by_hostname"][middle] ] host_re = "(.*)" elif not honor_site and not '*' in host_re and not '$' in host_re and not '|' in host_re: - entries = [ (("", host_re), entry) for entry in g_user_cache["services_by_hostname"][host_re] ] + entries = [ ((e[0], host_re), e[1]) for e in g_user_cache["services_by_hostname"][host_re] ] else: entries = g_user_cache["services"].items() @@ -621,7 +621,7 @@ def compile_leaf_node(host_re, service_re = config.HOST_STATE): found = [] honor_site = SITE_SEP in host_re if not honor_site and not '*' in host_re and not '$' in host_re and not '|' in host_re: - entries = [ (("", host_re), entry) for entry in g_user_cache["services_by_hostname"][host_re] ] + entries = [ ((e[0], host_re), e[1]) for e in g_user_cache["services_by_hostname"][host_re] ] else: entries = g_user_cache["services"].items()

12 years, 2 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: 53d79bb39fbbc77a4bcc01de9c7d49e407c6c9dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53d79bb39fbbc7… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 12 15:09:43 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 2 months

Check_MK Git: check_mk: blade_bx_temp: typecast in parameters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 765e6a7ab0c61a6fd5df85e4f152a91a93dca243 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=765e6a7ab0c61a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 12 15:09:33 2012 +0200 blade_bx_temp: typecast in parameters --- checks/blade_bx_temp | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/checks/blade_bx_temp b/checks/blade_bx_temp index 3e64bde..880a392 100644 --- a/checks/blade_bx_temp +++ b/checks/blade_bx_temp @@ -36,13 +36,16 @@ def check_blade_bx_temp(item, params, info): unit = "°C" for index, status, descr, level_warn, level_crit, temp, crit_react in info: status = saveint(status) + level_crit = saveint(level_crit) + level_warn = saveint(level_warn) + temp = saveint(temp) if descr != item: continue - max_temp = int(level_crit) + (int(level_crit) * 15 /100) # critical + 15% - perfdata=[ ('temp', temp, level_warn, level_crit, "0", max_temp ) ] - if params != None: level_warn, level_crit = params + max_temp = level_crit + (level_crit * 15 /100) # critical + 15% + perfdata=[ ('temp', temp, level_warn, level_crit, "0", max_temp ) ] + if crit_react != "2": return (2, "CRIT - Temperature not present or poweroff", perfdata) elif status != 3:

12 years, 2 months

Check_MK Git: check_mk: FIX: fixed localization of general permissions

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4f9aeea092d3e28cd571bebd741ce85da1ed5834 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f9aeea092d3e2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 14:53:15 2012 +0200 FIX: fixed localization of general permissions --- ChangeLog | 8 ++ web/htdocs/config.py | 124 ++++-------------------------------- web/htdocs/default_permissions.py | 128 +++++++++++++++++++++++++++++++++++++ web/htdocs/htmllib.py | 4 +- web/htdocs/index.py | 6 +- web/htdocs/logwatch.py | 6 +- web/htdocs/mobile.py | 4 +- web/htdocs/sidebar.py | 18 +++--- web/htdocs/views.py | 46 +++++++------- web/htdocs/wato.py | 59 ++++++++++------- web/plugins/sidebar/shipped.py | 2 +- web/plugins/views/layouts.py | 2 +- 12 files changed, 229 insertions(+), 178 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4f9aeea092…

12 years, 2 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: e9e75f58ad259fcced7a5f2101013eac425efd26 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9e75f58ad259f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 14:55:26 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk Conflicts: ChangeLog ---

12 years, 2 months

Check_MK Git: check_mk: Added wato rule for blade_bx_temp

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c071b03b56526a2e8576d7931b36f7def5d7c762 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c071b03b56526a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 12 14:53:29 2012 +0200 Added wato rule for blade_bx_temp --- checks/blade_bx_temp | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/checks/blade_bx_temp b/checks/blade_bx_temp index 6328ca9..3e64bde 100644 --- a/checks/blade_bx_temp +++ b/checks/blade_bx_temp @@ -72,5 +72,6 @@ check_info['blade_bx_temp'] = { 7, # crit react ]), "snmp_scan_function" : lambda oid: "BX600" in oid(".1.3.6.1.2.1.1.1.0"), + "group" : "hw_temperature", }

12 years, 2 months

Check_MK Git: check_mk: check services: added service name in output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: da40bb33ebace42ed117b0d1bd98f7a2d8571c2b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da40bb33ebace4… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 12 13:40:04 2012 +0200 check services: added service name in output --- checks/services | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/services b/checks/services index f64cb0b..7516f9d 100644 --- a/checks/services +++ b/checks/services @@ -157,7 +157,7 @@ def check_windows_services(item, params, info): best_info = state, start_type best_running_on = running_on - infotext = nagios_state_names[best_state] + " - %s (start type is %s)" % best_info + infotext = nagios_state_names[best_state] + " - %s (start type is %s): %s" % (best_info , item) if best_running_on: infotext += " (running on: %s)" % best_running_on

12 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits