Fix broken proj file and monitor help. (#4468)

azure-cli.pyproj

@@ -317,6 +317,14 @@
     <Compile Include="command_modules\azure-cli-eventgrid\azure\cli\__init__.py" />
     <Compile Include="command_modules\azure-cli-eventgrid\azure\__init__.py" />
     <Compile Include="command_modules\azure-cli-eventgrid\setup.py" />
+    <Compile Include="command_modules\azure-cli-extension\azure\cli\command_modules\extension\commands.py" />
+    <Compile Include="command_modules\azure-cli-extension\azure\cli\command_modules\extension\custom.py" />
+    <Compile Include="command_modules\azure-cli-extension\azure\cli\command_modules\extension\tests\test_extension_commands.py" />
+    <Compile Include="command_modules\azure-cli-extension\azure\cli\command_modules\extension\tests\__init__.py" />
+    <Compile Include="command_modules\azure-cli-extension\azure\cli\command_modules\extension\_help.py" />
+    <Compile Include="command_modules\azure-cli-extension\azure\cli\command_modules\extension\_params.py" />
+    <Compile Include="command_modules\azure-cli-extension\azure\cli\command_modules\extension\__init__.py" />
+    <Compile Include="command_modules\azure-cli-extension\setup.py" />
     <Compile Include="command_modules\azure-cli-feedback\azure\cli\command_modules\feedback\commands.py" />
     <Compile Include="command_modules\azure-cli-feedback\azure\cli\command_modules\feedback\custom.py" />
     <Compile Include="command_modules\azure-cli-feedback\azure\cli\command_modules\feedback\_help.py">
@@ -496,7 +504,18 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="command_modules\azure-cli-role\azure\cli\command_modules\role\_validators.py" />
-    <Compile Include="command_modules\azure-cli-role\azure_bdist_wheel.py" />s
+    <Compile Include="command_modules\azure-cli-role\azure_bdist_wheel.py" />
+    <Compile Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\commands.py" />
+    <Compile Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\custom.py" />
+    <Compile Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\tests\test_sf_commands.py" />
+    <Compile Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\tests\__init__.py" />
+    <Compile Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\_client_factory.py" />
+    <Compile Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\_help.py" />
+    <Compile Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\_params.py" />
+    <Compile Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\_validators.py" />
+    <Compile Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\__init__.py" />
+    <Compile Include="command_modules\azure-cli-servicefabric\setup.py" />
+    <Compile Include="command_modules\azure-cli-servicefabric\setup.py" />
     <Compile Include="command_modules\azure-cli-sql\azure\cli\command_modules\sql\commands.py" />
     <Compile Include="command_modules\azure-cli-sql\azure\cli\command_modules\sql\custom.py" />
     <Compile Include="command_modules\azure-cli-sql\azure\cli\command_modules\sql\params.py" />
@@ -756,6 +775,13 @@
     <Folder Include="command_modules\azure-cli-eventgrid\azure\cli\command_modules\eventgrid\tests\recordings\" />
     <Folder Include="command_modules\azure-cli-eventgrid\azure\cli\command_modules\eventgrid\tests\recordings\latest\" />
     <Folder Include="command_modules\azure-cli-eventgrid\azure_cli_eventgrid.egg-info\" />
+    <Folder Include="command_modules\azure-cli-extension\" />
+    <Folder Include="command_modules\azure-cli-extension\azure\" />
+    <Folder Include="command_modules\azure-cli-extension\azure\cli\" />
+    <Folder Include="command_modules\azure-cli-extension\azure\cli\command_modules\" />
+    <Folder Include="command_modules\azure-cli-extension\azure\cli\command_modules\extension\" />
+    <Folder Include="command_modules\azure-cli-extension\azure\cli\command_modules\extension\tests\" />
+    <Folder Include="command_modules\azure-cli-extension\azure\cli\command_modules\extension\tests\data\" />
     <Folder Include="command_modules\azure-cli-feedback\" />
     <Folder Include="command_modules\azure-cli-feedback\azure\" />
     <Folder Include="command_modules\azure-cli-feedback\azure\cli\" />
@@ -822,6 +848,17 @@
     <Folder Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\" />
     <Folder Include="command_modules\azure-cli-role\azure\cli\command_modules\role\tests\" />
     <Folder Include="command_modules\azure-cli-role\tests\" />
+    <Folder Include="command_modules\azure-cli-servicefabric\" />
+    <Folder Include="command_modules\azure-cli-servicefabric\azure\" />
+    <Folder Include="command_modules\azure-cli-servicefabric\azure\cli\" />
+    <Folder Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\" />
+    <Folder Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\" />
+    <Folder Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\template\" />
+    <Folder Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\template\linux\" />
+    <Folder Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\template\windows\" />
+    <Folder Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\tests\" />
+    <Folder Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\tests\recordings\" />
+    <Folder Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\tests\recordings\latest\" />
     <Folder Include="command_modules\azure-cli-sql\" />
     <Folder Include="command_modules\azure-cli-sql\azure\" />
     <Folder Include="command_modules\azure-cli-sql\azure\cli\" />
@@ -955,6 +992,12 @@
     <Content Include="command_modules\azure-cli-eventgrid\azure_cli_eventgrid.egg-info\top_level.txt" />
     <Content Include="command_modules\azure-cli-eventgrid\HISTORY.rst" />
     <Content Include="command_modules\azure-cli-eventgrid\README.rst" />
+    <Content Include="command_modules\azure-cli-extension\azure\cli\command_modules\extension\tests\data\myfirstcliextension-0.0.3+dev-py2.py3-none-any.whl" />
+    <Content Include="command_modules\azure-cli-extension\azure\cli\command_modules\extension\tests\data\notanextension.txt" />
+    <Content Include="command_modules\azure-cli-extension\HISTORY.rst" />
+    <Content Include="command_modules\azure-cli-extension\MANIFEST.in" />
+    <Content Include="command_modules\azure-cli-extension\README.rst" />
+    <Content Include="command_modules\azure-cli-extension\setup.cfg" />
     <Content Include="command_modules\azure-cli-feedback\HISTORY.rst" />
     <Content Include="command_modules\azure-cli-find\HISTORY.rst" />
     <Content Include="command_modules\azure-cli-find\MANIFEST.in" />
@@ -1003,6 +1046,26 @@
     <Content Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\test-template.json" />
     <Content Include="command_modules\azure-cli-resource\HISTORY.rst" />
     <Content Include="command_modules\azure-cli-role\HISTORY.rst" />
+    <Content Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\template\linux\parameter.json" />
+    <Content Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\template\linux\template.json" />
+    <Content Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\template\windows\parameter.json" />
+    <Content Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\template\windows\template.json" />
+    <Content Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\tests\recordings\latest\test_client_cert.yaml" />
+    <Content Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\tests\recordings\latest\test_cluster_cert.yaml" />
+    <Content Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\tests\recordings\latest\test_create.yaml" />
+    <Content Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\tests\recordings\latest\test_durability.yaml" />
+    <Content Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\tests\recordings\latest\test_node.yaml" />
+    <Content Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\tests\recordings\latest\test_reliability.yaml" />
+    <Content Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\tests\recordings\latest\test_remove_node.yaml" />
+    <Content Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\tests\recordings\latest\test_setting.yaml" />
+    <Content Include="command_modules\azure-cli-servicefabric\HISTORY.rst" />
+    <Content Include="command_modules\azure-cli-servicefabric\HISTORY.rst" />
+    <Content Include="command_modules\azure-cli-servicefabric\MANIFEST.in" />
+    <Content Include="command_modules\azure-cli-servicefabric\MANIFEST.in" />
+    <Content Include="command_modules\azure-cli-servicefabric\README.rst" />
+    <Content Include="command_modules\azure-cli-servicefabric\README.rst" />
+    <Content Include="command_modules\azure-cli-servicefabric\setup.cfg" />
+    <Content Include="command_modules\azure-cli-servicefabric\setup.cfg" />
     <Content Include="command_modules\azure-cli-sql\HISTORY.rst" />
     <Content Include="command_modules\azure-cli-rdbms\HISTORY.rst" />
     <Content Include="command_modules\azure-cli-storage\HISTORY.rst" />

src/command_modules/azure-cli-monitor/azure/cli/command_modules/monitor/_help.py

@@ -44,10 +44,10 @@ helps['monitor alert create'] = """
     examples:
         - name: Create a high CPU usage alert on a VM with no actions.
           text: >
-            az vm alert rule create -n rule1 -g <RG> --target <VM ID> --condition "Percentage CPU > 90 avg 5m"
+            az alert rule create -n rule1 -g <RG> --target <VM ID> --condition "Percentage CPU > 90 avg 5m"
         - name: Create a high CPU usage alert on a VM with email and webhook actions.
           text: |
-            az vm alert rule create -n rule1 -g <RG> --target <VM ID> \\
+            az alert rule create -n rule1 -g <RG> --target <VM ID> \\
                 --condition "Percentage CPU > 90 avg 5m" \\
                 --action email bob@contoso.com ann@contoso.com --email-service-owners \\
                 --action webhook https://www.contoso.com/alerts?type=HighCPU \\