Skip to content

Conversation

eannamacken
Copy link
Contributor

What does this PR do? What is the motivation?

This updates the Entra specific SCIM docs to include a flag as part of the tenant url by default. We're seeing this more and more on support where customers are reporting errors due to a limitation on Microsofts side. This flag resolves the issue and from our knowledge, will have no adverse side affects from being set by default.

cc @heavi5ide

Merge instructions

Merge readiness:

  • Ready for merge

For Datadog employees:

Your branch name MUST follow the <name>/<description> convention and include the forward slash (/). Without this format, your pull request will not pass CI, the GitLab pipeline will not run, and you won't get a branch preview. Getting a branch preview makes it easier for us to check any issues with your PR, such as broken links.

If your branch doesn't follow this format, rename it or create a new branch and PR.

[6/5/2025] Merge queue has been disabled on the documentation repo. If you have write access to the repo, the PR has been reviewed by a Documentation team member, and all of the required checks have passed, you can use the Squash and Merge button to merge the PR. If you don't have write access, or you need help, reach out in the #documentation channel in Slack.

Additional notes

@eannamacken eannamacken requested a review from a team as a code owner August 13, 2025 12:10
Copy link
Contributor

github-actions bot commented Aug 13, 2025

✅ Documentation Team Review

The documentation team has approved this pull request. Thank you for your contribution!

Copy link
Contributor

Preview links (active after the build_preview check completes)

Modified Files

Copy link
Contributor

@heavi5ide heavi5ide left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you able to get a new screenshot?

- **Tenant URL**: `https://{{< region-param key="dd_full_site" >}}/api/v2/scim` **Note:** Use the appropriate subdomain for your site. To find your URL, see [Datadog sites][3].
- **Tenant URL**: `https://{{< region-param key="dd_full_site" >}}/api/v2/scim?aadOptscim062020`
- **Note:** Use the appropriate subdomain for your site. To find your URL, see [Datadog sites][3].
- **Note:** The `?aadOptscim062020` part of the Tenant URL is specifically for Entra ID. This is a flag that tells Entra to correct it's SCIM behavior as outlined in [this knowledgebase article][8]. If you are not using Entra ID, you should not include this suffix on the URL.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, realize this error originates in my copy in the Slack thread, but noticed it here:

Suggested change
- **Note:** The `?aadOptscim062020` part of the Tenant URL is specifically for Entra ID. This is a flag that tells Entra to correct it's SCIM behavior as outlined in [this knowledgebase article][8]. If you are not using Entra ID, you should not include this suffix on the URL.
- **Note:** The `?aadOptscim062020` part of the Tenant URL is specifically for Entra ID. This is a flag that tells Entra to correct its SCIM behavior as outlined in [this knowledgebase article][8]. If you are not using Entra ID, you should not include this suffix on the URL.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@heavi5ide ah sorry about the screenshot, I forgot about that. I don't seem to be able to load the provisioning tab within the Entra admin console. I don't have the correct access. Do you by any chance? Or perhaps know someone who would have access?

Copy link
Contributor

@maycmlee maycmlee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a couple of small suggestions

Co-authored-by: May Lee <may.lee@datadoghq.com>
Copy link
Contributor Author

@eannamacken eannamacken left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@maycmlee - I'm looking to replace this image with
2025-08-15 Entra SCIM Config aadOptscim062020 cropped

but I can't see where I should upload that in the repo. Can you point me to the right place?

@heavi5ide
Copy link
Contributor

but I can't see where I should upload that in the repo. Can you point me to the right place?

Looks like it's here: https://github.com/DataDog/documentation/blob/master/static/images/account_management/scim/admin-credentials-2.png

I'd suggest adding it in that directory with a new name, and changing the img tag in this doc to point to the new name. If you use the same name, depending on how this stuff is deployed, user's may load the old image from cache.

@maycmlee
Copy link
Contributor

@maycmlee - I'm looking to replace this image

but I can't see where I should upload that in the repo. Can you point me to the right place?

@eannamacken looks like @heavi5ide found it: #31059 (comment)

Also, yes, please use a different name for the new image otherwise you'll run into caching issues as @heavi5ide mentioned.

@github-actions github-actions bot added the Images Images are added/removed with this PR label Aug 15, 2025
@eannamacken
Copy link
Contributor Author

@maycmlee - I think that should be everything now? Thanks for your help here

Copy link
Contributor

@maycmlee maycmlee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Is it good to merge?

Copy link
Contributor

@heavi5ide heavi5ide left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, thanks Éanna!

@eannamacken
Copy link
Contributor Author

All good from me anyway!

@maycmlee maycmlee merged commit 59dfee6 into master Aug 15, 2025
21 of 22 checks passed
@maycmlee maycmlee deleted the eannamacken/update_entra_docs branch August 15, 2025 18:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Images Images are added/removed with this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants