Checkmk git commits April 2013

checkmk-commits@lists.checkmk.com

3 participants
237 discussions

Check_MK Git: check_mk: winperf_if: assume devices up if wmic_if is missing

by Mathias Kettner

Module: check_mk Branch: master Commit: b7d2d11d6b08debd0316bfc56045a04cfb843370 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7d2d11d6b08de… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 26 10:17:53 2013 +0200 winperf_if: assume devices up if wmic_if is missing --- checks/winperf_if | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/checks/winperf_if b/checks/winperf_if index 4ecd625..868c00e 100644 --- a/checks/winperf_if +++ b/checks/winperf_if @@ -130,7 +130,9 @@ def convert_winperf_if(info): nic_name, "loopback" in nic_name.lower() and '24' or '6', nic[10], # Aktuelle Bandbreite - nic.get('NetConnectionStatus', '7') == '2' and '1' or '2', + # NetConnectionStatus: 2 st up, 7 ist 'not connected'. If the plugin + # wmic_if is missing and we have link information we need to assume 'up': + nic.get('NetConnectionStatus', '2') == '2' and '1' or '2', nic[-246], # ifInOctets, nic[14], # inucast 0, # inmcast

11 years, 2 months

Check_MK Git: check_mk: ESX: added simple CPU check for VMs

by Mathias Kettner

Module: check_mk Branch: master Commit: 23088515886a1b0706a10c38440cbdda2b0dd5be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23088515886a1b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 25 16:46:25 2013 +0200 ESX: added simple CPU check for VMs Not yet finished. --- agents/special/agent_vsphere | 9 +++++---- checks/esx_vsphere_vm | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index a211692..47c4972 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -639,17 +639,18 @@ if "virtualmachine" in mortypes: output_mors("virtualmachine", { "name": str, "guestHeartbeatStatus": str, - "summary.quickStats.overallCpuUsage": str, - "summary.quickStats.overallCpuDemand": str, "summary.quickStats.uptimeSeconds": str, + # CPU Statistics "summary.quickStats.overallCpuUsage": str, "summary.quickStats.overallCpuDemand": str, + "summary.quickStats.staticCpuEntitlement": str, + "summary.quickStats.distributedCpuEntitlement": str, + + # Memory "summary.quickStats.guestMemoryUsage": str, "summary.quickStats.hostMemoryUsage": str, - "summary.quickStats.distributedCpuEntitlement": str, "summary.quickStats.distributedMemoryEntitlement": str, - "summary.quickStats.staticCpuEntitlement": str, "summary.quickStats.staticMemoryEntitlement": str, "summary.quickStats.privateMemory": str, "summary.quickStats.sharedMemory": str, diff --git a/checks/esx_vsphere_vm b/checks/esx_vsphere_vm index 6921c47..8c9df6f 100644 --- a/checks/esx_vsphere_vm +++ b/checks/esx_vsphere_vm @@ -156,3 +156,39 @@ check_info['esx_vsphere_vm.heartbeat'] = { "service_description" : "ESX Heartbeat", } +#. +# .--CPU-----------------------------------------------------------------. +# | ____ ____ _ _ | +# | / ___| _ \| | | | | +# | | | | |_) | | | | | +# | | |___| __/| |_| | | +# | \____|_| \___/ | +# | | +# +----------------------------------------------------------------------+ +# | | +# '----------------------------------------------------------------------' + +# <<<esx_vsphere_vm>>> +# config.hardware.numCPU 8 +# config.hardware.numCoresPerSocket 2 +# summary.quickStats.overallCpuUsage 8 + +def inventory_esx_vsphere_vm_cpu(info): + data = esx_vsphere_vm_convert(info) + if 'summary.quickStats.overallCpuUsage' in data: + return [(None, None)] + +def check_esx_vsphere_vm_cpu(_no_item, _no_params, info): + data = esx_vsphere_vm_convert(info) + usage_mhz = int(data['summary.quickStats.overallCpuUsage'][0]) + cpus = int(data['config.hardware.numCPU'][0]) + return 0, "demand is %.3f Ghz, %d virtual CPUs" % (usage_mhz / 1000.0, cpus), [ ("demand", usage_mhz) ] + + + +check_info['esx_vsphere_vm.cpu'] = { + "inventory_function" : inventory_esx_vsphere_vm_cpu, + "check_function" : check_esx_vsphere_vm_cpu, + "service_description" : "ESX CPU", + "has_perfdata" : True, +}

11 years, 2 months

Check_MK Git: check_mk: Fix typo in output of Check_MK

by Mathias Kettner

Module: check_mk Branch: master Commit: 9d71231141e52b6e913cb4386b0bf1b262bd2f5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d71231141e52b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 25 15:17:42 2013 +0200 Fix typo in output of Check_MK --- modules/check_mk_base.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index d78200d..4bcb900 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -568,7 +568,7 @@ def write_cache_file(relpath, output): # Get information about a real host (not a cluster node) via TCP -# or by executing an external programm. ipaddress may be None. +# or by executing an external program. ipaddress may be None. # In that case it will be looked up if needed. Also caching will # be handled here def get_agent_info(hostname, ipaddress, max_cache_age): @@ -595,10 +595,10 @@ def get_agent_info(hostname, ipaddress, max_cache_age): return output -# Get data in case of external programm +# Get data in case of external program def get_agent_info_program(commandline): if opt_verbose: - sys.stderr.write("Calling external programm %s\n" % commandline) + sys.stderr.write("Calling external program %s\n" % commandline) try: sout = os.popen(commandline + " 2>/dev/null") output = sout.read() @@ -608,9 +608,9 @@ def get_agent_info_program(commandline): if exitstatus: if exitstatus >> 8 == 127: - raise MKAgentError("Programm '%s' not found (exit code 127)" % (commandline,)) + raise MKAgentError("Program '%s' not found (exit code 127)" % (commandline,)) else: - raise MKAgentError("Programm '%s' exited with code %d" % (commandline, exitstatus >> 8)) + raise MKAgentError("Program '%s' exited with code %d" % (commandline, exitstatus >> 8)) return output # Get data in case of TCP

11 years, 2 months

Check_MK Git: check_mk: ESX: add timeout, make counters configurable

by Mathias Kettner

Module: check_mk Branch: master Commit: 628c4b38b389b511ad5df09193c0716b7a92b929 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=628c4b38b389b5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 25 15:17:11 2013 +0200 ESX: add timeout, make counters configurable --- agents/special/agent_vsphere | 64 ++++++++++++++++++++++++------- checks/agent_vsphere | 7 +++- checks/esx_vsphere_objects | 28 ++++++++++++++ checks/esx_vsphere_vm | 5 +++ web/plugins/wato/check_parameters.py | 10 +++++ web/plugins/wato/datasource_programs.py | 14 ++++++- 6 files changed, 112 insertions(+), 16 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=628c4b38b3…

11 years, 2 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 640808270330d05bff31179ea106ebbae26178ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=640808270330d0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 25 15:17:12 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 2 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 0abe2ea38784b742c2afb21a55fe973762cd12a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0abe2ea38784b7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 25 11:41:31 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 2 months

Check_MK Git: check_mk: vsphere objects: show running state and running on

by Mathias Kettner

Module: check_mk Branch: master Commit: 247c8365c623183d9a085e6b3f33f9cb0a946f85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=247c8365c62318… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 25 11:41:30 2013 +0200 vsphere objects: show running state and running on --- agents/special/agent_vsphere | 60 +++++++++++++++++++----------------------- checks/esx_vsphere_objects | 16 ++++++++++- 2 files changed, 42 insertions(+), 34 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 70b2fcc..f8bc46b 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -176,6 +176,9 @@ except: print "<<<check_mk>>>" print "Version: %s" % host.get_api_version() print "AgentOs: %s " % host.get_server_type() + +# Prepare list of all hosts systems +all_hosts = host.get_hosts() def debug(x): pprint.pprint(inspect.getmembers(x)) @@ -221,27 +224,6 @@ def dump_list(l, indent): print indent + "%d:" % nr dump(v, indent + " ") - -pm = host.get_performance_manager() -# h = host.get_hosts() -# x = pm.get_entity_counters(h.keys()[0]) -# print x -# sys.exit(0) - -# print h -# for name, mor in h.items(): -# debug(mor) -# x = pm.get_entity_counters(mor) -# debug(x) -# p = VIProperty(host, name) -# debug(p.network[0].summary) -# -# # debug(p.network[0].summary.network.value) -# # dump_list(p.network, "") -# # debug(p) - -# sys.exit(0) - # List of counters: # 'cpu.coreUtilization': 20, # 'cpu.costop': 27, @@ -413,7 +395,7 @@ pm = host.get_performance_manager() def output_hostsystem_counters(): pm = host.get_performance_manager() - for mor, name in host.get_hosts().items(): + for mor, name in all_hosts.items(): if not opt_direct: print '<<<<%s>>>>' % name print '<<<esx_vsphere_counters:sep(124)>>>' @@ -500,9 +482,6 @@ def output_mors(what, properties, direct=False): # Convert property value using specified conversion function data[p.Name] = properties[p.Name](p.Val) - # Remember the total list of output objects. We will put this into - # a special section - object_collection.append((what, data["name"])) name = data["name"].split()[0] # get rid of comment # Output multiplexed Check_MK Agent output (new in version 1.2.3i1) @@ -515,12 +494,23 @@ def output_mors(what, properties, direct=False): print '<<<esx_vsphere_%s>>>' % (what.replace('virtualmachine', 'vm')) items = data.items() items.sort() + running_on = '' + power_state = '' for name, value in items: if type(value) == tuple: sections.append(value) else: + if name == 'runtime.host': + running_on = value + elif name == 'runtime.powerState': + power_state = value print '%s %s' % (name, value) + # Remember the total list of output objects. We will put this into + # a special section + object_collection.append([what, data["name"], running_on, power_state]) + + # pprint.pprint(sections) for section_name, section_lines in sections: print '<<<%s>>>' % section_name @@ -573,6 +563,9 @@ def conv_numeric_sensor_info(value): # return pprint.pformat(inspect.getmembers(value)) +def conv_host(value): + return all_hosts.get(value) + if "datastore" in mortypes: output_datastores() @@ -611,11 +604,11 @@ if "hostsystem" in mortypes: # we get is summary.runtime.powerState if "virtualmachine" in mortypes: output_mors("virtualmachine", { - "name": str, - "guestHeartbeatStatus": str, - "summary.quickStats.overallCpuUsage": str, - "summary.quickStats.overallCpuDemand": str, - "summary.quickStats.uptimeSeconds": str, + "name": str, + "guestHeartbeatStatus": str, + "summary.quickStats.overallCpuUsage": str, + "summary.quickStats.overallCpuDemand": str, + "summary.quickStats.uptimeSeconds": str, "summary.quickStats.overallCpuUsage": str, "summary.quickStats.overallCpuDemand": str, @@ -640,13 +633,14 @@ if "virtualmachine" in mortypes: #"config.hardware.guestId": str, #"config.hardware.uuid": str, - "summary.runtime.powerState": str, + "runtime.powerState": str, + "runtime.host" : conv_host, }) print "<<<<>>>>" print "<<<esx_vsphere_objects:sep(9)>>>" -for what, name in object_collection: - print "%s\t%s" % (what, name) +for entry in object_collection: + print "\t".join(entry) host.disconnect() diff --git a/checks/esx_vsphere_objects b/checks/esx_vsphere_objects index 61d8db5..311c70a 100644 --- a/checks/esx_vsphere_objects +++ b/checks/esx_vsphere_objects @@ -50,10 +50,24 @@ 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: - return 0, "information about this object present" + running_on = line[2] + power_state = line[3] + if power_state == "poweredOn": + state = 0 + elif power_state == "poweredOff": + state = 1 + elif power_state == "suspended": + state = 1 + else: + state = 3 + infotext = "power state: %s" % power_state + if running_on: + infotext += ', running on [%s]' % running_on + return state, infotext what = item.split()[0] name = item.split()[1] + if what == "VM": return 3, "Virtual machine %s is missing" % name else:

11 years, 2 months

Check_MK Git: check_mk: esx_vsphere_datastores: add missing space in check output

by Mathias Kettner

Module: check_mk Branch: master Commit: 37e80cb5aff2793e930a3e7eda859c8c41664f1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37e80cb5aff279… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 25 10:41:04 2013 +0200 esx_vsphere_datastores: add missing space in check output --- checks/esx_vsphere_datastores | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/esx_vsphere_datastores b/checks/esx_vsphere_datastores index fafba17..831e428 100644 --- a/checks/esx_vsphere_datastores +++ b/checks/esx_vsphere_datastores @@ -88,7 +88,7 @@ def check_esx_vsphere_datastores(item, params, info): if not store["accessible"]: state = 2 - infotext += "unaccessible(!!), " + infotext + infotext += " unaccessible(!!), " + infotext return state, infotext, perfdata

11 years, 2 months

Check_MK Git: check_mk: esx_vsphere_hostsystem.multipath:

by Mathias Kettner

ignore local disks Message-ID: <5178ea56.SozLw09pUN+MRYxG%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: e03d49c2b30cd530c74661cbf57e4eeba7993047 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e03d49c2b30cd5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 25 10:33:22 2013 +0200 esx_vsphere_hostsystem.multipath: ignore local disks --- checks/esx_vsphere_hostsystem | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index 3f10e9c..27ef457 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -218,9 +218,10 @@ def esx_vsphere_multipath_convert(info): for path, state in data: path_type, path_id = path.split('-')[-1].split('.') if path_type in ['naa', 'eui']: - paths.setdefault(path_id, []) - path_type = "%s/%s" % (path_type, path.split('.')[0]) - paths[path_id].append((state, path_type)) + hw_type = path.split('.')[0] + if hw_type != 'unknown': + paths.setdefault(path_id, []) + paths[path_id].append((state, "%s/%s" % (path_type, hw_type))) return paths def inventory_esx_vsphere_hostsystem_multipath(info): @@ -265,7 +266,12 @@ def check_esx_vsphere_hostsystem_multipath(item, params, info): unknown += 1 message = "Type %s, %d active, %d dead%s, %d disabled%s, %d standby%s, %s unknown%s" % \ - (path_type, active, dead, dead_label, disabled, disabled_label, standby, standby_label, unknown, unknow_label ) + (path_type, active, dead, dead_label, disabled, disabled_label, + standby, standby_label, unknown, unknow_label ) + break + else: + return 3, "Path not found in agent output" + return (state, message) check_info['esx_vsphere_hostsystem.multipath'] = {

11 years, 2 months

Check_MK Git: check_mk: mkeventd: fix exception on empty hostname

by Mathias Kettner

Module: check_mk Branch: master Commit: 4c9264c84f172b0fb41f0ee7dd6f6e92be317de9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c9264c84f172b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 25 10:19:00 2013 +0200 mkeventd: fix exception on empty hostname --- mkeventd/bin/mkeventd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 3e703d7..563a6f6 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1492,7 +1492,7 @@ class EventServer: backedhost = backedhost.lower() # 2. Drop domain part (not applied to IP addresses!) - if translation.get("drop_domain") and not backedhost[0].isdigit(): + if translation.get("drop_domain") and backedhost and not backedhost[0].isdigit(): backedhost = backedhost.split(".", 1)[0] # 3. Regular expression conversion

11 years, 2 months

← Newer
1
2
3
4
5
6
7
8
...
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