Skip to content

Commit d156f55

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 3ee1a64 + e46d311 commit d156f55

File tree

80 files changed

+1482
-784
lines changed

Some content is hidden

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

80 files changed

+1482
-784
lines changed

.openpublishing.redirection.defender-for-iot.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-install-software.md",
5+
"redirect_url": "/azure/defender-for-iot/organizations/ot-deploy/install-software-ot-sensor",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-create-and-manage-users.md",
510
"redirect_url": "/azure/defender-for-iot/organizations/manage-users-overview",
@@ -117,7 +122,7 @@
117122
},
118123
{
119124
"source_path_from_root": "/articles/defender-for-iot/how-to-install-software.md",
120-
"redirect_url": "/azure/defender-for-iot/organizations/how-to-install-software",
125+
"redirect_url": "/azure/defender-for-iot/organizations/ot-deploy/install-software-ot-sensor",
121126
"redirect_document_id": false
122127
},
123128
{

articles/active-directory-b2c/configure-authentication-sample-python-web-app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ Open the *app_config.py* file. This file contains information about your Azure A
216216

217217
|Key |Value |
218218
|---------|---------|
219-
|`ENDPOINT`| The URI of your web API (for example, `https://localhost:44332/hello`).|
219+
|`ENDPOINT`| The URI of your web API (for example, `https://localhost:5000/getAToken`).|
220220
|`SCOPE`| The web API [scopes](#step-62-configure-scopes) that you created.|
221221
| | |
222222

@@ -238,7 +238,7 @@ CLIENT_SECRET = "xxxxxxxxxxxxxxxxxxxxxxxx" # Placeholder - for use ONLY during t
238238
### More code here
239239

240240
# This is the API resource endpoint
241-
ENDPOINT = 'https://localhost:44332'
241+
ENDPOINT = 'https://localhost:5000'
242242

243243

244244
SCOPE = ["https://contoso.onmicrosoft.com/api/demo.read", "https://contoso.onmicrosoft.com/api/demo.write"]

articles/active-directory/saas-apps/blinq-provisioning-tutorial.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,8 @@ Once you've configured provisioning, use the following resources to monitor your
174174
* If the provisioning configuration seems to be in an unhealthy state, the application will go into quarantine. Learn more about quarantine states [here](../app-provisioning/application-provisioning-quarantine-status.md).
175175

176176
## Change Logs
177-
05/25/2022 - **Schema Discovery** feature enabled on this app.
177+
* 05/25/2022 - **Schema Discovery** feature enabled on this app.
178+
* 12/22/2022 - The source attribute of **addresses[type eq "work"].formatted** ha been changed to **Join("", [streetAddress], IIF(IsPresent([city]),", ",""), [city], IIF(IsPresent([state]),", ",""), [state], IIF(IsPresent([postalCode])," ",""), [postalCode]) --> addresses[type eq "work"].formatted**.
178179

179180
## More resources
180181

articles/active-directory/saas-apps/lucid-all-products-provisioning-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ This section guides you through the steps to configure the Azure AD provisioning
9898

9999
1. Select **Save**.
100100

101-
1. Under the **Mappings** section, select **Synchronize Azure Active Directory Users to Lucid (All Products)**.
101+
1. Under the **Mappings** section, select **Provision Azure Active Directory Users**.
102102

103103
1. Review the user attributes that are synchronized from Azure AD to Lucid (All Products) in the **Attribute-Mapping** section. The attributes selected as **Matching** properties are used to match the user accounts in Lucid (All Products) for update operations. If you choose to change the [matching target attribute](../app-provisioning/customize-application-attributes.md), you will need to ensure that the Lucid (All Products) API supports filtering users based on that attribute. Select the **Save** button to commit any changes.
104104

@@ -116,7 +116,7 @@ This section guides you through the steps to configure the Azure AD provisioning
116116
|urn:ietf:params:scim:schemas:extension:lucid:2.0:User:productLicenses.LucidscaleCreator|String||
117117

118118

119-
1. Under the **Mappings** section, select **Synchronize Azure Active Directory Groups to Lucid (All Products)**.
119+
1. Under the **Mappings** section, select **Provision Azure Active Directory Groups**.
120120

121121
1. Review the group attributes that are synchronized from Azure AD to Lucid (All Products) in the **Attribute-Mapping** section. The attributes selected as **Matching** properties are used to match the groups in Lucid (All Products) for update operations. Select the **Save** button to commit any changes.
122122

articles/active-directory/saas-apps/tripwire-enterprise-tutorial.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.subservice: saas-app-tutorial
1010
ms.workload: identity
1111
ms.topic: how-to
12-
ms.date: 12/14/2022
12+
ms.date: 01/02/2023
1313
ms.author: jeedes
1414

1515
---
@@ -77,17 +77,13 @@ Complete the following steps to enable Azure AD single sign-on in the Azure port
7777

7878
![Screenshot shows the Certificate download link.](common/metadataxml.png "Certificate")
7979

80-
1. On the **Set up Tripwire Enterprise** section, copy the appropriate URL(s) based on your requirement.
81-
82-
![Screenshot shows to copy configuration appropriate URL.](common/copy-configuration-urls.png "Metadata")
83-
8480
## Configure Tripwire Enterprise SSO
8581

86-
To configure single sign-on on **Tripwire Enterprise** side, you need to send the downloaded **Federation Metadata XML** and appropriate copied URLs from Azure portal to [Tripwire Enterprise support team](mailto:support@tripwire.com). They set this setting to have the SAML SSO connection set properly on both sides.
82+
To configure single sign-on in Tripwire Enterprise, please see **Using Tripwire Enterprise with SAML Authentication** section in the Tripwire Enterprise Hardeing Guide, available for download on the [Tripwire Customer Center](https://tripwireinc.force.com/customers/home). If you require assistance, contact [Tripwire Enterprise support team](mailto:[email protected]).
8783

8884
### Create Tripwire Enterprise test user
8985

90-
In this section, you create a user called Britta Simon in Tripwire Enterprise. Work with [Tripwire Enterprise support team](mailto:support@tripwire.com) to add the users in the Tripwire Enterprise platform. Users must be created and activated before you use single sign-on.
86+
To create a Tripwire Enterprise user, please see **Creating a User Account** section in the Tripwire Enterprise User Guide, available for download on the [Tripwire Customer Center](https://tripwireinc.force.com/customers/home). If you require assistance, contact [Tripwire Enterprise support team](mailto:[email protected]).
9187

9288
## Test SSO
9389

articles/aks/auto-upgrade-cluster.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@ If you’re using Planned Maintenance and Auto-Upgrade, your upgrade will start
6969
7070
For more information on Planned Maintenance, see [Use Planned Maintenance to schedule maintenance windows for your Azure Kubernetes Service (AKS) cluster][planned-maintenance].
7171

72+
## Auto upgrade limitations
73+
74+
If you’re using Auto-Upgrade you cannot anymore upgrade the control plane first, and then upgrade the individual node pools. Auto-Upgrade will always upgrade the control plane and the node pools together. In Auto-Upgrade there is no concept of upgrading the control plane only, and trying to run the command `az aks upgrade --control-plane-only` will raise the error: `NotAllAgentPoolOrchestratorVersionSpecifiedAndUnchanged: Using managed cluster api, all Agent pools' OrchestratorVersion must be all specified or all unspecified. If all specified, they must be stay unchanged or the same with control plane.`
75+
7276
## Best practices for auto-upgrade
7377

7478
The following best practices will help maximize your success when using auto-upgrade:

articles/aks/best-practices.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@ ms.date: 03/09/2021
1010
# Cluster operator and developer best practices to build and manage applications on Azure Kubernetes Service (AKS)
1111

1212
Building and running applications successfully in Azure Kubernetes Service (AKS) require understanding and implementation of some key considerations, including:
13+
1314
* Multi-tenancy and scheduler features.
1415
* Cluster and pod security.
15-
* Business continuity and disaster recovery.
16-
16+
* Business continuity and disaster recovery.
1717

1818
The AKS product group, engineering teams, and field teams (including global black belts [GBBs]) contributed to, wrote, and grouped the following best practices and conceptual articles. Their purpose is to help cluster operators and developers understand the considerations above and implement the appropriate features.
1919

20-
2120
## Cluster operator best practices
2221

2322
As a cluster operator, work together with application owners and developers to understand their needs. You can then use the following best practices to configure your AKS clusters as needed.
@@ -76,9 +75,7 @@ To help understand some of the features and components of these best practices,
7675

7776
## Next steps
7877

79-
If you need to get started with AKS, see the AKS quickstart [using the Azure CLI][aks-quickstart-cli], [using Azure PowerShell][aks-quickstart-powershell], or [using the Azure portal][aks-quickstart-portal].
78+
For guidance on a creating full solutions with AKS for production, see [AKS solution guidance][aks-solution-guidance].
8079

8180
<!-- LINKS - internal -->
82-
[aks-quickstart-cli]: ./learn/quick-kubernetes-deploy-cli.md
83-
[aks-quickstart-portal]: ./learn/quick-kubernetes-deploy-portal.md
84-
[aks-quickstart-powershell]: ./learn/quick-kubernetes-deploy-powershell.md
81+
[aks-solution-guidance]: /azure/architecture/reference-architectures/containers/aks-start-here?WT.mc_id=AKSDOCSPAGE

articles/aks/intro-kubernetes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,5 +186,5 @@ Learn more about deploying and managing AKS.
186186
[aks-monitor]: monitor-aks.md
187187
[azure-monitor]: ../azure-monitor/containers/containers.md
188188
[azure-logs]: ../azure-monitor/logs/log-analytics-overview.md
189-
[helm]: /quickstart-helm.md
190-
[aks-best-practices]: /best-practices.md
189+
[helm]: quickstart-helm.md
190+
[aks-best-practices]: best-practices.md

articles/azure-monitor/logs/basic-logs-configure.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ By default, all tables in your Log Analytics workspace are Analytics tables, and
5252
| [ACSCallAutomationIncomingOperations](/azure/azure-monitor/reference/tables/ACSCallAutomationIncomingOperations) | Communication Services incoming requests Calls. |
5353
| [ACSCallRecordingSummary](/azure/azure-monitor/reference/tables/acscallrecordingsummary) | Communication Services recording summary logs. |
5454
| [ACSRoomsIncomingOperations](/azure/azure-monitor/reference/tables/acsroomsincomingoperations) | Communication Services Rooms incoming requests operations. |
55+
| [AHDSMedTechDiagnosticLogs](/azure/azure-monitor/reference/tables/AHDSMedTechDiagnosticLogs) | Health Data Services operational logs. |
5556
| [AppTraces](/azure/azure-monitor/reference/tables/apptraces) | Application Insights Freeform traces. |
5657
| [AMSLiveEventOperations](/azure/azure-monitor/reference/tables/AMSLiveEventOperations) | Azure Media Services encoder connects, disconnects, or discontinues. |
5758
| [AMSKeyDeliveryRequests](/azure/azure-monitor/reference/tables/AMSKeyDeliveryRequests) | Azure Media Services HTTP request details for key, or license acquisition. |

articles/azure-monitor/logs/tutorial-logs-ingestion-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ Instead of directly configuring the schema of the table, you can use the portal
233233
```kusto
234234
source
235235
| extend TimeGenerated = todatetime(Time)
236-
| parse RawData.value with
236+
| parse RawData with
237237
ClientIP:string
238238
' ' *
239239
' ' *

0 commit comments

Comments
 (0)