From 6c01dd8dcffd9415e220b7b21ef6f39ba9b382c8 Mon Sep 17 00:00:00 2001
From: WanqQixiang <wangqixiang@espressif.com>
Date: Sun, 4 Jan 2026 09:13:56 +0800
Subject: [PATCH] esp_matter: Add WiFiNetworkDiagnotics and
 ThreadNetworkDiagnostics cluster by default

---
 components/esp_matter/data_model/esp_matter_endpoint.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/components/esp_matter/data_model/esp_matter_endpoint.cpp b/components/esp_matter/data_model/esp_matter_endpoint.cpp
index ac1d76f81..b86846915 100644
--- a/components/esp_matter/data_model/esp_matter_endpoint.cpp
+++ b/components/esp_matter/data_model/esp_matter_endpoint.cpp
@@ -89,6 +89,12 @@ esp_err_t add(endpoint_t *endpoint, config_t *config)
 #endif // CHIP_CONFIG_ENABLE_ICD_LIT
     }
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
+#if defined(CONFIG_SUPPORT_WIFI_NETWORK_DIAGNOSTICS_CLUSTER)
+    wifi_network_diagnostics::create(endpoint, nullptr, CLUSTER_FLAG_SERVER);
+#endif
+#if defined(CONFIG_SUPPORT_THREAD_NETWORK_DIAGNOSTICS_CLUSTER)
+    thread_network_diagnostics::create(endpoint, nullptr, CLUSTER_FLAG_SERVER);
+#endif
     return ESP_OK;
 }
 } /* root_node */