conflict

.gitattributes

@@ -0,0 +1,8 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.json text
+*.xml text
+*.md text

Commands/netappfiles/volume/_create.md

@@ -109,7 +109,7 @@ Create the specified volume within the capacity pool
 
 - Create an ANF volume
     ```bash
-        netappfiles volume create -g group --account-name aname --pool-name pname --volume-name vname -l location --service-level "Premium" --usage-threshold 107374182400 --creation-token "unique-token" --protocol-types NFSv3 --vnet myvnet --subnet-id "/subscriptions/mysubsid/resourceGroups/myrg/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/default" --rules '[{"allowed_clients":"0.0.0.0/0","rule_index":"1","unix_read_only":"true","unix_read_write":"false","cifs":"false","nfsv3":"true","nfsv41":"false"}]'
+        netappfiles volume create -g group --account-name aname --pool-name pname --volume-name vname -l location --service-level "Premium" --usage-threshold 100 --creation-token "unique-token" --protocol-types NFSv3 --vnet myvnet --subnet-id "/subscriptions/mysubsid/resourceGroups/myrg/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/default" --rules '[{"allowed_clients":"0.0.0.0/0","rule_index":"1","unix_read_only":"true","unix_read_write":"false","cifs":"false","nfsv3":"true","nfsv41":"false"}]'
     ```
 
 - Create an ANF volume with zones (Availability Zone) specified
@@ -130,7 +130,7 @@ Create the specified volume within the capacity pool
 
 - Create an ANF volume
     ```bash
-        netappfiles volume create -g group --account-name aname --pool-name pname --volume-name vname -l location --service-level "Premium" --usage-threshold 107374182400 --creation-token "unique-token" --protocol-types NFSv3 --vnet myvnet --subnet-id "/subscriptions/mysubsid/resourceGroups/myrg/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/default" --rules '[{"allowed_clients":"0.0.0.0/0","rule_index":"1","unix_read_only":"true","unix_read_write":"false","cifs":"false","nfsv3":"true","nfsv41":"false"}]'
+        netappfiles volume create -g group --account-name aname --pool-name pname --volume-name vname -l location --service-level "Premium" --usage-threshold 100 --creation-token "unique-token" --protocol-types NFSv3 --vnet myvnet --subnet-id "/subscriptions/mysubsid/resourceGroups/myrg/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/default" --rules '[{"allowed_clients":"0.0.0.0/0","rule_index":"1","unix_read_only":"true","unix_read_write":"false","cifs":"false","nfsv3":"true","nfsv41":"false"}]'
     ```
 
 - Create an ANF volume with zones (Availability Zone) specified

Commands/network/firewall/policy/_deploy.md

@@ -0,0 +1,9 @@
+# [Command] _network firewall policy deploy_
+
+Deploys the firewall policy draft and child rule collection group drafts.
+
+## Versions
+
+### [2023-11-01](/Resources/mgmt-plane/L3N1YnNjcmlwdGlvbnMve30vcmVzb3VyY2Vncm91cHMve30vcHJvdmlkZXJzL21pY3Jvc29mdC5uZXR3b3JrL2ZpcmV3YWxscG9saWNpZXMve30vZGVwbG95/2023-11-01.xml) **Stable**
+
+<!-- mgmt-plane /subscriptions/{}/resourcegroups/{}/providers/microsoft.network/firewallpolicies/{}/deploy 2023-11-01 -->

Commands/network/firewall/policy/draft/_create.md

@@ -0,0 +1,9 @@
+# [Command] _network firewall policy draft create_
+
+Create a draft Firewall Policy.
+
+## Versions
+
+### [2023-11-01](/Resources/mgmt-plane/L3N1YnNjcmlwdGlvbnMve30vcmVzb3VyY2Vncm91cHMve30vcHJvdmlkZXJzL21pY3Jvc29mdC5uZXR3b3JrL2ZpcmV3YWxscG9saWNpZXMve30vZmlyZXdhbGxwb2xpY3lkcmFmdHMvZGVmYXVsdA==/2023-11-01.xml) **Stable**
+
+<!-- mgmt-plane /subscriptions/{}/resourcegroups/{}/providers/microsoft.network/firewallpolicies/{}/firewallpolicydrafts/default 2023-11-01 -->

Commands/network/firewall/policy/draft/_delete.md

@@ -0,0 +1,9 @@
+# [Command] _network firewall policy draft delete_
+
+Delete a draft policy.
+
+## Versions
+
+### [2023-11-01](/Resources/mgmt-plane/L3N1YnNjcmlwdGlvbnMve30vcmVzb3VyY2Vncm91cHMve30vcHJvdmlkZXJzL21pY3Jvc29mdC5uZXR3b3JrL2ZpcmV3YWxscG9saWNpZXMve30vZmlyZXdhbGxwb2xpY3lkcmFmdHMvZGVmYXVsdA==/2023-11-01.xml) **Stable**
+
+<!-- mgmt-plane /subscriptions/{}/resourcegroups/{}/providers/microsoft.network/firewallpolicies/{}/firewallpolicydrafts/default 2023-11-01 -->

Commands/network/firewall/policy/draft/_show.md

@@ -0,0 +1,9 @@
+# [Command] _network firewall policy draft show_
+
+Get a draft Firewall Policy.
+
+## Versions
+
+### [2023-11-01](/Resources/mgmt-plane/L3N1YnNjcmlwdGlvbnMve30vcmVzb3VyY2Vncm91cHMve30vcHJvdmlkZXJzL21pY3Jvc29mdC5uZXR3b3JrL2ZpcmV3YWxscG9saWNpZXMve30vZmlyZXdhbGxwb2xpY3lkcmFmdHMvZGVmYXVsdA==/2023-11-01.xml) **Stable**
+
+<!-- mgmt-plane /subscriptions/{}/resourcegroups/{}/providers/microsoft.network/firewallpolicies/{}/firewallpolicydrafts/default 2023-11-01 -->

Commands/network/firewall/policy/draft/_update.md

@@ -0,0 +1,9 @@
+# [Command] _network firewall policy draft update_
+
+Update a draft Firewall Policy.
+
+## Versions
+
+### [2023-11-01](/Resources/mgmt-plane/L3N1YnNjcmlwdGlvbnMve30vcmVzb3VyY2Vncm91cHMve30vcHJvdmlkZXJzL21pY3Jvc29mdC5uZXR3b3JrL2ZpcmV3YWxscG9saWNpZXMve30vZmlyZXdhbGxwb2xpY3lkcmFmdHMvZGVmYXVsdA==/2023-11-01.xml) **Stable**
+
+<!-- mgmt-plane /subscriptions/{}/resourcegroups/{}/providers/microsoft.network/firewallpolicies/{}/firewallpolicydrafts/default 2023-11-01 -->

Commands/network/firewall/policy/draft/readme.md

@@ -0,0 +1,17 @@
+# [Group] _network firewall policy draft_
+
+Manage and configure Azure firewall policy draft,
+
+## Commands
+
+- [create](/Commands/network/firewall/policy/draft/_create.md)
+: Create a draft Firewall Policy.
+
+- [delete](/Commands/network/firewall/policy/draft/_delete.md)
+: Delete a draft policy.
+
+- [show](/Commands/network/firewall/policy/draft/_show.md)
+: Get a draft Firewall Policy.
+
+- [update](/Commands/network/firewall/policy/draft/_update.md)
+: Update a draft Firewall Policy.

Commands/network/firewall/policy/readme.md

@@ -4,11 +4,14 @@ Manage and configure Azure firewall policy.
 
 ## Subgroups
 
+- [draft](/Commands/network/firewall/policy/draft/readme.md)
+: Manage and configure Azure firewall policy draft,
+
 - [intrusion-detection](/Commands/network/firewall/policy/intrusion-detection/readme.md)
 : Manage intrusion signature rules and bypass rules
 
 - [rule-collection-group](/Commands/network/firewall/policy/rule-collection-group/readme.md)
-: Manage and configure Azure firewall policy rule collection group.
+: Manage and configure Azure firewall policy rule-collection-group.
 
 ## Commands
 
@@ -18,6 +21,9 @@ Manage and configure Azure firewall policy.
 - [delete](/Commands/network/firewall/policy/_delete.md)
 : Delete an Azure firewall policy.
 
+- [deploy](/Commands/network/firewall/policy/_deploy.md)
+: Deploys the firewall policy draft and child rule collection group drafts.
+
 - [list](/Commands/network/firewall/policy/_list.md)
 : List all Azure firewall policies.
 

Commands/network/firewall/policy/rule-collection-group/draft/_create.md

@@ -0,0 +1,9 @@
+# [Command] _network firewall policy rule-collection-group draft create_
+
+Create Rule Collection Group Draft.
+
+## Versions
+
+### [2023-11-01](/Resources/mgmt-plane/L3N1YnNjcmlwdGlvbnMve30vcmVzb3VyY2Vncm91cHMve30vcHJvdmlkZXJzL21pY3Jvc29mdC5uZXR3b3JrL2ZpcmV3YWxscG9saWNpZXMve30vcnVsZWNvbGxlY3Rpb25ncm91cHMve30vcnVsZWNvbGxlY3Rpb25ncm91cGRyYWZ0cy9kZWZhdWx0/2023-11-01.xml) **Stable**
+
+<!-- mgmt-plane /subscriptions/{}/resourcegroups/{}/providers/microsoft.network/firewallpolicies/{}/rulecollectiongroups/{}/rulecollectiongroupdrafts/default 2023-11-01 -->

Commands/network/firewall/policy/rule-collection-group/draft/_delete.md

@@ -0,0 +1,9 @@
+# [Command] _network firewall policy rule-collection-group draft delete_
+
+Delete Rule Collection Group Draft.
+
+## Versions
+
+### [2023-11-01](/Resources/mgmt-plane/L3N1YnNjcmlwdGlvbnMve30vcmVzb3VyY2Vncm91cHMve30vcHJvdmlkZXJzL21pY3Jvc29mdC5uZXR3b3JrL2ZpcmV3YWxscG9saWNpZXMve30vcnVsZWNvbGxlY3Rpb25ncm91cHMve30vcnVsZWNvbGxlY3Rpb25ncm91cGRyYWZ0cy9kZWZhdWx0/2023-11-01.xml) **Stable**
+
+<!-- mgmt-plane /subscriptions/{}/resourcegroups/{}/providers/microsoft.network/firewallpolicies/{}/rulecollectiongroups/{}/rulecollectiongroupdrafts/default 2023-11-01 -->

Commands/network/firewall/policy/rule-collection-group/draft/_show.md

@@ -0,0 +1,9 @@
+# [Command] _network firewall policy rule-collection-group draft show_
+
+Get Rule Collection Group Draft.
+
+## Versions
+
+### [2023-11-01](/Resources/mgmt-plane/L3N1YnNjcmlwdGlvbnMve30vcmVzb3VyY2Vncm91cHMve30vcHJvdmlkZXJzL21pY3Jvc29mdC5uZXR3b3JrL2ZpcmV3YWxscG9saWNpZXMve30vcnVsZWNvbGxlY3Rpb25ncm91cHMve30vcnVsZWNvbGxlY3Rpb25ncm91cGRyYWZ0cy9kZWZhdWx0/2023-11-01.xml) **Stable**
+
+<!-- mgmt-plane /subscriptions/{}/resourcegroups/{}/providers/microsoft.network/firewallpolicies/{}/rulecollectiongroups/{}/rulecollectiongroupdrafts/default 2023-11-01 -->

Commands/network/firewall/policy/rule-collection-group/draft/_update.md

@@ -0,0 +1,9 @@
+# [Command] _network firewall policy rule-collection-group draft update_
+
+Update Rule Collection Group Draft.
+
+## Versions
+
+### [2023-11-01](/Resources/mgmt-plane/L3N1YnNjcmlwdGlvbnMve30vcmVzb3VyY2Vncm91cHMve30vcHJvdmlkZXJzL21pY3Jvc29mdC5uZXR3b3JrL2ZpcmV3YWxscG9saWNpZXMve30vcnVsZWNvbGxlY3Rpb25ncm91cHMve30vcnVsZWNvbGxlY3Rpb25ncm91cGRyYWZ0cy9kZWZhdWx0/2023-11-01.xml) **Stable**
+
+<!-- mgmt-plane /subscriptions/{}/resourcegroups/{}/providers/microsoft.network/firewallpolicies/{}/rulecollectiongroups/{}/rulecollectiongroupdrafts/default 2023-11-01 -->

Commands/network/firewall/policy/rule-collection-group/draft/readme.md

@@ -0,0 +1,17 @@
+# [Group] _network firewall policy rule-collection-group draft_
+
+Manage and configure Azure firewall policy rule-collection-group draft.
+
+## Commands
+
+- [create](/Commands/network/firewall/policy/rule-collection-group/draft/_create.md)
+: Create Rule Collection Group Draft.
+
+- [delete](/Commands/network/firewall/policy/rule-collection-group/draft/_delete.md)
+: Delete Rule Collection Group Draft.
+
+- [show](/Commands/network/firewall/policy/rule-collection-group/draft/_show.md)
+: Get Rule Collection Group Draft.
+
+- [update](/Commands/network/firewall/policy/rule-collection-group/draft/_update.md)
+: Update Rule Collection Group Draft.

Commands/network/firewall/policy/rule-collection-group/readme.md

@@ -1,12 +1,15 @@
 # [Group] _network firewall policy rule-collection-group_
 
-Manage and configure Azure firewall policy rule collection group.
+Manage and configure Azure firewall policy rule-collection-group.
 
 ## Subgroups
 
 - [collection](/Commands/network/firewall/policy/rule-collection-group/collection/readme.md)
 : Manage and configure Azure firewall policy rule collections in the rule collection group.
 
+- [draft](/Commands/network/firewall/policy/rule-collection-group/draft/readme.md)
+: Manage and configure Azure firewall policy rule-collection-group draft.
+
 ## Commands
 
 - [create](/Commands/network/firewall/policy/rule-collection-group/_create.md)

Commands/network/network-watcher/connection-monitor/_create.md

@@ -0,0 +1,21 @@
+# [Command] _network network-watcher connection-monitor create_
+
+Create a connection monitor.
+
+## Versions
+
+### [2023-09-01](/Resources/mgmt-plane/L3N1YnNjcmlwdGlvbnMve30vcmVzb3VyY2Vncm91cHMve30vcHJvdmlkZXJzL21pY3Jvc29mdC5uZXR3b3JrL25ldHdvcmt3YXRjaGVycy97fS9jb25uZWN0aW9ubW9uaXRvcnMve30=/2023-09-01.xml) **Stable**
+
+<!-- mgmt-plane /subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkwatchers/{}/connectionmonitors/{} 2023-09-01 -->
+
+#### examples
+
+- Create connection monitor
+    ```bash
+        network network-watcher connection-monitor create --name cm12 --network-watcher-name networkwatcher_eastus --resource-group networkwatcherrg --location eastus --endpoints "[{name:vmName,type:AzureVM,resourceId:/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Compute/virtualMachines/TESTVM-LINUX},{address:8.8.8.8,name:google,type:ExternalAddress}]" --test-configurations "[{name:TestConfiguration04,protocol:Tcp,successThreshold:{},tcpConfiguration:{disableTraceRoute:false,port:53},testFrequencySec:30}]" --test-groups "[{destinations:[google],disable:false,name:TestingGroup04,sources:[vmName],testConfigurations:[TestConfiguration04]}]"
+    ```
+
+- Create Connection Monitor
+    ```bash
+        network network-watcher connection-monitor create --name cm12 --network-watcher-name networkwatcher_eastus --resource-group networkwatcherrg --location eastus --endpoints "[{name:vmName,type:AzureVM,resourceId:/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Compute/virtualMachines/TESTVM-LINUX},{address:8.8.8.8,name:google,type:ExternalAddress}]" --test-configurations "[{name:TestConfiguration04,protocol:Tcp,successThreshold:{},tcpConfiguration:{disableTraceRoute:false,port:53},testFrequencySec:30}]" --test-groups "[{destinations:[google],disable:false,name:TestingGroup04,sources:[vmName],testConfigurations:[TestConfiguration04]}]" --outputs "[{type:Workspace,workspaceSettings:{workspaceResourceId:/subscriptions/subid/resourceGroups/DefaultResourceGroup-EUS/providers/Microsoft.OperationalInsights/workspaces/DefaultWorkspace-sub-id-region}}]"
+    ```

Commands/network/network-watcher/connection-monitor/_delete.md

@@ -0,0 +1,9 @@
+# [Command] _network network-watcher connection-monitor delete_
+
+Delete the specified connection monitor.
+
+## Versions
+
+### [2023-09-01](/Resources/mgmt-plane/L3N1YnNjcmlwdGlvbnMve30vcmVzb3VyY2Vncm91cHMve30vcHJvdmlkZXJzL21pY3Jvc29mdC5uZXR3b3JrL25ldHdvcmt3YXRjaGVycy97fS9jb25uZWN0aW9ubW9uaXRvcnMve30=/2023-09-01.xml) **Stable**
+
+<!-- mgmt-plane /subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkwatchers/{}/connectionmonitors/{} 2023-09-01 -->

Commands/network/network-watcher/connection-monitor/_list.md

@@ -0,0 +1,9 @@
+# [Command] _network network-watcher connection-monitor list_
+
+List all connection monitors for the specified Network Watcher.
+
+## Versions
+
+### [2023-09-01](/Resources/mgmt-plane/L3N1YnNjcmlwdGlvbnMve30vcmVzb3VyY2Vncm91cHMve30vcHJvdmlkZXJzL21pY3Jvc29mdC5uZXR3b3JrL25ldHdvcmt3YXRjaGVycy97fS9jb25uZWN0aW9ubW9uaXRvcnM=/2023-09-01.xml) **Stable**
+
+<!-- mgmt-plane /subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkwatchers/{}/connectionmonitors 2023-09-01 -->

Commands/network/network-watcher/connection-monitor/_show.md

@@ -0,0 +1,9 @@
+# [Command] _network network-watcher connection-monitor show_
+
+Get a connection monitor by name.
+
+## Versions
+
+### [2023-09-01](/Resources/mgmt-plane/L3N1YnNjcmlwdGlvbnMve30vcmVzb3VyY2Vncm91cHMve30vcHJvdmlkZXJzL21pY3Jvc29mdC5uZXR3b3JrL25ldHdvcmt3YXRjaGVycy97fS9jb25uZWN0aW9ubW9uaXRvcnMve30=/2023-09-01.xml) **Stable**
+
+<!-- mgmt-plane /subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkwatchers/{}/connectionmonitors/{} 2023-09-01 -->

Commands/network/network-watcher/connection-monitor/readme.md

@@ -0,0 +1,19 @@
+# [Group] _network network-watcher connection-monitor_
+
+Manage connection monitor
+
+Connection monitor provides unified, end-to-end connection monitoring in Network Watcher. The Connection monitor feature supports hybrid and Azure cloud deployments.
+
+## Commands
+
+- [create](/Commands/network/network-watcher/connection-monitor/_create.md)
+: Create a connection monitor.
+
+- [delete](/Commands/network/network-watcher/connection-monitor/_delete.md)
+: Delete the specified connection monitor.
+
+- [list](/Commands/network/network-watcher/connection-monitor/_list.md)
+: List all connection monitors for the specified Network Watcher.
+
+- [show](/Commands/network/network-watcher/connection-monitor/_show.md)
+: Get a connection monitor by name.

Commands/network/network-watcher/readme.md

@@ -0,0 +1,10 @@
+# [Group] _network network-watcher_
+
+Manage network watcher and its sub-resources.
+
+Network Watcher provides tools to monitor, diagnose, and view connectivity-related metrics for your Azure deployments.
+
+## Subgroups
+
+- [connection-monitor](/Commands/network/network-watcher/connection-monitor/readme.md)
+: Manage connection monitor