Merge pull request Netflix#1155 from olivernaaris/develop

mikegrima · web-flow · commit 06980618701e · 2018-12-03T10:18:08.000-08:00
Update ec2_instance.py
diff --git a/security_monkey/watchers/ec2/ec2_instance.py b/security_monkey/watchers/ec2/ec2_instance.py
@@ -95,6 +95,8 @@ def slurp_items(**kwargs):
                             'vpc_id': instance.get('VpcId'),
                             'private_ip_address': instance.get('PrivateIpAddress'),
                             'public_ip_address': instance.get('PublicIpAddress'),
+                            'security_groups': instance.get('SecurityGroups'),
+                            'tags': instance.get('Tags'),
                         }
 
                         unique_name = name + '(' + instance_id + ')'

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,8 @@ def slurp_items(**kwargs):`
`95`	`95`	`'vpc_id': instance.get('VpcId'),`
`96`	`96`	`'private_ip_address': instance.get('PrivateIpAddress'),`
`97`	`97`	`'public_ip_address': instance.get('PublicIpAddress'),`
	`98`	`+ 'security_groups': instance.get('SecurityGroups'),`
	`99`	`+ 'tags': instance.get('Tags'),`
`98`	`100`	`}`
`99`	`101`
`100`	`102`	`unique_name = name + '(' + instance_id + ')'`