Checkmk git commits April 2013

checkmk-commits@lists.checkmk.com

3 participants
237 discussions

Check_MK Git: check_mk: Added esx vsphere ramdisk check

by Lars Michelsen

Module: check_mk Branch: master Commit: 893eb49cb5b1aebc5e5507addef380a0f3c16c86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=893eb49cb5b1ae… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 29 14:57:14 2013 +0200 Added esx vsphere ramdisk check --- agents/special/agent_vsphere | 87 +++++++++++++++++++-------------- checkman/esx_vsphere_counters.ramdisk | 19 +++++++ checks/esx_vsphere_counters | 48 ++++++++++++++++++ 3 files changed, 116 insertions(+), 38 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 47c4972..0be9c33 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -203,10 +203,13 @@ if error: sys.stderr.write(error + "\n") sys.exit(error_exit) +esx_version = host.get_api_version() +esx_version_num = float(esx_version) + print "<<<check_mk>>>" -print "Version: %s" % host.get_api_version() +print "Version: %s" % esx_version print "AgentOs: %s " % host.get_server_type() - + # Prepare list of all hosts systems all_hosts = host.get_hosts() @@ -434,45 +437,53 @@ def output_hostsystem_counters(): # a couple of seconds. To check out which counters are available just comment out # the hardcoded needed_ids and uncomment the following three lines of code. This will # give you a) A dict of name to id mappings and b) Current values of all counters. - # counterids = pm.get_entity_counters(mor) - # needed_ids = counterids.keys() # retrieve all ids.... - # print counterids + #counterids = pm.get_entity_counters(mor) + #needed_ids = counterids.keys() # retrieve all ids.... + #print counterids needed_ids = [ - # net.* - 196616, 196621, 196617, 196625, 196619, 196623, 196609, 196614, - 196620, 196624, 196615, 196622, 196618, 196612, 196613, 196626, - # sys.uptime - 262144, - # mem.* - # 65635, 65537, 65577, 65625, 65545, 65611, 65573, 65615, 65582, - # 65549, 65630, 65622, 65618, 65621, 65561, 65623, 65632, 65557, - # 65628, 65633, 65541, 65643, 65586, 65553, 65569, 65589, 65639, - # 65620, 65599, 65580, 65619, 65603, - # 'disk.deviceLatency': 131091, - # 'disk.deviceReadLatency': 131083, - # 'disk.deviceWriteLatency': 131087, - # 'disk.kernelLatency': 131092, - # 'disk.kernelReadLatency': 131084, - # 'disk.kernelWriteLatency': 131088, - # 'disk.maxQueueDepth': 131096, - # 'disk.maxTotalLatency': 131095, - # 'disk.numberRead': 131076, - # 'disk.numberReadAveraged': 131097, - # 'disk.numberWrite': 131077, - # 'disk.numberWriteAveraged': 131098, - # 'disk.queueLatency': 131094, - # 'disk.queueReadLatency': 131086, - # 'disk.queueWriteLatency': 131090, - # 'disk.read': 131078, - # 'disk.totalLatency': 131093, - # 'disk.totalReadLatency': 131085, - # 'disk.totalWriteLatency': 131089, - # 'disk.usage': 131073, - - # disk.read/write/deviceLatency/numberRead/numberWrite - 131078, 131079, 131091, 131076, 131077, + # net.* + 196616, 196621, 196617, 196625, 196619, 196623, 196609, 196614, + 196620, 196624, 196615, 196622, 196618, 196612, 196613, 196626, + # sys.uptime + 262144, + # mem.* + # 65635, 65537, 65577, 65625, 65545, 65611, 65573, 65615, 65582, + # 65549, 65630, 65622, 65618, 65621, 65561, 65623, 65632, 65557, + # 65628, 65633, 65541, 65643, 65586, 65553, 65569, 65589, 65639, + # 65620, 65599, 65580, 65619, 65603, + # 'disk.deviceLatency': 131091, + # 'disk.deviceReadLatency': 131083, + # 'disk.deviceWriteLatency': 131087, + # 'disk.kernelLatency': 131092, + # 'disk.kernelReadLatency': 131084, + # 'disk.kernelWriteLatency': 131088, + # 'disk.maxQueueDepth': 131096, + # 'disk.maxTotalLatency': 131095, + # 'disk.numberRead': 131076, + # 'disk.numberReadAveraged': 131097, + # 'disk.numberWrite': 131077, + # 'disk.numberWriteAveraged': 131098, + # 'disk.queueLatency': 131094, + # 'disk.queueReadLatency': 131086, + # 'disk.queueWriteLatency': 131090, + # 'disk.read': 131078, + # 'disk.totalLatency': 131093, + # 'disk.totalReadLatency': 131085, + # 'disk.totalWriteLatency': 131089, + # 'disk.usage': 131073, + + # disk.read/write/deviceLatency/numberRead/numberWrite + 131078, 131079, 131091, 131076, 131077, ] + + # Seems as this is not available in ESX 5.0 but we saw it on 5.1 + if esx_version_num > 5.0: + # sys.resourceMemConsumed + needed_ids += [ + 262171, + ] + #needed_ids = [ # # sys.resourceMem* # 262151, 262155, 262169, 262152, 262154, 262153, 262157, 262156, 262168, diff --git a/checkman/esx_vsphere_counters.ramdisk b/checkman/esx_vsphere_counters.ramdisk new file mode 100644 index 0000000..6ef4255 --- /dev/null +++ b/checkman/esx_vsphere_counters.ramdisk @@ -0,0 +1,19 @@ +title: Ramdisks of ESX host system +agents: vsphere +author: Lars Michelsen <lm(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check monitors the usage of ramdisks used by the operating system + of ESX host systems. + + The check needs a host system with version 5.1 or newer. Older versions + do not provide the needed information. + + The check makes use of generic the {df} check code. Therefor parameters, + perfdata, configuration and results are similar to the {df} check. So + please take a look at that check man page for details. + +inventory: + One check per ramdisk is created from the counters reported by + the vsphere special agent. diff --git a/checks/esx_vsphere_counters b/checks/esx_vsphere_counters index d604edc..9d05388 100644 --- a/checks/esx_vsphere_counters +++ b/checks/esx_vsphere_counters @@ -272,3 +272,51 @@ check_info['esx_vsphere_counters.uptime'] = { 'group': 'uptime', } +# .--Ramdisk-------------------------------------------------------------. +# | ____ _ _ _ | +# | | _ \ __ _ _ __ ___ __| (_)___| | __ | +# | | |_) / _` | '_ ` _ \ / _` | / __| |/ / | +# | | _ < (_| | | | | | | (_| | \__ \ < | +# | |_| \_\__,_|_| |_| |_|\__,_|_|___/_|\_\ | +# | | +# +----------------------------------------------------------------------+ + +# We assume that all ramdisks have the same size (in mb) on all hosts +esx_vsphere_cunters_ramdisk_sizes = { + 'root': 32, + 'etc': 28, + 'tmp': 192, + 'hostdstats': 319, +} + +def inventory_esx_vsphere_counters_ramdisk(info): + ramdisks = [] + for name, instance, counter, unit in info: + if name == 'sys.resourceMemConsumed' \ + and instance.startswith('host/system/kernel/kmanaged/visorfs/'): + ramdisks.append(instance.split('/')[-1]) + + return df_inventory(ramdisks) + +def check_esx_vsphere_counters_ramdisk(item, params, info): + ramdisks = [] + for name, instance, counter, unit in info: + if name == 'sys.resourceMemConsumed' \ + and instance.startswith('host/system/kernel/kmanaged/visorfs/'): + name = instance.split('/')[-1] + size_mb = esx_vsphere_cunters_ramdisk_sizes[name] + used_mb = float(counter) / 1000 + avail_mb = size_mb - used_mb + ramdisks.append((name, size_mb, avail_mb)) + + return df_check_filesystem_list(item, params, ramdisks) + +check_info['esx_vsphere_counters.ramdisk'] = { + 'inventory_function': inventory_esx_vsphere_counters_ramdisk, + 'check_function': check_esx_vsphere_counters_ramdisk, + 'service_description': 'Ramdisk %s', + 'has_perfdata': True, + 'includes': [ 'df.include' ], + 'group': 'filesystem', + 'default_levels_variable': 'filesystem_default_levels', +}

11 years, 1 month

Check_MK Git: check_mk: some minor formating in f5_bigip_psu check

by Lars Michelsen

Module: check_mk Branch: master Commit: 4582007483fb8622f61097dc56f053302c91884d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4582007483fb86… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 29 10:43:19 2013 +0200 some minor formating in f5_bigip_psu check --- checks/f5_bigip_psu | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/checks/f5_bigip_psu b/checks/f5_bigip_psu index 6972819..caa4fca 100644 --- a/checks/f5_bigip_psu +++ b/checks/f5_bigip_psu @@ -37,9 +37,6 @@ # good(1), # notpresent(2) - - - def inventory_f5_bigip_psu(info): inventory = [] for line in info: @@ -49,7 +46,6 @@ def inventory_f5_bigip_psu(info): inventory.append((psu, None)) return inventory - def check_f5_bigip_psu(item, _no_params, info): for line in info: psu = line[0][0] @@ -67,14 +63,6 @@ def check_f5_bigip_psu(item, _no_params, info): return (3, "item not found in SNMP output") - -# Get ID and status from the SysChassisPowerSupplyTable - - - - -# Check using the vendor mib Id and verify it's a loadbalancer - check_info["f5_bigip_psu"] = { 'check_function': check_f5_bigip_psu, 'inventory_function': inventory_f5_bigip_psu, @@ -82,5 +70,7 @@ check_info["f5_bigip_psu"] = { # Get ID and status from the SysChassisPowerSupplyTable 'snmp_info': [('.1.3.6.1.4.1.3375.2.1.3.2.2.2.1', [1, 2])], 'snmp_scan_function': \ - lambda oid: '.1.3.6.1.4.1.3375.2' in oid(".1.3.6.1.2.1.1.2.0") and "big-ip" in oid(".1.3.6.1.4.1.3375.2.1.4.1.0").lower(), + # Check using the vendor mib Id and verify it's a loadbalancer + lambda oid: '.1.3.6.1.4.1.3375.2' in oid(".1.3.6.1.2.1.1.2.0") \ + and "big-ip" in oid(".1.3.6.1.4.1.3375.2.1.4.1.0").lower(), }

11 years, 2 months

Check_MK Git: check_mk: Fixed exception with host objects in esx_vsphere_objects

by Lars Michelsen

Module: check_mk Branch: master Commit: e6451ad444ebe032244c2155efc402db494ad903 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6451ad444ebe0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 29 13:41:00 2013 +0200 Fixed exception with host objects in esx_vsphere_objects --- checks/esx_vsphere_objects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/esx_vsphere_objects b/checks/esx_vsphere_objects index 846a950..a7221bf 100644 --- a/checks/esx_vsphere_objects +++ b/checks/esx_vsphere_objects @@ -59,7 +59,7 @@ def inventory_esx_vsphere_objects(info): def check_esx_vsphere_objects(item, _no_params, info): for line in info: - if vsphere_object_names[line[0]] + " " + line[1] == item: + if vsphere_object_names[line[0]] + " " + line[1] == item and len(line) > 3: running_on = line[2] power_state = line[3] if power_state == "poweredOn":

11 years, 2 months

Check_MK Git: check_mk: FIX: HTML mails: Handle the case where plugin argument is not set

by Lars Michelsen

Module: check_mk Branch: master Commit: a28b702651f6a4685b2b8d73d439de7e08b99ebb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a28b702651f6a4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 29 10:33:52 2013 +0200 FIX: HTML mails: Handle the case where plugin argument is not set --- ChangeLog | 3 +++ notifications/mail | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 68d9a8c..bf1fd74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -127,6 +127,9 @@ * FIX: Fixed exception during initial page rendering in python 2.6 in special cases (Internal error: putenv() argument 2 must be string, not list) + Notifications: + * FIX: HTML mails: Handle the case where plugin argument is not set + WATO: * Improved handling of valuespec validations in WATO rule editor. Displaying a warning message when going to throw away the current settings. diff --git a/notifications/mail b/notifications/mail index 37d09cb..223e794 100755 --- a/notifications/mail +++ b/notifications/mail @@ -319,7 +319,7 @@ def fetch_pnp_data(context, params): path = "%s/share/pnp4nagios/htdocs/index.php" % context['OMD_ROOT'] except: # Non-omd environment - use plugin argument 1 - path = context['PARAMETER_1'] + path = context.get('PARAMETER_1', '') if not os.path.exists(path): raise GraphException('Unable to locate pnp4nagios index.php (%s)' % path)

11 years, 2 months

Check_MK Git: check_mk: Updated bug entries #0920

by Lars Michelsen

Module: check_mk Branch: master Commit: 05f861a9c49d600e5fd996ae1b75c00a71a40c41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05f861a9c49d60… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 29 10:25:09 2013 +0200 Updated bug entries #0920 --- .bugs/920 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.bugs/920 b/.bugs/920 new file mode 100644 index 0000000..59f474c --- /dev/null +++ b/.bugs/920 @@ -0,0 +1,13 @@ +Title: Implement paged ldap search to fix problems with response size limits +Component: multisite +State: open +Date: 2013-04-29 10:22:57 +Targetversion: 1.2.3 +Class: nastiness + +At the moment we have only implemented a simple ldap search. In some directories, +like active directory it leads into a SIZE_LIMIT_EXCEEDED exception when +a query results in more than 1000 response objects. + +The solution here is to implement a paged ldap search. An example can be +seen here: http://www.novell.com/coolsolutions/tip/18274.html

11 years, 2 months

Check_MK Git: check_mk: FIX: added missing perfdata declaration to job check

by Lars Michelsen

Module: check_mk Branch: master Commit: 2236fcee460697f1890f3883a14634a8c283ce4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2236fcee460697… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 29 10:14:40 2013 +0200 FIX: added missing perfdata declaration to job check --- checks/job | 1 + 1 file changed, 1 insertion(+) diff --git a/checks/job b/checks/job index 99d1a12..d86d78a 100644 --- a/checks/job +++ b/checks/job @@ -133,4 +133,5 @@ check_info["job"] = { 'inventory_function': inventory_job, 'service_description': 'Job %s', 'group': 'job', + 'perfdata': True, }

11 years, 2 months

Check_MK Git: check_mk: FIX: mk_jolokia: Handling spaces in application server instances correctly

by Lars Michelsen

Module: check_mk Branch: master Commit: c76d9b4e4957312b50c31a9e46ad74c1aeb9d1f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c76d9b4e495731… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 29 09:49:59 2013 +0200 FIX: mk_jolokia: Handling spaces in application server instances correctly --- ChangeLog | 1 + agents/plugins/mk_jolokia | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index dfd2322..68d9a8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -116,6 +116,7 @@ * FIX: vsphere_agent: fix problems whith ! and \ in username or password * FIX: check_mk_agent.aix: fix shebang: was python, must be ksh * FIX: cisco_qos: Be compatible to newer IOS-XE versions (Thanks to Ken Smith) + * FIX: mk_jolokia: Handling spaces in application server instances correctly Multisite: * FIX: do not remove directories of non-exisant users anymore. This lead to diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index def7dd8..74afb61 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -92,7 +92,7 @@ def query_instance(inst): # Prepare user/password authentication via HTTP Auth if inst.get("password"): passwdmngr = urllib2.HTTPPasswordMgrWithDefaultRealm() - passwdmngr.add_password(None, "http://%s:%d/" % + passwdmngr.add_password(None, "http://%s:%d/" % (inst["server"], inst["port"]), inst["user"], inst["password"]) if inst["mode"] == 'digest': authhandler = urllib2.HTTPDigestAuthHandler(passwdmngr) @@ -117,7 +117,6 @@ def query_instance(inst): sys.stdout.write('<<<jolokia_metrics>>>\n') # Fetch the general information first for path, title, itemspec in global_vars + specific_vars.get(product, []): - try: values = fetch_var(inst["server"], inst["port"], "read/" + path, inst["suburi"], itemspec) @@ -131,7 +130,7 @@ def query_instance(inst): raise # Simply ignore exceptions. Need to be removed for debugging continue - + for subinstance, value in values: if not subinstance and not title: print "INTERNAL ERROR: %s" % value @@ -149,7 +148,7 @@ def query_instance(inst): else: tit = subinstance[-1] - sys.stdout.write("%s %s %s\n" % (item, tit, value)) + sys.stdout.write("%s %s %s\n" % (item.replace(" ", "_"), tit, value)) # Default configuration for all instances

11 years, 2 months

Check_MK Git: check_mk: FIX: Fixed exception during initial page rendering in python 2. 6 in special cases

by Lars Michelsen

Module: check_mk Branch: master Commit: d05837b2496e6fb1d442d1651e9c6bd91463653f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d05837b2496e6f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 29 09:43:14 2013 +0200 FIX: Fixed exception during initial page rendering in python 2.6 in special cases (Internal error: putenv() argument 2 must be string, not list) Conflicts: ChangeLog --- ChangeLog | 3 +++ web/htdocs/htmllib.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f2d531c..0f298a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -115,6 +115,9 @@ a deletion of users' settings in case of an external authentication (like mod_ldap). * FIX: Fixed handling of dashboards without title in sidebar view snapin + * FIX: titles and services got lost when moving join-columns in views + * FIX: Fixed exception during initial page rendering in python 2.6 in special cases + (Internal error: putenv() argument 2 must be string, not list) WATO: * Improved handling of valuespec validations in WATO rule editor. Displaying a diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 4e79c67..bfae476 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1194,7 +1194,8 @@ document.body.onfocus = keybindings_focus; def omd_mode(self): # Load mod_python env into regular environment - os.environ.update(self.req.subprocess_env) + for k, v in self.req.subprocess_env.items(): + os.environ[k] = v omd_mode = None omd_site = None

11 years, 2 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 8533224c0df56011682d9576590fe846aadace11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8533224c0df560… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 29 09:44:24 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk Conflicts: ChangeLog ---

11 years, 2 months

Check_MK Git: check_mk: FIX: titles and services got lost when moving join-columns in views

by Mathias Kettner

Module: check_mk Branch: master Commit: 227c12d110c9d9e8d95ee18e797a17b241509cda URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=227c12d110c9d9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 26 13:55:42 2013 +0200 FIX: titles and services got lost when moving join-columns in views Conflicts: web/htdocs/js/checkmk.js --- ChangeLog | 1 + web/htdocs/js/checkmk.js | 4 ++-- web/htdocs/views.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec31bb4..20ea97a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -122,6 +122,7 @@ a deletion of users' settings in case of an external authentication (like mod_ldap). * FIX: Fixed handling of dashboards without title in sidebar view snapin + * FIX: titles and services got lost when moving join-columns in views WATO: * Improved handling of valuespec validations in WATO rule editor. Displaying a diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 1fce61f..82c5f5a 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -634,9 +634,9 @@ function column_swap_ids(o1, o2) { var type = parts[0]; var num1 = parts[2]; var num2 = o2.id.split('_')[2]; - + var o1 = null, o2 = null; - var objects = [ '', '_editor', '_up', '_down', '_link', '_tooltip' ]; + var objects = [ '', '_editor', '_up', '_down', '_link', '_tooltip', '_label', '_title', '_join_index' ]; for(var i = 0,len = objects.length; key = type+objects[i]+'_', i < len; i++) { o1 = document.getElementById(key + num1); o2 = document.getElementById(key + num2); diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 4425beb..516ec34 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -768,14 +768,14 @@ def view_edit_column(n, var_prefix, maxnum, allowed, joined = []): display = '' html.write("</td></tr><tr id='%sjoin_index_row%d' style='display:%s'><td class=celeft>%s:</td><td>" % (var_prefix, n, display, _('of Service'))) - html.text_input("%sjoin_index_%d" % (var_prefix, n)) + html.text_input("%sjoin_index_%d" % (var_prefix, n), id = var_prefix + "join_index_%d" % n) html.write("</td></tr><tr><td class=celeft>%s:</td><td>" % _('Link')) select_view("%slink_%d" % (var_prefix, n)) html.write("</td></tr><tr><td class=celeft>%s:</td><td>" % _('Tooltip')) html.select("%stooltip_%d" % (var_prefix, n), collist) html.write("</td></tr><tr id='%stitle_row%d' style='display:%s'><td class=celeft>%s:</td><td>" % (var_prefix, n, display, _('Title'))) - html.text_input("%stitle_%d" % (var_prefix, n)) + html.text_input("%stitle_%d" % (var_prefix, n), id = var_prefix + "title_%d" % n) html.write("</td></tr></table>") html.write("</div>")

11 years, 2 months

← Newer
1
2
3
4
5
6
7
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2013