Skip to content

Commit 1fd3a0e

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into tamram23-0330
2 parents 4018a25 + d353c32 commit 1fd3a0e

17 files changed

+523
-338
lines changed

articles/app-service/includes/quickstart-java/quickstart-java-linux-maven-pivot.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ If Maven isn't your preferred development tool, check out our similar tutorials
4242
Clone the [sample project](https://github.com/Azure-Samples/app-service-java-quickstart) and check out the source code that runs with this version of the article.
4343

4444
> [!TIP]
45-
> Though App Service supports older versions of Java, the sample project uses Java records and requires **Java 17**. For more information about Java records, see [JEP 395](https://openjdk.org/jeps/395).
45+
> Though App Service supports older versions of Java, the `booty-duke-app-service` sample project uses Java records and requires **Java 17**. For more information about Java records, see [JEP 395](https://openjdk.org/jeps/395).
4646
4747
```azurecli-interactive
4848
git clone https://github.com/Azure-Samples/app-service-java-quickstart
@@ -83,11 +83,14 @@ git clone https://github.com/Azure-Samples/app-service-java-quickstart
8383

8484
Change directory to the completed project and build from the top level. Then `cd` to the subdirectory for petstore.
8585

86+
> [!TIP]
87+
> The `petstore-ee7` sample requires **Java 11 or newer**. The `booty-duke-app-service` sample project requires **Java 17**. If your installed version of Java is less than 17, run the build from within the `petstore-ee7` directory, rather than at the top level.
88+
8689
```azurecli-interactive
8790
cd app-service-java-quickstart
8891
git checkout 20230308
89-
mvn clean install
9092
cd petstore-ee7
93+
mvn clean install
9194
```
9295

9396
---

articles/app-service/overview-name-resolution.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Name resolution in App Service
33
description: Overview of how name resolution (DNS) works for your app in Azure App Service.
44
author: madsd
55
ms.topic: conceptual
6-
ms.date: 03/01/2023
6+
ms.date: 04/03/2023
77
ms.author: madsd
88
---
99

@@ -35,15 +35,15 @@ Using the app setting `WEBSITE_DNS_ALT_SERVER`, you append a DNS server to end o
3535

3636
If you require fine-grained control over name resolution, App Service allows you to modify the default behavior. You can modify retry attempts, retry timeout and cache timeout. Changing behavior like disabling or lowering cache duration may influence performance.
3737

38-
|Property name|Default value|Allowed values|Description|
39-
|-|-|-|
40-
|dnsRetryAttemptCount|1|1-5|Defines the number of attempts to resolve where one means no retries|
41-
|dnsMaxCacheTimeout|30|0-60|Cache timeout defined in seconds. Setting cache to zero means you've disabled caching|
42-
|dnsRetryAttemptTimeout|3|1-30|Timeout before retrying or failing. Timeout also defines the time to wait for secondary server results if the primary doesn't respond|
38+
|Property name|Windows default value|Linux default value|Allowed values|Description|
39+
|-|-|-|-|
40+
|dnsRetryAttemptCount|1|5|1-5|Defines the number of attempts to resolve where one means no retries.|
41+
|dnsMaxCacheTimeout|30|0|0-60|Cache timeout defined in seconds. Setting cache to zero means you've disabled caching.|
42+
|dnsRetryAttemptTimeout|3|1|1-30|Timeout before retrying or failing. Timeout also defines the time to wait for secondary server results if the primary doesn't respond.|
4343

4444
>[!NOTE]
45-
> * Changing name resolution behavior is not supported on Windows Container apps
46-
> * To enable DNS caching on Web App for Containers and Linux-based apps you must add the app setting `WEBSITE_ENABLE_DNS_CACHE`
45+
> * Changing name resolution behavior is not supported on Windows Container apps.
46+
> * To enable DNS caching on Web App for Containers and Linux-based apps, you must add the app setting `WEBSITE_ENABLE_DNS_CACHE`. This setting defaults to 30 seconds.
4747
4848
Configure the name resolution behavior by using these CLI commands:
4949

@@ -63,4 +63,4 @@ az resource show --resource-group <group-name> --name <app-name> --query propert
6363

6464
- [Configure virtual network integration](./configure-vnet-integration-enable.md)
6565
- [Name resolution for resources in Azure virtual networks](../virtual-network/virtual-networks-name-resolution-for-vms-and-role-instances.md)
66-
- [General networking overview](./networking-features.md)
66+
- [General networking overview](./networking-features.md)

articles/azure-cache-for-redis/cache-best-practices-development.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Some Redis operations, like the [KEYS](https://redis.io/commands/keys) command,
6262

6363
## Choose an appropriate tier
6464

65-
Use Standard or Premium tier for production systems. Don't use the Basic tier in production. The Basic tier is a single node system with no data replication and no SLA. Also, use at least a C1 cache. C0 caches are only meant for simple dev/test scenarios because:
65+
Use Standard, Premium, Enterprise, or Enterprise Flash tiers for production systems. Don't use the Basic tier in production. The Basic tier is a single node system with no data replication and no SLA. Also, use at least a C1 cache. C0 caches are only meant for simple dev/test scenarios because:
6666

6767
- they share a CPU core
6868
- use little memory
@@ -89,6 +89,10 @@ The public IP address assigned to your cache can change as a result of a scale o
8989

9090
The default version of Redis that is used when creating a cache can change over time. Azure Cache for Redis might adopt a new version when a new version of open-source Redis is released. If you need a specific version of Redis for your application, we recommend choosing the Redis version explicitly when you create the cache.
9191

92+
## Specific guidance for the Enterprise tiers
93+
94+
Because the _Enterprise_ and _Enterprise Flash_ tiers are built on Redis Enterprise rather than open-source Redis, there are some differences in development best practices. See [Best Practices for the Enterprise and Enterprise Flash tiers](cache-best-practices-enterprise-tiers.md) for more information.
95+
9296
## Use TLS encryption
9397

9498
Azure Cache for Redis requires TLS encrypted communications by default. TLS versions 1.0, 1.1 and 1.2 are currently supported. However, TLS 1.0 and 1.1 are on a path to deprecation industry-wide, so use TLS 1.2 if at all possible.
@@ -149,7 +153,7 @@ If your application validates certificate in code, you need to modify it to reco
149153

150154
For more information, see [Client libraries](cache-best-practices-client-libraries.md#client-libraries).
151155

152-
## Next steps
156+
## Next steps
153157

154158
- [Performance testing](cache-best-practices-performance.md)
155159
- [Failover and patching for Azure Cache for Redis](cache-failover.md)

articles/container-apps/workload-profiles-overview.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ You can constrain the memory and CPU usage of each app inside a workload profile
6868

6969
When demand for new apps or more replicas of an existing app exceeds the profile's current resources, profile instances may be added. Inversely, if the number of apps or replicas goes down, profile instances may be removed. You have control over the constraints on the minimum and maximum number of profile instances. Azure calculates [billing](billing.md#consumption-dedicated) largely based on the number of running profile instances.
7070

71+
## Networking
72+
73+
When using workload profiles in the Consumption + Dedicated plan structure, additional networking features to fully secure your ingress/egress networking traffic such as user defined routes are available. To learn more about what networking features are supported, see [networking concepts](./networking.md), and for steps on how to secure your network with Container Apps, see the [lock down your Container App environment section](./networking.md#lock-down-your-container-app-environment).
74+
7175
## Next steps
7276

7377
> [!div class="nextstepaction"]

articles/cosmos-db/mongodb/vcore/tutorial-nodejs-web-app.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ For the most straightforward dev environment, we use GitHub Codespaces so that y
4545
1. Create a new GitHub Codespace on the `main` branch of the [`azure-samples/msdocs-azure-cosmos-db-mongodb-mern-web-app`](https://github.com/azure-samples/msdocs-azure-cosmos-db-mongodb-mern-web-app) GitHub repository.
4646

4747
> [!div class="nextstepaction"]
48-
> [Open this project in GitHub Codespaces](https://github.com/azure-samples/msdocs-azure-cosmos-db-mongodb-mern-web-app/codespaces)
48+
> [Open this project in GitHub Codespaces](https://github.com/codespaces/new?hide_repo_select=true&ref=main&repo=611024069)
4949
5050
1. Wait for the Codespace to start. This startup process can take two to three minutes.
5151

@@ -165,13 +165,13 @@ Start by running the sample application's API with the local MongoDB container t
165165
> [!NOTE]
166166
> The object ids (`_id`) are randomnly generated and will differ from this truncated example output.
167167
168-
1. In the **client/** directory, create a new **.env** file.
168+
1. In the **server/** directory, create a new **.env** file.
169169
170-
1. In the **client/.env** file, add an environment variable for this value:
170+
1. In the **server/.env** file, add an environment variable for this value:
171171
172172
| Environment Variable | Value |
173173
| --- | --- |
174-
| `CONNECTION_STRING` | The connection string to the Azure Cosmos DB for MongoDB vCore cluster. For now, use `mongodb://localhost`. |
174+
| `CONNECTION_STRING` | The connection string to the Azure Cosmos DB for MongoDB vCore cluster. For now, use `mongodb://localhost:27017?directConnection=true`. |
175175
176176
```env
177177
CONNECTION_STRING=mongodb://localhost:27017?directConnection=true
@@ -270,8 +270,13 @@ Now, let's validate that the application works seamlessly with Azure Cosmos DB f
270270
```shell
271271
exit
272272
```
273+
1. In the **client/** directory, create a new **.env** file.
273274
274-
1. Open the **client/.env** file again. Then, update the value of the `CONNECTION_STRING` environment variables with the connection string you used with the mongo shell:
275+
1. In the **client/.env** file, add an environment variable for this value:
276+
277+
| Environment Variable | Value |
278+
| --- | --- |
279+
| `CONNECTION_STRING` | The connection string to the Azure Cosmos DB for MongoDB vCore cluster. Use the same connection string you used with the mongo shell:
275280
276281
```output
277282
CONNECTION_STRING=<your-connection-string>

0 commit comments

Comments
 (0)