From 5a20d9fce397d16f58770df090ab167140861d78 Mon Sep 17 00:00:00 2001
From: jjlawren <jjlawren@users.noreply.github.com>
Date: Sun, 24 Oct 2021 17:52:15 -0500
Subject: [PATCH] Set Sonos alarm and battery entity categories (#58340)

---
 homeassistant/components/sonos/binary_sensor.py | 3 +++
 homeassistant/components/sonos/sensor.py        | 8 +++++++-
 homeassistant/components/sonos/switch.py        | 4 +++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/sonos/binary_sensor.py b/homeassistant/components/sonos/binary_sensor.py
index 9e35fc59616..488f29a7be8 100644
--- a/homeassistant/components/sonos/binary_sensor.py
+++ b/homeassistant/components/sonos/binary_sensor.py
@@ -7,6 +7,7 @@ from homeassistant.components.binary_sensor import (
     DEVICE_CLASS_BATTERY_CHARGING,
     BinarySensorEntity,
 )
+from homeassistant.const import ENTITY_CATEGORY_DIAGNOSTIC
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 from .const import SONOS_CREATE_BATTERY
@@ -31,6 +32,8 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
 class SonosPowerEntity(SonosEntity, BinarySensorEntity):
     """Representation of a Sonos power entity."""
 
+    _attr_entity_category = ENTITY_CATEGORY_DIAGNOSTIC
+
     @property
     def unique_id(self) -> str:
         """Return the unique ID of the sensor."""
diff --git a/homeassistant/components/sonos/sensor.py b/homeassistant/components/sonos/sensor.py
index f8e5142c123..599e5434fb4 100644
--- a/homeassistant/components/sonos/sensor.py
+++ b/homeassistant/components/sonos/sensor.py
@@ -2,7 +2,11 @@
 from __future__ import annotations
 
 from homeassistant.components.sensor import SensorEntity
-from homeassistant.const import DEVICE_CLASS_BATTERY, PERCENTAGE
+from homeassistant.const import (
+    DEVICE_CLASS_BATTERY,
+    ENTITY_CATEGORY_DIAGNOSTIC,
+    PERCENTAGE,
+)
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 from .const import SONOS_CREATE_BATTERY
@@ -25,6 +29,8 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
 class SonosBatteryEntity(SonosEntity, SensorEntity):
     """Representation of a Sonos Battery entity."""
 
+    _attr_entity_category = ENTITY_CATEGORY_DIAGNOSTIC
+
     @property
     def unique_id(self) -> str:
         """Return the unique ID of the sensor."""
diff --git a/homeassistant/components/sonos/switch.py b/homeassistant/components/sonos/switch.py
index 3e9d5484784..9af6c1eebec 100644
--- a/homeassistant/components/sonos/switch.py
+++ b/homeassistant/components/sonos/switch.py
@@ -178,6 +178,8 @@ class SonosSwitchEntity(SonosEntity, SwitchEntity):
 class SonosAlarmEntity(SonosEntity, SwitchEntity):
     """Representation of a Sonos Alarm entity."""
 
+    _attr_entity_category = ENTITY_CATEGORY_CONFIG
+
     def __init__(self, alarm_id: str, speaker: SonosSpeaker) -> None:
         """Initialize the switch."""
         super().__init__(speaker)
@@ -215,7 +217,7 @@ class SonosAlarmEntity(SonosEntity, SwitchEntity):
     @property
     def name(self) -> str:
         """Return the name of the sensor."""
-        return "Sonos Alarm {} {} {}".format(
+        return "{} {} Alarm {}".format(
             self.speaker.zone_name,
             self.alarm.recurrence.title(),
             str(self.alarm.start_time)[0:5],