More progress on metric choices for Create Alarm dialog.  GUI-215