Skip to content

Commit 22836de

Browse files
Merge pull request #3267 from MicrosoftDocs/main638590970359087890sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 7ff56d9 + f4d8673 commit 22836de

20 files changed

+323
-380
lines changed

azure-stack/hci/manage/windows-server-azure-edition-23h2.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,6 @@ To obtain Azure verification for the Windows Server Azure Edition license, a mem
174174
Schtasks /change /TN "\Microsoft\Windows\Clip\LicenseImdsIntegration" /RU "NT Authority\System"
175175
```
176176

177-
For more information, see [flcip](https://github.com/urbans0ft/fclip) on GitHub.
178-
179177
## Next steps
180178

181179
Learn more about [Azure Automanage for Windows Server](/azure/automanage/automanage-windows-server-services-overview).

azure-stack/hci/update/update-troubleshooting-23h2.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ To collect logs for the update failures using PowerShell, follow these steps on
3636
2. Get all the solutions updates and then filter the solution updates corresponding to a specific version. The version used corresponds to the version of solution update that failed to install.
3737
3838
```powershell
39-
$Update = Get-SolutionUpdate | ? version -eq "<Version string>" -verbose
39+
$Update = Get-SolutionUpdate | ? Version -eq "<Version string>" -verbose
4040
```
4141
4242
3. Identify the action plan for the failed solution update run.
@@ -54,7 +54,7 @@ To collect logs for the update failures using PowerShell, follow these steps on
5454
Here's a sample output:
5555
5656
```output
57-
PS C:\Users\lcmuser> $Update = Get-SolutionUpdate| ? version -eq "10.2303.1.7" -verbose
57+
PS C:\Users\lcmuser> $Update = Get-SolutionUpdate| ? Version -eq "10.2303.1.7" -verbose
5858
PS C:\Users\lcmuser> $Failure = $Update|Get-SolutionUpdateRun
5959
PS C:\Users\lcmuser> $Failure
6060
@@ -98,13 +98,13 @@ We highly recommend using the Azure portal, to browse to your failed update and
9898
If you're using PowerShell and need to resume a previously failed update run, use the following command:
9999
100100
```powershell
101-
Get-SolutionUpdate | Start-SolutionUpdate
101+
Get-SolutionUpdate | ? Version -eq "10.2302.0.31" | Start-SolutionUpdate
102102
```
103103

104104
To resume a previously failed update due to update health checks in a **Warning** state, use the following command:
105105

106106
```powershell
107-
Get-SolutionUpdate | Start-SolutionUpdate -IgnoreWarnings
107+
Get-SolutionUpdate | ? Version -eq "10.2302.0.31" | Start-SolutionUpdate -IgnoreWarnings
108108
```
109109

110110
## Next steps

azure-stack/hci/update/update-via-powershell-23h2.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -261,14 +261,14 @@ Discovering solution updates using the online catalog is the *recommended* metho
261261
3. Optionally review the versions of the update package components.
262262
263263
```powershell
264-
$Update = Get-SolutionUpdate | ? version -eq "10.2302.0.31"
264+
$Update = Get-SolutionUpdate | ? Version -eq "10.2302.0.31"
265265
$Update.ComponentVersions
266266
```
267267
268268
Here's an example output:
269269
270270
```console
271-
PS C:\Users\lcmuser> $Update = Get-SolutionUpdate | ? version -eq "10.2302.0.31"
271+
PS C:\Users\lcmuser> $Update = Get-SolutionUpdate | ? Version -eq "10.2302.0.31"
272272
PS C:\Users\lcmuser> $Update.ComponentVersions
273273
274274
PackageType Version LastUpdated
@@ -330,14 +330,14 @@ If you're using solution extension updates from your hardware, you would need to
330330
7. Optionally check the version of the update package components. Run the following command:
331331
332332
```powershell
333-
$Update = Get-SolutionUpdate | ? version -eq "10.2302.0.31"
333+
$Update = Get-SolutionUpdate | ? Version -eq "10.2302.0.31"
334334
$Update.ComponentVersions
335335
```
336336
337337
Here's an example output:
338338
339339
```console
340-
PS C:\Users\lcmuser> $Update = Get-SolutionUpdate | ? version -eq "10.2302.0.31"
340+
PS C:\Users\lcmuser> $Update = Get-SolutionUpdate | ? Version -eq "10.2302.0.31"
341341
PS C:\Users\lcmuser> $Update.ComponentVersions
342342
343343
PackageType Version LastUpdated
@@ -357,7 +357,7 @@ You can download the updates, perform a set of checks to verify your cluster's u
357357
- To download and install the update, run the following command:
358358
359359
```powershell
360-
Get-SolutionUpdate | ? version -eq "10.2302.0.31" | Start-SolutionUpdate
360+
Get-SolutionUpdate | ? Version -eq "10.2302.0.31" | Start-SolutionUpdate
361361
```
362362
363363
- To only download the updates without starting the installation, use the `-PrepareOnly` flag with `Start-SolutionUpdate`.
@@ -469,13 +469,13 @@ After the updates are installed, verify the solution version of the environment
469469
To resume a previously failed update run via PowerShell, use the following command:
470470
471471
```powershell
472-
Get-SolutionUpdate | Start-SolutionUpdate
472+
Get-SolutionUpdate | ? Version -eq "10.2302.0.31" | Start-SolutionUpdate
473473
```
474474

475475
To resume a previously failed update due to update health checks in a **Warning** state, use the following command:
476476

477477
```powershell
478-
Get-SolutionUpdate | Start-SolutionUpdate -IgnoreWarnings
478+
Get-SolutionUpdate | ? Version -eq "10.2302.0.31" | Start-SolutionUpdate -IgnoreWarnings
479479
```
480480

481481
To troubleshoot other update run issues, see [Troubleshoot updates](./update-troubleshooting-23h2.md).

azure-stack/operator/aks-add-on.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Install and offer the Azure Kubernetes Service on Azure Stack Hub
33
description: Learn how to install and offer the Azure Kubernetes Service on Azure Stack Hub.
44
author: sethmanheim
55
ms.topic: how-to
6-
ms.date: 04/24/2023
6+
ms.date: 08/08/2024
77
ms.author: sethm
88
ms.reviewer: waltero
99
ms.lastreviewed: 03/24/2022
@@ -20,11 +20,11 @@ Azure Kubernetes Service (AKS) enables your users to deploy Kubernetes clusters
2020
To install, you must have the VM extensions, the AKS base image, a plan and offer to your users, and enable multi-tenancy for your Azure Stack Hub. AKS clusters can only be created in the user environment.
2121

2222
> [!IMPORTANT]
23-
> Azure Kubernetes Service on Azure Stack Hub, currently in preview, is being discontinued and will not become GA. See [AKS Engine](../user/azure-stack-kubernetes-aks-engine-overview.md) for a Kubernetes solution on Azure Stack Hub.
23+
> Azure Kubernetes Service on Azure Stack Hub, currently in preview, is discontinued and won't be released to general availability (GA). See the [AKS Engine overview](../user/azure-stack-kubernetes-aks-engine-overview.md) for a Kubernetes solution on Azure Stack Hub.
2424
> See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for legal terms that apply to Azure features that are in beta, preview, or otherwise not yet released into general availability.
2525
2626
> [!NOTE]
27-
> Azure Kubernetes Service on Azure Stack Hub doesn't support the creation of a cluster in the administration environment. You can only create AKS clusters in the user environment.
27+
> Azure Kubernetes Service on Azure Stack Hub doesn't support the creation of a cluster in the administrator environment. You can only create AKS clusters in the user environment.
2828
2929
## Download required VM extensions
3030

@@ -36,11 +36,11 @@ You can find the VM extensions in the Azure Stack Hub Marketplace. You can downl
3636

3737
- Run command for Linux (latest version)
3838

39-
![Get the run command for Linux](media/aks-add-on/get-run-command-for-linux.png)
39+
![Screenshot of portal showing the run command for Linux.](media/aks-add-on/get-run-command-for-linux.png)
4040

4141
- Custom script for Linux (version 2.0.6)
4242

43-
![Get custom script for Linux](media/aks-add-on/get-custom-script-for-linux.png)
43+
![Screenshot of portal showing custom script for Linux.](media/aks-add-on/get-custom-script-for-linux.png)
4444

4545
### View the extensions with PowerShell
4646

@@ -56,50 +56,50 @@ For information about installing and using the AzureStack PowerShell module, see
5656

5757
## Download AKS base image
5858

59-
The AKS Service needs a special VM image referred to as the *AKS base image*. The AKS service doesn't work without the correct image version available in the local Azure Stack Hub Marketplace. The image is meant to be used by the AKS service, not to be used by tenants to create individual VMs. The image is not visible to tenants in the Marketplace. This is a task that needs to be done along with every Azure Stack Hub update. Every time there is a new update, there is a new AKS base image associated with the AKS service. Here are the steps:
59+
The AKS service needs a special VM image referred to as the *AKS base image*. The AKS service doesn't work without the correct image version available in the local Azure Stack Hub Marketplace. The image is meant to be used by the AKS service, not to be used by tenants to create individual VMs. The image is not visible to tenants in the Marketplace. This is a task that needs to be done along with every Azure Stack Hub update. Every time there is a new update, there's a new AKS base image associated with the AKS service. Here are the steps:
6060

6161
1. Using the administrator portal, go the **Marketplace management** blade and select **Add from Azure**.
6262
1. Type **AKS** in the search box. Locate and download both the Linux **AKS Base Ubuntu 18.04-LTS Image Distro, 2022 Q1** version **2022.01.21** and the **AKS Base Windows Image** version **17763.2300.220121**.
6363

6464
- Linux base image:
6565

66-
[![Add the AKS Base Image - Linux](media/aks-add-on/aks-base-image-linux.png)](media/aks-add-on/aks-base-image-linux.png#lightbox)
66+
[![Screenshot of portal showing adding the AKS Base Image - Linux.](media/aks-add-on/aks-base-image-linux.png)](media/aks-add-on/aks-base-image-linux.png#lightbox)
6767

6868
- Windows base image:
6969

70-
[![Add the AKS Base Image - Windows](media/aks-add-on/aks-base-image-windows.png)](media/aks-add-on/aks-base-image-windows.png#lightbox)
70+
[![Screenshot of portal showing adding the AKS Base Image - Windows.](media/aks-add-on/aks-base-image-windows.png)](media/aks-add-on/aks-base-image-windows.png#lightbox)
7171

72-
1. If your instance is disconnected, follow the instructions in the article [Download Marketplace items to Azure Stack Hub](azure-stack-download-azure-marketplace-item.md) to download the two specified items from the marketplace in Azure, and upload them to your Azure Stack Hub instance.
72+
1. If your instance is disconnected, follow the instructions in [Download Marketplace items to Azure Stack Hub](azure-stack-download-azure-marketplace-item.md) to download the two specified items from the marketplace in Azure, and upload them to your Azure Stack Hub instance.
7373

7474
## Create plans and offers
7575

7676
To allow tenant users to use the AKS service, the operator must make it available through a plan and an offer.
7777

7878
1. Create a plan with the `Microsoft.Container` service. There are no specific quotas for this service; it uses the quotas available for the Compute, Network, and Storage services:
7979

80-
![Create a plan](media/aks-add-on/aks-create-a-plan.png)
80+
![Screenshot of portal showing create a plan.](media/aks-add-on/aks-create-a-plan.png)
8181

8282
1. Again, use the Azure Stack Hub administration portal to create an offer that contains the plan created in the prior step:
8383

84-
![Create an offer](media/aks-add-on/aks-create-an-offer.png)
84+
![Screenshot of portal showing create an offer.](media/aks-add-on/aks-create-an-offer.png)
8585

8686
## Configure multi-tenancy
8787

8888
You must configure Azure Stack Hub to support sign-ins from users that reside in other Microsoft Entra directories, allowing them to use services in Azure Stack Hub.
8989

90-
For instructions, see [Configure multi-tenancy in Azure Stack Hub](enable-multitenancy.md?pivots=management-tool-powershell)
90+
For instructions, see [Configure multi-tenancy in Azure Stack Hub](enable-multitenancy.md?pivots=management-tool-powershell).
9191

9292
## Monitor and act on alerts
9393

94-
1. Using the administrative portal, you can access the **Azure Kubernetes Service** under the **Administration** group.
94+
1. Use the administrator portal to access **Azure Kubernetes Service** under the **Administration** group.
9595
1. Select the **Alerts** blade. Review the alerts:
9696

97-
![AKS - Admin](media/aks-add-on/aks-admin.png)
97+
![Screenshot of portal showing AKS - Admin.](media/aks-add-on/aks-admin.png)
9898

9999
1. Alerts appear in the **Alerts** blade, and you can take action on them if necessary:
100100

101-
![AKS - Alerts](media/aks-add-on/aks-alerts.png)
101+
![Screenshot of portal showing AKS - Alerts.](media/aks-add-on/aks-alerts.png)
102102

103103
## Next steps
104104

105-
[Learn more about AKS on Azure Stack Hub](../user/aks-overview.md)
105+
[More information about AKS on Azure Stack Hub](../user/aks-overview.md)

azure-stack/operator/app-service-back-up.md

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
title: Back up App Service on Azure Stack Hub
33
description: Learn how to back up App Services on Azure Stack Hub.
44
author: sethmanheim
5-
65
ms.topic: article
7-
ms.date: 04/23/2019
8-
ms.author: anwestg
6+
ms.date: 08/08/2024
7+
ms.author: sethm
98
ms.reviewer: anwestg
109
ms.lastreviewed: 03/21/2019
1110

@@ -16,39 +15,40 @@ ms.lastreviewed: 03/21/2019
1615

1716
# Back up App Service on Azure Stack Hub
1817

19-
This document provides instructions on how to back up App Service on Azure Stack Hub.
18+
This article provides instructions on how to back up App Service on Azure Stack Hub.
2019

2120
> [!IMPORTANT]
22-
> App Service on Azure Stack Hub isn't backed up as part of [Azure Stack Hub infrastructure backup](azure-stack-backup-infrastructure-backup.md). As an Azure Stack Hub Operator, you must take steps to ensure App Service can be successfully recovered if necessary.
21+
> App Service on Azure Stack Hub isn't backed up as part of [Azure Stack Hub infrastructure backup](azure-stack-backup-infrastructure-backup.md). As an Azure Stack Hub operator, you must take steps to ensure App Service can be successfully recovered if necessary.
2322
2423
Azure App Service on Azure Stack Hub has four main components to consider when planning for disaster recovery:
25-
1. The resource provider infrastructure; server roles, worker tiers, and so on.
26-
2. The App Service secrets.
27-
3. The App Service SQL Server hosting and metering databases.
28-
4. The App Service user workload content stored in the App Service file share.
2924

30-
## Back up App Service secrets
31-
When recovering App Service from backup, you need to provide the App Service keys used by the initial deployment. This information should be saved as soon as App Service is successfully deployed and stored in a safe location. The resource provider infrastructure configuration is recreated from backup during recovery using App Service recovery PowerShell cmdlets.
25+
1. The resource provider infrastructure; server roles, worker tiers, and so on.
26+
1. The App Service secrets.
27+
1. The App Service SQL Server hosting and metering databases.
28+
1. The App Service user workload content stored in the App Service file share.
3229

33-
Use the administration portal to back up app service secrets by following these steps:
30+
## Back up App Service secrets
3431

35-
1. Sign in to the Azure Stack Hub administrator portal as the service admin.
32+
When you recover App Service from backup, you must provide the App Service keys used by the initial deployment. This information should be saved as soon as App Service is successfully deployed and stored in a safe location. The resource provider infrastructure configuration is recreated from backup during recovery using App Service recovery PowerShell cmdlets.
3633

37-
2. Browse to **App Service** -> **Secrets**.
34+
Use the administrator portal to back up App Service secrets by following these steps:
3835

39-
3. Select **Download Secrets**.
36+
1. Sign in to the Azure Stack Hub administrator portal as the service admin.
37+
1. Browse to **App Service** -> **Secrets**.
38+
1. Select **Download Secrets**.
4039

41-
![Download secrets in Azure Stack Hub administrator portal](./media/app-service-back-up/download-secrets.png)
40+
![Screenshot showing download secrets in Azure Stack Hub administrator portal.](./media/app-service-back-up/download-secrets.png)
4241

43-
4. When secrets are ready for downloading, click **Save** and store the App Service secrets (**SystemSecrets.JSON**) file in a safe location.
42+
1. When the secrets are ready for downloading, select **Save** and store the App Service secrets (**SystemSecrets.json**) file in a safe location.
4443

45-
![Save secrets in Azure Stack Hub administrator portal](./media/app-service-back-up/save-secrets.png)
44+
![Screenshot showing save secrets in Azure Stack Hub administrator portal.](./media/app-service-back-up/save-secrets.png)
4645

4746
> [!NOTE]
4847
> Repeat these steps every time the App Service secrets are rotated.
4948
5049
## Back up the App Service databases
51-
To restore App Service, you need the **Appservice_hosting** and **Appservice_metering** database backups. We recommend using SQL Server maintenance plans or Azure Backup Server to ensure these databases are backed up and saved securely on a regular basis. However, any method of ensuring regular SQL backups are created can be used.
50+
51+
To restore App Service, you need the **Appservice_hosting** and **Appservice_metering** database backups. We recommend using SQL Server maintenance plans or Azure Backup Server to ensure these databases are backed up and saved securely on a regular basis. However, you can use any method of ensuring regular SQL backups are created.
5252

5353
To manually back up these databases while logged into the SQL Server, use the following PowerShell commands:
5454

@@ -61,16 +61,17 @@ To manually back up these databases while logged into the SQL Server, use the fo
6161
```
6262

6363
> [!NOTE]
64-
> If you need to back up SQL AlwaysOn databases, follow [these instructions](/sql/database-engine/availability-groups/windows/configure-backup-on-availability-replicas-sql-server?view=sql-server-2017&preserve-view=true).
64+
> If you need to back up SQL AlwaysOn databases, [follow these instructions](/sql/database-engine/availability-groups/windows/configure-backup-on-availability-replicas-sql-server?view=sql-server-2017&preserve-view=true).
6565
6666
After all databases have been successfully backed up, copy the .bak files to a safe location along with the App Service secrets info.
6767

6868
## Back up the App Service file share
69+
6970
App Service stores tenant app info in the file share. This file share must be backed up on a regular basis along with the App Service databases so that as little data as possible is lost if a restore is required.
7071

7172
To back up the App Service file share content, use Azure Backup Server or another method to regularly copy the file share content to the location you've saved all previous recovery info.
7273

73-
For example, you can use these steps to use Robocopy from a Windows PowerShell (not PowerShell ISE) console session:
74+
For example, you can run these commands to use Robocopy from a Windows PowerShell (not PowerShell ISE) console session:
7475

7576
```powershell
7677
$source = "<file share location>"
@@ -81,4 +82,5 @@ net use $destination /delete
8182
```
8283

8384
## Next steps
85+
8486
[Restore App Service on Azure Stack Hub](app-service-recover.md)

0 commit comments

Comments
 (0)