Merge pull request #1610 from eucalyptus/GUI-2126

GUI-2126: Remove errant scaling group dimension when adding a scaling policy to allow ELB alarms to work

eucaconsole/views/scalinggroups.py

@@ -658,7 +658,8 @@ def scalinggroup_policy_create(self):
                 # Attach policy to alarm
                 alarm_name = self.request.params.get('alarm')
                 alarm = self.cloudwatch_conn.describe_alarms(alarm_names=[alarm_name])[0]
-                alarm.dimensions.update({"AutoScalingGroupName": self.scaling_group.name})
+                if 'EC2' in alarm.namespace:
+                    alarm.dimensions.update({"AutoScalingGroupName": self.scaling_group.name})
                 alarm.comparison = alarm._cmp_map.get(alarm.comparison)  # See https://github.com/boto/boto/issues/1311
                 # TODO: Detect if an alarm has 5 scaling policies attached to it and abort accordingly
                 if created_scaling_policy.policy_arn not in alarm.alarm_actions: