Checkmk git commits February 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: A few cleanups in the datacore checks

by Mathias Kettner

Module: check_mk Branch: master Commit: f3c8b4c0e160c50886875c89aec2ebe7a04cae44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3c8b4c0e160c5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 2 12:21:30 2015 +0100 A few cleanups in the datacore checks --- checks/datacore_alerts | 5 +++-- checks/{datacore_poolallocation => datacore_pool} | 24 ++++++++++----------- checks/datacore_poolstatus | 2 +- checks/datacore_ports | 14 ++++++------ checks/datacore_serverstatus | 4 ++-- checks/datacore_virtualdiskstatus | 8 +++---- 6 files changed, 29 insertions(+), 28 deletions(-) diff --git a/checks/datacore_alerts b/checks/datacore_alerts index 94fff08..c05f9ec 100644 --- a/checks/datacore_alerts +++ b/checks/datacore_alerts @@ -24,7 +24,7 @@ # to the free software foundation, inc., 51 franklin st, fifth floor, # boston, ma 02110-1301 usa. -datacore_alerts_default_values = (1,2) +datacore_alerts_default_values = (1, 2) def inventory_datacore_alerts(info): return [ (None, "datacore_alerts_default_values") ] @@ -34,7 +34,7 @@ def check_datacore_alerts(_no_item, params, info): warn, crit = params nr_of_alerts = int(info[0][0]) perfdata = [ ( "alerts", nr_of_alerts, warn, crit ) ] - infotxt = "There are %d unacknowlegded alerts" % nr_of_alerts + infotxt = "Unacknowlegded alerts: %d" % nr_of_alerts levels = " (levels at %d/%d)" % (warn, crit) state = 0 @@ -46,6 +46,7 @@ def check_datacore_alerts(_no_item, params, info): infotxt += levels return state, infotxt, perfdata + check_info["datacore_alerts"] = { "check_function" : check_datacore_alerts, "inventory_function" : inventory_datacore_alerts, diff --git a/checks/datacore_poolallocation b/checks/datacore_pool similarity index 73% rename from checks/datacore_poolallocation rename to checks/datacore_pool index bd31f9c..efe518a 100644 --- a/checks/datacore_poolallocation +++ b/checks/datacore_pool @@ -24,20 +24,20 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -datacore_poolallocation_default_values = (80, 90) +datacore_pool_default_values = (80, 90) -def inventory_datacore_poolallocation(info): +def inventory_datacore_pool(info): for line in info: - yield line[0], "datacore_poolallocation_default_values" + yield line[0], "datacore_pool_default_values" -def check_datacore_poolallocation(item, params, info): +def check_datacore_pool(item, params, info): warn, crit = params for poolname, allocated in info: if poolname == item: allocated = int(allocated) - infotxt = "Poolallocation is at %.0f %%" % allocated - levels = " (levels at %.0f %%/%.0f %%)" % (warn, crit) - perfdata = [("allocated", allocated, warn, crit)] + infotxt = "Pool allocation: %d%%" % allocated + levels = " (levels at %d/%d%%)" % (warn, crit) + perfdata = [("pool_allocation", allocated, warn, crit)] state = 0 if allocated >= crit: @@ -48,10 +48,10 @@ def check_datacore_poolallocation(item, params, info): infotxt += levels return state, infotxt, perfdata -check_info['datacore_poolallocation'] = { - "check_function" : check_datacore_poolallocation, - "inventory_function" : inventory_datacore_poolallocation, - "service_description" : "DataCore Poolallocation %s", +check_info['datacore_pool'] = { + "check_function" : check_datacore_pool, + "inventory_function" : inventory_datacore_pool, + "service_description" : "DataCore Pool %s", "has_perfdata" : True, - "group" : "datacore_poolallocation", + "group" : "datacore_pool", } diff --git a/checks/datacore_poolstatus b/checks/datacore_poolstatus index ff1a8f7..dd4f674 100644 --- a/checks/datacore_poolstatus +++ b/checks/datacore_poolstatus @@ -45,5 +45,5 @@ def check_datacore_poolstatus(item, _no_params, info): check_info['datacore_poolstatus'] = { "check_function" : check_datacore_poolstatus, "inventory_function" : inventory_datacore_poolstatus, - "service_description" : "DataCore Diskpool %s", + "service_description" : "DataCore Disk Pool %s", } diff --git a/checks/datacore_ports b/checks/datacore_ports index 7745f4d..88aa89e 100644 --- a/checks/datacore_ports +++ b/checks/datacore_ports @@ -24,13 +24,13 @@ # to the free software foundation, inc., 51 franklin st, fifth floor, # boston, ma 02110-1301 usa. -#<<<datacore_ports>>> -#shdesolssy01_FE1 FibreChannel True -#Server_FC_Port_2 FibreChannel True -#Server_FC_Port_3 FibreChannel False -#Server_FC_Port_4 FibreChannel True -#Server_iSCSI_Port_1 iSCSI True -#Microsoft_iSCSI-Initiator iSCSI True +# <<<datacore_ports>>> +# shdesolssy01_FE1 FibreChannel True +# Server_FC_Port_2 FibreChannel True +# Server_FC_Port_3 FibreChannel False +# Server_FC_Port_4 FibreChannel True +# Server_iSCSI_Port_1 iSCSI True +# Microsoft_iSCSI-Initiator iSCSI True def inventory_datacore_ports(info): for portname, porttype, portstatus in info: diff --git a/checks/datacore_serverstatus b/checks/datacore_serverstatus index 4ee265b..56fe8d8 100644 --- a/checks/datacore_serverstatus +++ b/checks/datacore_serverstatus @@ -24,8 +24,8 @@ # to the free software foundation, inc., 51 franklin st, fifth floor, # boston, ma 02110-1301 usa. -#<<<datacore_serverstatus>>> -#Online WritebackGlobal +# <<<datacore_serverstatus>>> +# Online WritebackGlobal def inventory_datacore_serverstatus(info): return [(None, None)] diff --git a/checks/datacore_virtualdiskstatus b/checks/datacore_virtualdiskstatus index 97506ac..b1b9a7f 100644 --- a/checks/datacore_virtualdiskstatus +++ b/checks/datacore_virtualdiskstatus @@ -24,9 +24,9 @@ # to the free software foundation, inc., 51 franklin st, fifth floor, # boston, ma 02110-1301 usa. -#<<<datacore_virtualdiskstatus>>> -#testvmfs01 Online -#vmfs10 Online +# <<<datacore_virtualdiskstatus>>> +# testvmfs01 Online +# vmfs10 Online def inventory_datacore_virtualdiskstatus(info): for line in info: @@ -43,5 +43,5 @@ def check_datacore_virtualdiskstatus(item, _no_params, info): check_info['datacore_virtualdiskstatus'] = { "check_function" : check_datacore_virtualdiskstatus, "inventory_function" : inventory_datacore_virtualdiskstatus, - "service_description" : "DataCore VirtualDisk %s", + "service_description" : "DataCore Virtual Disk %s", }

9 years, 4 months

Check_MK Git: check_mk: #1973 Added intelligent host and service type icons to default views

by Lars Michelsen

Module: check_mk Branch: master Commit: e2cbff59c2ad4e549f7be417f8d10d58cf360c11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2cbff59c2ad4e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 2 12:18:06 2015 +0100 #1973 Added intelligent host and service type icons to default views The default list views of hosts and services show a new column, the type icon, by default now. The rendered icon is some kind of intelligent icon. It tries to detect which icon has to be shown for each host or service. This is done automatically based on the available information, for example which services are configured for a host or what is the name of a service. The currently implemented auto detection is far from being complete. It only contains some examples to show the new possibilites. This can be extended using icon plugins. For details take a look at the default <tt>plugins/icons/builtin.py</tt> code. If you like to change / override the icon by hand, you can configure the already existing rulesets "Icon image for hosts in status GUI" and "Icon image for services in status GUI". You can choose from the PNG icons available in <tt>htdocs/images/icons</tt>. If you use OMD, the default files are located in <tt>share/check_mk/web/htdocs/images/icons</tt>. You can place your own files in <tt>local/share/check_mk/web/htdocs/images/icons</tt>. --- .werks/1973 | 28 +++++++++ ChangeLog | 1 + web/htdocs/images/icons/checkmk.png | Bin 0 -> 2062 bytes web/htdocs/images/icons/cisco.png | Bin 0 -> 1271 bytes web/htdocs/images/icons/cpu.png | Bin 0 -> 4356 bytes web/htdocs/images/icons/disk_io.png | Bin 0 -> 2721 bytes web/htdocs/images/icons/filesystem.png | Bin 0 -> 2207 bytes web/htdocs/images/icons/interface.png | Bin 0 -> 3830 bytes web/htdocs/images/icons/linux.png | Bin 0 -> 2878 bytes web/htdocs/images/icons/log.png | Bin 0 -> 4030 bytes web/htdocs/images/icons/mail_queue.png | Bin 0 -> 4924 bytes web/htdocs/images/icons/mount.png | Bin 0 -> 3637 bytes web/htdocs/images/icons/temperature.png | Bin 0 -> 5061 bytes web/htdocs/images/icons/time.png | Bin 0 -> 5063 bytes web/htdocs/images/icons/uptime.png | Bin 0 -> 3592 bytes web/htdocs/images/icons/windows.png | Bin 0 -> 812 bytes web/htdocs/status.css | 4 ++ web/plugins/icons/builtin.py | 101 +++++++++++++++++++++++++------ web/plugins/views/builtin.py | 80 ++++++------------------ web/plugins/views/painters.py | 67 +++++++++++++++++--- 20 files changed, 195 insertions(+), 86 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e2cbff59c2…

9 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0985

by Lars Michelsen

Module: check_mk Branch: master Commit: eae6987a47ee5ab3f732bbf5e891d15dd9b87687 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eae6987a47ee5a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 2 11:42:47 2015 +0100 Updated bug entries #0985 --- .bugs/985 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/985 b/.bugs/985 index f302b8f..dc4e68d 100644 --- a/.bugs/985 +++ b/.bugs/985 @@ -1,9 +1,9 @@ Title: Reloading sidebar after config change erases Quicksearch Component: multisite -State: open +Class: nastiness +State: done Date: 2013-10-15 01:34:28 Targetversion: 1.2.3i3 -Class: nastiness If you active changes via WATO then the sidebar reloads. That way Quicksearch is emptied. This is nasty. @@ -15,3 +15,6 @@ That way Quicksearch is emptied. This is nasty. Does the Quicksearch need to be reloaded at the first place? It's now AJAX-enabled, isn't it? + +2015-02-02 11:42:44: changed state open -> done +Fixed.

9 years, 4 months

Check_MK Git: check_mk: #1972 FIX Prevent erasing of quicksearch field when sidebar is reloaded ( e.g. during activate changes)

by Lars Michelsen

Module: check_mk Branch: master Commit: a653c23821a5117dfd99b90c5a851e25d86ee2ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a653c23821a511… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 2 11:41:50 2015 +0100 #1972 FIX Prevent erasing of quicksearch field when sidebar is reloaded (e.g. during activate changes) When performing "activate changes" in WATO, the quicksearch field of the sidebar was cleared during this process. This lead to user confusions when typing into the quicksearch field while the activate changes process was completing. --- .werks/1972 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 2 +- web/htdocs/js/checkmk.js | 46 ++++++++++++++++++++++++++++++++++++++++++++++ web/htdocs/js/wato.js | 6 ++---- 5 files changed, 62 insertions(+), 5 deletions(-) diff --git a/.werks/1972 b/.werks/1972 new file mode 100644 index 0000000..e59c19f --- /dev/null +++ b/.werks/1972 @@ -0,0 +1,12 @@ +Title: Prevent erasing of quicksearch field when sidebar is reloaded (e.g. during activate changes) +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1422873119 + +When performing "activate changes" in WATO, the quicksearch field of the sidebar was cleared +during this process. This lead to user confusions when typing into the quicksearch field +while the activate changes process was completing. diff --git a/ChangeLog b/ChangeLog index c81e3ae..7f022f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -163,6 +163,7 @@ * 1876 FIX: User sorting of views can now be disabled again * 1884 FIX: Fixed exception in virtual host tree snapin * 1885 FIX: Fixed filtering by software versions in software package search + * 1972 FIX: Prevent erasing of quicksearch field when sidebar is reloaded (e.g. during activate changes)... WATO: * 1760 Added search form to manual checks page diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 88e91a9..5748609 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1123,7 +1123,7 @@ class html: def reload_sidebar(self): if not self.has_var("_ajaxid"): - self.javascript("if(parent && parent.frames[0]) parent.frames[0].location.reload();"); + self.javascript("reload_sidebar()") def set_ignore_transids(self): self.ignore_transids = True diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 5c7a2d1..6df55e0 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -2347,3 +2347,49 @@ function add_to_visual(visual_type, visual_name) if (response) window.location.href = response; } + +var g_sidebar_reload_timer = null; + +function reload_sidebar() +{ + if (parent && parent.frames[0]) { + // reload sidebar, but preserve eventual quicksearch field value and focus + var val = ''; + var focused = false; + var field = parent.frames[0].document.getElementById('mk_side_search_field'); + if (field) { + val = field.value; + focused = parent.frames[0].document.activeElement == field; + } + + parent.frames[0].document.reloading = 1; + parent.frames[0].document.location.reload(); + + if (field) { + g_sidebar_reload_timer = setInterval(function (value, has_focus) { + return function() { + if (!parent.frames[0].document.reloading + && parent.frames[0].document.readyState === 'complete') { + var field = parent.frames[0].document.getElementById('mk_side_search_field'); + if (field) { + field.value = value; + if (has_focus) { + field.focus(); + + // Move caret to end + if (field.setSelectionRange !== undefined) + field.setSelectionRange(value.length, value.length); + } + field = null; + } + + clearInterval(g_sidebar_reload_timer); + g_sidebar_reload_timer = null; + } + }; + }(val, focused), 50); + + field = null; + } + } +} diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 6580387..31e002c 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -615,10 +615,8 @@ function wato_replication_result(siteid, code) { function wato_replication_finish() { // check if we have a sidebar-main frame setup if (this.parent && parent && parent.frames[1] == this) - parent.frames[0].location.reload(); // reload sidebar + reload_sidebar(); - // always reload main - // this.location.reload(); var oDiv = document.getElementById("act_changes_button"); oDiv.style.display = "none"; oDiv = null @@ -702,7 +700,7 @@ function wato_profile_replication_result(siteid, code) { function wato_profile_replication_finish() { // check if we have a sidebar-main frame setup if (this.parent && parent && parent.frames[1] == this) - parent.frames[0].location.reload(); // reload sidebar + reload_sidebar(); } // ----------------------------------------------------------------------------

9 years, 4 months

Check_MK Git: check_mk: New Datacore Checks, no finish,

by Bastian Kuhn

manpages are still missing Message-ID: <54cf544f.nyVUkis33AxHXHev%bk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 71a5d352e7b9bc2655ecb3c85a23824252b076c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71a5d352e7b9bc… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Feb 2 11:41:06 2015 +0100 New Datacore Checks, no finish, manpages are still missing --- agents/windows/plugins/datacore.ps1 | 104 ++++++++++++++++++++++++++++++++++ checks/datacore_alerts | 55 ++++++++++++++++++ checks/datacore_poolallocation | 57 +++++++++++++++++++ checks/datacore_poolstatus | 49 ++++++++++++++++ checks/datacore_ports | 52 +++++++++++++++++ checks/datacore_serverstatus | 46 +++++++++++++++ checks/datacore_virtualdiskstatus | 47 +++++++++++++++ web/plugins/wato/check_parameters.py | 49 ++++++++++++++++ 8 files changed, 459 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=71a5d352e7…

9 years, 4 months

Check_MK Git: check_mk: msi-installer: now supports plugins.cap, simplified software update

by Andreas Boesl

Module: check_mk Branch: master Commit: eb7218066f5f38896039495472327b32da7acf9a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb7218066f5f38… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Feb 2 10:52:09 2015 +0100 msi-installer: now supports plugins.cap, simplified software update --- agents/windows/msibuild/msi-update | 41 +++++++++++++++---------- agents/windows/msibuild/vanilla_container.msi | Bin 613376 -> 613376 bytes 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/agents/windows/msibuild/msi-update b/agents/windows/msibuild/msi-update index 2819304..ab6a3ca 100755 --- a/agents/windows/msibuild/msi-update +++ b/agents/windows/msibuild/msi-update @@ -72,7 +72,7 @@ try: # our path # Export required idt files into work dir - for entry in [ "File", "Upgrade", "Property" ]: + for entry in [ "File", "Property", "Component" ]: verbose("Export table %s from file %s" % (entry, msi_file)) os.system((path_prefix + "msiinfo export %(msi_file)s %(property)s > %(work_dir)s/%(property)s.idt") % \ { "work_dir" : work_dir, "msi_file": msi_file, "property": entry }) @@ -86,6 +86,7 @@ try: # HACK: the 64 bit agent is msi internally handled as check_mk_agent64.exe os.rename(source_dir + "/check_mk_agent-64.exe", source_dir + "/check_mk_agent64.exe") + lines_file_idt = file(work_dir + "/File.idt").readlines() file_idt_new = file(work_dir + "/File.idt.new", "w") file_idt_new.write("".join(lines_file_idt[:3])) @@ -107,24 +108,31 @@ try: # ============================================== - # Modify Upgrade.idt - lines_upgrade_idt = file(work_dir + "/Upgrade.idt").readlines() - upgrade_idt_new = file(work_dir + "/Upgrade.idt.new", "w") - upgrade_idt_new.write("".join(lines_upgrade_idt[:3])) - - for idx, token_offset in [ (3, 1), (4, 2) ]: - new_line = lines_upgrade_idt[idx] - tokens = new_line.split("\t") - tokens[token_offset] = ".".join(new_version_build.split(".")[:3]) - upgrade_idt_new.write("\t".join(tokens)) - upgrade_idt_new.close() - # ============================================== + # Modify Component.idt + lines_component_idt = file(work_dir + "/Component.idt").readlines() + component_idt_new = file(work_dir + "/Component.idt.new", "w") + component_idt_new.write("".join(lines_component_idt[:3])) + + plugins_cap_code = ("{%s}" % uuid.uuid1()).upper() + check_mk_ini_code = ("{%s}" % uuid.uuid1()).upper() + + for line in lines_component_idt[3:]: + tokens = line.split("\t") + if tokens[0] == "plugins.cap": + tokens[1] = plugins_cap_code + elif tokens[0] == "check_mk.ini": + tokens[1] = check_mk_ini_code + elif tokens[0] == "agent32": + tokens[1] = ("{%s}" % uuid.uuid1()).upper() + component_idt_new.write("\t".join(tokens)) + + component_idt_new.close() + # ============================================== # ============================================== # Modify Property.idt product_code = ("{%s}\r\n" % uuid.uuid1()).upper() - upgrade_code = ("{%s}\r\n" % uuid.uuid1()).upper() lines_property_idt = file(work_dir + "/Property.idt").readlines() property_idt_new = file(work_dir + "/Property.idt.new", "w") property_idt_new.write("".join(lines_property_idt[:3])) @@ -145,17 +153,16 @@ try: # ============================================== - verbose("Creating copy of original file %s -> %s" % (msi_file, new_msi_file)) # Make a copy os.system("cp %(msi_file)s %(new_msi_file)s" % { "msi_file": msi_file, "new_msi_file": new_msi_file}) # Rename modified tables - for entry in [ "Property", "File", "Upgrade" ]: + for entry in [ "Property", "File", "Component" ]: os.rename(work_dir + "/%s.idt.new" % entry , work_dir + "/%s.idt" % entry) - for entry in [ "Property", "File", "Upgrade" ]: + for entry in [ "Property", "File", "Component" ]: os.system((path_prefix + "msibuild %(new_msi_file)s -i %(work_dir)s/%(file)s.idt") % \ { "work_dir" : work_dir, "new_msi_file": new_msi_file, "file": entry }) diff --git a/agents/windows/msibuild/vanilla_container.msi b/agents/windows/msibuild/vanilla_container.msi index 092e5b1..863a5c8 100644 Binary files a/agents/windows/msibuild/vanilla_container.msi and b/agents/windows/msibuild/vanilla_container.msi differ

9 years, 4 months

Check_MK Git: check_mk: oracle_undostat: Fixed syntax error in check man page

by Mathias Kettner

Module: check_mk Branch: master Commit: aae7d9d6bce9d230c74b6f35021b6c1fe9403fd2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aae7d9d6bce9d2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 2 10:44:47 2015 +0100 oracle_undostat: Fixed syntax error in check man page --- checkman/oracle_undostat | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/checkman/oracle_undostat b/checkman/oracle_undostat index ae61f38..41b5a5f 100644 --- a/checkman/oracle_undostat +++ b/checkman/oracle_undostat @@ -41,6 +41,11 @@ perfdata: This is the value for the levels parameter. Fourth the maximum time for a running query. Last the non space error count. +examples: + checkgroup_parameters['oracle_undostat'] = [ + ( {'nospaceerrcnt_state': 1}, [], ALL_HOSTS, ALL_SERVICES ), + ] + [parameters] parameters (dict): @@ -55,8 +60,4 @@ inventory: One separate check for each database found running will be created. -checkgroup_parameters['oracle_undostat'] = [ - ( {'nospaceerrcnt_state': 1}, [], ALL_HOSTS, ALL_SERVICES ), -] -

9 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2015