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
9363c40a
Commit
9363c40a
authored
Jan 29, 2018
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:grafana/grafana
parents
b6ce16eb
2782ad09
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go
+7
-4
No files found.
pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go
View file @
9363c40a
...
...
@@ -69,10 +69,13 @@ func (tw *DatasourcePluginWrapper) Query(ctx context.Context, ds *models.DataSou
for
_
,
r
:=
range
pbres
.
Results
{
qr
:=
&
tsdb
.
QueryResult
{
RefId
:
r
.
RefId
,
Series
:
[]
*
tsdb
.
TimeSeries
{},
Error
:
errors
.
New
(
r
.
Error
),
ErrorString
:
r
.
Error
,
RefId
:
r
.
RefId
,
Series
:
[]
*
tsdb
.
TimeSeries
{},
}
if
r
.
Error
!=
""
{
qr
.
Error
=
errors
.
New
(
r
.
Error
)
qr
.
ErrorString
=
r
.
Error
}
for
_
,
s
:=
range
r
.
GetSeries
()
{
...
...
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