Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
f79dc0a8
Commit
f79dc0a8
authored
Mar 13, 2019
by
Sean Lafferty
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove auth_module settings from oauthPassThru ui
parent
4324a7f5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 additions
and
18 deletions
+1
-18
public/app/features/datasources/partials/http_settings.html
+1
-11
public/app/features/datasources/settings/HttpSettingsCtrl.ts
+0
-7
No files found.
public/app/features/datasources/partials/http_settings.html
View file @
f79dc0a8
...
...
@@ -88,17 +88,7 @@
checked=
"current.jsonData.tlsSkipVerify"
switch-class=
"max-width-6"
></gf-form-checkbox>
</div>
<div
class=
"gf-form-inline"
>
<gf-form-switch
class=
"gf-form"
ng-if=
"current.access=='proxy'"
label=
"Forward OAuth Identity"
label-class=
"width-13"
tooltip=
"Forward the user's upstream OAuth identity to the datasource (Their access token gets passed along)."
label-class=
"width-10"
checked=
"current.jsonData.oauthPassThru"
switch-class=
"max-width-6"
></gf-form-switch>
</div>
</div>
<div
class=
"gf-form-group"
ng-if=
"current.jsonData.oauthPassThru"
>
<h6>
OAuth Identity Forwarding Details
</h6>
<div
class=
"gf-form max-width-30"
>
<span
class=
"gf-form-label width-10"
>
OAuth Source
</span>
<div
class=
"gf-form-select-wrapper max-width-24"
>
<select
class=
"gf-form-input"
ng-model=
"current.jsonData.oauthPassThruProvider"
ng-options=
"f.key as f.value for f in oauthProviders"
></select>
</div>
<gf-form-checkbox
class=
"gf-form"
ng-if=
"current.access=='proxy'"
label=
"Forward OAuth Identity"
label-class=
"width-13"
tooltip=
"Forward the user's upstream OAuth identity to the datasource (Their access token gets passed along)."
checked=
"current.jsonData.oauthPassThru"
switch-class=
"max-width-6"
></gf-form-checkbox>
</div>
</div>
...
...
public/app/features/datasources/settings/HttpSettingsCtrl.ts
View file @
f79dc0a8
...
...
@@ -20,13 +20,6 @@ coreModule.directive('datasourceHttpSettings', () => {
$scope
.
getSuggestUrls
=
()
=>
{
return
[
$scope
.
suggestUrl
];
};
$scope
.
oauthProviders
=
[
{
key
:
'oauth_google'
,
value
:
'Google OAuth'
},
{
key
:
'oauth_gitlab'
,
value
:
'GitLab OAuth'
},
{
key
:
'oauth_generic_oauth'
,
value
:
'Generic OAuth'
},
{
key
:
'oauth_grafana_com'
,
value
:
'Grafana OAuth'
},
{
key
:
'oauth_github'
,
value
:
'GitHub OAuth'
},
];
},
},
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment