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
ed661767
Commit
ed661767
authored
Sep 21, 2017
by
bergquist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
follow go idiom and return error as second param
parent
79b873e4
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
70 additions
and
105 deletions
+70
-105
pkg/api/metrics.go
+4
-3
pkg/services/alerting/conditions/query.go
+1
-1
pkg/services/alerting/conditions/query_test.go
+1
-1
pkg/tsdb/fake_test.go
+5
-5
pkg/tsdb/graphite/graphite.go
+9
-13
pkg/tsdb/influxdb/influxdb.go
+13
-13
pkg/tsdb/models.go
+0
-16
pkg/tsdb/mysql/mysql.go
+5
-5
pkg/tsdb/opentsdb/opentsdb.go
+8
-11
pkg/tsdb/prometheus/prometheus.go
+8
-8
pkg/tsdb/query_endpoint.go
+1
-1
pkg/tsdb/request.go
+6
-14
pkg/tsdb/testdata/testdata.go
+6
-6
pkg/tsdb/tsdb_test.go
+3
-8
No files found.
pkg/api/metrics.go
View file @
ed661767
...
...
@@ -43,7 +43,7 @@ func QueryMetrics(c *middleware.Context, reqDto dtos.MetricRequest) Response {
})
}
resp
,
err
:=
tsdb
.
HandleRequest
(
context
.
Background
(),
request
)
resp
,
err
:=
tsdb
.
HandleRequest
(
context
.
Background
(),
dsQuery
.
Result
,
request
)
if
err
!=
nil
{
return
ApiError
(
500
,
"Metric request error"
,
err
)
}
...
...
@@ -100,16 +100,17 @@ func GetTestDataRandomWalk(c *middleware.Context) Response {
timeRange
:=
tsdb
.
NewTimeRange
(
from
,
to
)
request
:=
&
tsdb
.
TsdbQuery
{
TimeRange
:
timeRange
}
dsInfo
:=
&
models
.
DataSource
{
Type
:
"grafana-testdata-datasource"
}
request
.
Queries
=
append
(
request
.
Queries
,
&
tsdb
.
Query
{
RefId
:
"A"
,
IntervalMs
:
intervalMs
,
Model
:
simplejson
.
NewFromAny
(
&
util
.
DynMap
{
"scenario"
:
"random_walk"
,
}),
DataSource
:
&
models
.
DataSource
{
Type
:
"grafana-testdata-datasource"
}
,
DataSource
:
dsInfo
,
})
resp
,
err
:=
tsdb
.
HandleRequest
(
context
.
Background
(),
request
)
resp
,
err
:=
tsdb
.
HandleRequest
(
context
.
Background
(),
dsInfo
,
request
)
if
err
!=
nil
{
return
ApiError
(
500
,
"Metric request error"
,
err
)
}
...
...
pkg/services/alerting/conditions/query.go
View file @
ed661767
...
...
@@ -112,7 +112,7 @@ func (c *QueryCondition) executeQuery(context *alerting.EvalContext, timeRange *
req
:=
c
.
getRequestForAlertRule
(
getDsInfo
.
Result
,
timeRange
)
result
:=
make
(
tsdb
.
TimeSeriesSlice
,
0
)
resp
,
err
:=
c
.
HandleRequest
(
context
.
Ctx
,
req
)
resp
,
err
:=
c
.
HandleRequest
(
context
.
Ctx
,
getDsInfo
.
Result
,
req
)
if
err
!=
nil
{
if
err
==
gocontext
.
DeadlineExceeded
{
return
nil
,
fmt
.
Errorf
(
"Alert execution exceeded the timeout"
)
...
...
pkg/services/alerting/conditions/query_test.go
View file @
ed661767
...
...
@@ -168,7 +168,7 @@ func (ctx *queryConditionTestContext) exec() (*alerting.ConditionResult, error)
ctx
.
condition
=
condition
condition
.
HandleRequest
=
func
(
context
context
.
Context
,
req
*
tsdb
.
TsdbQuery
)
(
*
tsdb
.
Response
,
error
)
{
condition
.
HandleRequest
=
func
(
context
context
.
Context
,
dsInfo
*
m
.
DataSource
,
req
*
tsdb
.
TsdbQuery
)
(
*
tsdb
.
Response
,
error
)
{
return
&
tsdb
.
Response
{
Results
:
map
[
string
]
*
tsdb
.
QueryResult
{
"A"
:
{
Series
:
ctx
.
series
},
...
...
pkg/tsdb/fake_test.go
View file @
ed661767
...
...
@@ -20,18 +20,18 @@ func NewFakeExecutor(dsInfo *models.DataSource) (*FakeExecutor, error) {
},
nil
}
func
(
e
*
FakeExecutor
)
Query
(
ctx
context
.
Context
,
dsInfo
*
models
.
DataSource
,
context
*
TsdbQuery
)
*
BatchResult
{
result
:=
&
BatchResult
{
Query
Results
:
make
(
map
[
string
]
*
QueryResult
)}
func
(
e
*
FakeExecutor
)
Query
(
ctx
context
.
Context
,
dsInfo
*
models
.
DataSource
,
context
*
TsdbQuery
)
(
*
Response
,
error
)
{
result
:=
&
Response
{
Results
:
make
(
map
[
string
]
*
QueryResult
)}
for
_
,
query
:=
range
context
.
Queries
{
if
results
,
has
:=
e
.
results
[
query
.
RefId
];
has
{
result
.
Query
Results
[
query
.
RefId
]
=
results
result
.
Results
[
query
.
RefId
]
=
results
}
if
testFunc
,
has
:=
e
.
resultsFn
[
query
.
RefId
];
has
{
result
.
Query
Results
[
query
.
RefId
]
=
testFunc
(
context
)
result
.
Results
[
query
.
RefId
]
=
testFunc
(
context
)
}
}
return
result
return
result
,
nil
}
func
(
e
*
FakeExecutor
)
Return
(
refId
string
,
series
TimeSeriesSlice
)
{
...
...
pkg/tsdb/graphite/graphite.go
View file @
ed661767
...
...
@@ -37,8 +37,8 @@ func init() {
tsdb
.
RegisterTsdbQueryEndpoint
(
"graphite"
,
NewGraphiteExecutor
)
}
func
(
e
*
GraphiteExecutor
)
Query
(
ctx
context
.
Context
,
dsInfo
*
models
.
DataSource
,
tsdbQuery
*
tsdb
.
TsdbQuery
)
*
tsdb
.
BatchResult
{
result
:=
&
tsdb
.
BatchResult
{}
func
(
e
*
GraphiteExecutor
)
Query
(
ctx
context
.
Context
,
dsInfo
*
models
.
DataSource
,
tsdbQuery
*
tsdb
.
TsdbQuery
)
(
*
tsdb
.
Response
,
error
)
{
result
:=
&
tsdb
.
Response
{}
from
:=
"-"
+
formatTimeRange
(
tsdbQuery
.
TimeRange
.
From
)
until
:=
formatTimeRange
(
tsdbQuery
.
TimeRange
.
To
)
...
...
@@ -67,14 +67,12 @@ func (e *GraphiteExecutor) Query(ctx context.Context, dsInfo *models.DataSource,
req
,
err
:=
e
.
createRequest
(
dsInfo
,
formData
)
if
err
!=
nil
{
result
.
Error
=
err
return
result
return
nil
,
err
}
httpClient
,
err
:=
dsInfo
.
GetHttpClient
()
if
err
!=
nil
{
result
.
Error
=
err
return
result
return
nil
,
err
}
span
,
ctx
:=
opentracing
.
StartSpanFromContext
(
ctx
,
"graphite query"
)
...
...
@@ -90,17 +88,15 @@ func (e *GraphiteExecutor) Query(ctx context.Context, dsInfo *models.DataSource,
res
,
err
:=
ctxhttp
.
Do
(
ctx
,
httpClient
,
req
)
if
err
!=
nil
{
result
.
Error
=
err
return
result
return
nil
,
err
}
data
,
err
:=
e
.
parseResponse
(
res
)
if
err
!=
nil
{
result
.
Error
=
err
return
result
return
nil
,
err
}
result
.
Query
Results
=
make
(
map
[
string
]
*
tsdb
.
QueryResult
)
result
.
Results
=
make
(
map
[
string
]
*
tsdb
.
QueryResult
)
queryRes
:=
tsdb
.
NewQueryResult
()
for
_
,
series
:=
range
data
{
...
...
@@ -114,8 +110,8 @@ func (e *GraphiteExecutor) Query(ctx context.Context, dsInfo *models.DataSource,
}
}
result
.
Query
Results
[
"A"
]
=
queryRes
return
result
result
.
Results
[
"A"
]
=
queryRes
return
result
,
nil
}
func
(
e
*
GraphiteExecutor
)
parseResponse
(
res
*
http
.
Response
)
([]
TargetResponseDTO
,
error
)
{
...
...
pkg/tsdb/influxdb/influxdb.go
View file @
ed661767
...
...
@@ -39,17 +39,17 @@ func init() {
tsdb
.
RegisterTsdbQueryEndpoint
(
"influxdb"
,
NewInfluxDBExecutor
)
}
func
(
e
*
InfluxDBExecutor
)
Query
(
ctx
context
.
Context
,
dsInfo
*
models
.
DataSource
,
tsdbQuery
*
tsdb
.
TsdbQuery
)
*
tsdb
.
BatchResult
{
result
:=
&
tsdb
.
BatchResult
{}
func
(
e
*
InfluxDBExecutor
)
Query
(
ctx
context
.
Context
,
dsInfo
*
models
.
DataSource
,
tsdbQuery
*
tsdb
.
TsdbQuery
)
(
*
tsdb
.
Response
,
error
)
{
result
:=
&
tsdb
.
Response
{}
query
,
err
:=
e
.
getQuery
(
dsInfo
,
tsdbQuery
.
Queries
,
tsdbQuery
)
if
err
!=
nil
{
return
result
.
WithError
(
err
)
return
nil
,
err
}
rawQuery
,
err
:=
query
.
Build
(
tsdbQuery
)
if
err
!=
nil
{
return
result
.
WithError
(
err
)
return
nil
,
err
}
if
setting
.
Env
==
setting
.
DEV
{
...
...
@@ -58,21 +58,21 @@ func (e *InfluxDBExecutor) Query(ctx context.Context, dsInfo *models.DataSource,
req
,
err
:=
e
.
createRequest
(
dsInfo
,
rawQuery
)
if
err
!=
nil
{
return
result
.
WithError
(
err
)
return
nil
,
err
}
httpClient
,
err
:=
dsInfo
.
GetHttpClient
()
if
err
!=
nil
{
return
result
.
WithError
(
err
)
return
nil
,
err
}
resp
,
err
:=
ctxhttp
.
Do
(
ctx
,
httpClient
,
req
)
if
err
!=
nil
{
return
result
.
WithError
(
err
)
return
nil
,
err
}
if
resp
.
StatusCode
/
100
!=
2
{
return
result
.
WithError
(
fmt
.
Errorf
(
"Influxdb returned statuscode invalid status code: %v"
,
resp
.
Status
)
)
return
nil
,
fmt
.
Errorf
(
"Influxdb returned statuscode invalid status code: %v"
,
resp
.
Status
)
}
var
response
Response
...
...
@@ -82,17 +82,17 @@ func (e *InfluxDBExecutor) Query(ctx context.Context, dsInfo *models.DataSource,
err
=
dec
.
Decode
(
&
response
)
if
err
!=
nil
{
return
result
.
WithError
(
err
)
return
nil
,
err
}
if
response
.
Err
!=
nil
{
return
result
.
WithError
(
response
.
Err
)
return
nil
,
response
.
Err
}
result
.
Query
Results
=
make
(
map
[
string
]
*
tsdb
.
QueryResult
)
result
.
Query
Results
[
"A"
]
=
e
.
ResponseParser
.
Parse
(
&
response
,
query
)
result
.
Results
=
make
(
map
[
string
]
*
tsdb
.
QueryResult
)
result
.
Results
[
"A"
]
=
e
.
ResponseParser
.
Parse
(
&
response
,
query
)
return
result
return
result
,
nil
}
func
(
e
*
InfluxDBExecutor
)
getQuery
(
dsInfo
*
models
.
DataSource
,
queries
[]
*
tsdb
.
Query
,
context
*
tsdb
.
TsdbQuery
)
(
*
Query
,
error
)
{
...
...
pkg/tsdb/models.go
View file @
ed661767
...
...
@@ -22,26 +22,10 @@ type Query struct {
}
type
Response
struct
{
BatchTimings
[]
*
BatchTiming
`json:"timings"`
Results
map
[
string
]
*
QueryResult
`json:"results"`
Message
string
`json:"message,omitempty"`
}
type
BatchTiming
struct
{
TimeElapsed
int64
}
type
BatchResult
struct
{
Error
error
QueryResults
map
[
string
]
*
QueryResult
Timings
*
BatchTiming
}
func
(
br
*
BatchResult
)
WithError
(
err
error
)
*
BatchResult
{
br
.
Error
=
err
return
br
}
type
QueryResult
struct
{
Error
error
`json:"-"`
ErrorString
string
`json:"error,omitempty"`
...
...
pkg/tsdb/mysql/mysql.go
View file @
ed661767
...
...
@@ -85,9 +85,9 @@ func (e *MysqlExecutor) initEngine(dsInfo *models.DataSource) error {
return
nil
}
func
(
e
*
MysqlExecutor
)
Query
(
ctx
context
.
Context
,
dsInfo
*
models
.
DataSource
,
tsdbQuery
*
tsdb
.
TsdbQuery
)
*
tsdb
.
BatchResult
{
result
:=
&
tsdb
.
BatchResult
{
Query
Results
:
make
(
map
[
string
]
*
tsdb
.
QueryResult
),
func
(
e
*
MysqlExecutor
)
Query
(
ctx
context
.
Context
,
dsInfo
*
models
.
DataSource
,
tsdbQuery
*
tsdb
.
TsdbQuery
)
(
*
tsdb
.
Response
,
error
)
{
result
:=
&
tsdb
.
Response
{
Results
:
make
(
map
[
string
]
*
tsdb
.
QueryResult
),
}
macroEngine
:=
NewMysqlMacroEngine
(
tsdbQuery
.
TimeRange
)
...
...
@@ -102,7 +102,7 @@ func (e *MysqlExecutor) Query(ctx context.Context, dsInfo *models.DataSource, ts
}
queryResult
:=
&
tsdb
.
QueryResult
{
Meta
:
simplejson
.
New
(),
RefId
:
query
.
RefId
}
result
.
Query
Results
[
query
.
RefId
]
=
queryResult
result
.
Results
[
query
.
RefId
]
=
queryResult
rawSql
,
err
:=
macroEngine
.
Interpolate
(
rawSql
)
if
err
!=
nil
{
...
...
@@ -138,7 +138,7 @@ func (e *MysqlExecutor) Query(ctx context.Context, dsInfo *models.DataSource, ts
}
}
return
result
return
result
,
nil
}
func
(
e
MysqlExecutor
)
TransformToTable
(
query
*
tsdb
.
Query
,
rows
*
core
.
Rows
,
result
*
tsdb
.
QueryResult
)
error
{
...
...
pkg/tsdb/opentsdb/opentsdb.go
View file @
ed661767
...
...
@@ -50,8 +50,8 @@ func init() {
tsdb
.
RegisterTsdbQueryEndpoint
(
"opentsdb"
,
NewOpenTsdbExecutor
)
}
func
(
e
*
OpenTsdbExecutor
)
Query
(
ctx
context
.
Context
,
dsInfo
*
models
.
DataSource
,
queryContext
*
tsdb
.
TsdbQuery
)
*
tsdb
.
BatchResult
{
result
:=
&
tsdb
.
BatchResult
{}
func
(
e
*
OpenTsdbExecutor
)
Query
(
ctx
context
.
Context
,
dsInfo
*
models
.
DataSource
,
queryContext
*
tsdb
.
TsdbQuery
)
(
*
tsdb
.
Response
,
error
)
{
result
:=
&
tsdb
.
Response
{}
var
tsdbQuery
OpenTsdbQuery
...
...
@@ -69,29 +69,26 @@ func (e *OpenTsdbExecutor) Query(ctx context.Context, dsInfo *models.DataSource,
req
,
err
:=
e
.
createRequest
(
dsInfo
,
tsdbQuery
)
if
err
!=
nil
{
result
.
Error
=
err
return
result
return
nil
,
err
}
httpClient
,
err
:=
dsInfo
.
GetHttpClient
()
if
err
!=
nil
{
result
.
Error
=
err
return
result
return
nil
,
err
}
res
,
err
:=
ctxhttp
.
Do
(
ctx
,
httpClient
,
req
)
if
err
!=
nil
{
result
.
Error
=
err
return
result
return
nil
,
err
}
queryResult
,
err
:=
e
.
parseResponse
(
tsdbQuery
,
res
)
if
err
!=
nil
{
return
result
.
WithError
(
err
)
return
nil
,
err
}
result
.
Query
Results
=
queryResult
return
result
result
.
Results
=
queryResult
return
result
,
nil
}
func
(
e
*
OpenTsdbExecutor
)
createRequest
(
dsInfo
*
models
.
DataSource
,
data
OpenTsdbQuery
)
(
*
http
.
Request
,
error
)
{
...
...
pkg/tsdb/prometheus/prometheus.go
View file @
ed661767
...
...
@@ -80,17 +80,17 @@ func (e *PrometheusExecutor) getClient(dsInfo *models.DataSource) (apiv1.API, er
return
apiv1
.
NewAPI
(
client
),
nil
}
func
(
e
*
PrometheusExecutor
)
Query
(
ctx
context
.
Context
,
dsInfo
*
models
.
DataSource
,
tsdbQuery
*
tsdb
.
TsdbQuery
)
*
tsdb
.
BatchResult
{
result
:=
&
tsdb
.
BatchResult
{}
func
(
e
*
PrometheusExecutor
)
Query
(
ctx
context
.
Context
,
dsInfo
*
models
.
DataSource
,
tsdbQuery
*
tsdb
.
TsdbQuery
)
(
*
tsdb
.
Response
,
error
)
{
result
:=
&
tsdb
.
Response
{}
client
,
err
:=
e
.
getClient
(
dsInfo
)
if
err
!=
nil
{
return
result
.
WithError
(
err
)
return
nil
,
err
}
query
,
err
:=
parseQuery
(
tsdbQuery
.
Queries
,
tsdbQuery
)
if
err
!=
nil
{
return
result
.
WithError
(
err
)
return
nil
,
err
}
timeRange
:=
apiv1
.
Range
{
...
...
@@ -108,15 +108,15 @@ func (e *PrometheusExecutor) Query(ctx context.Context, dsInfo *models.DataSourc
value
,
err
:=
client
.
QueryRange
(
ctx
,
query
.
Expr
,
timeRange
)
if
err
!=
nil
{
return
result
.
WithError
(
err
)
return
nil
,
err
}
queryResult
,
err
:=
parseResponse
(
value
,
query
)
if
err
!=
nil
{
return
result
.
WithError
(
err
)
return
nil
,
err
}
result
.
Query
Results
=
queryResult
return
result
result
.
Results
=
queryResult
return
result
,
nil
}
func
formatLegend
(
metric
model
.
Metric
,
query
*
PrometheusQuery
)
string
{
...
...
pkg/tsdb/query_endpoint.go
View file @
ed661767
...
...
@@ -8,7 +8,7 @@ import (
)
type
TsdbQueryEndpoint
interface
{
Query
(
ctx
context
.
Context
,
ds
*
models
.
DataSource
,
query
*
TsdbQuery
)
*
BatchResult
Query
(
ctx
context
.
Context
,
ds
*
models
.
DataSource
,
query
*
TsdbQuery
)
(
*
Response
,
error
)
}
var
registry
map
[
string
]
GetTsdbQueryEndpointFn
...
...
pkg/tsdb/request.go
View file @
ed661767
...
...
@@ -2,25 +2,17 @@ package tsdb
import
(
"context"
"github.com/grafana/grafana/pkg/models"
)
type
HandleRequestFunc
func
(
ctx
context
.
Context
,
req
*
TsdbQuery
)
(
*
Response
,
error
)
type
HandleRequestFunc
func
(
ctx
context
.
Context
,
dsInfo
*
models
.
DataSource
,
req
*
TsdbQuery
)
(
*
Response
,
error
)
func
HandleRequest
(
ctx
context
.
Context
,
req
*
TsdbQuery
)
(
*
Response
,
error
)
{
//TODO niceify
ds
:=
req
.
Queries
[
0
]
.
DataSource
endpoint
,
err
:=
getTsdbQueryEndpointFor
(
ds
)
func
HandleRequest
(
ctx
context
.
Context
,
dsInfo
*
models
.
DataSource
,
req
*
TsdbQuery
)
(
*
Response
,
error
)
{
endpoint
,
err
:=
getTsdbQueryEndpointFor
(
dsInfo
)
if
err
!=
nil
{
return
nil
,
err
}
res
:=
endpoint
.
Query
(
ctx
,
ds
,
req
)
if
res
.
Error
!=
nil
{
return
nil
,
res
.
Error
}
return
&
Response
{
Results
:
res
.
QueryResults
,
BatchTimings
:
[]
*
BatchTiming
{
res
.
Timings
},
},
nil
return
endpoint
.
Query
(
ctx
,
dsInfo
,
req
)
}
pkg/tsdb/testdata/testdata.go
View file @
ed661767
...
...
@@ -24,19 +24,19 @@ func init() {
tsdb
.
RegisterTsdbQueryEndpoint
(
"grafana-testdata-datasource"
,
NewTestDataExecutor
)
}
func
(
e
*
TestDataExecutor
)
Query
(
ctx
context
.
Context
,
dsInfo
*
models
.
DataSource
,
tsdbQuery
*
tsdb
.
TsdbQuery
)
*
tsdb
.
BatchResult
{
result
:=
&
tsdb
.
BatchResult
{}
result
.
Query
Results
=
make
(
map
[
string
]
*
tsdb
.
QueryResult
)
func
(
e
*
TestDataExecutor
)
Query
(
ctx
context
.
Context
,
dsInfo
*
models
.
DataSource
,
tsdbQuery
*
tsdb
.
TsdbQuery
)
(
*
tsdb
.
Response
,
error
)
{
result
:=
&
tsdb
.
Response
{}
result
.
Results
=
make
(
map
[
string
]
*
tsdb
.
QueryResult
)
for
_
,
query
:=
range
tsdbQuery
.
Queries
{
scenarioId
:=
query
.
Model
.
Get
(
"scenarioId"
)
.
MustString
(
"random_walk"
)
if
scenario
,
exist
:=
ScenarioRegistry
[
scenarioId
];
exist
{
result
.
Query
Results
[
query
.
RefId
]
=
scenario
.
Handler
(
query
,
tsdbQuery
)
result
.
Query
Results
[
query
.
RefId
]
.
RefId
=
query
.
RefId
result
.
Results
[
query
.
RefId
]
=
scenario
.
Handler
(
query
,
tsdbQuery
)
result
.
Results
[
query
.
RefId
]
.
RefId
=
query
.
RefId
}
else
{
e
.
log
.
Error
(
"Scenario not found"
,
"scenarioId"
,
scenarioId
)
}
}
return
result
return
result
,
nil
}
pkg/tsdb/tsdb_test.go
View file @
ed661767
...
...
@@ -19,7 +19,7 @@ func TestMetricQuery(t *testing.T) {
fakeExecutor
:=
registerFakeExecutor
()
fakeExecutor
.
Return
(
"A"
,
TimeSeriesSlice
{
&
TimeSeries
{
Name
:
"argh"
}})
res
,
err
:=
HandleRequest
(
context
.
TODO
(),
req
)
res
,
err
:=
HandleRequest
(
context
.
TODO
(),
&
models
.
DataSource
{
Id
:
1
,
Type
:
"test"
},
req
)
So
(
err
,
ShouldBeNil
)
Convey
(
"Should return query results"
,
func
()
{
...
...
@@ -40,18 +40,13 @@ func TestMetricQuery(t *testing.T) {
fakeExecutor
.
Return
(
"A"
,
TimeSeriesSlice
{
&
TimeSeries
{
Name
:
"argh"
}})
fakeExecutor
.
Return
(
"B"
,
TimeSeriesSlice
{
&
TimeSeries
{
Name
:
"barg"
}})
res
,
err
:=
HandleRequest
(
context
.
TODO
(),
req
)
res
,
err
:=
HandleRequest
(
context
.
TODO
(),
&
models
.
DataSource
{
Id
:
1
,
Type
:
"test"
},
req
)
So
(
err
,
ShouldBeNil
)
Convey
(
"Should return query results"
,
func
()
{
So
(
len
(
res
.
Results
),
ShouldEqual
,
2
)
So
(
res
.
Results
[
"B"
]
.
Series
[
0
]
.
Name
,
ShouldEqual
,
"barg"
)
})
Convey
(
"Should have been batched in one request"
,
func
()
{
So
(
len
(
res
.
BatchTimings
),
ShouldEqual
,
1
)
})
})
Convey
(
"When query uses data source of unknown type"
,
t
,
func
()
{
...
...
@@ -61,7 +56,7 @@ func TestMetricQuery(t *testing.T) {
},
}
_
,
err
:=
HandleRequest
(
context
.
TODO
(),
req
)
_
,
err
:=
HandleRequest
(
context
.
TODO
(),
&
models
.
DataSource
{
Id
:
12
,
Type
:
"testjughjgjg"
},
req
)
So
(
err
,
ShouldNotBeNil
)
})
}
...
...
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