Move SAML config into separate page and add multi-SAML #32469

evazorro · 2025-10-29T18:28:57Z

What does this PR do? What is the motivation?

You can now enable multiple SAML providers per organization (available to enterprise customers only). This PR moves the SAML configuration information out of the top-level SAML doc and into a standalone configuration guide, and adds a new section "Configuring multiple SAML providers."

Merge instructions

Merge readiness:

Ready for merge

evazorro · 2025-10-29T18:29:27Z

content/en/account_management/saml/configuration.md

+6. After uploading the IdP metadata, return to the **Login Methods** page and turn SAML `on` by default. 
+
+**Note**: To configure SAML for a multi-org, see [Managing Multiple-Organization Accounts][18].
+


New content starts below

github-actions · 2025-10-29T18:32:45Z

Preview links (active after the `build_preview` check completes)

New or renamed files

https://docs-staging.datadoghq.com/eva/DOCS-11869/account_management/saml/configuration

Modified Files

https://docs-staging.datadoghq.com/eva/DOCS-11869/account_management/saml/

buraizu

Looks good overall! I left a few suggestions that:

Update some links
Make note format consistent
Make minor style updates

The suggestions that add a hyphen to single sign on are based on the Microsoft style guide. Both styles are used in the docs currently, but the hyphenated version seems to be more common. Let me know if there's a reason to keep this un-hyphenated.

content/en/account_management/saml/configuration.md

content/en/account_management/saml/_index.md

content/en/account_management/saml/configuration.md

content/en/account_management/saml/_index.md

content/en/account_management/saml/configuration.md

buraizu · 2025-10-29T19:34:48Z

content/en/account_management/saml/configuration.md

+    * [Auth0][10]
+    * [Google][12]
+    * [Microsoft Entra ID][11]
+    * [NoPassword][13]


Suggested change

* [NoPassword][13]

* [LastPass][13]

This seems to have been deprecated:

NoPassword was acquired by LogMeIn, the creator of LastPass. The NoPassword Datadog SAML integration is no longer available. Follow the LastPass integration instructions above.

That's a good point. Would you recommend removing the mention from this page entirely?

I'm guessing this can be removed entirely, and maybe also this page as well.

However, I'll defer to the AAA team, who may have more context on this.

@wangadong one more question for you if you don't mind! Do we still want to mention NoPassword/LastPass in this doc?

This should be a question for our PM @tomnof or customer service people who is closer to our customer integration. But since NoPassword is no longer available, so we can remove it. But I guess LastPass still provides integration as a SAML IdP, and it's a question about whether we want to update the doc to show how to integrate with LastPass?

Since NoPassword doesn't exist anymore -- let's remove.
Since LastPass do exist -- let's keep.
from what I can tell, we currently don't have any saml customers with LastPass, but lets keep anyway

I'm going to leave LastPass in for this PR but make a ticket for myself to keep investigating, because it looks like the LastPass/Datadog page referenced doesn't exist anymore on their side. So we might want to remove the mention entirely in the future (but it doesn't have to block this PR merging)

Co-authored-by: Bryce Eadie <bryce.eadie@datadoghq.com>

buraizu

Thanks for following up on those suggestions! I've added a couple of additional suggestions to add detail about the required permissions, but overall LGTM and approving.

content/en/account_management/saml/configuration.md

tomnof · 2025-11-04T20:41:51Z

content/en/account_management/saml/configuration.md

+
+### Role mapping with multiple SAML providers
+
+If you use SAML role mapping and want to use the same role mappings in any additional providers you add, make sure the attributes in the new IdP(s) match what is defined in your mappings. If you add a new IdP, make sure to either use the same attribute names as your existing IdP, or add new mappings that align with the new IdP's attributes to ensure roles are assigned correctly when users log in with different IdPs.


should we add a link to this page:
https://docs-staging.datadoghq.com/eva/DOCS-11869/account_management/saml/mapping/#map-saml-attributes-to-datadog-roles

Yes! Good idea. Added

tomnof · 2025-11-04T20:46:32Z

content/en/account_management/saml/configuration.md

+    * [Auth0][10]
+    * [Google][12]
+    * [Microsoft Entra ID][11]
+    * [NoPassword][13]


Since NoPassword doesn't exist anymore -- let's remove.
Since LastPass do exist -- let's keep.
from what I can tell, we currently don't have any saml customers with LastPass, but lets keep anyway

Co-authored-by: Bryce Eadie <bryce.eadie@datadoghq.com>

hay-sam · 2025-11-05T14:30:02Z

content/en/account_management/saml/configuration.md

+    * [LastPass][13]
+    * [Okta][14]
+    * [SafeNet][15]
+


something potentially worth noting - although right now the UI is different for multi saml & non multi saml customers

We are going to unify the experience under the same (new) UI which we created for multi saml
The only difference is that non-enterprise customers won't have the ability to add additional SAML

(an org with a limit of 1)

@hay-sam Swapped out the screenshot and ended up rewriting this procedure too; can you tell me whether step 7 is still relevant? I suspect it is not, you just need to save the SAML config, but couldn't fully test

Preview here: https://docs-staging.datadoghq.com/eva/DOCS-11869/account_management/saml/configuration/#configuring-saml

nope! when you upload your first saml, we turn it on for you :)

Perfect, I'll remove that step!

content/en/account_management/saml/configuration.md

hay-sam · 2025-11-11T17:44:49Z

content/en/account_management/saml/configuration.md

+### Role mapping with multiple SAML providers
+
+If you use [SAML role mapping][19] and want to use the same role mappings in any additional providers you add, make sure the attributes in the new IdP(s) match what is defined in your mappings. If you add a new IdP, make sure to either use the same attribute names as your existing IdP, or add new mappings that align with the new IdP's attributes to ensure roles are assigned correctly when users log in with different IdPs.
+


the same also applies to team mappings :)

Sweet, I can change this section to say "role or team mappings" throughout

* Move SAML config into separate page and add multi-SAML * Fix menu * Fix menu but for real * Apply suggestions from code review Co-authored-by: Bryce Eadie <bryce.eadie@datadoghq.com> * Add considerations + restyle notes * Rewording * Incorporate considerations into procedure * Update link and remove a sentence * Apply suggestions from code review Co-authored-by: Bryce Eadie <bryce.eadie@datadoghq.com> * Apply suggestions from code review Co-authored-by: Bryce Eadie <bryce.eadie@datadoghq.com> * NoPassword->LastPass, and link to role mapping doc * Swap screenshot and rewrite single SAML config procedure * Remove unnecessary step and add team mapping info --------- Co-authored-by: Bryce Eadie <bryce.eadie@datadoghq.com>

evazorro added 3 commits October 29, 2025 12:18

Move SAML config into separate page and add multi-SAML

9b0de73

Fix menu

d3c843d

Fix menu but for real

8052dbb

evazorro requested a review from a team as a code owner October 29, 2025 18:28

github-actions bot added the Architecture Everything related to the Doc backend label Oct 29, 2025

evazorro commented Oct 29, 2025

View reviewed changes

buraizu self-assigned this Oct 29, 2025

buraizu requested changes Oct 29, 2025

View reviewed changes

evazorro requested review from hay-sam and tomnof October 29, 2025 19:57

evazorro and others added 7 commits October 29, 2025 14:05

Apply suggestions from code review

8404d56

Co-authored-by: Bryce Eadie <bryce.eadie@datadoghq.com>

Add considerations + restyle notes

bea9b0c

Merge branch 'master' into eva/DOCS-11869

330fced

Rewording

c7856af

Incorporate considerations into procedure

cf69220

Update link and remove a sentence

a61ab90

Apply suggestions from code review

b69c825

Co-authored-by: Bryce Eadie <bryce.eadie@datadoghq.com>

evazorro requested a review from buraizu November 4, 2025 19:34

buraizu approved these changes Nov 4, 2025

View reviewed changes

content/en/account_management/saml/configuration.md Outdated Show resolved Hide resolved

content/en/account_management/saml/configuration.md Outdated Show resolved Hide resolved

tomnof reviewed Nov 4, 2025

View reviewed changes

content/en/account_management/saml/configuration.md Outdated Show resolved Hide resolved

tomnof reviewed Nov 4, 2025

View reviewed changes

evazorro and others added 2 commits November 5, 2025 07:19

Apply suggestions from code review

130fdd4

Co-authored-by: Bryce Eadie <bryce.eadie@datadoghq.com>

NoPassword->LastPass, and link to role mapping doc

ccdd1a6

hay-sam reviewed Nov 5, 2025

View reviewed changes

tomnof reviewed Nov 5, 2025

View reviewed changes

content/en/account_management/saml/configuration.md Outdated Show resolved Hide resolved

Swap screenshot and rewrite single SAML config procedure

c04d2f6

github-actions bot added the Images Images are added/removed with this PR label Nov 10, 2025

evazorro requested a review from hay-sam November 10, 2025 20:27

hay-sam reviewed Nov 11, 2025

View reviewed changes

evazorro added 2 commits November 11, 2025 12:08

Remove unnecessary step and add team mapping info

6fe7385

Merge branch 'master' into eva/DOCS-11869

84a05cf

evazorro merged commit a868b02 into master Nov 11, 2025
17 checks passed

evazorro deleted the eva/DOCS-11869 branch November 11, 2025 20:14

		6. After uploading the IdP metadata, return to the Login Methods page and turn SAML `on` by default.

		Note: To configure SAML for a multi-org, see [Managing Multiple-Organization Accounts][18].


		### Role mapping with multiple SAML providers

		If you use SAML role mapping and want to use the same role mappings in any additional providers you add, make sure the attributes in the new IdP(s) match what is defined in your mappings. If you add a new IdP, make sure to either use the same attribute names as your existing IdP, or add new mappings that align with the new IdP's attributes to ensure roles are assigned correctly when users log in with different IdPs.

		### Role mapping with multiple SAML providers

		If you use [SAML role mapping][19] and want to use the same role mappings in any additional providers you add, make sure the attributes in the new IdP(s) match what is defined in your mappings. If you add a new IdP, make sure to either use the same attribute names as your existing IdP, or add new mappings that align with the new IdP's attributes to ensure roles are assigned correctly when users log in with different IdPs.

Move SAML config into separate page and add multi-SAML #32469

Move SAML config into separate page and add multi-SAML #32469

Uh oh!

Conversation

evazorro commented Oct 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do? What is the motivation?

Merge instructions

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Oct 29, 2025

Preview links (active after the build_preview check completes)

New or renamed files

Modified Files

Uh oh!

buraizu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

buraizu Oct 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

buraizu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

evazorro commented Oct 29, 2025 •

edited

Loading

Preview links (active after the `build_preview` check completes)

buraizu Oct 30, 2025 •

edited

Loading