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
ef08a243
Commit
ef08a243
authored
Nov 10, 2016
by
bergquist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(influxdb): fixes possible nil pointer
closes #6531
parent
6a813890
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
pkg/tsdb/influxdb/model_parser.go
+2
-2
No files found.
pkg/tsdb/influxdb/model_parser.go
View file @
ef08a243
...
@@ -12,7 +12,6 @@ type InfluxdbQueryParser struct{}
...
@@ -12,7 +12,6 @@ type InfluxdbQueryParser struct{}
func
(
qp
*
InfluxdbQueryParser
)
Parse
(
model
*
simplejson
.
Json
,
dsInfo
*
tsdb
.
DataSourceInfo
)
(
*
Query
,
error
)
{
func
(
qp
*
InfluxdbQueryParser
)
Parse
(
model
*
simplejson
.
Json
,
dsInfo
*
tsdb
.
DataSourceInfo
)
(
*
Query
,
error
)
{
policy
:=
model
.
Get
(
"policy"
)
.
MustString
(
"default"
)
policy
:=
model
.
Get
(
"policy"
)
.
MustString
(
"default"
)
rawQuery
:=
model
.
Get
(
"query"
)
.
MustString
(
""
)
rawQuery
:=
model
.
Get
(
"query"
)
.
MustString
(
""
)
interval
:=
model
.
Get
(
"interval"
)
.
MustString
(
""
)
measurement
:=
model
.
Get
(
"measurement"
)
.
MustString
(
""
)
measurement
:=
model
.
Get
(
"measurement"
)
.
MustString
(
""
)
...
@@ -36,7 +35,8 @@ func (qp *InfluxdbQueryParser) Parse(model *simplejson.Json, dsInfo *tsdb.DataSo
...
@@ -36,7 +35,8 @@ func (qp *InfluxdbQueryParser) Parse(model *simplejson.Json, dsInfo *tsdb.DataSo
return
nil
,
err
return
nil
,
err
}
}
if
interval
==
""
{
interval
:=
model
.
Get
(
"interval"
)
.
MustString
(
""
)
if
interval
==
""
&&
dsInfo
.
JsonData
!=
nil
{
dsInterval
:=
dsInfo
.
JsonData
.
Get
(
"timeInterval"
)
.
MustString
(
""
)
dsInterval
:=
dsInfo
.
JsonData
.
Get
(
"timeInterval"
)
.
MustString
(
""
)
if
dsInterval
!=
""
{
if
dsInterval
!=
""
{
interval
=
dsInterval
interval
=
dsInterval
...
...
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