Skip to content

Commit 8b13f1b

Browse files
authored
Merge pull request #203043 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 7515778 + 60ae464 commit 8b13f1b

File tree

7 files changed

+14
-5
lines changed

7 files changed

+14
-5
lines changed

articles/azure-resource-manager/management/tag-support.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3049,6 +3049,11 @@ To get the same data as a file of comma-separated values, download [tag-support.
30493049
> | workspaces / sqlDatabases | Yes | Yes |
30503050
> | workspaces / sqlPools | Yes | Yes |
30513051
3052+
<a id="synapsenote"></a>
3053+
3054+
> [!NOTE]
3055+
> The Master database doesn't support tags, but other databases, including Azure Synapse Analytics databases, support tags. Azure Synapse Analytics databases must be in Active (not Paused) state.
3056+
30523057
## Microsoft.TestBase
30533058

30543059
> [!div class="mx-tableFixed"]

articles/cognitive-services/language-service/question-answering/how-to/authoring.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.date: 11/23/2021
1515
The question answering Authoring API is used to automate common tasks like adding new question answer pairs, as well as creating, publishing, and maintaining projects/knowledge bases.
1616

1717
> [!NOTE]
18-
> Currently authoring functionality is only available via the REST API. This article provides examples of using the REST API with cURL. For full documentation of all parameters and functionality available consult the [REST API reference content](/rest/api/cognitiveservices/questionanswering/question-answering-projects).
18+
> Authoring functionality is available via the REST API and [Authoring SDK (preview)](https://docs.microsoft.com/dotnet/api/overview/azure/ai.language.questionanswering-readme-pre). This article provides examples of using the REST API with cURL. For full documentation of all parameters and functionality available consult the [REST API reference content](/rest/api/cognitiveservices/questionanswering/question-answering-projects).
1919
2020
## Prerequisites
2121

articles/cost-management-billing/costs/analyze-cost-data-azure-cost-management-power-bi-template-app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Here's how values in the overview tiles are calculated.
8383
- The value shown in the **New purchase amount** tile is calculated as the sum of `newPurchases`.
8484
- The value shown in the **Total charges** tile is calculated as the sum of (`adjustments` + `ServiceOverage` + `chargesBilledseparately` + `azureMarketplaceServiceCharges`).
8585

86-
The EA portal doesn't the Total charges column. The Power BI template app includes Adjustments, Service Overage, Charges billed separately, and Azure marketplace service charges as Total charges.
86+
The EA portal doesn't show the Total charges column. The Power BI template app includes Adjustments, Service Overage, Charges billed separately, and Azure marketplace service charges as Total charges.
8787

8888
The Prepayment Usage shown in the EA portal isn't available in the Template app as part of the total charges.
8989

@@ -235,4 +235,4 @@ For more information about configuring data, refresh, sharing reports, and addit
235235
- [Subscribe yourself and others to reports and dashboards in the Power BI service](/power-bi/service-report-subscribe)
236236
- [Download a report from the Power BI service to Power BI Desktop](/power-bi/service-export-to-pbix)
237237
- [Save a report in Power BI service and Power BI Desktop](/power-bi/service-report-save)
238-
- [Create a report in the Power BI service by importing a dataset](/power-bi/service-report-create-new)
238+
- [Create a report in the Power BI service by importing a dataset](/power-bi/service-report-create-new)

articles/defender-for-cloud/alerts-reference.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,7 @@ Microsoft Defender for Containers provides security alerts on the cluster level
374374
| **Digital currency mining activity**<br>(K8S.NODE_CurrencyMining) <sup>[1](#footnote1)</sup> | Analysis of DNS transactions detected digital currency mining activity. Such activity, while possibly legitimate user behavior, is frequently performed by attackers following compromise of resources. Typical related attacker activity is likely to include the download and execution of common mining tools. | Exfiltration | Low |
375375
| **Access to kubelet kubeconfig file detected**<br>(K8S.NODE_KubeConfigAccess) <sup>[1](#footnote1)</sup> | Analysis of processes running on a Kubernetes cluster node detected access to kubeconfig file on the host. The kubeconfig file, normally used by the Kubelet process, contains credentials to the Kubernetes cluster API server. Access to this file is often associated with attackers attempting to access those credentials, or with security scanning tools which check if the file is accessible. | CredentialAccess | Medium |
376376
| **Access to cloud metadata service detected**<br>(K8S.NODE_ImdsCall) <sup>[1](#footnote1)</sup> | Analysis of processes running within a container detected access to the cloud metadata service for acquiring identity token. The container doesn't normally perform such operation. While this behavior might be legitimate, attackers might use this technique to access cloud resources after gaining initial access to a running container. | CredentialAccess | Medium |
377+
| **MITRE Caldera agent detected**<br>(K8S.NODE_MitreCalderaTools) <sup>[1](#footnote1)</sup> | Analysis of processes running within a container or directly on a Kubernetes node, has detected a suspicious process. This is often associated with the MITRE 54ndc47 agent which could be used maliciously to attack other machines. | Persistence, PrivilegeEscalation, DefenseEvasion, CredentialAccess, Discovery, LateralMovement, Execution, Collection, Exfiltration, Command And Control, Probing, Exploitation | Medium |
377378

378379
<sup><a name="footnote1"></a>1</sup>: **Preview for non-AKS clusters**: This alert is generally available for AKS clusters, but it is in preview for other environments, such as Azure Arc, EKS and GKE.
379380

articles/event-grid/storage-upload-process-images.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ The *images* container's public access is set to `off`. The *thumbnails* contain
113113
Get the storage account key by using the [Get-AzStorageAccountKey](/powershell/module/az.storage/get-azstorageaccountkey) command. Then, use this key to create two containers with the [New-AzStorageContainer](/powershell/module/az.storage/new-azstoragecontainer) command.
114114

115115
```powershell
116-
$blobStorageAccountKey = (Get-AzStorageAccountKey -ResourceGroupName myResourceGroup -Name $blobStorageAccount).Key1
116+
$blobStorageAccountKey = ((Get-AzStorageAccountKey -ResourceGroupName myResourceGroup -Name $blobStorageAccount)| Where-Object {$_.KeyName -eq "key1"}).Value
117117
$blobStorageContext = New-AzStorageContext -StorageAccountName $blobStorageAccount -StorageAccountKey $blobStorageAccountKey
118118
119119
New-AzStorageContainer -Name images -Context $blobStorageContext

articles/postgresql/hyperscale/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Hyperscale (Citus) documentation
33
summary: "Hyperscale (Citus) is PostgreSQL extended with the superpower of distributed tables. It's a fully managed service designed to build highly scalable relational apps."
44
metadata:
5-
description: "Azure Database for PostgreSQL is a relational database service in the Microsoft cloud that is built for developers based on the open-source PostgreSQL database engine."
5+
description: "Hyperscale (Citus) is PostgreSQL extended with the superpower of distributed tables. It's a fully managed service designed to build highly scalable relational apps."
66
author: jonels-msft
77
ms.author: jonels
88
ms.date: 04/28/2022

articles/spring-cloud/tutorial-circuit-breaker.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ ms.custom: devx-track-java, devx-track-azurecli, event-tier1-build-2022
1111

1212
# Tutorial: Use Circuit Breaker Dashboard with Azure Spring Apps
1313

14+
> [!WARNING]
15+
> Hystrix is no longer in active development and is currently in maintenance mode.
16+
1417
> [!NOTE]
1518
> Azure Spring Apps is the new name for the Azure Spring Cloud service. Although the service has a new name, you'll see the old name in some places for a while as we work to update assets such as screenshots, videos, and diagrams.
1619

0 commit comments

Comments
 (0)