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
e13e2f8a
Commit
e13e2f8a
authored
Oct 15, 2018
by
Erik Sundell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stackdriver: change name of authentication type
parent
5b9cd830
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
public/app/plugins/datasource/stackdriver/config_ctrl.ts
+1
-1
public/app/plugins/datasource/stackdriver/partials/config.html
+3
-3
No files found.
public/app/plugins/datasource/stackdriver/config_ctrl.ts
View file @
e13e2f8a
...
@@ -20,7 +20,7 @@ export class StackdriverConfigCtrl {
...
@@ -20,7 +20,7 @@ export class StackdriverConfigCtrl {
this
.
current
.
secureJsonFields
=
this
.
current
.
secureJsonFields
||
{};
this
.
current
.
secureJsonFields
=
this
.
current
.
secureJsonFields
||
{};
this
.
authenticationTypes
=
[
this
.
authenticationTypes
=
[
{
key
:
this
.
defaultAuthenticationType
,
value
:
'Google JWT File'
},
{
key
:
this
.
defaultAuthenticationType
,
value
:
'Google JWT File'
},
{
key
:
'gce'
,
value
:
'
Use GCE default Authentication
'
},
{
key
:
'gce'
,
value
:
'
GCE Default Service Account
'
},
];
];
}
}
...
...
public/app/plugins/datasource/stackdriver/partials/config.html
View file @
e13e2f8a
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
<div
class=
"gf-form-group"
>
<div
class=
"gf-form-group"
>
<div
class=
"gf-form"
>
<div
class=
"gf-form"
>
<h3>
Service Account
Authentication
</h3>
<h3>
Authentication
</h3>
<info-popover
mode=
"header"
>
Upload your Service Account key file or paste in the contents of the file. The file
<info-popover
mode=
"header"
>
Upload your Service Account key file or paste in the contents of the file. The file
contents will be encrypted and saved in the Grafana database.
</info-popover>
contents will be encrypted and saved in the Grafana database.
</info-popover>
</div>
</div>
...
@@ -102,4 +102,4 @@
...
@@ -102,4 +102,4 @@
class=
"fa fa-save"
></i>
Do not forget to save your changes after uploading a file.
</p>
class=
"fa fa-save"
></i>
Do not forget to save your changes after uploading a file.
</p>
<p
class=
"gf-form-label"
ng-show=
"ctrl.current.jsonData.authenticationType !== ctrl.defaultAuthenticationType"
><i
class=
"fa fa-save"
></i>
<p
class=
"gf-form-label"
ng-show=
"ctrl.current.jsonData.authenticationType !== ctrl.defaultAuthenticationType"
><i
class=
"fa fa-save"
></i>
Verify GCE automatic authentication by clicking Save
&
Test
</p>
Verify GCE default service account by clicking Save
&
Test
</p>
\ No newline at end of file
\ No newline at end of file
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