Skip to content

Commit 09227f7

Browse files
authored
Merge pull request #215914 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 3fa8115 + cf67a5e commit 09227f7

File tree

6 files changed

+37
-15
lines changed

6 files changed

+37
-15
lines changed

articles/active-directory/conditional-access/concept-conditional-access-cloud-apps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ The Office 365 suite makes it possible to target these services all at once. We
7979

8080
Targeting this group of applications helps to avoid issues that may arise because of inconsistent policies and dependencies. For example: The Exchange Online app is tied to traditional Exchange Online data like mail, calendar, and contact information. Related metadata may be exposed through different resources like search. To ensure that all metadata is protected by as intended, administrators should assign policies to the Office 365 app.
8181

82-
Administrators can exclude the entire Office 365 suite or specific Office 365 client apps from the Conditional Access policy.
82+
Administrators can exclude the entire Office 365 suite or specific Office 365 cloud apps from the Conditional Access policy.
8383

84-
The following key applications are included in the Office 365 client app:
84+
The following key applications are affected by the Office 365 cloud app:
8585

8686
- Exchange Online
8787
- Microsoft 365 Search Service
10.8 KB
Loading

articles/azure-monitor/partners.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ Grafana is an open-source application that enables you to visualize metric data
137137

138138
## InfluxData
139139

140-
![InfluxData logo.](./media/partners/Influxdata.png)
140+
![InfluxData logo.](./media/partners/influxdata.png)
141141

142142
InfluxData is the creator of InfluxDB, the open-source time series database. Its technology is purpose built to handle the massive volumes of time-stamped data produced by Internet of Things (IoT) devices, applications, networks, containers, and computers.
143143

@@ -362,7 +362,7 @@ For more information, see the [SquaredUp website](https://squaredup.com/).
362362

363363
## Sumo Logic
364364

365-
![Sumo Logic logo.](./media/partners/SumoLogic.png)
365+
![Sumo Logic logo.](./media/partners/sumologic.png)
366366

367367
Sumo Logic is a secure, cloud-native analytics service for machine data. It delivers real-time, continuous intelligence from structured, semistructured, and unstructured data across the entire application lifecycle and stack.
368368

@@ -372,14 +372,24 @@ For more information, see the [Sumo Logic documentation](https://www.sumologic.c
372372

373373
## Turbonomic
374374

375-
![Turbonomic logo.](./media/partners/Turbonomic.png)
375+
![Turbonomic logo.](./media/partners/turbonomic.png)
376376

377377
Turbonomic delivers workload automation for hybrid clouds by simultaneously optimizing performance, cost, and compliance in real time. Turbonomic helps organizations be elastic in their Azure estate by continuously optimizing the estate. Applications constantly get the resources they require to deliver their SLA, and nothing more, across compute, storage, and network for the IaaS and PaaS layer.
378378

379379
Organizations can simulate migrations, properly scale workloads, and retire datacenter resources to responsibly migrate to Azure on time and within budget, while assuring both performance and compliance. Turbonomic is API driven and runs as an agentless VM in Azure and on-premises.
380380

381381
For more information, see the [Turbonomic introduction](https://turbonomic.com/).
382382

383+
## Zenduty
384+
385+
![Zenduty logo.](./media/partners/zenduty.png)
386+
387+
Zenduty is a novel collaborative incident management platform that provides end-to-end incident alerting, on-call management, and response orchestration, which gives teams greater control and automation over the incident management lifecycle. Zenduty is ideal for always-on services, helping teams orchestrate incident response for creating better user experiences and brand value and centralizing all incoming alerts through predefined notification rules to ensure that the right people are notified at the right time.
388+
389+
Zenduty provides your NOC, SRE, and application engineers with detailed context around the Azure Monitor alert along with playbooks and a complete incident command framework to triage, remediate, and resolve incidents with speed.
390+
391+
For more information, see the [Zenduty documentation](https://docs.zenduty.com/docs/microsoftazure).
392+
383393
## Partner tools with Event Hubs integration
384394

385395
If you use Azure Monitor to route monitoring data to an event hub, you can easily integrate with some external SIEM and monitoring tools. The following partners are known to have integration with the Event Hubs service.

articles/cost-management-billing/microsoft-customer-agreement/manage-tenants.md

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,26 @@ A tenant is a digital representation of your organization and is primarily assoc
2121

2222
Each tenant is distinct and separate from other tenants, yet you can allow guest users from other tenants to access your tenant to track your costs and manage billing.
2323

24+
## What's an associated tenant?
25+
An associated tenant is a tenant that is linked to your primary billing tenant’s billing account. You can move Microsoft 365 subscriptions to these tenants. You can also assign billing account roles to users in associated billing tenants. Read more about associated tenants [Manage billing across multiple tenants using associated billing tenants](../manage/manage-billing-across-tenants.md).
26+
2427
## How tenants and subscriptions relate to billing account
2528

2629
You use your Microsoft Customer Agreement (billing account) to track costs and manage billing. Each billing account has at least one billing profile. The billing profile allows you to manage your invoice and payment method. Each billing profile includes one invoice section, by default. You can create more invoice sections to group, track, and manage costs at a more granular level if needed.
2730

28-
- Your billing account is associated with a single tenant. It means only users who are part of the tenant can access your billing account.
29-
- When you create a new Azure subscription for your billing account, it's always created in your billing account tenant. However, you can move subscriptions to other tenants. You can also link existing subscriptions from other tenants to your billing account. It allows you to centrally manage billing through one tenant while keeping resources and subscriptions in other tenants based on your needs.
31+
- Your billing account is associated with a single, primary tenant. Users who are part of the primary tenant or who are part of associated tenants can access your billing account if they have the appropriate billing role assigned.
32+
- When you create a new Azure subscription for your billing account, it's created in your tenant or one of the other tenants you have access to. You can choose the tenant while creating the subscription.
33+
- You can move subscriptions to other tenants. You can also link existing subscriptions from other tenants to your billing account. This flexibility allows you to centrally manage billing through one tenant while keeping resources and subscriptions in other tenants based on your needs.
3034

31-
The following diagram shows how billing account and subscriptions are linked to tenants. The Contoso MCA billing account is associated with Tenant 1 while Contoso PAYG account is associated with Tenant 2. Let's assume Contoso wants to pay for their PAYG subscription through their MCA billing account, they can use a billing ownership transfer to link the subscription to their MCA billing account. The subscription and its resources will still be associated with Tenant 2, but they're paid for using the MCA billing account.
35+
The following diagram shows how billing account and subscriptions are linked to tenants. Let's assume Contoso would like to streamline their billing management through an MCA. The Contoso MCA billing account is in Tenant 1 while Contoso PAYG account is in Tenant 2. They can use a billing ownership transfer to link the subscription to their MCA billing account. The subscription and its resources will still be associated with Tenant 2, but they're paid for using the MCA billing account.
3236

3337
:::image type="content" source="./media/manage-tenants/billing-hierarchy-example.png" alt-text="Diagram showing an example billing hierarchy." border="false" lightbox="./media/manage-tenants/billing-hierarchy-example.png":::
3438

3539
## Manage subscriptions under multiple tenants in a single Microsoft Customer Agreement
3640

37-
Billing owners can create subscriptions when they have the [appropriate permissions](../manage/understand-mca-roles.md#subscription-billing-roles-and-tasks) to the billing account. By default, any new subscriptions created under the Microsoft Customer Agreement are in the Microsoft Customer Agreement tenant.
41+
Billing owners can create subscriptions when they have the [appropriate permissions](../manage/understand-mca-roles.md#subscription-billing-roles-and-tasks) to the billing account. By default, any new subscriptions created under the Microsoft Customer Agreement are in the current user’s tenant. Different tenants can be selected from the list of tenants to which the user has access to create subscriptions.
3842

3943
- You can link subscriptions from other tenants to your Microsoft Customer Agreement billing account. Taking billing ownership of a subscription only changes the invoicing arrangement. It doesn't affect the service tenant or Azure RBAC roles.
40-
- To change the subscription owner in the service tenant, you must transfer the [subscription to a different Azure Active Directory directory](../../role-based-access-control/transfer-subscription.md).
41-
42-
An MCA billing account is managed by a single tenant/directory. The billing account only controls billing for the subscriptions in its tenant. However, you can use a billing ownership transfer to link a subscription to a billing account in a different tenant.
4344

4445
### Billing ownership transfer
4546

@@ -56,6 +57,13 @@ Billing ownership transfer doesn’t affect:
5657
- Resources
5758
- Azure RBAC permissions
5859

60+
## Assign roles to users to your Microsoft Customer Agreement
61+
62+
There are three ways users with billing owner access can assign roles to users to MCA
63+
64+
- Assign billing roles to users in the primary tenant
65+
- Assign billing roles to external users (outside of your primary tenant) if they are part of an associated tenant
66+
- If tenants are not associated, [create guest users in primary tenant and assign roles](#add-guest-users-to-your-microsoft-customer-agreement-tenant).
5967

6068
## Add guest users to your Microsoft Customer Agreement tenant
6169

articles/key-vault/secrets/multiline-secrets.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,14 @@ You can then view the stored secret using the Azure CLI [az keyvault secret show
3939
az keyvault secret show --name "MultilineSecret" --vault-name "<your-unique-keyvault-name>" --query "value"
4040
```
4141

42-
The secret will be returned with newlines embedded:
42+
The secret will be returned with `\n` in place of newline:
4343

4444
```bash
4545
"This is\nmy multi-line\nsecret"
4646
```
4747

48+
The `\n` above is a `\` and `n` character, not the newline character. Quotes `"` are included in the string.
49+
4850
## Set the secret using Azure Powershell
4951

5052
With Azure PowerShell, you must first read in the file using the [Get-Content](/powershell/module/microsoft.powershell.management/get-content) cmdlet, then convert it to a secure string using [ConvertTo-SecureString](/powershell/module/microsoft.powershell.security/convertto-securestring).
@@ -66,12 +68,14 @@ You can then view the stored secret using the Azure CLI [az keyvault secret show
6668
az keyvault secret show --name "MultilineSecret" --vault-name "<your-unique-keyvault-name>" --query "value"
6769
```
6870

69-
The secret will be returned with newlines embedded:
71+
The secret will be returned with `\n` in place of newline:
7072

7173
```bash
7274
"This is\nmy multi-line\nsecret"
7375
```
7476

77+
The `\n` above is a `\` and `n` character, not the newline character. Quotes `"` are included in the string.
78+
7579
## Next steps
7680

7781
- Read an [Overview of Azure Key Vault](../general/overview.md)

articles/postgresql/flexible-server/how-to-configure-sign-in-azure-ad-authentication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Connect-AzureAD -TenantId <customer tenant id>
4040
```powershell
4141
New-AzureADServicePrincipal -AppId 5657e26c-cc92-45d9-bc47-9da6cfdb4ed9
4242
```
43-
This command will grant Azure Database for PostgreSQL Flexible Server Service Principal read access to customer tenant to request Graph API tokens for Azure AD validation tasks. AppID (5657e26c-cc92-45d9-bc47-9da6cfdb4ed) in the above command is the AppID for Azure Database for PostgreSQL Flexible Server Service.
43+
This command will grant Azure Database for PostgreSQL Flexible Server Service Principal read access to customer tenant to request Graph API tokens for Azure AD validation tasks. AppID (5657e26c-cc92-45d9-bc47-9da6cfdb4ed9) in the above command is the AppID for Azure Database for PostgreSQL Flexible Server Service.
4444

4545
### Step 3: Networking Requirements
4646

0 commit comments

Comments
 (0)