Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64161 discussions

Check_MK Git: check_mk: FIX: netapp_*: scan functions now detect IBM versions of firmware

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0f781c9db7ef831c31bcd2f2483945aa31ca00e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f781c9db7ef83… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 10:55:12 2011 +0100 FIX: netapp_*: scan functions now detect IBM versions of firmware --- ChangeLog | 1 + checks/netapp_cluster | 3 ++- checks/netapp_vfiler | 3 ++- checks/netapp_volumes | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc9e769..75134f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -109,6 +109,7 @@ not working but interface has been used since last reboot. This fixes the problem where interface are not found by inventory. * FIX: snmp_uptime: handels alternative timeformat + * FIX: netapp_*: scan functions now detect IBM versions of firmware 1.1.12p4: Multisite: diff --git a/checks/netapp_cluster b/checks/netapp_cluster index 6accb22..e723647 100644 --- a/checks/netapp_cluster +++ b/checks/netapp_cluster @@ -109,4 +109,5 @@ check_info["netapp_cluster"] = (check_netapp_cluster, "metrocluster_w_%s", 0, in # Run inventory only on Data Ontap OS with cluster enabled snmp_scan_functions["netapp_cluster"] = \ - lambda oid: "netapp release" in oid(".1.3.6.1.2.1.1.1.0").lower() + lambda oid: "netapp release" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.789") diff --git a/checks/netapp_vfiler b/checks/netapp_vfiler index 1b44ec4..3c6809d 100644 --- a/checks/netapp_vfiler +++ b/checks/netapp_vfiler @@ -68,4 +68,5 @@ check_info["netapp_vfiler"] = (check_netapp_vfiler, "vFiler Status %s", 0, inven snmp_scan_functions["netapp_vfiler"] = \ - lambda oid: "netapp release" in oid(".1.3.6.1.2.1.1.1.0").lower() + lambda oid: "netapp release" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.789") diff --git a/checks/netapp_volumes b/checks/netapp_volumes index a7ff567..05394c5 100644 --- a/checks/netapp_volumes +++ b/checks/netapp_volumes @@ -125,4 +125,5 @@ snmp_info["netapp_volumes"] = ( ".1.3.6.1.4.1.789.1.5.8.1", ["2", # volName ] ) snmp_scan_functions['netapp_volumes'] = \ - lambda oid: oid(".1.3.6.1.2.1.1.1.0").startswith('NetApp Release') + lambda oid: oid(".1.3.6.1.2.1.1.1.0").startswith('NetApp Release') or \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.789")

12 years, 9 months

Check_MK Git: check_mk: commentss -> fix typo in command

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fe964edfba4172e81ec0cb9049ddb62c1051e7cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe964edfba4172… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 10:44:20 2011 +0100 commentss -> fix typo in command --- web/plugins/views/commands.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 039ad47..6ecadbe 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -418,7 +418,7 @@ multisite_commands.append({ multisite_commands.append({ "tables" : [ "comment" ], "permission" : "action.addcomment", - "title" : _("commentss"), + "title" : _("Comments"), "render" : lambda: \ html.button("_remove_comments", _("Remove")), "action" : lambda cmdtag, spec, row: \

12 years, 9 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: 737af5df55f599f20b56d74c5d26599f88387bea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=737af5df55f599… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 10:44:22 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: FIX: Fixed duplicate view plugin loading when using localized multisite

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 334369b8b29c86d16e9c7ab8bf5dc6d5aec2139a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=334369b8b29c86… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 16 10:36:01 2011 +0100 FIX: Fixed duplicate view plugin loading when using localized multisite --- ChangeLog | 1 + web/htdocs/views.py | 21 +++++++++++---------- web/plugins/views/commands.py | 3 +++ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a514bc..6e84116 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * New (hidden) button for reloading a snapin (left to the close button) * Automatically falling back to hardcoded default language if configured language is not available + * FIX: Fixed duplicate view plugin loading when using localized multisite BI: * Host/Service elements are now iterable via FOREACH_HOST, e.g. diff --git a/web/htdocs/views.py b/web/htdocs/views.py index f91b7df..fc41ac7 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -41,16 +41,6 @@ except NameError: # Datastructures and functions needed before plugins can be loaded loaded_with_language = False -multisite_datasources = {} -multisite_filters = {} -multisite_layouts = {} -multisite_painters = {} -multisite_sorters = {} -multisite_builtin_views = {} -multisite_painter_options = {} -multisite_commands = [] -ubiquitary_filters = [] # Always show this filters -view_hooks = {} # Load all view plugins def load_plugins(): @@ -59,6 +49,17 @@ def load_plugins(): return loaded_with_language = current_language + global multisite_datasources ; multisite_datasources = {} + global multisite_filters ; multisite_filters = {} + global multisite_layouts ; multisite_layouts = {} + global multisite_painters ; multisite_painters = {} + global multisite_sorters ; multisite_sorters = {} + global multisite_builtin_views ; multisite_builtin_views = {} + global multisite_painter_options ; multisite_painter_options = {} + global multisite_commands ; multisite_commands = [] + global ubiquitary_filters ; ubiquitary_filters = [] # Always show this filters + global view_hooks ; view_hooks = {} + config.declare_permission_section("action", _("Commands on host and services")) load_web_plugins("views", globals()) diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 039ad47..eaac3b1 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -36,6 +36,9 @@ # - function that outputs the HTML input fields # - function that creates the nagios command and title +#import datetime, traceback +#file('/tmp/1', 'a').write('%s %s\n%s' % (datetime.datetime.now(), current_language, ''.join(traceback.format_stack()))) + # RESCHEDULE ACTIVE CHECKS config.declare_permission("action.reschedule", _("Reschedule checks"),

12 years, 9 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: 899024198d4a2098a880555538fb247be282a0d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=899024198d4a20… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 16 10:36:32 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk Conflicts: ChangeLog ---

12 years, 9 months

Check_MK Git: check_mk: Solaris agent: changed shell to /usr/bin/bash ( fixes problems with LC_ALL=C)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 54e97035ec9c52c4e5269c993e1b4daa803e3472 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54e97035ec9c52… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 09:52:55 2011 +0100 Solaris agent: changed shell to /usr/bin/bash (fixes problems with LC_ALL=C) --- ChangeLog | 1 + agents/check_mk_agent.solaris | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 31488f9..5998071 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,6 +91,7 @@ should work on Debian now. * fsc_*: added missing scan functions * printer_alerts: added further state codes (thanks to Matthew Stew) + * Solaris agent: changed shell to /usr/bin/bash (fixes problems with LC_ALL=C) 1.1.12p5: Multisite: diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index df0fe41..c81a7d3 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/bash # +------------------------------------------------------------------+ # | ____ _ _ __ __ _ __ | # | / ___| |__ ___ ___| | __ | \/ | |/ / |

12 years, 9 months

Check_MK Git: check_mk: WATO: Make sure tag ids are unique

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bea52dbae57f6e7fa3738853fb2da1dbfccff0b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bea52dbae57f6e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 09:31:39 2011 +0100 WATO: Make sure tag ids are unique --- .bugs/479 | 7 +++++-- .bugs/480 | 7 +++++-- web/htdocs/wato.py | 4 ++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.bugs/479 b/.bugs/479 index ba51093..4ee00a5 100644 --- a/.bugs/479 +++ b/.bugs/479 @@ -1,11 +1,14 @@ Title: Host tags reorder works only partially Component: wato +State: done +Class: bug Benefit: 1 -State: open Cost: 1 Date: 2011-12-06 12:11:21 Targetversion: 1.2.0 -Class: bug Changing the order of host tags in WATO does not work with the down arrow on the first tag group. + +2011-12-16 09:28:03: changed state open -> done +Already fixed. diff --git a/.bugs/480 b/.bugs/480 index 1f1c46d..da1895a 100644 --- a/.bugs/480 +++ b/.bugs/480 @@ -1,11 +1,14 @@ Title: Check for duplicate host tags values Component: wato +State: done +Class: bug Benefit: 1 -State: open Cost: 1 Date: 2011-12-06 12:18:18 Targetversion: 1.2.0 -Class: bug When editing host tags make sure that within one tag group each tag is unique. + +2011-12-16 09:31:23: changed state open -> done +Is now checked. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 55a4a1b..10bc735 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8130,6 +8130,10 @@ def mode_edit_hosttag(phase): if have_none_tag: raise MKUserError("id_%d" % nr, _("Only on tag may be empty.")) have_none_tag = True + # Make sure tag ID is unique within this group + if id in [ x[0] for x in new_choices ]: + raise MKUserError("id_%d" % nr, _("Tags IDs must be unique. You've used <b>%s</b> twice.") % id) + new_choices.append((id, descr)) if id: # Make sure this ID is not used elsewhere

12 years, 9 months

Check_MK Git: check_mk: Repair layout of Perf-O-Meter in single dataset layout

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 58b91ab4ff1a40632f34e6ad54ef68d580b70b09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58b91ab4ff1a40… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 09:26:22 2011 +0100 Repair layout of Perf-O-Meter in single dataset layout --- .bugs/493 | 7 +++++-- ChangeLog | 1 + web/htdocs/status.css | 15 +++++++++------ web/htdocs/views.css | 31 ++++++++++++++++++++++++------- web/plugins/views/builtin.py | 1 + web/plugins/views/layouts.py | 10 +++++++--- 6 files changed, 47 insertions(+), 18 deletions(-) diff --git a/.bugs/493 b/.bugs/493 index 9a418a6..13baa49 100644 --- a/.bugs/493 +++ b/.bugs/493 @@ -1,10 +1,13 @@ Title: Repair Perf-O-Meter in single dataset view Component: multisite +State: done +Class: bug Benefit: 1 -State: open Cost: 1 Date: 2011-12-13 16:47:27 Targetversion: 1.1.13i1 -Class: bug Should look like in table view. + +2011-12-16 09:25:56: changed state open -> done +Looks good now. diff --git a/ChangeLog b/ChangeLog index bf300e7..31488f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * New (hidden) button for reloading a snapin (left to the close button) * Automatically falling back to hardcoded default language if configured language is not available + * Repair layout of Perf-O-Meter in single dataset layout BI: * Host/Service elements are now iterable via FOREACH_HOST, e.g. diff --git a/web/htdocs/status.css b/web/htdocs/status.css index 09ed6b8..6469c1d 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -136,8 +136,8 @@ b.stmark { } /* Performeter styling */ -td.perfometer { - padding: 1px 1px 1px 0px; +table.data tr.data td.perfometer { + padding: 1px 2px 2px 1px; width: 120px; height: 22px; vertical-align: middle; @@ -147,7 +147,7 @@ td.perfometer div.content { position: relative; top: 0px; left: 1px; - width: 119px; + width: 120px; height: 0px; float: left; z-index: 20; @@ -169,7 +169,7 @@ td.perfometer img.glass { position: relative; top: 1px; left: 2px; - width: 118px; + width: 120px; height: 22px; margin-bottom: 1px; z-index: 30; @@ -177,13 +177,13 @@ td.perfometer img.glass { td.perfometer table { - width: 120px; + width: 100%; height: 22px; border-spacing: 0px; padding: 0; margin: 0; border: 1px solid #aaa; - height: 100%; + height: 24px; } table.data td.perfometer td.inner { @@ -224,6 +224,9 @@ tr.even2 { background-color: #faa; } tr.odd3 { background-color: #fda; } tr.even3 { background-color: #fea; } +/* Row headers in single dataset layout */ + + /*-------------------------------------------------------------------------. | ____ _ _ | | | _ \ __ _(_)_ __ | |_ ___ _ __ ___ | diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 56dc248..27ce157 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -253,30 +253,32 @@ table.tiled td { about a single host/service on a page. e.g. the "host defails" page uses thislayout */ -table.dataset { +table.data.single { + margin-top: 5px; border-spacing: 1px; padding: 0; border-collapse: collapse; empty-cells: show; - width: 100%; + width: 200px; + box-shadow: 1px 1px 3px #000000; } -table.dataset tr.data { +table.data.single tr.data { background-color: #eee; } -table.dataset tr.gap { +table.data.single tr.gap { background-color: transparent; } -table.dataset td { +table.data.single td { padding-bottom: 4px; padding: 1px 10px 5px 10px; text-align: left; vertical-align: middle; border: 1px solid #bbb; } -table.dataset td.left { +table.data.single td.left { padding-right: 10px; color: #fff; background-color: #888; @@ -284,11 +286,26 @@ table.dataset td.left { white-space: nowrap; vertical-align: top; } -table.dataset td.gap { +table.data.single td.gap { background-color: transparent; border-left-style: none; border-right-style: none; } +table.data.single td.age, +table.data.single td.number, +table.data.single td.count { + text-align: left; +} + +table.data.single td.perfometer div.content { + width: 100%; +} +table.data.single td.perfometer img.glass { + width: 100%; +} +table.data.single td.perfometer div.title { + width: 100%; +} /*-------------------------------------------------------------------------. | _____ _ _ _ _ | diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 63dabe5..d244785 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1048,6 +1048,7 @@ multisite_builtin_views.update({ ('svc_plugin_output', None), ('svc_long_plugin_output', None), ('svc_perf_data', None), + ('perfometer', None), ('svc_check_command', None), ('svc_attempt', None), ('svc_check_type', None), diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 064165e..ead5f49 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -67,8 +67,10 @@ def render_single_dataset(rows, view, group_painters, painters, num_columns, _ig for row in rows: register_events(row) # needed for playing sounds - html.write('<div class="tableshadow left"><table class=dataset>\n') + # html.write('<div class="tableshadow left">\n') + html.write('<table class="data single">\n') rownum = 0 + odd = "odd" while rownum < len(rows): if rownum > 0: html.write("<tr class=gap><td class=gap colspan=%d></td></tr>\n" % (1 + num_columns)) @@ -80,7 +82,8 @@ def render_single_dataset(rows, view, group_painters, painters, num_columns, _ig else: title = painter["title"] - html.write("<tr class=data>") + odd = odd == "odd" and "even" or "odd" + html.write('<tr class="data %s0">' % odd) if view.get("column_headers") != "off": html.write("<td class=left>%s</td>" % title) for row in thispart: @@ -89,7 +92,8 @@ def render_single_dataset(rows, view, group_painters, painters, num_columns, _ig html.write("<td class=gap style=\"border-style: none;\" colspan=%d></td>" % (1 + num_columns - len(thispart))) html.write("</tr>\n") rownum += num_columns - html.write("</table></div>\n") + html.write("</table>\n") + html.write("</div>\n") multisite_layouts["dataset"] = { "title" : _("Single dataset"),

12 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0494

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 96d66721c56b5fcef16bce2afd9032e4d87e8125 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96d66721c56b5f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 08:36:41 2011 +0100 Updated bug entries #0494 --- .bugs/494 | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.bugs/494 b/.bugs/494 index 0b8bc40..a81cecc 100644 --- a/.bugs/494 +++ b/.bugs/494 @@ -1,11 +1,13 @@ Title: Single dataset layout does not honor column-headers-off Component: multisite +State: done +Class: bug Benefit: 1 -State: open Cost: 1 Date: 2011-12-13 16:47:59 Targetversion: 1.1.13i1 -Class: bug If you switch off column headers in a single dataset view, the headers do not vanish. + +2011-12-16 08:36:31: changed state open -> done

12 years, 9 months

Check_MK Git: check_mk: FIX: single dataset layout honors column header settings

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 67872ab8d7807566106a79ab3d11210f6b09e90d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67872ab8d78075… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 08:37:03 2011 +0100 FIX: single dataset layout honors column header settings --- ChangeLog | 1 + web/plugins/views/layouts.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a514bc..bf300e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -99,6 +99,7 @@ * FIX: fix dashboard dashlet background on IE * FIX: fix row highlight in status GUI on IE 7/8 * FIX: fix row highlight after status page reload + * FIX: single dataset layout honors column header settings Checks & Agents: * FIX: lnx_if: assume interfaces as up if ethtool is missing or diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 3fd6b63..064165e 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -80,7 +80,9 @@ def render_single_dataset(rows, view, group_painters, painters, num_columns, _ig else: title = painter["title"] - html.write("<tr class=data><td class=left>%s</td>" % title) + html.write("<tr class=data>") + if view.get("column_headers") != "off": + html.write("<td class=left>%s</td>" % title) for row in thispart: paint(p, row) if len(thispart) < num_columns:

12 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits