From e715d6a7a1ca504d9b34ff2906520a2bc97d41d8 Mon Sep 17 00:00:00 2001
From: G Johansson <goran.johansson@shiftit.se>
Date: Fri, 12 Jan 2024 08:44:38 +0100
Subject: [PATCH] Fix duplicated resource issue in System Monitor (#107671)

* Fix duplicated resource issue

* Only slug the argument
---
 homeassistant/components/systemmonitor/sensor.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/systemmonitor/sensor.py b/homeassistant/components/systemmonitor/sensor.py
index 28929d07a7c..da6e35238ec 100644
--- a/homeassistant/components/systemmonitor/sensor.py
+++ b/homeassistant/components/systemmonitor/sensor.py
@@ -405,7 +405,7 @@ async def async_setup_entry(
                 is_enabled = check_legacy_resource(
                     f"{_type}_{argument}", legacy_resources
                 )
-                loaded_resources.add(f"{_type}_{argument}")
+                loaded_resources.add(f"{_type}_{slugify(argument)}")
                 entities.append(
                     SystemMonitorSensor(
                         sensor_registry,
@@ -425,7 +425,7 @@ async def async_setup_entry(
                 is_enabled = check_legacy_resource(
                     f"{_type}_{argument}", legacy_resources
                 )
-                loaded_resources.add(f"{_type}_{argument}")
+                loaded_resources.add(f"{_type}_{slugify(argument)}")
                 entities.append(
                     SystemMonitorSensor(
                         sensor_registry,
@@ -449,7 +449,7 @@ async def async_setup_entry(
                 sensor_registry[(_type, argument)] = SensorData(
                     argument, None, None, None, None
                 )
-                loaded_resources.add(f"{_type}_{argument}")
+                loaded_resources.add(f"{_type}_{slugify(argument)}")
                 entities.append(
                     SystemMonitorSensor(
                         sensor_registry,
@@ -478,10 +478,13 @@ async def async_setup_entry(
     # of mount points automatically discovered
     for resource in legacy_resources:
         if resource.startswith("disk_"):
+            check_resource = slugify(resource)
             _LOGGER.debug(
-                "Check resource %s already loaded in %s", resource, loaded_resources
+                "Check resource %s already loaded in %s",
+                check_resource,
+                loaded_resources,
             )
-            if resource not in loaded_resources:
+            if check_resource not in loaded_resources:
                 split_index = resource.rfind("_")
                 _type = resource[:split_index]
                 argument = resource[split_index + 1 :]