IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

SAML: Configuration defaults, examples and dependencies (#17954)

Browse Source 
* Add SAML configuration options

* Add crewjam/saml as a depdency

Needed as part of the enterprise SAML integration.

* Vendor github.com/stretchr/testify/require

The package require implements the same assertions as the `assert` package but stops test execution when a test fails.
This commit is contained in:
gotjosh
2019-07-05 11:27:14 +01:00
committed by GitHub
parent 48d5a1bcd3
commit e6b8a1529b
63 changed files with 12096 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
conf/defaults.ini
View File

@@ -377,6 +377,19 @@ tls_client_key =
tls_client_ca =
send_client_credentials_via_post = false
#################################### SAML Auth ###########################
[auth.saml] # Enterprise only
enabled = false
private_key =
private_key_path =
certificate =
certificate_path =
idp_metadata =
idp_metadata_path =
idp_metadata_url =
max_issue_delay = 90s
metadata_valid_duration = 48h
#################################### Basic Auth ##########################
[auth.basic]
enabled = true

13
conf/sample.ini
View File

@@ -333,6 +333,19 @@
; This might be required if the OAuth provider is not RFC6749 compliant, only supporting credentials passed via POST payload
;send_client_credentials_via_post = false
#################################### SAML Auth ###########################
;[auth.saml] # Enterprise only
;enabled = false
;private_key =
;private_key_path =
;certificate =
;certificate_path =
;idp_metadata =
;idp_metadata_path =
;idp_metadata_url =
;max_issue_delay = 90s
;metadata_valid_duration = 48h
#################################### Grafana.com Auth ####################
[auth.grafana_com]
;enabled = false