Fix bug where alarm is only created for last disk in multi-disk systems

Add disk name to alarm name to stop new alarms overwriting old ones.