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.

Sign up for GitHub

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

Add insecure email lookup property to Grafana #489

Merged
merged 1 commit into from
Feb 26, 2024
Merged

Add insecure email lookup property to Grafana #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions jobs/grafana/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,8 @@ properties:
description: "mask the Grafana version number for unauthenticated users"
grafana.auth.oauth_skip_org_role_update_sync:
description: "Skip forced assignment of OrgID 1 or 'auto_assign_org_id' for social logins"
grafana.auth.oauth_allow_insecure_email_lookup:
description: "Enable user lookup based on email in addition to using unique ID provided by IdPs."
grafana.auth.azure_auth_enabled:
description: "Set to true to enable Azure authentication option for HTTP-based datasources"

Expand Down
5 changes: 5 additions & 0 deletions jobs/grafana/templates/config/grafana.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,11 @@ oauth_state_cookie_max_age = <%= oauth_state_cookie_max_age %>
oauth_skip_org_role_update_sync = <%= oauth_skip_org_role_update_sync %>
<% end %>

<% if_p('grafana.auth.oauth_allow_insecure_email_lookup') do |oauth_allow_insecure_email_lookup| %>
# Enable user lookup based on email in addition to using unique ID provided by IdPs.
oauth_allow_insecure_email_lookup = <%= oauth_allow_insecure_email_lookup %>
<% end %>

<% if_p('grafana.auth.api_key_max_seconds_to_live') do |api_key_max_seconds_to_live| %>
# limit of api_key seconds to live before expiration
api_key_max_seconds_to_live = <%= api_key_max_seconds_to_live %>
Expand Down