Skip to content

Commit 2d76823

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into convFix
2 parents 4cdaec5 + 12f257f commit 2d76823

File tree

52 files changed

+361
-164
lines changed

Some content is hidden

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

52 files changed

+361
-164
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,6 +1240,11 @@
12401240
"redirect_url": "/previous-versions/azure/azure-video-analyzer/video-analyzer-docs/edge/use-visual-studio-code-extension",
12411241
"redirect_document_id": false
12421242
},
1243+
{
1244+
"source_path": "articles/azure-video-indexer/observed-people-tracing.md",
1245+
"redirect_url": "/azure/azure-video-indexer/observed-people-tracking",
1246+
"redirect_document_id": false
1247+
},
12431248
{
12441249
"source_path": "articles/cloudfoundry/index.yml",
12451250
"redirect_url": "https://docs.pivotal.io/pivotalcf/1-11/customizing/pcf_azure.html",

articles/ai-services/openai/concepts/use-your-data.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.subservice: openai
99
ms.topic: quickstart
1010
author: aahill
1111
ms.author: aahi
12-
ms.date: 07/12/2023
12+
ms.date: 08/08/2023
1313
recommendations: false
1414
---
1515

@@ -160,7 +160,7 @@ After you connect Azure OpenAI to your data, you can deploy it using the **Deplo
160160

161161
#### Using Power Virtual Agents
162162

163-
You can deploy your model to [Power Virtual Agents](/power-virtual-agents/fundamentals-what-is-power-virtual-agents) directly from Azure OpenAI studio, enabling you to bring conversational experiences to various data stores like public websites, SharePoint, OneDrive, and more. Power Virtual Agents acts as a conversational and generative AI platform, making the process of creating, publishing and deploying a bot to any number of channels simple and accessible.
163+
You can deploy your model to [Power Virtual Agents](/power-virtual-agents/fundamentals-what-is-power-virtual-agents) directly from Azure OpenAI studio, enabling you to bring conversational experiences to various Microsoft Teams, Websites, Power Platform solutions, Dynamics 365, and other [Azure Bot Service channels](/power-virtual-agents/publication-connect-bot-to-azure-bot-service-channels). Power Virtual Agents acts as a conversational and generative AI platform, making the process of creating, publishing and deploying a bot to any number of channels simple and accessible.
164164

165165
While Power Virtual Agents has features that leverage Azure OpenAI such as [generative answers](/power-virtual-agents/nlu-boost-conversations), deploying a model grounded on your data lets you create a chatbot that will respond using your data, and connect it to the Power Platform. For more information, see [Use a connection to Azure OpenAI on your data](/power-virtual-agents/nlu-generative-answers-azure-openai).
166166

articles/ai-services/openai/use-your-data-quickstart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.subservice: openai
99
ms.topic: quickstart
1010
author: aahill
1111
ms.author: aahi
12-
ms.date: 07/12/2023
12+
ms.date: 08/08/2023
1313
recommendations: false
1414
zone_pivot_groups: openai-use-your-data
1515
---

articles/ai-services/openai/whats-new.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,17 @@ ms.author: mbullwin
88
ms.service: cognitive-services
99
ms.subservice: openai
1010
ms.topic: whats-new
11-
ms.date: 07/27/2023
11+
ms.date: 08/08/2023
1212
recommendations: false
1313
keywords:
1414
---
1515

1616
# What's new in Azure OpenAI Service
1717

18+
## August 2023
19+
20+
- You can now deploy Azure OpenAI on your data to [Power Virtual Agents](/azure/ai-services/openai/concepts/use-your-data#deploying-the-model).
21+
1822
## July 2023
1923

2024
### Support for function calling

articles/aks/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -568,6 +568,8 @@
568568
maintainContext: true
569569
- name: Use Windows Server containers
570570
items:
571+
- name: Windows AKS Partner Solutions
572+
href: windows-aks-partner-solutions.md
571573
- name: Connect remotely
572574
href: rdp.md
573575
- name: Use HostProcess containers
Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
---
2+
title: Windows AKS Partner Solutions
3+
titleSuffix: Windows Server Container Partner Solutions
4+
description: Find partner-tested solutions that enable you to build, test, deploy, manage and monitor your Windows-based apps on Windows containers on AKS.
5+
ms.topic: article
6+
ms.date: 08/04/2023
7+
---
8+
9+
# Windows AKS Partners Solutions
10+
11+
Microsoft has collaborated with partners to ensure your build, test, deployment, configuration, and monitoring of your applications perform optimally with Windows containers on AKS.
12+
13+
Our 3rd party partners featured below have published introduction guides to start using their solutions with your applications running on Windows containers on AKS.
14+
15+
| Solutions | Partners |
16+
|--------------------|-----------------------------------------------------|
17+
| DevOps | [GitLab](#gitlab) <br> [CircleCI](#circleci) |
18+
| Networking | [NGINX](#f5-nginx) <br> [Calico](#calico) |
19+
| Observability | [Datadog](#datadog) <br> [New Relic](#new-relic) |
20+
| Security | [Prisma](#prisma) |
21+
| Storage | [NetApp](#netapp) |
22+
| Config Management | [Chef](#chef) |
23+
24+
25+
## DevOps
26+
27+
DevOps streamlines the delivery process, improves collaboration across teams, and enhances software quality, ensuring swift, reliable, and continuous deployment of your Windows-based applications.
28+
29+
### GitLab
30+
31+
The GitLab DevSecOps Platform supports the Microsoft development ecosystem with performance, accessibility testing, SAST, DAST and Fuzzing security scanning, dependency scanning, SBOM, license management and more.
32+
33+
As an extensible platform, GitLab also allows you to plug in your own tooling for any stage. GitLab's integration with Azure Kubernetes Services (AKS) enables full DevSecOps workflows for Windows and Linux Container workloads using either Push CD or GitOps Pull CD with flux manifests. Using Cloud Native Buildpaks, GitLab Auto DevOps can build, test and autodeploy OSS .NET projects.
34+
35+
To learn more, please our see our [joint blog](https://techcommunity.microsoft.com/t5/containers/using-gitlab-to-build-and-deploy-windows-containers-on-azure/ba-p/3889929).
36+
37+
### CircleCI
38+
39+
CircleCI’s integration with Azure Kubernetes Services (AKS) allows you to automate, build, validate, and ship containerized Windows applications, ensuring faster and more reliable software deployment. You can easily integrate your pipeline with AKS using CircleCI orbs, which are prepacked snippets of YAML configuration.
40+
41+
Follow this [tutorial](https://techcommunity.microsoft.com/t5/containers/continuous-deployment-of-windows-containers-with-circleci-and/ba-p/3841220) to learn how to set up a CI/CD pipeline to build a Dockerized ASP.NET application and deploy it to an AKS cluster.
42+
43+
## Networking
44+
45+
Ensure efficient traffic management, enhanced security, and optimal network performance with these solutions to achieve smooth application connectivity and communication.
46+
47+
### F5 NGINX
48+
49+
NGINX Ingress Controller deployed in AKS, on-premises, and in the cloud implements unified Kubernetes-native API gateways, load balancers, and Ingress controllers to reduce complexity, increase uptime, and provide in-depth insights into app health and performance for containerized Windows workloads.
50+
51+
Running at the edge of a Kubernetes cluster, NGINX Ingress Controller ensures holistic app security with user and service identities, authorization, access control, encrypted communications, and additional NGINX App Protect modules for Layer 7 WAF and DoS app protection.
52+
53+
Learn how to manage connectivity to your Windows applications running on Windows nodes in a mixed-node AKS cluster with NGINX Ingress controller in this [blog](https://techcommunity.microsoft.com/t5/containers/improving-customer-experiences-with-f5-nginx-and-windows-on/ba-p/3820344).
54+
55+
### Calico
56+
57+
Tigera provides an active security platform with full-stack observability for containerized workloads and Microsoft AKS as a fully managed SaaS (Calico Cloud) or a self-managed service (Calico Enterprise). The platform prevents, detects, troubleshoots, and automatically mitigates exposure risks of security breaches for workloads in Microsoft AKS.
58+
59+
Its open-source offering, Calico Open Source, is the most widely adopted container networking and security solution. It specifies security and observability as code to ensure consistent enforcement of security policies, which enables DevOps, platform, and security teams to protect workloads, detect threats, achieve continuous compliance, and troubleshoot service issues in real-time.
60+
61+
To learn more, [click here](https://techcommunity.microsoft.com/t5/containers/securing-windows-workloads-on-azure-kubernetes-service-with/ba-p/3815429).
62+
63+
## Observability
64+
65+
Observability provides deep insights into your systems, enabling rapid issue detection and resolution to enhance your application’s reliability and performance.
66+
67+
### Datadog
68+
69+
Datadog is the essential monitoring and security platform for cloud applications. We bring together end-to-end traces, metrics, and logs to make your applications, infrastructure, and third-party services entirely observable. Partner with Datadog for Windows on AKS environments to streamline monitoring, proactively resolve issues, and optimize application performance and availability.
70+
71+
Get started by following the recommendations in our [joint blog](https://techcommunity.microsoft.com/t5/containers/gain-full-observability-into-windows-containers-on-azure/ba-p/3853603).
72+
73+
### New Relic
74+
75+
New Relic's Azure Kubernetes integration is a powerful solution that seamlessly connects New Relic's monitoring and observability capabilities with Azure Kubernetes Service (AKS). By deploying the New Relic Kubernetes integration, users gain deep insights into their AKS clusters' performance, health, and resource utilization. This integration allows users to efficiently manage and troubleshoot containerized applications, optimize resource allocation, and proactively identify and resolve issues in their AKS environments. With New Relic's comprehensive monitoring and analysis tools, businesses can ensure the smooth operation and optimal performance of their Kubernetes workloads on Azure.
76+
77+
Check this [blog](https://techcommunity.microsoft.com/t5/containers/persistent-storage-for-windows-containers-on-azure-kubernetes/ba-p/3836781) for detailed information.
78+
79+
## Security
80+
81+
Ensure the integrity and confidentiality of applications, thereby fostering trust and compliance across your infrastructure.
82+
83+
### Prisma
84+
85+
Prisma Cloud is a comprehensive Cloud-Native Application Protection Platform (CNAPP) tailor-made to help secure Windows containers on Azure Kubernetes Service (AKS). Gain continuous, real-time visibility and control over Windows container environments including vulnerability and compliance management, identities and permissions, and AI-assisted runtime defense. Integrated container scanning across the pipeline and in Azure Container Registry ensure security throughout the entire application lifecycle.
86+
87+
See [our guidance](https://techcommunity.microsoft.com/t5/containers/unlocking-new-possibilities-with-prisma-cloud-and-windows/ba-p/3866485) for more details.
88+
89+
## Storage
90+
91+
Storage enables standardized and seamless storage interactions, ensuring high application performance and data consistency.
92+
93+
### NetApp
94+
95+
Astra Control provides application data management for stateful workloads on Azure Kubernetes Service (AKS). Discover your apps and define protection policies that automatically back up workloads offsite. Protect, clone, and move applications across Kubernetes environments with ease.
96+
97+
Follow the steps provided in [this blog](https://techcommunity.microsoft.com/t5/containers/persistent-storage-for-windows-containers-on-azure-kubernetes/ba-p/3836781) post to dynamically provision SMB volumes for Windows AKS workloads.
98+
99+
## Config management
100+
101+
Automate and standardize the system settings across your environments to enhance efficiency, reduce errors, and ensuring system stability and compliance.
102+
103+
### Chef
104+
105+
Chef provides visibility and threat detection from build to runtime that monitors, audits, and remediates the security of your Azure cloud services and Kubernetes and Windows container assets. Chef provides comprehensive visibility and continuous compliance into your cloud security posture and helps limit the risk of misconfigurations in cloud-native environments by providing best practices based on CIS, STIG, SOC2, PCI-DSS and other benchmarks. This is part of a broader compliance offering that supports on-premises or hybrid cloud environments including applications deployed on the edge.
106+
107+
To learn more about Chef’s capabilities, check out the comprehensive ‘how-to’ blog post here: [Securing Your Windows Environments Running on Azure Kubernetes Service with Chef](https://techcommunity.microsoft.com/t5/containers/securing-your-windows-environments-running-on-azure-kubernetes/ba-p/3821830).

articles/azure-monitor/app/sdk-connection-string.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ A connection string consists of a list of settings represented as key-value pair
5959
#### Syntax
6060

6161
- `InstrumentationKey` (for example, 00000000-0000-0000-0000-000000000000).
62-
This is a *required* field.
62+
`InstrumentationKey` is a *required* field.
6363
- `Authorization` (for example, ikey). This setting is optional because today we only support ikey authorization.
6464
- `EndpointSuffix` (for example, applicationinsights.azure.cn).
65-
Setting the endpoint suffix will instruct the SDK on which Azure cloud to connect to. The SDK will assemble the rest of the endpoint for individual services.
65+
Setting the endpoint suffix tells the SDK which Azure cloud to connect to. The SDK assembles the rest of the endpoint for individual services.
6666
- Explicit endpoints.
6767
Any service can be explicitly overridden in the connection string:
6868
- `IngestionEndpoint` (for example, `https://dc.applicationinsights.azure.com`)
@@ -105,7 +105,7 @@ Here are some examples of connection strings.
105105

106106
`InstrumentationKey=00000000-0000-0000-0000-000000000000;EndpointSuffix=ai.contoso.com;`
107107

108-
In this example, the connection string specifies the endpoint suffix and the SDK will construct service endpoints:
108+
In this example, the connection string specifies the endpoint suffix and the SDK constructs service endpoints:
109109

110110
- Authorization scheme defaults to "ikey"
111111
- Instrumentation key: 00000000-0000-0000-0000-000000000000
@@ -119,7 +119,7 @@ In this example, the connection string specifies the endpoint suffix and the SDK
119119

120120
`InstrumentationKey=00000000-0000-0000-0000-000000000000;IngestionEndpoint=https://custom.com:111/;LiveEndpoint=https://custom.com:222/;ProfilerEndpoint=https://custom.com:333/;SnapshotEndpoint=https://custom.com:444/;`
121121

122-
In this example, the connection string specifies explicit overrides for every service. The SDK will use the exact endpoints provided without modification:
122+
In this example, the connection string specifies explicit overrides for every service. The SDK uses the exact endpoints provided without modification:
123123

124124
- Authorization scheme defaults to "ikey"
125125
- Instrumentation key: 00000000-0000-0000-0000-000000000000
@@ -180,9 +180,6 @@ Connection string: `APPLICATIONINSIGHTS_CONNECTION_STRING`
180180
builder.Services.AddApplicationInsightsTelemetry(options: options);
181181
```
182182

183-
> [!NOTE]
184-
> When deploying applications to Azure in production scenarios, consider placing connection strings or other configuration secrets in secure locations such as App Service configuration settings or Azure Key Vault. Avoid including secrets in your application code or checking them into source control where they might be exposed or misused. The preceding code example will also work if the connection string is stored in App Service configuration settings. Learn more about [configuring App Service settings](/azure/app-service/configure-common).
185-
186183
# [.NET Framework](#tab/dotnet-framework)
187184

188185
Set the property [TelemetryConfiguration.ConnectionString](https://github.com/microsoft/ApplicationInsights-dotnet/blob/add45ceed35a817dc7202ec07d3df1672d1f610d/BASE/src/Microsoft.ApplicationInsights/Extensibility/TelemetryConfiguration.cs#L271-L274) or [ApplicationInsightsServiceOptions.ConnectionString](https://github.com/microsoft/ApplicationInsights-dotnet/blob/81288f26921df1e8e713d31e7e9c2187ac9e6590/NETCORE/src/Shared/Extensions/ApplicationInsightsServiceOptions.cs#L66-L69).

articles/azure-video-indexer/accounts-overview.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Azure AI Video Indexer accounts
33
description: This article gives an overview of Azure AI Video Indexer accounts and provides links to other articles for more details.
44
ms.topic: conceptual
5-
ms.date: 01/25/2023
5+
ms.date: 08/07/2023
66
ms.author: juliako
77
---
88

@@ -14,10 +14,7 @@ This article gives an overview of Azure AI Video Indexer accounts types and prov
1414

1515
When starting out with [Azure AI Video Indexer](https://www.videoindexer.ai/), click **start free** to kick off a quick and easy process of creating a trial account. No Azure subscription is required and this is a great way to explore Azure AI Video Indexer and try it out with your content. Keep in mind that the trial Azure AI Video Indexer account has a limitation on the number of indexing minutes, support, and SLA.
1616

17-
With a trial account, Azure AI Video Indexer provides:
18-
19-
* up to 600 minutes of free indexing to the [Azure AI Video Indexer](https://www.videoindexer.ai/) website users and
20-
* up to 2400 minutes of free indexing to users that subscribe to the Azure AI Video Indexer API on the [developer portal](https://api-portal.videoindexer.ai/).
17+
With a trial account, Azure AI Video Indexer provides up to 2,400 minutes of free indexing when using the [Azure AI Video Indexer](https://www.videoindexer.ai/) website or the Azure AI Video Indexer API (see [developer portal](https://api-portal.videoindexer.ai/)).
2118

2219
The trial account option is not available on the Azure Government cloud. For other Azure Government limitations, see [Limitations of Azure AI Video Indexer on Azure Government](connect-to-azure.md#limitations-of-azure-ai-video-indexer-on-azure-government).
2320

articles/azure-video-indexer/detected-clothing.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Enable detected clothing feature
33
description: Azure AI Video Indexer detects clothing associated with the person wearing it in the video and provides information such as the type of clothing detected and the timestamp of the appearance (start, end). The API returns the detection confidence level.
44
ms.topic: how-to
5-
ms.date: 08/02/2023
5+
ms.date: 08/07/2023
66
ms.author: juliako
77
---
88

@@ -19,7 +19,7 @@ The newly added clothing detection feature is available when indexing your file
1919

2020
:::image type="content" source="./media/detected-clothing/index-video.png" alt-text="This screenshot represents an indexing video option":::
2121

22-
When you choose to see **Insights** of your video on the [Azure AI Video Indexer](https://www.videoindexer.ai/) website, the People's detected clothing could be viewed from the **Observed People** tracing insight. When choosing a thumbnail of a person the detected clothing became available.
22+
When you choose to see **Insights** of your video on the [Azure AI Video Indexer](https://www.videoindexer.ai/) website, the People's detected clothing could be viewed from the **Observed People** tracking insight. When choosing a thumbnail of a person the detected clothing became available.
2323

2424
:::image type="content" source="./media/detected-clothing/observed-people.png" alt-text="Observed people screenshot":::
2525

@@ -29,7 +29,7 @@ If you're interested to view People's detected clothing in the Timeline of your
2929

3030
Searching for a specific clothing to return all the observed people wearing it's enabled using the search bar of either the **Insights** or from the **Timeline** of your video on the Azure AI Video Indexer website.
3131

32-
The following JSON response illustrates what Azure AI Video Indexer returns when tracing observed people having detected clothing associated:
32+
The following JSON response illustrates what Azure AI Video Indexer returns when tracking observed people having detected clothing associated:
3333

3434
```json
3535
"observedPeople": [
@@ -102,4 +102,4 @@ As the detected clothing feature uses observed people tracking, the tracking qua
102102

103103
## Next steps
104104

105-
[Trace observed people in a video](observed-people-tracing.md)
105+
[Track observed people in a video](observed-people-tracking.md)

0 commit comments

Comments
 (0)