Skip to content

Commit e429db6

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into aks-network-metadata
2 parents b77510f + 64701c0 commit e429db6

File tree

6 files changed

+12
-16
lines changed

6 files changed

+12
-16
lines changed

articles/active-directory/saas-apps/kintone-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: tutorial
12-
ms.date: 11/21/2022
12+
ms.date: 01/13/2023
1313
ms.author: jeedes
1414
---
1515
# Tutorial: Azure AD SSO integration with Kintone
@@ -71,12 +71,8 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
7171

7272
4. On the **Basic SAML Configuration** section, perform the following steps:
7373

74-
a. In the **Identifier (Entity ID)** text box, type a URL using one of the following patterns:
75-
76-
| **Identifier** |
77-
|---|
78-
| `https://<companyname>.cybozu.com` |
79-
| `https://<companyname>.kintone.com` |
74+
a. In the **Identifier (Entity ID)** text box, type a URL using the following pattern:
75+
`https://<companyname>.kintone.com`
8076

8177
b. In the **Sign on URL** text box, type a URL using the following pattern:
8278
`https://<companyname>.kintone.com`

articles/active-directory/saas-apps/mysdworxcom-tutorial.md

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

1515
---
1616

1717
# Azure Active Directory SSO integration with my.sdworx.com
1818

19-
In this article, you'll learn how to integrate my.sdworx.com with Azure Active Directory (Azure AD). my.sdworx.com is a SD Worx portal. When you integrate my.sdworx.com with Azure AD, you can:
19+
In this article, you'll learn how to integrate my.sdworx.com with Azure Active Directory (Azure AD). my.sdworx.com is an SD Worx portal. When you integrate my.sdworx.com with Azure AD, you can:
2020

2121
* Control in Azure AD who has access to my.sdworx.com.
2222
* Enable your users to be automatically signed-in to my.sdworx.com with their Azure AD accounts.
@@ -60,19 +60,19 @@ Complete the following steps to enable Azure AD single sign-on in the Azure port
6060

6161
![Screenshot shows how to edit Basic SAML Configuration.](common/edit-urls.png "Basic Configuration")
6262

63-
1. On the **Basic SAML Configuration** section, the user does not have to perform any step as the app is already pre-integrated with Azure.
63+
1. On the **Basic SAML Configuration** section, the **Relay State** should be set to `https://auth.sdworx.com/idhub/tb/wf_startapp?AppCode=MWAM`
6464

6565
1. On the **Set up single sign-on with SAML** page, in the **SAML Signing Certificate** section, click copy button to copy **App Federation Metadata Url** and save it on your computer.
6666

6767
![Screenshot shows the Certificate download link.](common/copy-metadataurl.png "Certificate")
6868

6969
## Configure my.sdworx.com SSO
7070

71-
To configure single sign-on on **my.sdworx.com** side, you need to send the **App Federation Metadata Url** to [my.sdworx.com support team](mailto:support@sdworx.com). They set this setting to have the SAML SSO connection set properly on both sides.
71+
To configure single sign-on on **my.sdworx.com** side, you need to send the **App Federation Metadata Url** to [my.sdworx.com support team](mailto:prod_cloud&busoper_middleware&hostsol@sdworx.com). They set this setting to have the SAML SSO connection set properly on both sides.
7272

7373
### Create my.sdworx.com test user
7474

75-
In this section, you create a user called Britta Simon at my.sdworx.com. Work with [my.sdworx.com support team](mailto:support@sdworx.com) to add the users in the my.sdworx.com platform. Users must be created and activated before you use single sign-on.
75+
In this section, you create a user called Britta Simon at my.sdworx.com. Work with [my.sdworx.com support team](mailto:prod_cloud&busoper_middleware&hostsol@sdworx.com) to add the users in the my.sdworx.com platform. Users must be created and activated before you use single sign-on.
7676

7777
## Test SSO
7878

articles/aks/open-service-mesh-about.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ OSM can be added to your Azure Kubernetes Service (AKS) cluster by enabling the
2121

2222
> [!IMPORTANT]
2323
> Based on the version of Kubernetes your cluster is running, the OSM add-on installs a different version of OSM:
24-
> - If your cluster is running Kubernetes version 1.24.0 or greater, the OSM add-on installs version *1.2.2* of OSM.
24+
> - If your cluster is running Kubernetes version 1.24.0 or greater, the OSM add-on installs version *1.2.3* of OSM.
2525
> - If your cluster is running a version of Kubernetes between 1.23.5 and 1.24.0, the OSM add-on installs version *1.1.3* of OSM.
2626
> - If your cluster is running a version of Kubernetes below 1.23.5, the OSM add-on installs version *1.0.0* of OSM.
2727

articles/aks/open-service-mesh-binary.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ This article will discuss how to download the OSM client library to be used to o
1414

1515
> [!IMPORTANT]
1616
> Based on the version of Kubernetes your cluster is running, the OSM add-on installs a different version of OSM:
17-
> - If your cluster is running Kubernetes version 1.24.0 or greater, the OSM add-on installs version *1.2.2* of OSM.
17+
> - If your cluster is running Kubernetes version 1.24.0 or greater, the OSM add-on installs version *1.2.3* of OSM.
1818
> - If your cluster is running a version of Kubernetes between 1.23.5 and 1.24.0, the OSM add-on installs version *1.1.3* of OSM.
1919
> - If your cluster is running a version of Kubernetes below 1.23.5, the OSM add-on installs version *1.0.0* of OSM.
2020

articles/aks/open-service-mesh-deploy-addon-az-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This article shows you how to install the Open Service Mesh (OSM) add-on on an A
1313

1414
> [!IMPORTANT]
1515
> Based on the version of Kubernetes your cluster is running, the OSM add-on installs a different version of OSM:
16-
> - If your cluster is running Kubernetes version 1.24.0 or greater, the OSM add-on installs version *1.2.2* of OSM.
16+
> - If your cluster is running Kubernetes version 1.24.0 or greater, the OSM add-on installs version *1.2.3* of OSM.
1717
> - If your cluster is running a version of Kubernetes between 1.23.5 and 1.24.0, the OSM add-on installs version *1.1.3* of OSM.
1818
> - If your cluster is running a version of Kubernetes below 1.23.5, the OSM add-on installs version *1.0.0* of OSM.
1919

articles/aks/open-service-mesh-deploy-addon-bicep.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This article shows you how to deploy the Open Service Mesh (OSM) add-on to Azure
1313

1414
> [!IMPORTANT]
1515
> Based on the version of Kubernetes your cluster is running, the OSM add-on installs a different version of OSM:
16-
> - If your cluster is running Kubernetes version 1.24.0 or greater, the OSM add-on installs version *1.2.2* of OSM.
16+
> - If your cluster is running Kubernetes version 1.24.0 or greater, the OSM add-on installs version *1.2.3* of OSM.
1717
> - If your cluster is running a version of Kubernetes between 1.23.5 and 1.24.0, the OSM add-on installs version *1.1.3* of OSM.
1818
> - If your cluster is running a version of Kubernetes below 1.23.5, the OSM add-on installs version *1.0.0* of OSM.
1919

0 commit comments

Comments
 (0)