[checkmk-commits] Check_MK Git: check_mk: Renamed esx_vsphere_virtualmachine ->

esx_vsphere_vm Message-ID: &lt;516d4f59.NVWuiy78KylLfsCi%mk(a)mathias-kettner.de&gt; 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: 250a725cc67b0ed7688786afe7fcabe06405d980 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=250a725cc67b0e… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Tue Apr 16 15:17:11 2013 +0200 Renamed esx_vsphere_virtualmachine -> esx_vsphere_vm Check names got too long. Sorry for the mess, but we better cleanup things in the early phase than later... --- agents/special/agent_vsphere | 2 +- checks/.f12 | 2 +- .../{esx_vsphere_virtualmachine => esx_vsphere_vm} | 44 ++++++++++---------- web/plugins/perfometer/check_mk.py | 2 +- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 7907a8c..49998dc 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -296,7 +296,7 @@ def output_mors(what, properties, direct=False): else: print '<<<<%s>>>>' % name - print '<<<esx_vsphere_%s>>>' % what + print '<<<esx_vsphere_%s>>>' % (what.replace('virtualmachine', 'vm')) items = data.items() items.sort() for name, value in items: diff --git a/checks/.f12 b/checks/.f12 index 959cb4c..c4e5e87 100644 --- a/checks/.f12 +++ b/checks/.f12 @@ -1,3 +1,3 @@ SITE=${SITE:-$(omd sites --bare | head -n 1)} -sudo install -m 644 * /omd/sites/$SITE/share/check_mk/checks +sudo rsync -ar --delete-after ./ /omd/sites/$SITE/share/check_mk/checks/ diff --git a/checks/esx_vsphere_virtualmachine b/checks/esx_vsphere_vm similarity index 82% rename from checks/esx_vsphere_virtualmachine rename to checks/esx_vsphere_vm index 3b3bf95..998db95 100644 --- a/checks/esx_vsphere_virtualmachine +++ b/checks/esx_vsphere_vm @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -def esx_vsphere_virtualmachine_convert(info): +def esx_vsphere_vm_convert(info): data = {} for line in info: data[line[0]] = line[1:] @@ -40,13 +40,13 @@ def esx_vsphere_virtualmachine_convert(info): # '----------------------------------------------------------------------' -def inventory_esx_vsphere_virtualmachine_mem(info): - data = esx_vsphere_virtualmachine_convert(info).keys() +def inventory_esx_vsphere_vm_mem(info): + data = esx_vsphere_vm_convert(info).keys() if 'summary.quickStats.guestMemoryUsage' in data: return [(None, {})] -def check_esx_vsphere_virtualmachine_mem(item, params, info): - data = esx_vsphere_virtualmachine_convert(info) +def check_esx_vsphere_vm_mem(item, params, info): + data = esx_vsphere_vm_convert(info) #consumed host memory host_memory_usage = savefloat(data["summary.quickStats.hostMemoryUsage"][0]) * 1024 * 1024 @@ -75,9 +75,9 @@ def check_esx_vsphere_virtualmachine_mem(item, params, info): return(0, message, perf) -check_info['esx_vsphere_virtualmachine.mem_usage'] = { - "inventory_function" : inventory_esx_vsphere_virtualmachine_mem, - "check_function" : check_esx_vsphere_virtualmachine_mem, +check_info['esx_vsphere_vm.mem_usage'] = { + "inventory_function" : inventory_esx_vsphere_vm_mem, + "check_function" : check_esx_vsphere_vm_mem, "service_description" : "ESX Memory", "has_perfdata" : True } @@ -92,19 +92,19 @@ check_info['esx_vsphere_virtualmachine.mem_usage'] = { # | | # '----------------------------------------------------------------------' -def inventory_esx_vsphere_virtualmachine_name(info): - data = esx_vsphere_virtualmachine_convert(info).keys() +def inventory_esx_vsphere_vm_name(info): + data = esx_vsphere_vm_convert(info).keys() if 'name' in data: return [(None, None)] -def check_esx_vsphere_virtualmachine_name(item, params, info): - data = esx_vsphere_virtualmachine_convert(info) +def check_esx_vsphere_vm_name(item, params, info): + data = esx_vsphere_vm_convert(info) return(0, " ".join(data['name'])) -check_info['esx_vsphere_virtualmachine.name'] = { - "inventory_function" : inventory_esx_vsphere_virtualmachine_name, - "check_function" : check_esx_vsphere_virtualmachine_name, +check_info['esx_vsphere_vm.name'] = { + "inventory_function" : inventory_esx_vsphere_vm_name, + "check_function" : check_esx_vsphere_vm_name, "service_description" : "ESX Name", } @@ -124,14 +124,14 @@ check_info['esx_vsphere_virtualmachine.name'] = { # yellow - Intermittent heartbeat. May be due to guest load. # green - Guest operating system is responding normally. # -def inventory_esx_vsphere_virtualmachine_hb_status(info): - data = esx_vsphere_virtualmachine_convert(info) +def inventory_esx_vsphere_vm_hb_status(info): + data = esx_vsphere_vm_convert(info) status = data.get('guestHeartbeatStatus') if status and status[0] != "gray": return [(None, None)] -def check_esx_vsphere_virtualmachine_hb_status(item, params, info): - data = esx_vsphere_virtualmachine_convert(info) +def check_esx_vsphere_vm_hb_status(item, params, info): + data = esx_vsphere_vm_convert(info) vm_status = data['guestHeartbeatStatus'][0] state = 3 @@ -146,9 +146,9 @@ def check_esx_vsphere_virtualmachine_hb_status(item, params, info): return(state, "Heartbeat status is %s" % vm_status) -check_info['esx_vsphere_virtualmachine.heartbeat'] = { - "inventory_function" : inventory_esx_vsphere_virtualmachine_hb_status, - "check_function" : check_esx_vsphere_virtualmachine_hb_status, +check_info['esx_vsphere_vm.heartbeat'] = { + "inventory_function" : inventory_esx_vsphere_vm_hb_status, + "check_function" : check_esx_vsphere_vm_hb_status, "service_description" : "ESX Heartbeat", } diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 4d203d9..64da541 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -654,7 +654,7 @@ def perfometer_vmguest_mem_usage(row, command, perf): used = float(perf[0][1]) return number_human_readable(used), perfometer_logarithmic(used, 1024*1024*2000, 2, "#20cf80") -perfometers['check_mk-esx_vsphere_virtualmachine.mem_usage'] = perfometer_vmguest_mem_usage +perfometers['check_mk-esx_vsphere_vm.mem_usage'] = perfometer_vmguest_mem_usage def perfometer_esx_vsphere_hostsystem_cpu(row, command, perf): used_perc = float(perf[0][1])