Skip to content

Commit 930f3f4

Browse files
authored
Merge branch 'main' into patch-87
2 parents 225ba46 + 2b02a2d commit 930f3f4

File tree

176 files changed

+735
-699
lines changed

Some content is hidden

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

176 files changed

+735
-699
lines changed

articles/active-directory/develop/reference-app-manifest.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.subservice: develop
99
ms.topic: reference
1010
ms.workload: identity
11-
ms.date: 05/19/2022
11+
ms.date: 04/13/2023
1212
ms.author: ryanwi
1313
ms.custom: aaddev
1414
ms.reviewer: sureshja
@@ -260,9 +260,9 @@ Example:
260260
"keyCredentials": [
261261
{
262262
"customKeyIdentifier":null,
263-
"endDate":"2018-09-13T00:00:00Z",
263+
"endDateTime":"2018-09-13T00:00:00Z",
264264
"keyId":"<guid>",
265-
"startDate":"2017-09-12T00:00:00Z",
265+
"startDateTime":"2017-09-12T00:00:00Z",
266266
"type":"AsymmetricX509Cert",
267267
"usage":"Verify",
268268
"value":null
@@ -425,10 +425,12 @@ Example:
425425
"passwordCredentials": [
426426
{
427427
"customKeyIdentifier": null,
428-
"endDate": "2018-10-19T17:59:59.6521653Z",
428+
"displayName": "Generated by App Service",
429+
"endDateTime": "2022-10-19T17:59:59.6521653Z",
430+
"hint": "Nsn",
429431
"keyId": "<guid>",
430-
"startDate":"2016-10-19T17:59:59.6521653Z",
431-
"value":null
432+
"secretText": null,
433+
"startDateTime":"2022-10-19T17:59:59.6521653Z"
432434
}
433435
],
434436
```
@@ -638,4 +640,4 @@ Use the following comments section to provide feedback that helps refine and sha
638640
[IMPLICIT-GRANT]:v1-oauth2-implicit-grant-flow.md
639641
[INTEGRATING-APPLICATIONS-AAD]: ./quickstart-register-app.md
640642
[O365-PERM-DETAILS]: /graph/permissions-reference
641-
[RBAC-CLOUD-APPS-AZUREAD]: http://www.dushyantgill.com/blog/2014/12/10/roles-based-access-control-in-cloud-applications-using-azure-ad/
643+
[RBAC-CLOUD-APPS-AZUREAD]: http://www.dushyantgill.com/blog/2014/12/10/roles-based-access-control-in-cloud-applications-using-azure-ad/

articles/aks/static-ip.md

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,17 @@ This article shows you how to create a static public IP address and assign it to
2525

2626
## Create a static IP address
2727

28-
1. Use the `az aks show`[az-aks-show] command to get the node resource group name of your AKS cluster, which follows this format: `MC_<resource group name>_<AKS cluster name>_<region>`.
28+
1. Create a resource group for your IP address
2929

3030
```azurecli-interactive
31-
az aks show \
32-
--resource-group myResourceGroup \
33-
--name myAKSCluster
34-
--query nodeResourceGroup
35-
--output tsv
31+
az group create --name myNetworkResourceGroup
3632
```
3733
38-
2. Use the [`az network public ip create`][az-network-public-ip-create] command to create a static public IP address. The following example creates a static IP resource named *myAKSPublicIP* in the *MC_myResourceGroup_myAKSCluster_eastus* node resource group.
34+
2. Use the [`az network public ip create`][az-network-public-ip-create] command to create a static public IP address. The following example creates a static IP resource named *myAKSPublicIP* in the *myNetworkResourceGroup* resource group.
3935
4036
```azurecli-interactive
4137
az network public-ip create \
42-
--resource-group MC_myResourceGroup_myAKSCluster_eastus \
38+
--resource-group myNetworkResourceGroup \
4339
--name myAKSPublicIP \
4440
--sku Standard \
4541
--allocation-method static
@@ -51,18 +47,20 @@ This article shows you how to create a static public IP address and assign it to
5147
3. After you create the static public IP address, use the [`az network public-ip list`][az-network-public-ip-list] command to get the IP address. Specify the name of the node resource group and public IP address you created, and query for the *ipAddress*.
5248
5349
```azurecli-interactive
54-
az network public-ip show --resource-group MC_myResourceGroup_myAKSCluster_eastus --name myAKSPublicIP --query ipAddress --output tsv
50+
az network public-ip show --resource-group myNetworkResourceGroup --name myAKSPublicIP --query ipAddress --output tsv
5551
```
5652
5753
## Create a service using the static IP address
5854
5955
1. Before creating a service, use the [`az role assignment create`][az-role-assignment-create] command to ensure the cluster identity used by the AKS cluster has delegated permissions to the node resource group.
6056
6157
```azurecli-interactive
58+
CLIENT_ID=$(az aks show --name <cluster name> --resource-group <cluster resource group> --query identity.principalId -o tsv)
59+
RG_SCOPE=$(az group show --name myNetworkResourceGroup --query id -o tsv)
6260
az role assignment create \
63-
--assignee <Client ID> \
61+
--assignee ${CLIENT_ID} \
6462
--role "Network Contributor" \
65-
--scope /subscriptions/<subscription id>/resourceGroups/<MC_myResourceGroup_myAKSCluster_eastus>
63+
--scope ${RG_SCOPE}
6664
```
6765
6866
> [!IMPORTANT]
@@ -75,7 +73,7 @@ This article shows you how to create a static public IP address and assign it to
7573
kind: Service
7674
metadata:
7775
annotations:
78-
service.beta.kubernetes.io/azure-load-balancer-resource-group: MC_myResourceGroup_myAKSCluster_eastus
76+
service.beta.kubernetes.io/azure-load-balancer-resource-group: myNetworkResourceGroup
7977
name: azure-load-balancer
8078
spec:
8179
loadBalancerIP: 40.121.183.52

articles/azure-arc/data/index.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ title: Azure Arc-enabled data services # < 60 chars
44
summary: Run Azure data services on-premises, at the edge, and in multicloud environments using Kubernetes on the infrastructure of your choice. # < 160 chars
55

66
metadata:
7-
title: Azure Arc-enabled data services # Required; page title displayed in search results. Include the brand. < 60 chars.
8-
description: Run Azure data services on-premises, at the edge, and in multicloud environments using Kubernetes on the infrastructure of your choice. # Required; article description that is displayed in search results. < 160 chars.
9-
ms.service: azure-arc #Required; service per approved list. service slug assigned to your service by ACOM.
7+
title: Azure Arc-enabled data services
8+
description: Run Azure data services on-premises, at the edge, and in multicloud environments using Kubernetes on the infrastructure of your choice.
9+
ms.service: azure-arc
1010
ms.subservice: azure-arc-data # Optional; Remove if no subservice is used.
11-
ms.topic: landing-page # Required
12-
author: MikeRayMSFT #Required; your GitHub user alias, with correct capitalization.
13-
ms.author: mikeray #Required; microsoft alias of author; optional team alias.
14-
ms.date: 12/16/2020 #Required; mm/dd/yyyy format.
11+
ms.topic: landing-page
12+
author: MikeRayMSFT
13+
ms.author: mikeray
14+
ms.date: 12/16/2020
1515

1616
# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | sample | tutorial | video | whats-new
1717

articles/azure-cache-for-redis/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Azure Cache for Redis Documentation
33
summary: Learn how to use Azure Cache for Redis, a secure data cache and messaging broker that provides high throughput and low-latency access to data for applications. Tutorials, API references, and other documentation show you how to use Azure Cache for Redis from any application on Azure.
44
metadata:
55
title: Azure Cache for Redis Documentation
6-
description: Learn how to use Azure Cache for Redis, a secure data cache and messaging broker that gives applications fast access to data. Tutorials, API references, and more. # Required; article description that is displayed in search results. < 160 chars.
6+
description: Learn how to use Azure Cache for Redis, a secure data cache and messaging broker that gives applications fast access to data. Tutorials, API references, and more.
77
ms.service: cache
88
ms.topic: landing-page
99
author: flang-msft

articles/azure-edge-hardware-center/index.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ title: Azure Edge Hardware Center documentation # < 60 chars
44
summary: Use Azure Edge Hardware Center service to order from a variety of Azure Stack Edge devices as per your business need. # < 160 chars
55

66
metadata:
7-
title: Azure Edge Hardware Center documentation # Required; page title displayed in search results. Include the brand. < 60 chars.
8-
description: Azure Edge Hardware Center Documentation. # Required; article description that is displayed in search results. < 160 chars.
7+
title: Azure Edge Hardware Center documentation
8+
description: Azure Edge Hardware Center Documentation.
99
services: Azure Edge Hardware Center
10-
ms.service: databox #Required; service per approved list. service slug assigned to your service by ACOM.
10+
ms.service: databox
1111
ms.subservice: edge
12-
ms.topic: landing-page # Required
12+
ms.topic: landing-page
1313
ms.collection: collection
14-
author: alkohli #Required; your GitHub user alias, with correct capitalization.
15-
ms.author: alkohli #Required; microsoft alias of author; optional team alias.
16-
ms.date: 11/30/2021 #Required; mm/dd/yyyy format.
14+
author: alkohli
15+
ms.author: alkohli
16+
ms.date: 11/30/2021
1717

1818
# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | whats-new
1919

articles/azure-functions/durable/index.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ title: Azure Durable Functions documentation # <60 chars
44
summary: Durable Functions is an extension of Azure Functions that lets you write stateful functions in a serverless compute environment. # < 160 chars
55

66
metadata:
7-
title: Azure Durable Functions documentation # Required; page title displayed in search results. Include the brand. < 60 chars.
8-
description: Durable Functions is an extension of Azure Functions that lets you write stateful functions in a serverless compute environment. # Required; article description that is displayed in search results. < 160 chars.
7+
title: Azure Durable Functions documentation
8+
description: Durable Functions is an extension of Azure Functions that lets you write stateful functions in a serverless compute environment.
99
ms.service: azure-functions
10-
ms.topic: landing-page # Required
10+
ms.topic: landing-page
1111
author: ggailey777
1212
ms.author: azfundocs
1313
ms.date: 10/04/2019

articles/azure-functions/functions-bindings-warmup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ The following considerations apply to using a warmup function in C#:
251251

252252
# [Isolated process](#tab/isolated-process)
253253

254-
- Your function must be named `warmup` (case-insensitive) using the `FunctionName` attribute.
254+
- Your function must be named `warmup` (case-insensitive) using the `Function` attribute.
255255
- A return value attribute isn't required.
256256
- You can pass an object instance to the function.
257257

articles/azure-functions/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
title: Azure Functions documentation
88
description: Azure Functions is a cloud service available on-demand that provides all the continually updated infrastructure and resources needed to run your applications. You focus on the code that matters most to you, in the most productive language for you, and Functions handles the rest. Functions provides serverless compute for Azure. You can use Azure Functions to build web APIs, respond to database changes, process IoT streams, manage message queues, and more.
99
ms.service: azure-functions
10-
ms.topic: landing-page # Required
10+
ms.topic: landing-page
1111
author: ggailey777
1212
ms.author: azfundocs
1313
ms.date: 12/27/2021

articles/azure-relay/index.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ title: Azure Relay documentation # < 60 chars
44
summary: Learn how Azure Relay service allows you to securely expose services that run in your corporate network to the public cloud. # < 160 chars
55

66
metadata:
7-
title: Azure Relay documentation # Required; page title displayed in search results. Include the brand. < 60 chars.
8-
description: Learn how Azure Relay service allows you to securely expose services that run in your corporate network to the public cloud. # Required; article description that is displayed in search results. < 160 chars.
7+
title: Azure Relay documentation
8+
description: Learn how Azure Relay service allows you to securely expose services that run in your corporate network to the public cloud.
99
services: service-bus-relay
10-
ms.service: service-bus-relay #Required; service per approved list. service slug assigned to your service by ACOM.
10+
ms.service: service-bus-relay
1111
ms.subservice:
12-
ms.topic: landing-page # Required
12+
ms.topic: landing-page
1313
ms.collection: collection
14-
author: spelluru #Required; your GitHub user alias, with correct capitalization.
15-
ms.author: spelluru #Required; microsoft alias of author; optional team alias.
16-
ms.date: 01/11/2022 #Required; mm/dd/yyyy format.
14+
author: spelluru
15+
ms.author: spelluru
16+
ms.date: 01/11/2022
1717

1818
# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | whats-new
1919

articles/azure-resource-manager/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
title: Azure Resource Manager documentation
1010
description: Azure Resource Manager is the deployment and management service for Azure.
1111
ms.service: azure-resource-manager
12-
ms.topic: hub-page # Required
12+
ms.topic: hub-page
1313
ms.collection: collection
1414
author: tfitzmac
1515
ms.author: tomfitz

0 commit comments

Comments
 (0)