Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64242 discussions

Check_MK Git: check_mk: Updated bug entries #0689

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5e52cf3c226d60e9df0299d22c2083389483a5f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e52cf3c226d60… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 6 11:26:09 2012 +0200 Updated bug entries #0689 --- .bugs/689 | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/689 b/.bugs/689 index abe4ba1..15ad3e4 100644 --- a/.bugs/689 +++ b/.bugs/689 @@ -1,10 +1,14 @@ Title: BI nodes must not use the label of the aggregation for the node id Component: bi -State: open +Class: bug +State: works4me Date: 2012-03-21 11:24:20 Targetversion: 1.2.0 -Class: bug At the moment the aggregation label is used for the html node id without any escaping or similar. Labels like this "Host <a href=\"view.py?view_name=hoststatus&site=&host=$HOST$\">$HOST$</a>" will destroy the bi page but should really be possible. + +2012-04-06 11:26:05: changed state open -> works4me +The label should not be used for HTML hacks. We'd rather invent +some general method of adding custom data into the BI tree view.

12 years, 5 months

Check_MK Git: check_mk: Fixed styling of buttons

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3d9830c5679e0a19a7393841d3321ebb421c2a81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d9830c5679e0a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 6 11:22:27 2012 +0200 Fixed styling of buttons --- web/htdocs/check_mk.css | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 79b5d33..094e1b8 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -144,7 +144,7 @@ label.image_button input { border: none; padding-left: 0px; padding-right: 10px; - padding-top: 0px; + padding-top: 2px; padding-bottom: 0px; background: transparent url('images/image_button_r.png') no-repeat; background-position: right -35px;

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0672

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3cbf044e2fcd55fe88ad529cef07581a5987ce14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3cbf044e2fcd55… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 6 11:24:08 2012 +0200 Updated bug entries #0672 --- .bugs/672 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/672 b/.bugs/672 new file mode 100644 index 0000000..d175e8c --- /dev/null +++ b/.bugs/672 @@ -0,0 +1,10 @@ +Title: Commands with checkboxes -> Request-URI Too Large +Component: multisite +State: open +Date: 2012-04-06 11:23:12 +Targetversion: 1.2.0 +Class: bug + +When you use checkboxes for selecting many items in a host +or service view and then issue a command, then the request +URI will be too long. Can we convert this to a POST request?

12 years, 5 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: 55d4ce1cfddbdad86ebf8b9d94c9c47e5f171881 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55d4ce1cfddbda… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 6 11:24:10 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 5 months

Check_MK Git: check_mk: Make commands more flexible internally

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 71429aa45e18ba5c3e0808061636f913c7be1fc6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71429aa45e18ba… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 6 11:22:50 2012 +0200 Make commands more flexible internally --- web/htdocs/views.py | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 1f7d9af..5af94f1 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2020,20 +2020,23 @@ def core_command(what, row): spec = "%s;%s" % (host, descr) cmdtag = "SVC" prefix = "service_" - elif what in [ "comment", "downtime" ]: + else: spec = row.get(what + "_id") if descr: cmdtag = "SVC" else: cmdtag = "HOST" - else: - raise MKInternalError(_("Sorry, no actions possible on table %s") % tablename) commands = None + # Call all command actions. The first one that detects + # itself to be executed (by examining the HTML variables) + # will return a command to execute and a title for the + # confirmation dialog. for cmd in multisite_commands: if config.may(cmd["permission"]): result = cmd["action"](cmdtag, spec, row) if result: + executor = cmd.get("executor", command_executor_livestatus) commands, title = result break @@ -2043,10 +2046,13 @@ def core_command(what, row): # Some commands return lists of complete command lines, others # just return one basic command without timestamp. Convert those if type(commands) != list: - commands = ["[%d] %s\n" % (int(time.time()), commands)] + commands = [commands] + + return commands, title, executor - return commands, title +def command_executor_livestatus(command, site): + html.live.command("[%d] %s" % (int(time.time()), command), site) # Returns: # True -> Actions have been done @@ -2064,18 +2070,18 @@ def do_actions(view, what, action_rows, backurl): return False # no actions done command = None - title = core_command(what, action_rows[0])[1] # just get the title + title, executor = core_command(what, action_rows[0])[1:3] # just get the title and executor if not html.confirm(_("Do you really want to %s the following %d %ss?") % (title, len(action_rows), what)): return False count = 0 for row in action_rows: - nagios_commands, title = core_command(what, row) + nagios_commands, title, executor = core_command(what, row) for command in nagios_commands: if type(command) == unicode: command = command.encode("utf-8") - html.live.command(command, row["site"]) + executor(command, row["site"]) count += 1 if command:

12 years, 5 months

Check_MK Git: check_mk: fsc_subsystem cosmetic change. Thanks to Christoph Roeder

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3a9ba976f8a0506bef6f0a4e78671eff1e850887 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a9ba976f8a050… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Apr 5 15:41:21 2012 +0200 fsc_subsystem cosmetic change. Thanks to Christoph Roeder --- checks/fsc_subsystems | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/fsc_subsystems b/checks/fsc_subsystems index 81d7c6d..c6ae5b3 100644 --- a/checks/fsc_subsystems +++ b/checks/fsc_subsystems @@ -42,7 +42,7 @@ def check_fsc_subsystems(item, params, info): else: return (3, "UNKNOWN - unknown status %d" % status) - return (3, "UNKNOWN - FAN %s not found in SNMP data" % item) + return (3, "UNKNOWN - Subsystem %s not found in SNMP data" % item) check_info['fsc_subsystems'] = (check_fsc_subsystems, "FSC %s", 0, inventory_fsc_subsystems) snmp_info['fsc_subsystems'] = ( ".1.3.6.1.4.1.231.2.10.2.11.3.1.1", [ 2, 3 ])

12 years, 5 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: cd8931fbf7798668fa26841cdd76604228b2b7ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd8931fbf77986… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Apr 5 15:41:33 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 5 months

Check_MK Git: check_mk: WATO: new config option wato_hide_hosttags.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: def391d5c27be15dd9479bb40ab49458b7d0206e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=def391d5c27be1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 5 14:41:30 2012 +0200 WATO: new config option wato_hide_hosttags. hides host tags in folder view --- web/htdocs/config.py | 1 + web/htdocs/wato.css | 8 ++++++++ web/htdocs/wato.py | 21 ++++++++++++--------- web/plugins/wato/check_mk_configuration.py | 8 ++++++++ 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 324cdb3..9ed4fad 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -614,6 +614,7 @@ wato_enabled = True wato_host_tags = [] wato_aux_tags = [] wato_hide_filenames = True +wato_hide_hosttags = False wato_max_snapshots = 50 wato_num_hostspecs = 12 wato_num_itemspecs = 15 diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index d11e24e..de2a427 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -524,6 +524,14 @@ table.validationerror img { font-size: 8pt; } +.wato td.tag-ellipsis { + max-width: 300px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; +} + /*-------------------------------------------------------------------------. | ____ | | | _ \ _ __ ___ __ _ _ __ ___ ___ ___ | diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 90c2677..3cd1716 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1137,8 +1137,9 @@ def show_hosts(folder): html.write("<table class=data>\n") html.write("<tr><th class=left></th><th></th><th>" + _("Hostname") + "</th><th>" - + _("Auth") + "</th>" - + "<th>" + _("Tags") + "</th>") + + _("Auth") + "</th>") + if not config.wato_hide_hosttags: + html.write("<th>" + _("Tags") + "</th>") for attr, topic in host_attributes: if attr.show_in_table(): @@ -1256,13 +1257,15 @@ def show_hosts(folder): title = htmllib.strip_tags(auth) html.write('<td><img class=icon src="images/icon_%s.png" title="%s"></td>' % (icon, title)) - # Raw tags - # - # Optimize wraps: - # 1. add round the single tags to prevent wrap within tags - # 2. add "zero width space" () - html.write("<td>%s</td>" % "|".join( - [ '%s' % t for t in host[".tags"] ])) + if not config.wato_hide_hosttags: + # Raw tags + # + # Optimize wraps: + # 1. add round the single tags to prevent wrap within tags + # 2. add "zero width space" () + tag_title = "|".join([ '%s' % t for t in host[".tags"] ]) + html.write("<td title='%s' class='tag-ellipsis'>%s</td>" % (tag_title, "|".join( + [ '%s' % t for t in host[".tags"] ]))) # Show attributes for attr, topic in host_attributes: diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index fc52c27..1f296d2 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -165,6 +165,14 @@ register_configvar(group, domain = "multisite") register_configvar(group, + "wato_hide_hosttags", + Checkbox(title = _("Hide hosttags in WATO folder view"), + label = _("hide hosttags"), + help = _("When enabled, hosttags are no longer shown within the WATO folder view"), + default_value = False), + domain = "multisite") + +register_configvar(group, "wato_max_snapshots", Integer(title = _("Number of configuration snapshots to keep"), help = _("Whenever you successfully activate changes a snapshot of the configuration "

12 years, 5 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: f24489da6194d6c324a656c33d2a8110061e451f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f24489da6194d6… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Thu Mar 29 17:48:06 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 5 months

Check_MK Git: check_mk: mem.win - change the Check to check the "swap" when we talk about the "pagefile".

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fa20e18701ffcf1e49490c448de2d66d165f10e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa20e18701ffcf… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Thu Mar 29 17:44:24 2012 +0200 mem.win - change the Check to check the "swap" when we talk about the "pagefile". otherwise it might monitor the total VSS. This is an update to Bug #021. Thanks to our favority brewery for reporting this (Yes, seriously) --- checks/mem | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/checks/mem b/checks/mem index 8282a4b..c360e76 100644 --- a/checks/mem +++ b/checks/mem @@ -7,7 +7,7 @@ # | | |___| | | | __/ (__| < | | | | . \ | # | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | # | | -# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | +# | Copyright Mathias Kettner 2010 mk(a)mathias-kettner.de | # +------------------------------------------------------------------+ # # This file is part of Check_MK. @@ -120,14 +120,8 @@ def check_mem_used(item, params, info): return (0, 'OK - %s' % infotext, perfdata) -check_info['mem.used'] = { - "check_function" : check_mem_used, - "inventory_function" : inventory_mem_used, - "service_description" : "Memory used", - "has_perfdata" : True, - "group" : "memory", - "check_config_variables" : [ "mem_extended_perfdata" ], -} +check_info['mem.used'] = (check_mem_used, "Memory used", 1, inventory_mem_used) +check_config_variables.append("mem_extended_perfdata") # +----------------------------------------------------------------------+ @@ -151,7 +145,7 @@ factory_settings["memory_win_default_levels"] = { def inventory_mem_win(info): meminfo = parse_proc_meminfo(info) - if "PageTotal" in meminfo: + if "SwapTotal" in meminfo: return [(None, {})] def check_mem_windows(item, params, info): @@ -162,7 +156,7 @@ def check_mem_windows(item, params, info): worststate = 0 for title, what, paramname in [ ( "Memory", "Mem", "memory" ), - ( "Page file", "Page", "pagefile" )]: + ( "Page file", "Swap", "pagefile" )]: total_kb = meminfo[what + "Total"] free_kb = meminfo[what + "Free"] used_kb = total_kb - free_kb @@ -198,7 +192,6 @@ def check_mem_windows(item, params, info): check_info['mem.win'] = (check_mem_windows, "Memory and pagefile", 1, inventory_mem_win) -checkgroup_of['mem.win'] = "memory_pagefile_win" # +----------------------------------------------------------------------+

12 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits