From ebc2a0103ed83ba3cbdf0219e011cf3ac8cc0ccf Mon Sep 17 00:00:00 2001
From: Raman Gupta <7243222+raman325@users.noreply.github.com>
Date: Sun, 29 Aug 2021 23:25:47 -0400
Subject: [PATCH] Make zwave_js discovery log message more descriptive (#55432)

---
 homeassistant/components/zwave_js/__init__.py  |  2 +-
 homeassistant/components/zwave_js/discovery.py | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/zwave_js/__init__.py b/homeassistant/components/zwave_js/__init__.py
index c8f2bd19776..f38594c1594 100644
--- a/homeassistant/components/zwave_js/__init__.py
+++ b/homeassistant/components/zwave_js/__init__.py
@@ -145,7 +145,7 @@ async def async_setup_entry(  # noqa: C901
         value_updates_disc_info: dict[str, ZwaveDiscoveryInfo] = {}
 
         # run discovery on all node values and create/update entities
-        for disc_info in async_discover_values(node):
+        for disc_info in async_discover_values(node, device):
             platform = disc_info.platform
 
             # This migration logic was added in 2021.3 to handle a breaking change to
diff --git a/homeassistant/components/zwave_js/discovery.py b/homeassistant/components/zwave_js/discovery.py
index 7a4955d693a..7232279f4c6 100644
--- a/homeassistant/components/zwave_js/discovery.py
+++ b/homeassistant/components/zwave_js/discovery.py
@@ -13,6 +13,7 @@ from zwave_js_server.model.node import Node as ZwaveNode
 from zwave_js_server.model.value import Value as ZwaveValue
 
 from homeassistant.core import callback
+from homeassistant.helpers.device_registry import DeviceEntry
 
 from .const import LOGGER
 from .discovery_data_template import (
@@ -667,7 +668,9 @@ DISCOVERY_SCHEMAS = [
 
 
 @callback
-def async_discover_values(node: ZwaveNode) -> Generator[ZwaveDiscoveryInfo, None, None]:
+def async_discover_values(
+    node: ZwaveNode, device: DeviceEntry
+) -> Generator[ZwaveDiscoveryInfo, None, None]:
     """Run discovery on ZWave node and return matching (primary) values."""
     for value in node.values.values():
         for schema in DISCOVERY_SCHEMAS:
@@ -758,7 +761,11 @@ def async_discover_values(node: ZwaveNode) -> Generator[ZwaveDiscoveryInfo, None
                     resolved_data = schema.data_template.resolve_data(value)
                 except UnknownValueData as err:
                     LOGGER.error(
-                        "Discovery for value %s will be skipped: %s", value, err
+                        "Discovery for value %s on device '%s' (%s) will be skipped: %s",
+                        value,
+                        device.name_by_user or device.name,
+                        node,
+                        err,
                     )
                     continue
                 additional_value_ids_to_watch = schema.data_template.value_ids_to_watch(