Skip to content

Commit 430deab

Browse files
authored
Merge pull request #249379 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 43b69b6 + 3b21833 commit 430deab

File tree

5 files changed

+18
-14
lines changed

5 files changed

+18
-14
lines changed

articles/aks/image-cleaner.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.date: 06/02/2023
1313
It's common to use pipelines to build and deploy images on Azure Kubernetes Service (AKS) clusters. While great for image creation, this process often doesn't account for the stale images left behind and can lead to image bloat on cluster nodes. These images may contain vulnerabilities, which may create security issues. To remove security risks in your clusters, you can clean these unreferenced images. Manually cleaning images can be time intensive. Image Cleaner performs automatic image identification and removal, which mitigates the risk of stale images and reduces the time required to clean them up.
1414

1515
> [!NOTE]
16-
> Image Cleaner is a feature based on [Eraser](https://azure.github.io/eraser).
16+
> Image Cleaner is a feature based on [Eraser](https://eraser-dev.github.io/eraser).
1717
> On an AKS cluster, the feature name and property name is `Image Cleaner`, while the relevant Image Cleaner pods' names contain `Eraser`.
1818
1919
## Prerequisites

articles/app-service/monitor-instances-health-check.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,10 @@ function envVarMatchesHeader(headerValue) {
136136
> The `x-ms-auth-internal-token` header is only available on Windows App Service.
137137
138138
## Instances
139-
Once Health Check is enabled, you can restart and monitor the status of your application instances through the instances tab. The instances tab shows your instance's name, the status of that instance and gives you the option to manually restart the application instance.
140139

141-
If the status of your instance is unhealthy, you can restart the instance manually using the restart button in the table. Keep in mind that any other applications hosted on the same App Service Plan as the instance will also be affected by the restart. If there are other applications using the same App Service Plan as the instance, they are listed on the opening blade from the restart button.
140+
Once Health Check is enabled, you can restart and monitor the status of your application instances through the instances tab. The instances tab shows your instance's name, the status of that application's instance and gives you the option to manually restart the instance.
141+
142+
If the status of your application instance is unhealthy, you can restart the instance manually using the restart button in the table. Keep in mind that any other applications hosted on the same App Service Plan as the instance will also be affected by the restart. If there are other applications using the same App Service Plan as the instance, they are listed on the opening blade from the restart button.
142143

143144
If you restart the instance and the restart process fails, you will then be given the option to replace the worker (only 1 instance can be replaced per hour). This will also affect any applications using the same App Service Plan.
144145

articles/app-service/quickstart-wordpress.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ To complete this quickstart, you need an Azure account with an active subscripti
4646
1. Select the **Advanced** tab. If you're unfamiliar with an [Azure CDN](../cdn/cdn-overview.md), [Azure Front Door](../frontdoor/front-door-overview.md), or [Blob Storage](../storage/blobs/storage-blobs-overview.md), then clear the checkboxes. For more details on the Content Distribution options, see [WordPress on App Service](https://azure.github.io/AppService/2022/02/23/WordPress-on-App-Service-Public-Preview.html).
4747

4848
:::image type="content" source="./media/quickstart-wordpress/08-wordpress-advanced-settings.png" alt-text="Screenshot of WordPress Advanced Settings.":::
49+
50+
> [!NOTE]
51+
> The WordPress app requires a virtual network with an address space of /23 at minimum.
4952
5053
1. Select the **Review + create** tab. After validation runs, select the **Create** button at the bottom of the page to create the WordPress site.
5154

articles/azure-cache-for-redis/cache-configure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ New Azure Cache for Redis instances are configured with the following default Re
476476
| `maxmemory-samples` |3 |To save memory, LRU and minimal TTL algorithms are approximated algorithms instead of precise algorithms. By default Redis checks three keys and picks the one that was used less recently. |
477477
| `lua-time-limit` |5,000 |Max execution time of a Lua script in milliseconds. If the maximum execution time is reached, Redis logs that a script is still in execution after the maximum allowed time, and starts to reply to queries with an error. |
478478
| `lua-event-limit` |500 |Max size of script event queue. |
479-
| `client-output-buffer-limit` `normalclient-output-buffer-limit` `pubsub` |0 0 032mb 8 mb 60 |The client output buffer limits can be used to force disconnection of clients that aren't reading data from the server fast enough for some reason. A common reason is that a Pub/Sub client can't consume messages as fast as the publisher can produce them. For more information, see [https://redis.io/topics/clients](https://redis.io/topics/clients). |
479+
| `client-output-buffer-limit normal` / `client-output-buffer-limit pubsub` |`0 0 0` / `32mb 8mb 60` |The client output buffer limits can be used to force disconnection of clients that aren't reading data from the server fast enough for some reason. A common reason is that a Pub/Sub client can't consume messages as fast as the publisher can produce them. For more information, see [https://redis.io/topics/clients](https://redis.io/topics/clients). |
480480

481481
<a name="databases"></a>
482482

articles/cloud-shell/features.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ Cloud Shell comes with the following Azure command-line tools preinstalled:
8585

8686
| Tool | Version | Command |
8787
| ------------------------- | -------- | ------------------------------ |
88-
| [Azure CLI][08] | 2.45.0 | `az --version` |
89-
| [Azure PowerShell][06] | 9.4.0 | `Get-Module Az -ListAvailable` |
88+
| [Azure CLI][08] | 2.51.0 | `az --version` |
89+
| [Azure PowerShell][06] | 10.2.0 | `Get-Module Az -ListAvailable` |
9090
| [AzCopy][04] | 10.15.0 | `azcopy --version` |
91-
| [Azure Functions CLI][01] | 4.0.3971 | `func --version` |
91+
| [Azure Functions CLI][01] | 4.0.5198 | `func --version` |
9292
| [Service Fabric CLI][03] | 11.2.0 | `sfctl --version` |
9393
| [Batch Shipyard][09] | 3.9.1 | `shipyard --version` |
9494
| [blobxfer][10] | 1.11.0 | `blobxfer --version` |
@@ -153,13 +153,13 @@ Cloud Shell comes with the following languages preinstalled:
153153

154154
| Language | Version | Command |
155155
| ---------- | ------------- | ------------------ |
156-
| .NET Core | [6.0.405][16] | `dotnet --version` |
157-
| Go | 1.17.13 | `go version` |
158-
| Java | 11.0.18 | `java --version` |
159-
| Node.js | 16.18.1 | `node --version` |
160-
| PowerShell | [7.3.2][07] | `pwsh -Version` |
156+
| .NET Core | [7.0.400][16] | `dotnet --version` |
157+
| Go | 1.19.11 | `go version` |
158+
| Java | 17.0.8 | `java --version` |
159+
| Node.js | 16.20.1 | `node --version` |
160+
| PowerShell | [7.3.6][07] | `pwsh -Version` |
161161
| Python | 3.9.14 | `python --version` |
162-
| Ruby | 3.1.3p185 | `ruby --version` |
162+
| Ruby | 3.1.4p223 | `ruby --version` |
163163

164164
You can verify the version of the language using the command listed in the table.
165165

@@ -186,7 +186,7 @@ You can verify the version of the language using the command listed in the table
186186
[13]: https://docs.cloudfoundry.org/cf-cli/
187187
[14]: https://docs.d2iq.com/dkp/2.3/azure-quick-start
188188
[15]: https://docs.docker.com/desktop/
189-
[16]: https://dotnet.microsoft.com/download/dotnet/6.0
189+
[16]: https://dotnet.microsoft.com/download/dotnet/7.0
190190
[17]: https://github.com/Azure/CloudShell/issues
191191
[18]: https://github.com/microsoft/mssql-scripter/blob/dev/doc/usage_guide.md
192192
[19]: https://helm.sh/docs/

0 commit comments

Comments
 (0)