From 3fe28c5dd2bce7497176323d3fdf14c4688e2ef8 Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Wed, 6 Jul 2011 13:14:14 +0200 Subject: [PATCH] feature #696: enable host monitoring and fix minor bugs in watch_helper --- src/acct/acctd.rb | 2 +- src/acct/watch_helper.rb | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/acct/acctd.rb b/src/acct/acctd.rb index 0b83239a83..265d2925ae 100755 --- a/src/acct/acctd.rb +++ b/src/acct/acctd.rb @@ -106,7 +106,7 @@ if CONF[:MONITORING_STEPS] > 0 host_pool ||= OpenNebula::HostPool.new(one_client) watcher.add(vm_monitoring, CONF[:MONITORING_STEPS], vm_pool) - #watcher.add(host_monitoring, CONF[:MONITORING_STEPS], host_pool) + watcher.add(host_monitoring, CONF[:MONITORING_STEPS], host_pool) end step = 0 diff --git a/src/acct/watch_helper.rb b/src/acct/watch_helper.rb index e355f9df35..a04e7301fc 100644 --- a/src/acct/watch_helper.rb +++ b/src/acct/watch_helper.rb @@ -121,6 +121,7 @@ module WatchHelper foreign_key :host_id, :hosts Integer :last_poll Integer :timestamp + Integer :state HOST_SAMPLE.each { |key,value| column key, value[:type] @@ -286,9 +287,9 @@ module WatchHelper set_schema do Integer :id, :primary_key=>true String :name - Integer :im_mad - Integer :vm_mad - Integer :tm_mad + String :im_mad + String :vm_mad + String :tm_mad end create_table unless table_exists? @@ -303,7 +304,7 @@ module WatchHelper h.name = host['NAME'] h.im_mad = host['IM_MAD'] h.vm_mad = host['VM_MAD'] - h.tm_nad = host['TM_MAD'] + h.tm_mad = host['TM_MAD'] } end