Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docs: Improve the SSO settings API docs #87599

Merged
merged 2 commits into from
May 31, 2024
Merged

Conversation

dmihai
Copy link
Contributor

@dmihai dmihai commented May 10, 2024

What is this feature?

Improve the SSO settings API docs.

Why do we need this feature?

Inform users on how to use the SSO settings API.

Who is this feature for?

Anyone using the SSO settings API.

Which issue(s) does this PR fix?:

Fixes #

Special notes for your reviewer:

Please check that:

  • It works as expected from a user's perspective.
  • If this is a pre-GA feature, it is behind a feature toggle.
  • The docs are updated, and if this is a notable improvement, it's added to our What's New doc.

@dmihai dmihai requested a review from a team May 10, 2024 09:49
@dmihai dmihai requested a review from Eve832 as a code owner May 10, 2024 09:49
@grafana-delivery-bot grafana-delivery-bot bot added this to the 11.1.x milestone May 10, 2024
@dmihai dmihai added the no-changelog Skip including change in changelog/release notes label May 10, 2024
@dmihai dmihai requested a review from chri2547 May 24, 2024 14:57
@@ -26,14 +26,23 @@ title: SSO Settings API
Available in Public Preview in Grafana 10.4 and on Grafana Cloud behind the `ssoSettingsApi` feature toggle.
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you please also update this part? By describing that it's GA since 11 and SAML support is public preview behind the ssoSettingsSAML feature toggle. Thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

The settings managed by this API are stored in the database and override
[settings from other sources]({{< relref "../../setup-grafana/configure-security/configure-authentication" >}})
(arguments, environment variables, settings file, etc).
Therefore, every time settings for a specific provider are removed at runtime,
Copy link
Contributor

@mgyongyosi mgyongyosi May 28, 2024

Choose a reason for hiding this comment

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

Suggested change
Therefore, every time settings for a specific provider are removed at runtime,
Therefore, every time settings for a specific provider are removed or reset to the default settings at runtime,

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

When you submit new settings for a provider via API,
Grafana verifies whether the given settings are allowed and valid.
If they are, then Grafana stores the settings in the database and reloads
Grafana services with no need to restart the instance.
Copy link
Contributor

Choose a reason for hiding this comment

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

I think it'd worth to add a note which says (we have the same note on the configuration pages: example):

If you run Grafana in high availability mode, configuration changes may not get applied to all Grafana instances immediately. You may need to wait a few minutes for the configuration to propagate to all Grafana instances.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@mgyongyosi mgyongyosi requested a review from rjcrutch May 28, 2024 14:07
@mgyongyosi
Copy link
Contributor

@rjcrutch Could you please review this PR?

@dmihai dmihai requested a review from mgyongyosi May 28, 2024 14:47
@dmihai dmihai merged commit d83288b into main May 31, 2024
11 checks passed
@dmihai dmihai deleted the dmihai/sso-api-docs-improve branch May 31, 2024 08:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no-changelog Skip including change in changelog/release notes type/docs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants