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
3935f9d2
Commit
3935f9d2
authored
Oct 10, 2018
by
Erik Sundell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stackdriver: use constant instead of variable
parent
569fe232
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
8 deletions
+11
-8
pkg/tsdb/stackdriver/stackdriver.go
+10
-7
pkg/tsdb/stackdriver/test_datasource_query.go
+1
-1
No files found.
pkg/tsdb/stackdriver/stackdriver.go
View file @
3935f9d2
...
...
@@ -31,10 +31,14 @@ import (
)
var
(
slog
log
.
Logger
legendKeyFormat
*
regexp
.
Regexp
metricNameFormat
*
regexp
.
Regexp
gceAuthentication
string
slog
log
.
Logger
legendKeyFormat
*
regexp
.
Regexp
metricNameFormat
*
regexp
.
Regexp
)
const
(
gceAuthentication
string
=
"gce"
jwtAuthentication
string
=
"jwt"
)
// StackdriverExecutor executes queries for the Stackdriver datasource
...
...
@@ -61,7 +65,6 @@ func init() {
tsdb
.
RegisterTsdbQueryEndpoint
(
"stackdriver"
,
NewStackdriverExecutor
)
legendKeyFormat
=
regexp
.
MustCompile
(
`\{\{\s*(.+?)\s*\}\}`
)
metricNameFormat
=
regexp
.
MustCompile
(
`([\w\d_]+)\.googleapis\.com/(.+)`
)
gceAuthentication
=
"gce"
}
// Query takes in the frontend queries, parses them into the Stackdriver query format
...
...
@@ -93,7 +96,7 @@ func (e *StackdriverExecutor) executeTimeSeriesQuery(ctx context.Context, tsdbQu
Results
:
make
(
map
[
string
]
*
tsdb
.
QueryResult
),
}
authenticationType
:=
e
.
dsInfo
.
JsonData
.
Get
(
"authenticationType"
)
.
MustString
(
"jwt"
)
authenticationType
:=
e
.
dsInfo
.
JsonData
.
Get
(
"authenticationType"
)
.
MustString
(
jwtAuthentication
)
if
authenticationType
==
gceAuthentication
{
defaultProject
,
err
:=
e
.
getDefaultProject
(
ctx
)
if
err
!=
nil
{
...
...
@@ -586,7 +589,7 @@ func (e *StackdriverExecutor) createRequest(ctx context.Context, dsInfo *models.
}
func
(
e
*
StackdriverExecutor
)
getDefaultProject
(
ctx
context
.
Context
)
(
string
,
error
)
{
authenticationType
:=
e
.
dsInfo
.
JsonData
.
Get
(
"authenticationType"
)
.
MustString
(
"jwt"
)
authenticationType
:=
e
.
dsInfo
.
JsonData
.
Get
(
"authenticationType"
)
.
MustString
(
jwtAuthentication
)
if
authenticationType
==
gceAuthentication
{
defaultCredentials
,
err
:=
google
.
FindDefaultCredentials
(
ctx
,
"https://www.googleapis.com/auth/monitoring.read"
)
if
err
!=
nil
{
...
...
pkg/tsdb/stackdriver/test_datasource_query.go
View file @
3935f9d2
...
...
@@ -20,7 +20,7 @@ func (e *StackdriverExecutor) executeTestDataSource(ctx context.Context, tsdbQue
Results
:
make
(
map
[
string
]
*
tsdb
.
QueryResult
),
}
authenticationType
:=
e
.
dsInfo
.
JsonData
.
Get
(
"authenticationType"
)
.
MustString
(
"jwt"
)
authenticationType
:=
e
.
dsInfo
.
JsonData
.
Get
(
"authenticationType"
)
.
MustString
(
jwtAuthentication
)
if
authenticationType
==
gceAuthentication
{
defaultProject
,
err
:=
e
.
getDefaultProject
(
ctx
)
if
err
!=
nil
{
...
...
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