diff --git a/src/Monitor/DiagnosticSetting.Autorest/Properties/AssemblyInfo.cs b/src/Monitor/DiagnosticSetting.Autorest/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000000..2a232c23ffd2
--- /dev/null
+++ b/src/Monitor/DiagnosticSetting.Autorest/Properties/AssemblyInfo.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the ""License"");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an ""AS IS"" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// Code generated by Microsoft (R) AutoRest Code Generator.Changes may cause incorrect behavior and will be lost if the code
+// is regenerated.
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: System.Reflection.AssemblyCompanyAttribute("Microsoft")]
+[assembly: System.Reflection.AssemblyCopyrightAttribute("Copyright © Microsoft")]
+[assembly: System.Reflection.AssemblyProductAttribute("Microsoft Azure PowerShell")]
+[assembly: System.Reflection.AssemblyTitleAttribute("Microsoft Azure PowerShell - DiagnosticSetting")]
+[assembly: System.Reflection.AssemblyFileVersionAttribute("6.0.2")]
+[assembly: System.Reflection.AssemblyVersionAttribute("6.0.2")]
+[assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
+[assembly: System.CLSCompliantAttribute(false)]
+
diff --git a/src/Monitor/DiagnosticSetting.Autorest/README.md b/src/Monitor/DiagnosticSetting.Autorest/README.md
index 562e449ab291..c385cda2b9fc 100644
--- a/src/Monitor/DiagnosticSetting.Autorest/README.md
+++ b/src/Monitor/DiagnosticSetting.Autorest/README.md
@@ -53,6 +53,56 @@ use-extension:
   "@autorest/powershell": "3.x"
 
 directive:
+  - where:
+      verb: Get|New
+      subject: DiagnosticSetting
+    set:
+      breaking-change:
+        deprecated-output-properties:
+          - Log
+          - Metric
+        new-output-properties:
+          - Log
+          - Metric
+        change-description: The types of the properties Log and Metric will be changed from single object or fixed array to 'List'.
+        deprecated-by-version: 7.0.0
+        deprecated-by-azversion: 15.0.0
+        change-effective-date: 2025/11/03
+  - where:
+      verb: Get
+      subject: DiagnosticSettingsCategory
+    set:
+      breaking-change:
+        deprecated-output-properties:
+          - CategoryGroup
+        new-output-properties:
+          - CategoryGroup
+        change-description: The type of the property CategoryGroup will be changed from fixed array to 'List'.
+        deprecated-by-version: 7.0.0
+        deprecated-by-azversion: 15.0.0
+        change-effective-date: 2025/11/03
+  - where:
+      verb: Get|New
+      subject: SubscriptionDiagnosticSetting
+    set:
+      breaking-change:
+        deprecated-output-properties:
+          - Log
+        new-output-properties:
+          - Log
+        change-description: The type of the property Log will be changed from single object or fixed array to 'List'.
+        deprecated-by-version: 7.0.0
+        deprecated-by-azversion: 15.0.0
+        change-effective-date: 2025/11/03
+  - where:
+      parameter-name: Log
+    set:
+      breaking-change:
+        old-parameter-type: Array
+        new-parameter-type: List
+        deprecated-by-version: 7.0.0
+        deprecated-by-azversion: 15.0.0
+        change-effective-date: 2025/11/03
   # Following is two common directive which are normally required in all the RPs
   # 1. Remove the unexpanded parameter set
   # 2. For New-* cmdlets, ViaIdentity is not required, so CreateViaIdentityExpanded is removed as well
diff --git a/src/Monitor/DiagnosticSetting.Autorest/docs/Az.DiagnosticSetting.md b/src/Monitor/DiagnosticSetting.Autorest/docs/Az.DiagnosticSetting.md
index 85dd7dd51b93..3c645346c183 100644
--- a/src/Monitor/DiagnosticSetting.Autorest/docs/Az.DiagnosticSetting.md
+++ b/src/Monitor/DiagnosticSetting.Autorest/docs/Az.DiagnosticSetting.md
@@ -1,6 +1,6 @@
 ---
 Module Name: Az.DiagnosticSetting
-Module Guid: 58f9f986-1839-4efb-baf4-5ba95f2726bd
+Module Guid: 6210decd-f3c4-4cdf-87d4-f4bca61bf471
 Download Help Link: https://learn.microsoft.com/powershell/module/az.diagnosticsetting
 Help Version: 1.0.0.0
 Locale: en-US
diff --git a/src/Monitor/DiagnosticSetting.Autorest/generate-info.json b/src/Monitor/DiagnosticSetting.Autorest/generate-info.json
index 511ed3565792..df09006b862a 100644
--- a/src/Monitor/DiagnosticSetting.Autorest/generate-info.json
+++ b/src/Monitor/DiagnosticSetting.Autorest/generate-info.json
@@ -1,3 +1,3 @@
 {
-  "generate_Id": "c5c70d3a-756d-4a6b-aad1-fe0e0747df71"
+  "generate_Id": "a61cca1c-3798-4b51-9d48-f8981ebf9903"
 }
diff --git a/src/Monitor/DiagnosticSetting.Autorest/resources/README.md b/src/Monitor/DiagnosticSetting.Autorest/resources/README.md
new file mode 100644
index 000000000000..937f07f8fec2
--- /dev/null
+++ b/src/Monitor/DiagnosticSetting.Autorest/resources/README.md
@@ -0,0 +1,11 @@
+# Resources
+This directory can contain any additional resources for module that are not required at runtime. This directory **does not** get packaged with the module. If you have assets for custom implementation, place them into the `..\custom` folder.
+
+## Info
+- Modifiable: yes
+- Generated: no
+- Committed: yes
+- Packaged: no
+
+## Purpose
+Use this folder to put anything you want to keep around as part of the repository for the module, but is not something that is required for the module. For example, development files, packaged builds, or additional information. This is only intended to be used in repositories where the module's output directory is cleaned, but tangential resources for the module want to remain intact.
\ No newline at end of file
diff --git a/src/Monitor/Monitor.sln b/src/Monitor/Monitor.sln
index bfd35a2ab807..f81ae47d88fb 100644
--- a/src/Monitor/Monitor.sln
+++ b/src/Monitor/Monitor.sln
@@ -40,8 +40,6 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.ActivityLogAlert", "..\..\generated\Monitor\ActivityLogAlert.Autorest\Az.ActivityLogAlert.csproj", "{A25F7324-8E75-4640-A6B2-B904378FC7F4}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.Autoscale", "..\..\generated\Monitor\Autoscale.Autorest\Az.Autoscale.csproj", "{64D875E7-2E3B-40B2-945C-B8891BC6EF41}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.DiagnosticSetting", "..\..\generated\Monitor\DiagnosticSetting.Autorest\Az.DiagnosticSetting.csproj", "{32336385-5322-43AC-B6D4-B99CDB5EDA5A}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.MonitorWorkspace", "..\..\generated\Monitor\MonitorWorkspace.Autorest\Az.MonitorWorkspace.csproj", "{803B981D-ED22-4DFF-90FA-C278DE8D228B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.PipelineGroup", "..\..\generated\Monitor\PipelineGroup.Autorest\Az.PipelineGroup.csproj", "{BBB1BE4E-4595-4589-AB2B-14BCFF7EB65C}"
@@ -63,7 +61,11 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.Autoscale", "..\..\generated\Monitor\Autoscale.Autorest\Az.Autoscale.csproj", "{A55047D2-EBBB-4C25-BD5E-52FEF9E5C627}"
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ActivityLogAlert.Autorest", "ActivityLogAlert.Autorest", "{F5B68159-9278-7C75-41B6-315547561DBE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.ActivityLogAlert", "..\..\generated\Monitor\ActivityLogAlert.Autorest\Az.ActivityLogAlert.csproj", "{0D41ADE3-ABBA-445B-8990-EA015AD4203D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.ActivityLogAlert", "..\..\generated\Monitor\ActivityLogAlert.Autorest\Az.ActivityLogAlert.csproj", "{81F263BA-D395-42CB-A7E0-AFC20029C4BC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DiagnosticSetting.Autorest", "DiagnosticSetting.Autorest", "{4644B825-05AB-0B45-5567-89C0D700A638}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.DiagnosticSetting", "..\..\generated\Monitor\DiagnosticSetting.Autorest\Az.DiagnosticSetting.csproj", "{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -267,18 +269,6 @@ Global
 		{64D875E7-2E3B-40B2-945C-B8891BC6EF41}.Release|x64.Build.0 = Release|Any CPU
 		{64D875E7-2E3B-40B2-945C-B8891BC6EF41}.Release|x86.ActiveCfg = Release|Any CPU
 		{64D875E7-2E3B-40B2-945C-B8891BC6EF41}.Release|x86.Build.0 = Release|Any CPU
-		{32336385-5322-43AC-B6D4-B99CDB5EDA5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{32336385-5322-43AC-B6D4-B99CDB5EDA5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{32336385-5322-43AC-B6D4-B99CDB5EDA5A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{32336385-5322-43AC-B6D4-B99CDB5EDA5A}.Debug|x64.Build.0 = Debug|Any CPU
-		{32336385-5322-43AC-B6D4-B99CDB5EDA5A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{32336385-5322-43AC-B6D4-B99CDB5EDA5A}.Debug|x86.Build.0 = Debug|Any CPU
-		{32336385-5322-43AC-B6D4-B99CDB5EDA5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{32336385-5322-43AC-B6D4-B99CDB5EDA5A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{32336385-5322-43AC-B6D4-B99CDB5EDA5A}.Release|x64.ActiveCfg = Release|Any CPU
-		{32336385-5322-43AC-B6D4-B99CDB5EDA5A}.Release|x64.Build.0 = Release|Any CPU
-		{32336385-5322-43AC-B6D4-B99CDB5EDA5A}.Release|x86.ActiveCfg = Release|Any CPU
-		{32336385-5322-43AC-B6D4-B99CDB5EDA5A}.Release|x86.Build.0 = Release|Any CPU
 		{803B981D-ED22-4DFF-90FA-C278DE8D228B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{803B981D-ED22-4DFF-90FA-C278DE8D228B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{803B981D-ED22-4DFF-90FA-C278DE8D228B}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -351,6 +341,30 @@ Global
 		{0A51A656-9092-4C82-83B5-524516C8FED7}.Release|x64.Build.0 = Release|Any CPU
 		{0A51A656-9092-4C82-83B5-524516C8FED7}.Release|x86.ActiveCfg = Release|Any CPU
 		{0A51A656-9092-4C82-83B5-524516C8FED7}.Release|x86.Build.0 = Release|Any CPU
+		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Debug|x64.Build.0 = Debug|Any CPU
+		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Debug|x86.Build.0 = Debug|Any CPU
+		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Release|x64.ActiveCfg = Release|Any CPU
+		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Release|x64.Build.0 = Release|Any CPU
+		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Release|x86.ActiveCfg = Release|Any CPU
+		{81F263BA-D395-42CB-A7E0-AFC20029C4BC}.Release|x86.Build.0 = Release|Any CPU
+		{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033}.Debug|x64.Build.0 = Debug|Any CPU
+		{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033}.Debug|x86.Build.0 = Debug|Any CPU
+		{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033}.Release|Any CPU.Build.0 = Release|Any CPU
+		{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033}.Release|x64.ActiveCfg = Release|Any CPU
+		{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033}.Release|x64.Build.0 = Release|Any CPU
+		{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033}.Release|x86.ActiveCfg = Release|Any CPU
+		{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033}.Release|x86.Build.0 = Release|Any CPU
 		{A55047D2-EBBB-4C25-BD5E-52FEF9E5C627}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A55047D2-EBBB-4C25-BD5E-52FEF9E5C627}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A55047D2-EBBB-4C25-BD5E-52FEF9E5C627}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -407,6 +421,8 @@ Global
 		{0636EEB2-FE81-4424-8CFC-CCEB25360A40} = {3F76A15C-B128-4A31-A887-05E303CF8D7F}
 		{138B61C0-9D0E-44A1-9EA1-E8142303ECA5} = {35E5CBAF-5596-AC3C-3DBD-816FC74B54D0}
 		{0A51A656-9092-4C82-83B5-524516C8FED7} = {97973F8C-3EE1-368A-3B71-C62280C2DC8C}
+		{81F263BA-D395-42CB-A7E0-AFC20029C4BC} = {F5B68159-9278-7C75-41B6-315547561DBE}
+		{88085FD3-B4EE-4AC4-94B7-D1D2A9A18033} = {4644B825-05AB-0B45-5567-89C0D700A638}
 		{A55047D2-EBBB-4C25-BD5E-52FEF9E5C627} = {0832AC06-44A1-FEDA-3879-082134F4AAB5}
 		{0D41ADE3-ABBA-445B-8990-EA015AD4203D} = {F5B68159-9278-7C75-41B6-315547561DBE}
 		{ABBBEF38-2D27-4BBA-B980-BEEBDC2843F4} = {97973F8C-3EE1-368A-3B71-C62280C2DC8C}
diff --git a/src/Monitor/Monitor/ChangeLog.md b/src/Monitor/Monitor/ChangeLog.md
index ec1a3a207181..d3097c8d1caa 100644
--- a/src/Monitor/Monitor/ChangeLog.md
+++ b/src/Monitor/Monitor/ChangeLog.md
@@ -25,6 +25,11 @@
   - `Update-AzActivityLogAlert`
   - `New-AzActivityLogAlertAlertRuleAnyOfOrLeafConditionObject`
   - `New-AzActivityLogAlertAlertRuleLeafConditionObject`
+  - `New-AzDiagnosticSetting`
+  - `New-AzSubscriptionDiagnosticSetting`
+  - `Get-AzDiagnosticSetting`
+  - `Get-AzDiagnosticSettingCategory`
+  - `Get-AzSubscriptionDiagnosticSetting`
   - `Get-AzAutoscalePredictiveMetric`
   - `Get-AzAutoscaleSetting`
   - `New-AzAutoscaleNotificationObject`