Azure · dolauli · Oct 30, 2025 · Mar 17, 2025 · Jul 22, 2025 · Jul 23, 2025
diff --git a/src/Workloads/Monitors.Autorest/Properties/AssemblyInfo.cs b/src/Workloads/Monitors.Autorest/Properties/AssemblyInfo.cs
@@ -20,7 +20,7 @@
 [assembly: System.Reflection.AssemblyCopyrightAttribute("Copyright © Microsoft")]
 [assembly: System.Reflection.AssemblyProductAttribute("Microsoft Azure PowerShell")]
 [assembly: System.Reflection.AssemblyTitleAttribute("Microsoft Azure PowerShell - Monitors")]
-[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0")]
-[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.1")]
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.1")]
 [assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
 [assembly: System.CLSCompliantAttribute(false)]
diff --git a/src/Workloads/Monitors.Autorest/README.md b/src/Workloads/Monitors.Autorest/README.md
@@ -45,66 +45,26 @@ root-module-name: $(prefix).Workloads
 title: Monitors
 subject-prefix: Workloads
 namespace: Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors
-resourcegroup-append: true
-identity-correction-for-post: true
-nested-object-to-string: true
-#add-api-version-in-model-namespace: true
 inlining-threshold: 100
 
-# For new modules, please avoid setting 3.x using the use-extension method and instead, use 4.x as the default option
-use-extension:
- "@autorest/powershell": "3.x"
-
 directive:
-# Monitor
-- where:
-    verb: New
-    subject: ^Monitor$
-    variant: ^Create$|^CreateViaIdentity$|^CreateViaIdentityExpanded$
-  remove: true
-
 - where:
-    verb: Update
-    subject: ^Monitor$
-    variant: ^Update$|^UpdateViaIdentity$
+    variant: ^(Create|Update)(?!.*?(Expanded|JsonFilePath|JsonString))|^CreateViaIdentityExpanded$
   remove: true
 
-- where:
-    subject: ^Monitor$
-    parameter-name: IdentityUserAssignedIdentity
-  set:
-    parameter-name: UserAssignedIdentity
-
+# Monitor
 - where:
     subject: ^Monitor$
     parameter-name: ManagedResourceGroupConfigurationName
   set:
     parameter-name: ManagedResourceGroupName
 
-# ProviderInstance
-- where:
-    verb: New
-    subject: ^ProviderInstance$
-    variant: ^Create$|^CreateViaIdentity$|^CreateViaIdentityExpanded$
-  remove: true
-
 # SapLandscapeMonitor
-- where:
-    verb: New
-    subject: ^SapLandscapeMonitor$
-    variant: ^Create$|^CreateViaIdentity$|^CreateViaIdentityExpanded$
-  remove: true
-
 - where:
     verb: Get
     subject: ^SapLandscapeMonitor$
     variant: ^List$
   remove: true
-- where:
-    verb: Update
-    subject: ^SapLandscapeMonitor$
-    variant: ^Update$|^UpdateViaIdentity$
-  remove: true
 
 # Module Table Formatting
 - where:
@@ -145,39 +105,23 @@ directive:
   - SAPConfiguration
   - ErrorInnerError
 - model-cmdlet:
-  - SapLandscapeMonitorSidMapping
-  - SapLandscapeMonitorMetricThresholds
+  - model-name: SapLandscapeMonitorSidMapping
+  - model-name: SapLandscapeMonitorMetricThresholds
+  - model-name: PrometheusHaClusterProviderInstanceProperties
+    cmdlet-name: New-AzWorkloadsProviderPrometheusHaClusterInstanceObject
+  - model-name: PrometheusOSProviderInstanceProperties
+    cmdlet-name: New-AzWorkloadsProviderPrometheusOSInstanceObject
+  - model-name: SapNetWeaverProviderInstanceProperties
+    cmdlet-name: New-AzWorkloadsProviderSapNetWeaverInstanceObject
 
 # remove System Data in module Monitor, ProviderInstance, SapApplicationServerInstance, SapCentralServerInstance, SapDatabaseInstance, SapLandscapeMonitor, SapVirtualInstance
 - from: Monitor.cs
   where: $
-  transform: $ = $.replace('public Microsoft.Azure.PowerShell.Cmdlets.Workloads.Models.Api30.ISystemData SystemData', 'internal Microsoft.Azure.PowerShell.Cmdlets.Workloads.Models.Api30.ISystemData SystemData');
+  transform: $ = $.replace('public Microsoft.Azure.PowerShell.Cmdlets.Workloads.Models.ISystemData SystemData', 'internal Microsoft.Azure.PowerShell.Cmdlets.Workloads.Models.ISystemData SystemData');
 - from: ProviderInstance.cs
   where: $
-  transform: $ = $.replace('public Microsoft.Azure.PowerShell.Cmdlets.Workloads.Models.Api30.ISystemData SystemData', 'internal Microsoft.Azure.PowerShell.Cmdlets.Workloads.Models.Api30.ISystemData SystemData');
+  transform: $ = $.replace('public Microsoft.Azure.PowerShell.Cmdlets.Workloads.Models.ISystemData SystemData', 'internal Microsoft.Azure.PowerShell.Cmdlets.Workloads.Models.ISystemData SystemData');
 - from: SapLandscapeMonitor.cs
   where: $
-  transform: $ = $.replace('public Microsoft.Azure.PowerShell.Cmdlets.Workloads.Models.Api30.ISystemData SystemData', 'internal Microsoft.Azure.PowerShell.Cmdlets.Workloads.Models.Api30.ISystemData SystemData');
-
-- where:
-    verb: Get|New
-    subject: Monitor|ProviderInstance|SapLandscapeMonitor
-  set:
-    preview-announcement:
-      preview-message: "*****************************************************************************************\\r\\n* This cmdlet will undergo a breaking change in Az v15.0.0, to be released on November 19th 2025. *\\r\\n* At least one change applies to this cmdlet.                                                     *\\r\\n* See all possible breaking changes at https://go.microsoft.com/fwlink/?linkid=2333486            *\\r\\n**************************************************************************************************"
-
-- where:
-    verb: Remove
-    subject: Monitor|ProviderInstance
-  set:
-    preview-announcement:
-      preview-message: "*****************************************************************************************\\r\\n* This cmdlet will undergo a breaking change in Az v15.0.0, to be released on November 19th 2025. *\\r\\n* At least one change applies to this cmdlet.                                                     *\\r\\n* See all possible breaking changes at https://go.microsoft.com/fwlink/?linkid=2333486            *\\r\\n**************************************************************************************************"
-
-- where:
-    verb: Update
-    subject: Monitor|SapLandscapeMonitor
-  set:
-    preview-announcement:
-      preview-message: "*****************************************************************************************\\r\\n* This cmdlet will undergo a breaking change in Az v15.0.0, to be released on November 19th 2025. *\\r\\n* At least one change applies to this cmdlet.                                                     *\\r\\n* See all possible breaking changes at https://go.microsoft.com/fwlink/?linkid=2333486            *\\r\\n**************************************************************************************************"
-
+  transform: $ = $.replace('public Microsoft.Azure.PowerShell.Cmdlets.Workloads.Models.ISystemData SystemData', 'internal Microsoft.Azure.PowerShell.Cmdlets.Workloads.Models.ISystemData SystemData');
 ```
diff --git a/src/Workloads/Monitors.Autorest/custom/New-AzWorkloadsProviderDB2InstanceObject.ps1 b/src/Workloads/Monitors.Autorest/custom/New-AzWorkloadsProviderDB2InstanceObject.ps1
@@ -21,12 +21,13 @@ Create an in-memory object for DB2ProviderInstanceProperties.
 Create an in-memory object for DB2ProviderInstanceProperties.
 
 .Outputs
-Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.DB2ProviderInstanceProperties
+Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.DB2ProviderInstanceProperties
 .Link
 https://learn.microsoft.com/powershell/module/az.workloads/new-azworkloadsproviderdb2instanceobject
 #>
 function New-AzWorkloadsProviderDB2InstanceObject {
-    [OutputType('Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.DB2ProviderInstanceProperties')]
+    [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.ModelCmdletAttribute()]
+    [OutputType('Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.DB2ProviderInstanceProperties')]
     [CmdletBinding(PositionalBinding=$false)]
     Param(
 
@@ -55,13 +56,13 @@ function New-AzWorkloadsProviderDB2InstanceObject {
         [string]
         $SslCertificateUri,
         [Parameter(HelpMessage="Gets or sets certificate preference if secure communication is enabled.")]
-        [ArgumentCompleter([Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Support.SslPreference])]
-        [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Support.SslPreference]
+        [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.PSArgumentCompleterAttribute("Disabled", "RootCertificate", "ServerCertificate")]
+        [string]
         $SslPreference
     )
 
     process {
-        $Object = [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.DB2ProviderInstanceProperties]::New()
+        $Object = [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.DB2ProviderInstanceProperties]::New()
 
         if ($PSBoundParameters.ContainsKey('Name')) {
             $Object.DbName = $Name
@@ -90,8 +91,6 @@ function New-AzWorkloadsProviderDB2InstanceObject {
         if ($PSBoundParameters.ContainsKey('SslPreference')) {
             $Object.SslPreference = $SslPreference
         }
-
-        $Object.ProviderType = 'Db2'
         return $Object
     }
 }

diff --git a/src/Workloads/Monitors.Autorest/custom/New-AzWorkloadsProviderHanaDbInstanceObject.ps1 b/src/Workloads/Monitors.Autorest/custom/New-AzWorkloadsProviderHanaDbInstanceObject.ps1
@@ -21,12 +21,13 @@ Create an in-memory object for HanaDbProviderInstanceProperties.
 Create an in-memory object for HanaDbProviderInstanceProperties.
 
 .Outputs
-Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.HanaDbProviderInstanceProperties
+Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.HanaDbProviderInstanceProperties
 .Link
 https://learn.microsoft.com/powershell/module/az.workloads/new-azworkloadsproviderhanadbinstanceobject
 #>
 function New-AzWorkloadsProviderHanaDbInstanceObject {
-    [OutputType('Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.HanaDbProviderInstanceProperties')]
+    [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.ModelCmdletAttribute()]
+    [OutputType('Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.HanaDbProviderInstanceProperties')]
     [CmdletBinding(PositionalBinding=$false)]
     Param(
 
@@ -61,13 +62,13 @@ function New-AzWorkloadsProviderHanaDbInstanceObject {
         [string]
         $SslHostNameInCertificate,
         [Parameter(HelpMessage="Gets or sets certificate preference if secure communication is enabled.")]
-        [ArgumentCompleter([Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Support.SslPreference])]
-        [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Support.SslPreference]
+        [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.PSArgumentCompleterAttribute("Disabled", "RootCertificate", "ServerCertificate")]
+        [string]
         $SslPreference
     )
 
     process {
-        $Object = [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.HanaDbProviderInstanceProperties]::New()
+        $Object = [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.HanaDbProviderInstanceProperties]::New()
 
         if ($PSBoundParameters.ContainsKey('Name')) {
             $Object.DbName = $Name
@@ -102,7 +103,6 @@ function New-AzWorkloadsProviderHanaDbInstanceObject {
         if ($PSBoundParameters.ContainsKey('SslPreference')) {
             $Object.SslPreference = $SslPreference
         }
-        $Object.ProviderType = 'SapHana'
         return $Object
     }
 }

diff --git a/src/Workloads/Monitors.Autorest/custom/New-AzWorkloadsProviderSqlServerInstanceObject.ps1 b/src/Workloads/Monitors.Autorest/custom/New-AzWorkloadsProviderSqlServerInstanceObject.ps1
@@ -21,12 +21,13 @@ Create an in-memory object for MsSqlServerProviderInstanceProperties.
 Create an in-memory object for MsSqlServerProviderInstanceProperties.
 
 .Outputs
-Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.MsSqlServerProviderInstanceProperties
+Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.MsSqlServerProviderInstanceProperties
 .Link
 https://learn.microsoft.com/powershell/module/az.workloads/new-azworkloadsprovidersqlserverinstanceobject
 #>
 function New-AzWorkloadsProviderSqlServerInstanceObject {
-    [OutputType('Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.MsSqlServerProviderInstanceProperties')]
+    [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.ModelCmdletAttribute()]
+    [OutputType('Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.MsSqlServerProviderInstanceProperties')]
     [CmdletBinding(PositionalBinding=$false)]
     Param(
 
@@ -52,13 +53,13 @@ function New-AzWorkloadsProviderSqlServerInstanceObject {
         [string]
         $SslCertificateUri,
         [Parameter(HelpMessage="Gets or sets certificate preference if secure communication is enabled.")]
-        [ArgumentCompleter([Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Support.SslPreference])]
-        [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Support.SslPreference]
+        [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.PSArgumentCompleterAttribute("Disabled", "RootCertificate", "ServerCertificate")]
+        [string]
         $SslPreference
     )
 
     process {
-        $Object = [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.MsSqlServerProviderInstanceProperties]::New()
+        $Object = [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.MsSqlServerProviderInstanceProperties]::New()
 
         if ($PSBoundParameters.ContainsKey('Password')) {
             $Object.DbPassword = $Password
@@ -84,7 +85,6 @@ function New-AzWorkloadsProviderSqlServerInstanceObject {
         if ($PSBoundParameters.ContainsKey('SslPreference')) {
             $Object.SslPreference = $SslPreference
         }
-        $Object.ProviderType = 'MsSqlServer'
         return $Object
     }
 }

diff --git a/...iderPrometheusHaClusterInstanceObject.ps1 → ...iderPrometheusHaClusterInstanceObject.ps1 b/...iderPrometheusHaClusterInstanceObject.ps1 → ...iderPrometheusHaClusterInstanceObject.ps1
@@ -21,12 +21,13 @@ Create an in-memory object for PrometheusHaClusterProviderInstanceProperties.
 Create an in-memory object for PrometheusHaClusterProviderInstanceProperties.
 
 .Outputs
-Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.PrometheusHaClusterProviderInstanceProperties
+Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.PrometheusHaClusterProviderInstanceProperties
 .Link
-https://learn.microsoft.com/powershell/module/az.workloads/new-azworkloadsproviderprometheushaclusterinstanceobject
+https://learn.microsoft.com/powershell/module/Az.Workloads/new-azworkloadsproviderprometheushaclusterinstanceobject
 #>
 function New-AzWorkloadsProviderPrometheusHaClusterInstanceObject {
-    [OutputType('Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.PrometheusHaClusterProviderInstanceProperties')]
+    [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.ModelCmdletAttribute()]
+    [OutputType('Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.PrometheusHaClusterProviderInstanceProperties')]
     [CmdletBinding(PositionalBinding=$false)]
     Param(
 
@@ -46,13 +47,13 @@ function New-AzWorkloadsProviderPrometheusHaClusterInstanceObject {
         [string]
         $SslCertificateUri,
         [Parameter(HelpMessage="Gets or sets certificate preference if secure communication is enabled.")]
-        [ArgumentCompleter([Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Support.SslPreference])]
-        [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Support.SslPreference]
+        [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.PSArgumentCompleterAttribute("Disabled", "RootCertificate", "ServerCertificate")]
+        [string]
         $SslPreference
     )
 
     process {
-        $Object = [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.PrometheusHaClusterProviderInstanceProperties]::New()
+        $Object = [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.PrometheusHaClusterProviderInstanceProperties]::New()
 
         if ($PSBoundParameters.ContainsKey('ClusterName')) {
             $Object.ClusterName = $ClusterName
@@ -69,12 +70,9 @@ function New-AzWorkloadsProviderPrometheusHaClusterInstanceObject {
         if ($PSBoundParameters.ContainsKey('SslCertificateUri')) {
             $Object.SslCertificateUri = $SslCertificateUri
         }
-
         if ($PSBoundParameters.ContainsKey('SslPreference')) {
             $Object.SslPreference = $SslPreference
         }
-
-        $Object.ProviderType = 'PrometheusHaCluster'
         return $Object
     }
 }

diff --git a/...adsProviderPrometheusOSInstanceObject.ps1 → ...adsProviderPrometheusOSInstanceObject.ps1 b/...adsProviderPrometheusOSInstanceObject.ps1 → ...adsProviderPrometheusOSInstanceObject.ps1
@@ -21,12 +21,13 @@ Create an in-memory object for PrometheusOSProviderInstanceProperties.
 Create an in-memory object for PrometheusOSProviderInstanceProperties.
 
 .Outputs
-Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.PrometheusOSProviderInstanceProperties
+Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.PrometheusOSProviderInstanceProperties
 .Link
-https://learn.microsoft.com/powershell/module/az.workloads/new-azworkloadsproviderprometheusosinstanceobject
+https://learn.microsoft.com/powershell/module/Az.Workloads/new-azworkloadsproviderprometheusosinstanceobject
 #>
 function New-AzWorkloadsProviderPrometheusOSInstanceObject {
-    [OutputType('Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.PrometheusOSProviderInstanceProperties')]
+    [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.ModelCmdletAttribute()]
+    [OutputType('Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.PrometheusOSProviderInstanceProperties')]
     [CmdletBinding(PositionalBinding=$false)]
     Param(
 
@@ -40,13 +41,13 @@ function New-AzWorkloadsProviderPrometheusOSInstanceObject {
         [string]
         $SslCertificateUri,
         [Parameter(HelpMessage="Gets or sets certificate preference if secure communication is enabled.")]
-        [ArgumentCompleter([Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Support.SslPreference])]
-        [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Support.SslPreference]
+        [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.PSArgumentCompleterAttribute("Disabled", "RootCertificate", "ServerCertificate")]
+        [string]
         $SslPreference
     )
 
     process {
-        $Object = [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.PrometheusOSProviderInstanceProperties]::New()
+        $Object = [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.PrometheusOSProviderInstanceProperties]::New()
 
         if ($PSBoundParameters.ContainsKey('PrometheusUrl')) {
             $Object.PrometheusUrl = $PrometheusUrl
@@ -60,7 +61,6 @@ function New-AzWorkloadsProviderPrometheusOSInstanceObject {
         if ($PSBoundParameters.ContainsKey('SslPreference')) {
             $Object.SslPreference = $SslPreference
         }
-        $Object.ProviderType = 'PrometheusOS'
         return $Object
     }
 }