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

feature #2435: Add extra monitoring information for EC2 VMs

Browse Source 
New tags:
		AWS_DNS_NAME
		AWS_PRIVATE_DNS_NAME
		AWS_KEY_NAME
		AWS_AVAILABILITY_ZONE
		AWS_PLATFORM
		AWS_VPC_ID
		AWS_PRIVATE_IP_ADDRESS
		AWS_IP_ADDRESS
		AWS_SUBNET_ID
		AWS_SECURITY_GROUPS
		AWS_INSTANCE_TYPE
This commit is contained in:
Daniel Molina 2013-11-15 17:15:59 +01:00 committed by Javi Fontan
parent b32af2dc05
commit 8f4a2ee27c
1 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,9 @@ class EC2Driver
POLL_ATTRIBUTE = VirtualMachineDriver::POLL_ATTRIBUTE
VM_STATE = VirtualMachineDriver::VM_STATE
# Key that will be used to store the monitoring information in the template
EC2_MONITOR_KEY = "EC2DRIVER_MONITOR"
# EC2 commands constants
EC2 = {
:run => {
@ -159,6 +162,21 @@ class EC2Driver
}
}
# EC2 attributes that will be retrieved in a polling action
EC2_POLL_ATTRS = [
:dns_name,
:private_dns_name,
:key_name,
:availability_zone,
:platform,
:vpc_id,
:private_ip_address,
:ip_address,
:subnet_id,
:security_groups,
:instance_type
]
# EC2 constructor, loads credentials and endpoint
def initialize(host)
@host = host
@ -356,21 +374,36 @@ private
info = "#{POLL_ATTRIBUTE[:usedmemory]}=0 " \
"#{POLL_ATTRIBUTE[:usedcpu]}=0 " \
"#{POLL_ATTRIBUTE[:nettx]}=0 " \
"#{POLL_ATTRIBUTE[:netrx]}=0"
"#{POLL_ATTRIBUTE[:netrx]}=0 "
state = ""
if !instance.exists?
info << " #{POLL_ATTRIBUTE[:state]}=#{VM_STATE[:deleted]}"
state = VM_STATE[:deleted]
else
case instance.status
when :pending
info << " #{POLL_ATTRIBUTE[:state]}=#{VM_STATE[:active]}"
when :running
info<<" #{POLL_ATTRIBUTE[:state]}=#{VM_STATE[:active]}"<<
" IP=#{instance.ip_address}"
when :'shutting-down', :terminated
info << " #{POLL_ATTRIBUTE[:state]}=#{VM_STATE[:deleted]}"
state = case instance.status
when :pending
VM_STATE[:active]
when :running
VM_STATE[:active]
when :'shutting-down', :terminated
VM_STATE[:deleted]
else
VM_STATE[:deleted]
end
end
info << "#{POLL_ATTRIBUTE[:state]}=#{state} "
EC2_POLL_ATTRS.map { |key|
value = instance.send(key)
if !value.nil? && !value.empty?
if value.is_a?(Array)
value = value.map {|v|
v.security_group_id if v.is_a?(AWS::EC2::SecurityGroup)
}.join(",")
end
info << "AWS_#{key.to_s.upcase}=#{value} "
end
}
info
end