Skip to content

Commit a1e12b2

Browse files
committed
Merge branch 'uuf-logic-apps-formula-2' of https://github.com/anaharris-ms/azure-docs-pr into uuf-logic-apps-formula-2
2 parents 9d83294 + 1b992fa commit a1e12b2

File tree

94 files changed

+1506
-923
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+1506
-923
lines changed

articles/api-management/api-management-howto-disaster-recovery-backup-restore.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: dlepow
77

88
ms.service: azure-api-management
99
ms.topic: how-to
10-
ms.date: 01/06/2025
10+
ms.date: 09/06/2024
1111
ms.author: danlep
1212
ms.custom: devx-track-azurepowershell
1313
---
@@ -29,8 +29,7 @@ This article shows how to automate backup and restore operations of your API Man
2929
> Each backup expires after 30 days. If you attempt to restore a backup after the 30-day expiration period has expired, the restore will fail with a `Cannot restore: backup expired` message.
3030
3131
> [!IMPORTANT]
32-
> * Backup and restore aren't supported in the [v2 service tiers](v2-service-tiers-overview.md) or in API Management instances configured with [workspaces](workspaces-overview.md).
33-
> * Restore operation doesn't change custom hostname configuration of the target service. We recommend to use the same custom hostname and TLS certificate for both active and standby services, so that, after restore operation completes, the traffic can be re-directed to the standby instance by a simple DNS CNAME change.
32+
> Restore operation doesn't change custom hostname configuration of the target service. We recommend to use the same custom hostname and TLS certificate for both active and standby services, so that, after restore operation completes, the traffic can be re-directed to the standby instance by a simple DNS CNAME change.
3433
3534

3635
[!INCLUDE [updated-for-az](~/reusable-content/ce-skilling/azure/includes/updated-for-az.md)]

articles/api-management/set-edit-policies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ To modify the policy evaluation order using the policy editor:
221221

222222
> [!NOTE]
223223
> * You can place the `base` element before or after any policy element in a section.
224-
> * If you want to prevent inheriting policies from the parent scope, remove the `base` element. In most cases, this isn't recommended.
224+
> * If you want to prevent inheriting policies from the parent scope, remove the `base` element. In most cases, this isn't recommended. However, it may be useful in certain situations, such as when you want to apply different policies to a specific operation than are configured for the API (all operations) scope.
225225

226226
1. Continue to configure the `base` element in policy definitions at successively broader scopes.
227227

articles/application-gateway/for-containers/how-to-websockets-gateway-api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: application gateway
55
author: greg-lindsay
66
ms.service: azure-appgw-for-containers
77
ms.topic: conceptual
8-
ms.date: 1/13/2025
8+
ms.date: 1/14/2025
99
ms.author: greglin
1010
---
1111

@@ -26,7 +26,7 @@ WebSocket protocol has no specific implementation with Gateway API for configura
2626
Apply the following deployment.yaml file on your cluster to create a sample web application to demonstrate WebSocket support.
2727

2828
```bash
29-
kubectl apply -f https://learn.microsoft.com/azure/application-gateway/for-containers/examples/websocket-scenario/deployment.yaml
29+
kubectl apply -f https://raw.githubusercontent.com/MicrosoftDocs/azure-docs/refs/heads/main/articles/application-gateway/for-containers/examples/websocket-scenario/deployment.yaml
3030
```
3131

3232
This command creates the following on your cluster:

articles/application-gateway/for-containers/websockets.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,6 @@ EOF
7171
7272
### Metrics & Monitoring
7373

74-
WebSockets Metrics:
75-
76-
- New Connection Upgrades: This metric incrments on new WebSocket connections created (or upgraded) from regular HTTP requests.
77-
- Current Connection Upgrades: This metrics reflects active upgraded connections.
78-
79-
>[!Note]
80-
>Connection upgrade metrics also include other connection upgrades, such as HTTP 1.1 to HTTP 2.
81-
8274
Diagnostic Logs:
8375

8476
WebSocket connections operate using a distinct protocol. Upon initiating the connection, the browser receives an HTTP 101 status code, indicating the switch from HTTP to WebSocket and will be reflected in the access log.

articles/azure-fluid-relay/how-tos/test-automation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fluid.url: https://fluidframework.com/docs/testing/testing/
99

1010
# How to: Use test automation with Azure Fluid Relay
1111

12-
Testing and automation are crucial to maintaining the quality and longevity of your code. Internally, Fluid uses a range of unit and integration tests powered by [Mocha](https://mochajs.org/), [Jest](https://jestjs.io/), [Puppeteer](https://github.com/puppeteer/puppeteer), and [Webpack](https://webpack.js.org/).
12+
Testing and automation are crucial to maintaining the quality and longevity of your code. Internally, Fluid uses a range of unit and integration tests powered by [Mocha](https://mochajs.org/), [Jest](https://jestjs.io/), [Puppeteer](https://github.com/puppeteer/puppeteer), and [webpack](https://webpack.js.org/).
1313

1414
You can run tests using the local [@fluidframework/azure-local-service](https://www.npmjs.com/package/@fluidframework/azure-local-service) or using a test tenant in Azure Fluid Relay service. AzureClient can be configured to connect to both a remote service and a local service, which enables you to use a single client type between tests against live and local service instances. The only difference is the configuration used to create the client.
1515

articles/azure-fluid-relay/how-tos/use-audience-in-fluid.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ npm run start
361361
Navigate to `localhost:3000` on a browser tab to view the running application. To create a new container, select a user ID button while leaving the container ID input blank. To simulate a new user joining the container session, open a new browser tab and navigate to `localhost:3000`. This time, input the container ID value which can be found from first browser tab's url proceeding `http://localhost:3000/#`.
362362

363363
> [!NOTE]
364-
> You may need to install an additional dependency to make this demo compatible with Webpack 5. If you receive a compilation error related to a "buffer" or "url" package, please run `npm install -D buffer url` and try again. This will be resolved in a future release of Fluid Framework.
364+
> You may need to install an additional dependency to make this demo compatible with webpack 5. If you receive a compilation error related to a "buffer" or "url" package, please run `npm install -D buffer url` and try again. This will be resolved in a future release of Fluid Framework.
365365
366366
## Next steps
367367

articles/azure-functions/functions-bindings-openai-assistant-trigger.md

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.custom:
1010
- devx-track-ts
1111
ms.collection:
1212
- ce-skilling-ai-copilot
13-
ms.date: 05/24/2024
13+
ms.date: 01/07/2025
1414
zone_pivot_groups: programming-languages-set-functions
1515
---
1616

@@ -40,21 +40,17 @@ This example demonstrates how to create an assistant that adds a new todo task t
4040
:::code language="java" source="~/functions-openai-extension/samples/assistant/java/src/main/java/com/azfs/AssistantSkills.java" range="27-43":::
4141

4242
::: zone-end
43+
::: zone pivot="programming-language-javascript,programming-language-typescript"
44+
This example demonstrates how to create an assistant that adds a new todo task to a database. The trigger has a static description of `Create a new todo task` used by the model. The function itself takes a string, which represents a new task to add. When executed, the function adds the task as a new todo item in a custom item store and returns a response from the store.
45+
::: zone-end
4346
::: zone pivot="programming-language-javascript"
44-
[!INCLUDE [functions-examples-not-available-note](../../includes/functions-examples-not-available-note.md)]
45-
<!---uncomment when code example is available:
46-
{{This comes from the example code comment}}
4747

48-
:::code language="javascript" source="~/functions-openai-extension/samples/{{link to the correct sample.ts}}" range="{{named is better than range}}":::
48+
:::code language="javascript" source="~/functions-openai-extension/samples/assistant/javascript/src/functions/assistantSkills.js" range="4-25":::
4949

50-
{{Add more examples if available}}
51-
-->
5250
::: zone-end
5351
::: zone pivot="programming-language-typescript"
5452

55-
This example demonstrates how to create an assistant that adds a new todo task to a database. The trigger has a static description of `Create a new todo task` used by the model. The function itself takes a string, which represents a new task to add. When executed, the function adds the task as a new todo item in a custom item store and returns a response from the store.
56-
57-
:::code language="typescript" source="~/functions-openai-extension/samples/assistant/typescript/src/functions/assistantSkills.ts" range="9-24" :::
53+
:::code language="typescript" source="~/functions-openai-extension/samples/assistant/typescript/src/functions/assistantSkills.ts" range="4-24" :::
5854

5955
::: zone-end
6056
::: zone pivot="programming-language-powershell"

articles/azure-functions/functions-bindings-openai-assistantcreate-output.md

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.custom:
1010
- devx-track-ts
1111
ms.collection:
1212
- ce-skilling-ai-copilot
13-
ms.date: 05/20/2024
13+
ms.date: 01/07/2025
1414
zone_pivot_groups: programming-languages-set-functions
1515
---
1616

@@ -35,26 +35,20 @@ This example demonstrates the creation process, where the HTTP PUT function that
3535
::: zone pivot="programming-language-java"
3636
This example demonstrates the creation process, where the HTTP PUT function that creates a new assistant chat bot with the specified ID. The response to the prompt is returned in the HTTP response.
3737

38-
:::code language="java" source="~/functions-openai-extension/samples/assistant/java/src/main/java/com/azfs/AssistantApis.java" range="33-58":::
39-
38+
:::code language="java" source="~/functions-openai-extension/samples/assistant/java/src/main/java/com/azfs/AssistantApis.java" range="33-58":::
4039

40+
::: zone-end
41+
::: zone pivot="programming-language-javascript,programming-language-typescript"
42+
This example demonstrates the creation process, where the HTTP PUT function that creates a new assistant chat bot with the specified ID. The response to the prompt is returned in the HTTP response.
4143
::: zone-end
4244
::: zone pivot="programming-language-javascript"
43-
[!INCLUDE [functions-examples-not-available-note](../../includes/functions-examples-not-available-note.md)]
44-
<!---uncomment when code example is available:
4545

46-
{{This comes from the example code comment}}
46+
:::code language="javascript" source="~/functions-openai-extension/samples/assistant/javascript/src/functions/assistantApis.js" range="6-33" :::
4747

48-
:::code language="javascript" source="~/functions-openai-extension/samples/{{link to the correct sample.js}}" range="{{named is better than range}}":::
49-
50-
{{Add more examples if available}}
51-
-->
52-
::: zone-end
48+
::: zone-end
5349
::: zone pivot="programming-language-typescript"
5450

55-
This example demonstrates the creation process, where the HTTP PUT function that creates a new assistant chat bot with the specified ID. The response to the prompt is returned in the HTTP response.
56-
57-
:::code language="javascript" source="~/functions-openai-extension/samples/assistant/typescript/src/functions/assistantApis.ts" range="7-29" :::
51+
:::code language="typescript" source="~/functions-openai-extension/samples/assistant/typescript/src/functions/assistantApis.ts" range="4-33" :::
5852

5953
::: zone-end
6054
::: zone pivot="programming-language-powershell"

articles/azure-functions/functions-bindings-openai-assistantpost-input.md

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.custom:
1010
- devx-track-ts
1111
ms.collection:
1212
- ce-skilling-ai-copilot
13-
ms.date: 05/20/2024
13+
ms.date: 01/07/2025
1414
zone_pivot_groups: programming-languages-set-functions
1515
---
1616

@@ -38,24 +38,19 @@ This example demonstrates the creation process, where the HTTP POST function tha
3838

3939
:::code language="java" source="~/functions-openai-extension/samples/assistant/java/src/main/java/com/azfs/AssistantApis.java" range="83-103":::
4040

41+
::: zone-end
42+
::: zone pivot="programming-language-javascript,programming-language-typescript"
43+
This example demonstrates the creation process, where the HTTP POST function that sends user prompts to the assistant chat bot. The response to the prompt is returned in the HTTP response.
4144
::: zone-end
4245
::: zone pivot="programming-language-javascript"
43-
[!INCLUDE [functions-examples-not-available-note](../../includes/functions-examples-not-available-note.md)]
44-
<!---uncomment when code example is available:
45-
{{This comes from the example code comment}}
46-
47-
:::code language="javascript" source="~/functions-openai-extension/samples/{{link to the correct sample.js}}" range="{{named is better than range}}":::
46+
:::code language="javascript" source="~/functions-openai-extension/samples/assistant/javascript/src/functions/assistantApis.js" range="6-7,36-60":::
4847

49-
{{Add more examples if available}}
50-
-->
5148
::: zone-end
5249
::: zone pivot="programming-language-typescript"
5350

54-
This example demonstrates the creation process, where the HTTP POST function that sends user prompts to the assistant chat bot. The response to the prompt is returned in the HTTP response.
55-
56-
:::code language="typescript" source="~/functions-openai-extension/samples/assistant/typescript/src/functions/assistantApis.ts" range="32-50":::
51+
:::code language="typescript" source="~/functions-openai-extension/samples/assistant/typescript/src/functions/assistantApis.ts" range="6-7,36-60":::
5752

58-
::: zone-end
53+
::: zone-end
5954
::: zone pivot="programming-language-powershell"
6055

6156
This example demonstrates the creation process, where the HTTP POST function that sends user prompts to the assistant chat bot. The response to the prompt is returned in the HTTP response.

articles/azure-functions/functions-bindings-openai-assistantquery-input.md

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.custom:
1010
- devx-track-ts
1111
ms.collection:
1212
- ce-skilling-ai-copilot
13-
ms.date: 05/20/2024
13+
ms.date: 01/07/2025
1414
zone_pivot_groups: programming-languages-set-functions
1515
---
1616

@@ -40,30 +40,26 @@ This example demonstrates the creation process, where the HTTP GET function that
4040
:::code language="java" source="~/functions-openai-extension/samples/assistant/java/src/main/java/com/azfs/AssistantApis.java" range="63-78":::
4141

4242

43+
::: zone-end
44+
::: zone pivot="programming-language-javascript,programming-language-typescript"
45+
This example demonstrates the creation process, where the HTTP GET function that queries the conversation history of the assistant chat bot. The response to the prompt is returned in the HTTP response.
4346
::: zone-end
4447
::: zone pivot="programming-language-javascript"
45-
[!INCLUDE [functions-examples-not-available-note](../../includes/functions-examples-not-available-note.md)]
46-
<!---uncomment when code example is available:
47-
48-
{{This comes from the example code comment}}
4948

50-
:::code language="javascript" source="~/functions-openai-extension/samples/{{link to the correct sample.js}}" range="{{named is better than range}}":::
49+
:::code language="javascript" source="~/functions-openai-extension/samples/assistant/javascript/src/functions/assistantApis.js" range="6-7,63-79":::
5150

52-
{{Add more examples if available}}
53-
-->
5451
::: zone-end
5552
::: zone pivot="programming-language-typescript"
5653

5754
This example demonstrates the creation process, where the HTTP GET function that queries the conversation history of the assistant chat bot. The response to the prompt is returned in the HTTP response.
5855

59-
:::code language="typescript" source="~/functions-openai-extension/samples/assistant/typescript/src/functions/assistantApis.ts" range="57-71":::
56+
:::code language="typescript" source="~/functions-openai-extension/samples/assistant/typescript/src/functions/assistantApis.ts" range="6-7,63-79":::
6057

61-
::: zone-end
58+
::: zone-end
6259
::: zone pivot="programming-language-powershell"
6360

6461
This example demonstrates the creation process, where the HTTP GET function that queries the conversation history of the assistant chat bot. The response to the prompt is returned in the HTTP response.
6562

66-
6763
Here's the _function.json_ file for Get Chat State:
6864

6965
:::code language="json" source="~/functions-openai-extension/samples/assistant/powershell/GetChatState/function.json" :::

0 commit comments

Comments
 (0)