Skip to content

Commit af19a1d

Browse files
authored
Merge pull request #45993 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 7f6b672 + efb299a commit af19a1d

File tree

13 files changed

+85
-48
lines changed

13 files changed

+85
-48
lines changed

articles/active-directory/authentication/howto-password-ban-bad-on-premises.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ There are two required installers for Azure AD password protection that can be d
101101
The example only works if the currently logged in user is also an Active Directory domain administrator for the root domain. An alternative is to supply the necessary domain credentials via the -ForestCredential parameter.
102102
103103
> [!NOTE]
104-
> If multiple proxy servers are installed in your environment, it does not matter which specific proxy server the above procedure above is executed upon.
104+
> If multiple proxy servers are installed in your environment, it does not matter which proxy server is specified in the procedure above.
105105
106106
> [!TIP]
107107
> There may be a considerable delay (many seconds) the first time this cmdlet is run for a given Azure tenant before the cmdlet completes execution. Unless a failure is reported this delay should not be considered alarming.

articles/active-directory/device-management-faq.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,21 @@ For down-level Windows OS versions that are on-premises AD domain-joined:
8282
3. Type `"%programFiles%\Microsoft Workplace Join\autoworkplace.exe /j"`.
8383

8484
---
85-
**Q: How do I unjoin an Azure AD Joined device locally on the device?
85+
**Q: How do I unjoin an Azure AD Joined device locally on the device?**
86+
8687
**A:**
8788
- For hybrid Azure AD Joined devices, make sure to turn off auto registration so that the scheduled task does not register the device again. Next, open command prompt as an administrator and type `dsregcmd.exe /debug /leave`. Alternatively, this command can be run as a script across multiple devices to unjoin in bulk.
8889

8990
- For pure Azure AD Joined devices, make sure you have an offline local administrator account or create one, as you won't be able to sign in with any Azure AD user credentials. Next, go to **Settings** > **Accounts** > **Access Work or School**. Select your account and click on **Disconnect**. Follow the prompts and provide the local administrator credentials when prompted. Reboot the device to complete the unjoin process.
9091

9192
---
9293

94+
**Q: My users cannot search printers from Azure AD Joined devices. How can I enable printing from Azure AD Joined devices ?**
95+
96+
**A:** For deploying printers for Azure AD Joined devices, see [Hybrid cloud print](https://docs.microsoft.com/en-us/windows-server/administration/hybrid-cloud-print/hybrid-cloud-print-deploy). You will need an on-premises Windows Server to deploy hybrid cloud print. Currently, cloud-based print service is not available.
97+
98+
---
99+
93100
**Q: Why do I see duplicate device entries in Azure portal?**
94101

95102
**A:**
@@ -121,6 +128,11 @@ Please evaluate the conditional access policy rules and ensure that the device i
121128

122129
---
123130

131+
**Q: Why do some of my users do not get MFA prompts on Azure AD joined devices?**
132+
133+
**A:** If user joins or registers a device with Azure AD using multi-factor auth, the device itself will become a trusted second factor for that particular user. Subsequently, whenever the same user signs in to the device and accesses an application, Azure AD considers the device as a second factor and enables that user to seamlessly access their applications without additional MFA prompts. This behavior is not applicable to any other user signing into that device, so all other users accessing that device would still be prompted with an MFA challenge before accessing applications that require MFA.
134+
135+
---
124136

125137
**Q: I see the device record under the USER info in the Azure portal and can see the state as registered on the device. Am I setup correctly for using conditional access?**
126138

@@ -172,5 +184,6 @@ Please create a different local account before using Azure Active Directory Join
172184

173185
- [Troubleshooting auto-registration of domain joined computers to Azure AD for Windows down-level clients](device-management-troubleshoot-hybrid-join-windows-legacy.md)
174186

187+
175188
---
176189

articles/aks/azure-files-volume.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ STORAGE_KEY=$(az storage account keys list --resource-group $AKS_PERS_RESOURCE_G
4848
4949
# Echo storage account name and key
5050
echo Storage account name: $AKS_PERS_STORAGE_ACCOUNT_NAME
51-
echo Storgae account key: $STORAGE_KEY
51+
echo Storage account key: $STORAGE_KEY
5252
```
5353

5454
## Create Kubernetes Secret

articles/app-service/containers/quickstart-java.md

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ To deploy from Maven, add the following plugin definition inside the `<build>` e
7272
<plugin>
7373
<groupId>com.microsoft.azure</groupId>
7474
<artifactId>azure-webapp-maven-plugin</artifactId>
75-
<version>1.1.0</version>
75+
<version>1.2.0</version>
7676
<configuration>
7777
<resourceGroup>YOUR_RESOURCE_GROUP</resourceGroup>
7878
<appName>YOUR_WEB_APP</appName>
@@ -102,7 +102,37 @@ Update the following placeholders in the plugin configuration:
102102
| `YOUR_RESOURCE_GROUP` | Name for the new resource group in which to create your web app. By putting all the resources for an app in a group, you can manage them together. For example, deleting the resource group would delete all resources associated with the app. Update this value with a unique new resource group name, for example, *TestResources*. You will use this resource group name to clean up all Azure resources in a later section. |
103103
| `YOUR_WEB_APP` | The app name will be part the host name for the web app when deployed to Azure (YOUR_WEB_APP.azurewebsites.net). Update this value with a unique name for the new Azure web app, which will host your Java app, for example *contoso*. |
104104

105-
The `linuxRuntime` element of the configuration controls what built-in Linux image is used with your application.
105+
The `linuxRuntime` element of the configuration controls what built-in Linux image is used with your application. All supported runtime stacks can be found at [this link](https://github.com/Microsoft/azure-maven-plugins/tree/develop/azure-webapp-maven-plugin#runtime-stacks).
106+
107+
If you are building a JAR web application, you can also add the following plugin definition inside the `<build>` element of the *pom.xml* file:
108+
109+
```xml
110+
<plugins>
111+
<plugin>
112+
<groupId>com.microsoft.azure</groupId>
113+
<artifactId>azure-webapp-maven-plugin</artifactId>
114+
<version>1.2.0</version>
115+
<configuration>
116+
<resourceGroup>YOUR_RESOURCE_GROUP</resourceGroup>
117+
<appName>YOUR_WEB_APP</appName>
118+
<linuxRuntime>jre8</linuxRuntime>
119+
<!-- This is to make sure the jar file will not be occupied during the deployment -->
120+
<stopAppDuringDeployment>true</stopAppDuringDeployment>
121+
<deploymentType>ftp</deploymentType>
122+
<resources>
123+
<resource>
124+
<directory>${project.basedir}/target</directory>
125+
<targetPath>webapps</targetPath>
126+
<includes>
127+
<!-- Currently it is required to set as app.jar -->
128+
<include>app.jar</include>
129+
</includes>
130+
</resource>
131+
</resources>
132+
</configuration>
133+
</plugin>
134+
</plugins>
135+
```
106136

107137
Execute the following command and follow all directions to authenticate with the Azure CLI:
108138

articles/automation/automation-dsc-compile.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ Asset references are the same in Azure Automation DSC configurations and runbook
232232

233233
While DSC configurations in Azure Automation can reference credential assets using **Get-AutomationPSCredential**, credential assets can also be passed in via parameters, if desired. If a configuration takes a parameter of **PSCredential** type, then you need to pass the string name of an Azure Automation credential asset as that parameter’s value, rather than a PSCredential object. Behind the scenes, the Azure Automation credential asset with that name is retrieved and passed to the configuration.
234234

235-
Keeping credentials secure in node configurations (MOF configuration documents) requires encrypting the credentials in the node configuration MOF file. Azure Automation takes this one step further and encrypts the entire MOF file. However, currently you must tell PowerShell DSC it is okay for credentials to be outputted in plain text during node configuration MOF generation, because PowerShell DSC doesn’t know that Azure Automation will be encrypting the entire MOF file after its generation via a compilation job.
235+
Keeping credentials secure in node configurations (MOF configuration documents) requires encrypting the credentials in the node configuration MOF file. However, currently you must tell PowerShell DSC it is okay for credentials to be outputted in plain text during node configuration MOF generation, because PowerShell DSC doesn’t know that Azure Automation will be encrypting the entire MOF file after its generation via a compilation job.
236236

237237
You can tell PowerShell DSC that it is okay for credentials to be outputted in plain text in the generated node configuration MOFs using [**ConfigurationData**](#configurationdata). You should pass `PSDscAllowPlainTextPassword = $true` via **ConfigurationData** for each node block’s name that appears in the DSC configuration and uses credentials.
238238

articles/automation/automation-solution-vm-management.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ You can enable either targeting the action against a subscription and resource g
147147

148148
Now that you have a schedule for stopping VMs based on CPU utilization, you need to enable one of the following schedules to start them.
149149

150-
* Target start action by subscription and resource group. See the steps in [Scenario 1](#scenario-1:-daily-stop/start-vms-across-a-subscription-or-target-resource-groups) for testing and enabling **Scheduled-StartVM** schedules.
151-
* Target start action by subscription, resource group, and tag. See the steps in [Scenario 2](#scenario-2:-sequence-the-stop/start-vms-across-a-subscription-using-tags) for testing and enabling **Sequenced-StartVM** schedules.
150+
* Target start action by subscription and resource group. See the steps in [Scenario 1](#scenario-1-startstop-vms-on-a-schedule) for testing and enabling **Scheduled-StartVM** schedules.
151+
* Target start action by subscription, resource group, and tag. See the steps in [Scenario 2](#scenario-2-startstop-vms-in-sequence-by-using-tags) for testing and enabling **Sequenced-StartVM** schedules.
152152

153153
## Solution components
154154

articles/automation/automation-update-azure-modules.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,13 @@ manager: carmonm
1313

1414
# How to update Azure PowerShell modules in Azure Automation
1515

16-
The most common Azure PowerShell modules are provided by default in each Automation account. The Azure team updates the Azure modules regularly, so in the Automation account you are provided a way to update the modules in the account when new versions are available from the portal.
16+
The most common Azure PowerShell modules are provided by default in each Automation account. The Azure team updates the Azure modules regularly, so in the Automation account you are provided a way to update the modules in the account when new versions are available from the portal.
1717

1818
Because modules are updated regularly by the product group, changes can occur with the included cmdlets, which may negatively impact your runbooks depending on the type of change, such as renaming a parameter or deprecating a cmdlet entirely. To avoid impacting your runbooks and the processes they automate, it is recommended that you test and validate before proceeding. If you do not have a dedicated Automation account intended for this purpose, consider creating one so that you can test many different scenarios and permutations during the development of your runbooks, in addition to iterative changes such as updating the PowerShell modules. After the results are validated and you have applied any changes required, proceed with coordinating the migration of any runbooks that required modification and perform the following update as described in production.
1919

20+
> [!NOTE]
21+
> A new Automation account might not contain the latest modules.
22+
2023
## Updating Azure Modules
2124

2225
1. In the Modules page of your Automation account, there is an option called **Update Azure Modules**. It is always enabled.<br><br> ![Update Azure Modules option in Modules page](media/automation-update-azure-modules/automation-update-azure-modules-option.png)
@@ -45,4 +48,4 @@ If you use cmdlets from these Azure PowerShell modules in your runbooks, you wan
4548

4649
* To learn more about Integration Modules and how to create custom modules to further integrate Automation with other systems, services, or solutions, see [Integration Modules](automation-integration-modules.md).
4750

48-
* Consider source control integration using [GitHub Enterprise](automation-scenario-source-control-integration-with-github-ent.md) or [Visual Studio Team Services](automation-scenario-source-control-integration-with-vsts.md) to centrally manage and control releases of your Automation runbook and configuration portfolio.
51+
* Consider source control integration using [GitHub Enterprise](automation-scenario-source-control-integration-with-github-ent.md) or [Visual Studio Team Services](automation-scenario-source-control-integration-with-vsts.md) to centrally manage and control releases of your Automation runbook and configuration portfolio.

articles/azure-stack/user/azure-stack-vm-considerations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Azure Stack imposes resource limits to avoid over consumption of resources (serv
4444

4545
- For networking egress from the VM, there are bandwidth caps in place. Caps in Azure Stack are the same as the caps in Azure.
4646
- For storage resources, Azure Stack implements storage IOPS limits to avoid basic overconsumption of resources by tenants for storage access.
47-
- For VMs with multiple attached data disks, the maximum throughput of each data disk is 500 IOPS for HHDs, and 2300 IOPS for SSDs.
47+
- For VMs with multiple attached data disks, the maximum throughput of each data disk is 500 IOPS for HDDs, and 2300 IOPS for SSDs.
4848

4949
The following table lists the VMs that are supported on Azure Stack along with their configuration:
5050

@@ -106,4 +106,4 @@ Microsoft Azure uses KMS activation to activate Windows VMs. If you move a VM fr
106106

107107
## Next steps
108108

109-
[Create a Windows virtual machine with PowerShell in Azure Stack](azure-stack-quick-create-vm-windows-powershell.md)
109+
[Create a Windows virtual machine with PowerShell in Azure Stack](azure-stack-quick-create-vm-windows-powershell.md)

articles/data-factory/compute-linked-services.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ You can create **Azure Databricks linked service** to register Databricks worksp
444444
"properties": {
445445
"type": "AzureDatabricks",
446446
"typeProperties": {
447-
"domain": "eastus.azuredatabricks.net",
447+
"domain": "https://eastus.azuredatabricks.net",
448448
"newClusterNodeType": "Standard_D3_v2",
449449
"newClusterNumOfWorker": "1:10",
450450
"newClusterVersion": "4.0.x-scala2.11",

0 commit comments

Comments
 (0)