shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

Bug #5080: ec2 1440 data points problem resolved (#278)

Browse Source
This commit is contained in:
Sergio Semedi Barranco 2017-04-25 12:51:48 +02:00 committed by Tino Vázquez
parent 5a268171aa
commit 68f4b39e84
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/vmm_mad/remotes/ec2/ec2_driver.rb
View File

@ -49,7 +49,7 @@ require 'opennebula'
def handle_exception(action, ex, host, did, id = nil, file = nil)
file ||= ""
id ||= ""
id ||= ""
STDERR.puts action + " of VM #{id} #{did} on host #{host} #{file} "+
"due to \"#{ex.message}\""
STDERR.puts "********* STACK TRACE *********"
@ -57,7 +57,6 @@ def handle_exception(action, ex, host, did, id = nil, file = nil)
STDERR.puts "*******************************"
exit (-1)
end
@ -829,14 +828,20 @@ private
# Get metric from AWS/EC2 namespace from the last poll
def get_cloudwatch_metric(cw, metric_name, last_poll, statistics, units, id)
options={:namespace=>"AWS/EC2",
:metric_name=>metric_name,
:start_time=> (Time.at(last_poll.to_i)-65).iso8601,
:end_time=> (Time.now-60).iso8601,
:period=>60,
:statistics=>statistics,
:unit=>units,
:dimensions=>[{:name=>"InstanceId", :value=>id}]}
dt = 60 # period
t0 = (Time.at(last_poll.to_i)-65) # last poll time
t = (Time.now-60) # actual time
while ((t - t0)/dt >= 1440) do dt+=60 end
options={:namespace=>"AWS/EC2",
:metric_name=>metric_name,
:start_time=> t0.iso8601,
:end_time=> t.iso8601,
:period=>dt,
:statistics=>statistics,
:unit=>units,
:dimensions=>[{:name=>"InstanceId", :value=>id}]}
cw.get_metric_statistics(options)
end