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
b45f72a1
Unverified
Commit
b45f72a1
authored
Nov 16, 2018
by
Marcus Efraimsson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
elasticsearch: support bucket script pipeline aggregations
parent
2325c5db
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
560 additions
and
9 deletions
+560
-9
devenv/dev-dashboards/datasource_tests_elasticsearch_compare.json
+0
-0
pkg/tsdb/elasticsearch/client/models.go
+1
-1
pkg/tsdb/elasticsearch/client/search_request.go
+2
-2
pkg/tsdb/elasticsearch/models.go
+14
-0
pkg/tsdb/elasticsearch/response_parser.go
+23
-0
pkg/tsdb/elasticsearch/response_parser_test.go
+78
-0
pkg/tsdb/elasticsearch/time_series_query.go
+39
-1
pkg/tsdb/elasticsearch/time_series_query_test.go
+71
-0
public/app/plugins/datasource/elasticsearch/elastic_response.ts
+18
-1
public/app/plugins/datasource/elasticsearch/metric_agg.ts
+14
-0
public/app/plugins/datasource/elasticsearch/partials/metric_agg.html
+25
-1
public/app/plugins/datasource/elasticsearch/partials/pipeline_variables.html
+20
-0
public/app/plugins/datasource/elasticsearch/pipeline_variables.ts
+45
-0
public/app/plugins/datasource/elasticsearch/query_builder.ts
+26
-1
public/app/plugins/datasource/elasticsearch/query_ctrl.ts
+4
-0
public/app/plugins/datasource/elasticsearch/query_def.ts
+17
-0
public/app/plugins/datasource/elasticsearch/specs/elastic_response.test.ts
+66
-0
public/app/plugins/datasource/elasticsearch/specs/query_builder.test.ts
+77
-0
public/app/plugins/datasource/elasticsearch/specs/query_def.test.ts
+20
-2
No files found.
devenv/dev-dashboards/datasource_tests_elasticsearch_compare.json
View file @
b45f72a1
This diff is collapsed.
Click to expand it.
pkg/tsdb/elasticsearch/client/models.go
View file @
b45f72a1
...
...
@@ -292,7 +292,7 @@ func (a *MetricAggregation) MarshalJSON() ([]byte, error) {
// PipelineAggregation represents a metric aggregation
type
PipelineAggregation
struct
{
BucketPath
string
BucketPath
interface
{}
Settings
map
[
string
]
interface
{}
}
...
...
pkg/tsdb/elasticsearch/client/search_request.go
View file @
b45f72a1
...
...
@@ -268,7 +268,7 @@ type AggBuilder interface {
Filters
(
key
string
,
fn
func
(
a
*
FiltersAggregation
,
b
AggBuilder
))
AggBuilder
GeoHashGrid
(
key
,
field
string
,
fn
func
(
a
*
GeoHashGridAggregation
,
b
AggBuilder
))
AggBuilder
Metric
(
key
,
metricType
,
field
string
,
fn
func
(
a
*
MetricAggregation
))
AggBuilder
Pipeline
(
key
,
pipelineType
,
bucketPath
string
,
fn
func
(
a
*
PipelineAggregation
))
AggBuilder
Pipeline
(
key
,
pipelineType
string
,
bucketPath
interface
{}
,
fn
func
(
a
*
PipelineAggregation
))
AggBuilder
Build
()
(
AggArray
,
error
)
}
...
...
@@ -438,7 +438,7 @@ func (b *aggBuilderImpl) Metric(key, metricType, field string, fn func(a *Metric
return
b
}
func
(
b
*
aggBuilderImpl
)
Pipeline
(
key
,
pipelineType
,
bucketPath
string
,
fn
func
(
a
*
PipelineAggregation
))
AggBuilder
{
func
(
b
*
aggBuilderImpl
)
Pipeline
(
key
,
pipelineType
string
,
bucketPath
interface
{}
,
fn
func
(
a
*
PipelineAggregation
))
AggBuilder
{
innerAgg
:=
&
PipelineAggregation
{
BucketPath
:
bucketPath
,
Settings
:
make
(
map
[
string
]
interface
{}),
...
...
pkg/tsdb/elasticsearch/models.go
View file @
b45f72a1
...
...
@@ -29,6 +29,7 @@ type MetricAgg struct {
Hide
bool
`json:"hide"`
ID
string
`json:"id"`
PipelineAggregate
string
`json:"pipelineAgg"`
PipelineVariables
map
[
string
]
string
`json:"pipelineVariables"`
Settings
*
simplejson
.
Json
`json:"settings"`
Meta
*
simplejson
.
Json
`json:"meta"`
Type
string
`json:"type"`
...
...
@@ -45,6 +46,7 @@ var metricAggType = map[string]string{
"cardinality"
:
"Unique Count"
,
"moving_avg"
:
"Moving Average"
,
"derivative"
:
"Derivative"
,
"bucket_script"
:
"Bucket Script"
,
"raw_document"
:
"Raw Document"
,
}
...
...
@@ -62,6 +64,11 @@ var extendedStats = map[string]string{
var
pipelineAggType
=
map
[
string
]
string
{
"moving_avg"
:
"moving_avg"
,
"derivative"
:
"derivative"
,
"bucket_script"
:
"bucket_script"
,
}
var
pipelineAggWithMultipleBucketPathsType
=
map
[
string
]
string
{
"bucket_script"
:
"bucket_script"
,
}
func
isPipelineAgg
(
metricType
string
)
bool
{
...
...
@@ -71,6 +78,13 @@ func isPipelineAgg(metricType string) bool {
return
false
}
func
isPipelineAggWithMultipleBucketPaths
(
metricType
string
)
bool
{
if
_
,
ok
:=
pipelineAggWithMultipleBucketPathsType
[
metricType
];
ok
{
return
true
}
return
false
}
func
describeMetric
(
metricType
,
field
string
)
string
{
text
:=
metricAggType
[
metricType
]
if
metricType
==
countType
{
...
...
pkg/tsdb/elasticsearch/response_parser.go
View file @
b45f72a1
...
...
@@ -260,6 +260,7 @@ func (rp *responseParser) processMetrics(esAgg *simplejson.Json, target *Query,
newSeries
.
Tags
[
"metric"
]
=
metric
.
Type
newSeries
.
Tags
[
"field"
]
=
metric
.
Field
newSeries
.
Tags
[
"metricId"
]
=
metric
.
ID
for
_
,
v
:=
range
esAgg
.
Get
(
"buckets"
)
.
MustArray
()
{
bucket
:=
simplejson
.
NewFromAny
(
v
)
key
:=
castToNullFloat
(
bucket
.
Get
(
"key"
))
...
...
@@ -459,6 +460,25 @@ func (rp *responseParser) getSeriesName(series *tsdb.TimeSeries, target *Query,
}
// todo, if field and pipelineAgg
if
field
!=
""
&&
isPipelineAgg
(
metricType
)
{
if
isPipelineAggWithMultipleBucketPaths
(
metricType
)
{
metricID
:=
""
if
v
,
ok
:=
series
.
Tags
[
"metricId"
];
ok
{
metricID
=
v
}
for
_
,
metric
:=
range
target
.
Metrics
{
if
metric
.
ID
==
metricID
{
metricName
=
metric
.
Settings
.
Get
(
"script"
)
.
MustString
()
for
name
,
pipelineAgg
:=
range
metric
.
PipelineVariables
{
for
_
,
m
:=
range
target
.
Metrics
{
if
m
.
ID
==
pipelineAgg
{
metricName
=
strings
.
Replace
(
metricName
,
"params."
+
name
,
describeMetric
(
m
.
Type
,
m
.
Field
),
-
1
)
}
}
}
}
}
}
else
{
found
:=
false
for
_
,
metric
:=
range
target
.
Metrics
{
if
metric
.
ID
==
field
{
...
...
@@ -469,10 +489,13 @@ func (rp *responseParser) getSeriesName(series *tsdb.TimeSeries, target *Query,
if
!
found
{
metricName
=
"Unset"
}
}
}
else
if
field
!=
""
{
metricName
+=
" "
+
field
}
delete
(
series
.
Tags
,
"metricId"
)
if
len
(
series
.
Tags
)
==
0
{
return
metricName
}
...
...
pkg/tsdb/elasticsearch/response_parser_test.go
View file @
b45f72a1
...
...
@@ -787,6 +787,84 @@ func TestResponseParser(t *testing.T) {
So
(
rows
[
0
][
2
]
.
(
null
.
Float
)
.
Float64
,
ShouldEqual
,
3000
)
})
Convey
(
"With bucket_script"
,
func
()
{
targets
:=
map
[
string
]
string
{
"A"
:
`{
"timeField": "@timestamp",
"metrics": [
{ "id": "1", "type": "sum", "field": "@value" },
{ "id": "3", "type": "max", "field": "@value" },
{
"id": "4",
"field": "select field",
"pipelineVariables": [{ "name": "var1", "pipelineAgg": "1" }, { "name": "var2", "pipelineAgg": "3" }],
"settings": { "script": "params.var1 * params.var2" },
"type": "bucket_script"
}
],
"bucketAggs": [{ "type": "date_histogram", "field": "@timestamp", "id": "2" }]
}`
,
}
response
:=
`{
"responses": [
{
"aggregations": {
"2": {
"buckets": [
{
"1": { "value": 2 },
"3": { "value": 3 },
"4": { "value": 6 },
"doc_count": 60,
"key": 1000
},
{
"1": { "value": 3 },
"3": { "value": 4 },
"4": { "value": 12 },
"doc_count": 60,
"key": 2000
}
]
}
}
}
]
}`
rp
,
err
:=
newResponseParserForTest
(
targets
,
response
)
So
(
err
,
ShouldBeNil
)
result
,
err
:=
rp
.
getTimeSeries
()
So
(
err
,
ShouldBeNil
)
So
(
result
.
Results
,
ShouldHaveLength
,
1
)
queryRes
:=
result
.
Results
[
"A"
]
So
(
queryRes
,
ShouldNotBeNil
)
So
(
queryRes
.
Series
,
ShouldHaveLength
,
3
)
seriesOne
:=
queryRes
.
Series
[
0
]
So
(
seriesOne
.
Name
,
ShouldEqual
,
"Sum @value"
)
So
(
seriesOne
.
Points
,
ShouldHaveLength
,
2
)
So
(
seriesOne
.
Points
[
0
][
0
]
.
Float64
,
ShouldEqual
,
2
)
So
(
seriesOne
.
Points
[
0
][
1
]
.
Float64
,
ShouldEqual
,
1000
)
So
(
seriesOne
.
Points
[
1
][
0
]
.
Float64
,
ShouldEqual
,
3
)
So
(
seriesOne
.
Points
[
1
][
1
]
.
Float64
,
ShouldEqual
,
2000
)
seriesTwo
:=
queryRes
.
Series
[
1
]
So
(
seriesTwo
.
Name
,
ShouldEqual
,
"Max @value"
)
So
(
seriesTwo
.
Points
,
ShouldHaveLength
,
2
)
So
(
seriesTwo
.
Points
[
0
][
0
]
.
Float64
,
ShouldEqual
,
3
)
So
(
seriesTwo
.
Points
[
0
][
1
]
.
Float64
,
ShouldEqual
,
1000
)
So
(
seriesTwo
.
Points
[
1
][
0
]
.
Float64
,
ShouldEqual
,
4
)
So
(
seriesTwo
.
Points
[
1
][
1
]
.
Float64
,
ShouldEqual
,
2000
)
seriesThree
:=
queryRes
.
Series
[
2
]
So
(
seriesThree
.
Name
,
ShouldEqual
,
"Sum @value * Max @value"
)
So
(
seriesThree
.
Points
,
ShouldHaveLength
,
2
)
So
(
seriesThree
.
Points
[
0
][
0
]
.
Float64
,
ShouldEqual
,
6
)
So
(
seriesThree
.
Points
[
0
][
1
]
.
Float64
,
ShouldEqual
,
1000
)
So
(
seriesThree
.
Points
[
1
][
0
]
.
Float64
,
ShouldEqual
,
12
)
So
(
seriesThree
.
Points
[
1
][
1
]
.
Float64
,
ShouldEqual
,
2000
)
})
// Convey("Raw documents query", func() {
// targets := map[string]string{
// "A": `{
...
...
pkg/tsdb/elasticsearch/time_series_query.go
View file @
b45f72a1
...
...
@@ -94,6 +94,35 @@ func (e *timeSeriesQuery) execute() (*tsdb.Response, error) {
}
if
isPipelineAgg
(
m
.
Type
)
{
if
isPipelineAggWithMultipleBucketPaths
(
m
.
Type
)
{
if
len
(
m
.
PipelineVariables
)
>
0
{
bucketPaths
:=
map
[
string
]
interface
{}{}
for
name
,
pipelineAgg
:=
range
m
.
PipelineVariables
{
if
_
,
err
:=
strconv
.
Atoi
(
pipelineAgg
);
err
==
nil
{
var
appliedAgg
*
MetricAgg
for
_
,
pipelineMetric
:=
range
q
.
Metrics
{
if
pipelineMetric
.
ID
==
pipelineAgg
{
appliedAgg
=
pipelineMetric
break
}
}
if
appliedAgg
!=
nil
{
if
appliedAgg
.
Type
==
countType
{
bucketPaths
[
name
]
=
"_count"
}
else
{
bucketPaths
[
name
]
=
pipelineAgg
}
}
}
}
aggBuilder
.
Pipeline
(
m
.
ID
,
m
.
Type
,
bucketPaths
,
func
(
a
*
es
.
PipelineAggregation
)
{
a
.
Settings
=
m
.
Settings
.
MustMap
()
})
}
else
{
continue
}
}
else
{
if
_
,
err
:=
strconv
.
Atoi
(
m
.
PipelineAggregate
);
err
==
nil
{
var
appliedAgg
*
MetricAgg
for
_
,
pipelineMetric
:=
range
q
.
Metrics
{
...
...
@@ -115,6 +144,7 @@ func (e *timeSeriesQuery) execute() (*tsdb.Response, error) {
}
else
{
continue
}
}
}
else
{
aggBuilder
.
Metric
(
m
.
ID
,
m
.
Type
,
m
.
Field
,
func
(
a
*
es
.
MetricAggregation
)
{
a
.
Settings
=
m
.
Settings
.
MustMap
()
...
...
@@ -328,12 +358,20 @@ func (p *timeSeriesQueryParser) parseMetrics(model *simplejson.Json) ([]*MetricA
metric
.
PipelineAggregate
=
metricJSON
.
Get
(
"pipelineAgg"
)
.
MustString
()
metric
.
Settings
=
simplejson
.
NewFromAny
(
metricJSON
.
Get
(
"settings"
)
.
MustMap
())
metric
.
Meta
=
simplejson
.
NewFromAny
(
metricJSON
.
Get
(
"meta"
)
.
MustMap
())
metric
.
Type
,
err
=
metricJSON
.
Get
(
"type"
)
.
String
()
if
err
!=
nil
{
return
nil
,
err
}
if
isPipelineAggWithMultipleBucketPaths
(
metric
.
Type
)
{
metric
.
PipelineVariables
=
map
[
string
]
string
{}
pvArr
:=
metricJSON
.
Get
(
"pipelineVariables"
)
.
MustArray
()
for
_
,
v
:=
range
pvArr
{
kv
:=
v
.
(
map
[
string
]
interface
{})
metric
.
PipelineVariables
[
kv
[
"name"
]
.
(
string
)]
=
kv
[
"pipelineAgg"
]
.
(
string
)
}
}
result
=
append
(
result
,
metric
)
}
return
result
,
nil
...
...
pkg/tsdb/elasticsearch/time_series_query_test.go
View file @
b45f72a1
...
...
@@ -543,6 +543,77 @@ func TestExecuteTimeSeriesQuery(t *testing.T) {
plAgg
:=
derivativeAgg
.
Aggregation
.
Aggregation
.
(
*
es
.
PipelineAggregation
)
So
(
plAgg
.
BucketPath
,
ShouldEqual
,
"_count"
)
})
Convey
(
"With bucket_script"
,
func
()
{
c
:=
newFakeClient
(
5
)
_
,
err
:=
executeTsdbQuery
(
c
,
`{
"timeField": "@timestamp",
"bucketAggs": [
{ "type": "date_histogram", "field": "@timestamp", "id": "4" }
],
"metrics": [
{ "id": "3", "type": "sum", "field": "@value" },
{ "id": "5", "type": "max", "field": "@value" },
{
"id": "2",
"type": "bucket_script",
"pipelineVariables": [
{ "name": "var1", "pipelineAgg": "3" },
{ "name": "var2", "pipelineAgg": "5" }
],
"settings": { "script": "params.var1 * params.var2" }
}
]
}`
,
from
,
to
,
15
*
time
.
Second
)
So
(
err
,
ShouldBeNil
)
sr
:=
c
.
multisearchRequests
[
0
]
.
Requests
[
0
]
firstLevel
:=
sr
.
Aggs
[
0
]
So
(
firstLevel
.
Key
,
ShouldEqual
,
"4"
)
So
(
firstLevel
.
Aggregation
.
Type
,
ShouldEqual
,
"date_histogram"
)
bucketScriptAgg
:=
firstLevel
.
Aggregation
.
Aggs
[
2
]
So
(
bucketScriptAgg
.
Key
,
ShouldEqual
,
"2"
)
plAgg
:=
bucketScriptAgg
.
Aggregation
.
Aggregation
.
(
*
es
.
PipelineAggregation
)
So
(
plAgg
.
BucketPath
.
(
map
[
string
]
interface
{}),
ShouldResemble
,
map
[
string
]
interface
{}{
"var1"
:
"3"
,
"var2"
:
"5"
,
})
})
Convey
(
"With bucket_script doc count"
,
func
()
{
c
:=
newFakeClient
(
5
)
_
,
err
:=
executeTsdbQuery
(
c
,
`{
"timeField": "@timestamp",
"bucketAggs": [
{ "type": "date_histogram", "field": "@timestamp", "id": "4" }
],
"metrics": [
{ "id": "3", "type": "count", "field": "select field" },
{
"id": "2",
"type": "bucket_script",
"pipelineVariables": [
{ "name": "var1", "pipelineAgg": "3" }
],
"settings": { "script": "params.var1 * 1000" }
}
]
}`
,
from
,
to
,
15
*
time
.
Second
)
So
(
err
,
ShouldBeNil
)
sr
:=
c
.
multisearchRequests
[
0
]
.
Requests
[
0
]
firstLevel
:=
sr
.
Aggs
[
0
]
So
(
firstLevel
.
Key
,
ShouldEqual
,
"4"
)
So
(
firstLevel
.
Aggregation
.
Type
,
ShouldEqual
,
"date_histogram"
)
bucketScriptAgg
:=
firstLevel
.
Aggregation
.
Aggs
[
0
]
So
(
bucketScriptAgg
.
Key
,
ShouldEqual
,
"2"
)
plAgg
:=
bucketScriptAgg
.
Aggregation
.
Aggregation
.
(
*
es
.
PipelineAggregation
)
So
(
plAgg
.
BucketPath
.
(
map
[
string
]
interface
{}),
ShouldResemble
,
map
[
string
]
interface
{}{
"var1"
:
"_count"
,
})
})
})
}
...
...
public/app/plugins/datasource/elasticsearch/elastic_response.ts
View file @
b45f72a1
...
...
@@ -88,6 +88,7 @@ export class ElasticResponse {
datapoints
:
[],
metric
:
metric
.
type
,
field
:
metric
.
field
,
metricId
:
metric
.
id
,
props
:
props
,
};
for
(
i
=
0
;
i
<
esAgg
.
buckets
.
length
;
i
++
)
{
...
...
@@ -240,7 +241,7 @@ export class ElasticResponse {
return
metricName
;
}
if
(
group
===
'field'
)
{
return
series
.
field
;
return
series
.
field
||
''
;
}
return
match
;
...
...
@@ -248,12 +249,28 @@ export class ElasticResponse {
}
if
(
series
.
field
&&
queryDef
.
isPipelineAgg
(
series
.
metric
))
{
if
(
series
.
metric
&&
queryDef
.
isPipelineAggWithMultipleBucketPaths
(
series
.
metric
))
{
const
agg
=
_
.
find
(
target
.
metrics
,
{
id
:
series
.
metricId
});
if
(
agg
&&
agg
.
settings
.
script
)
{
metricName
=
agg
.
settings
.
script
;
for
(
const
pv
of
agg
.
pipelineVariables
)
{
const
appliedAgg
=
_
.
find
(
target
.
metrics
,
{
id
:
pv
.
pipelineAgg
});
if
(
appliedAgg
)
{
metricName
=
metricName
.
replace
(
'params.'
+
pv
.
name
,
queryDef
.
describeMetric
(
appliedAgg
));
}
}
}
else
{
metricName
=
'Unset'
;
}
}
else
{
const
appliedAgg
=
_
.
find
(
target
.
metrics
,
{
id
:
series
.
field
});
if
(
appliedAgg
)
{
metricName
+=
' '
+
queryDef
.
describeMetric
(
appliedAgg
);
}
else
{
metricName
=
'Unset'
;
}
}
}
else
if
(
series
.
field
)
{
metricName
+=
' '
+
series
.
field
;
}
...
...
public/app/plugins/datasource/elasticsearch/metric_agg.ts
View file @
b45f72a1
...
...
@@ -35,11 +35,20 @@ export class ElasticMetricAggCtrl {
$scope
.
isFirst
=
$scope
.
index
===
0
;
$scope
.
isSingle
=
metricAggs
.
length
===
1
;
$scope
.
settingsLinkText
=
''
;
$scope
.
variablesLinkText
=
''
;
$scope
.
aggDef
=
_
.
find
(
$scope
.
metricAggTypes
,
{
value
:
$scope
.
agg
.
type
});
if
(
queryDef
.
isPipelineAgg
(
$scope
.
agg
.
type
))
{
if
(
queryDef
.
isPipelineAggWithMultipleBucketPaths
(
$scope
.
agg
.
type
))
{
$scope
.
variablesLinkText
=
'Options'
;
if
(
$scope
.
agg
.
settings
.
script
)
{
$scope
.
variablesLinkText
=
'Script: '
+
$scope
.
agg
.
settings
.
script
.
replace
(
new
RegExp
(
'params.'
,
'g'
),
''
);
}
}
else
{
$scope
.
agg
.
pipelineAgg
=
$scope
.
agg
.
pipelineAgg
||
'select metric'
;
$scope
.
agg
.
field
=
$scope
.
agg
.
pipelineAgg
;
}
const
pipelineOptions
=
queryDef
.
getPipelineOptions
(
$scope
.
agg
);
if
(
pipelineOptions
.
length
>
0
)
{
...
...
@@ -119,6 +128,10 @@ export class ElasticMetricAggCtrl {
$scope
.
updatePipelineAggOptions
();
};
$scope
.
toggleVariables
=
()
=>
{
$scope
.
showVariables
=
!
$scope
.
showVariables
;
};
$scope
.
onChangeInternal
=
()
=>
{
$scope
.
onChange
();
};
...
...
@@ -152,6 +165,7 @@ export class ElasticMetricAggCtrl {
$scope
.
target
.
bucketAggs
=
[
queryDef
.
defaultBucketAgg
()];
}
$scope
.
showVariables
=
queryDef
.
isPipelineAggWithMultipleBucketPaths
(
$scope
.
agg
.
type
);
$scope
.
updatePipelineAggOptions
();
$scope
.
onChange
();
};
...
...
public/app/plugins/datasource/elasticsearch/partials/metric_agg.html
View file @
b45f72a1
...
...
@@ -13,7 +13,17 @@
<div
class=
"gf-form"
>
<metric-segment-model
property=
"agg.type"
options=
"metricAggTypes"
on-change=
"onTypeChange()"
custom=
"false"
css-class=
"width-10"
></metric-segment-model>
<metric-segment-model
ng-if=
"aggDef.requiresField"
property=
"agg.field"
get-options=
"getFieldsInternal()"
on-change=
"onChange()"
css-class=
"width-12"
></metric-segment-model>
<metric-segment-model
ng-if=
"aggDef.isPipelineAgg"
property=
"agg.pipelineAgg"
options=
"pipelineAggOptions"
on-change=
"onChangeInternal()"
custom=
"false"
css-class=
"width-12"
></metric-segment-model>
<metric-segment-model
ng-if=
"aggDef.isPipelineAgg && !aggDef.supportsMultipleBucketPaths"
property=
"agg.pipelineAgg"
options=
"pipelineAggOptions"
on-change=
"onChangeInternal()"
custom=
"false"
css-class=
"width-12"
></metric-segment-model>
</div>
<div
class=
"gf-form gf-form--grow"
ng-if=
"aggDef.isPipelineAgg && aggDef.supportsMultipleBucketPaths"
>
<label
class=
"gf-form-label gf-form-label--grow"
>
<a
ng-click=
"toggleVariables()"
>
<i
class=
"fa fa-caret-down"
ng-show=
"showVariables"
></i>
<i
class=
"fa fa-caret-right"
ng-hide=
"showVariables"
></i>
{{variablesLinkText}}
</a>
</label>
</div>
<div
class=
"gf-form gf-form--grow"
>
...
...
@@ -36,6 +46,20 @@
</div>
</div>
<div
class=
"gf-form-group"
ng-if=
"showVariables"
>
<elastic-pipeline-variables
variables=
"agg.pipelineVariables"
options=
"pipelineAggOptions"
on-change=
"onChangeInternal()"
/>
<div
class=
"gf-form offset-width-7"
>
<label
class=
"gf-form-label width-10"
>
Script
<info-popover
mode=
"right-normal"
>
Elasticsearch v5.0 and above: Scripting language is Painless. Use
<i>
params.
<
var
>
</i>
to reference a variable.
<br/><br/>
Elasticsearch pre-v5.0: Scripting language is per default Groovy if not changed. For Groovy use
<i>
<
var
>
</i>
to reference a variable.
</info-popover>
</label>
<input
type=
"text"
class=
"gf-form-input max-width-24"
empty-to-null
ng-model=
"agg.settings.script"
ng-blur=
"onChangeInternal()"
spellcheck=
'false'
placeholder=
"params.var1 / params.var2"
>
</div>
</div>
<div
class=
"gf-form-group"
ng-if=
"showOptions"
>
<div
class=
"gf-form offset-width-7"
ng-if=
"agg.type === 'derivative'"
>
<label
class=
"gf-form-label width-10"
>
Unit
</label>
...
...
public/app/plugins/datasource/elasticsearch/partials/pipeline_variables.html
0 → 100644
View file @
b45f72a1
<div
ng-repeat=
"var in variables"
>
<div
class=
"gf-form offset-width-7"
ng-if=
"$index === 0"
>
<label
class=
"gf-form-label width-10"
>
Variables
</label>
<input
type=
"text"
class=
"gf-form-input max-width-12"
ng-model=
"var.name"
placeholder=
"Variable name"
ng-blur=
"onChangeInternal()"
spellcheck=
'false'
>
<metric-segment-model
property=
"var.pipelineAgg"
options=
"options"
on-change=
"onChangeInternal()"
custom=
"false"
css-class=
"width-12"
></metric-segment-model>
<label
class=
"gf-form-label"
>
<a
class=
"pointer"
ng-click=
"remove($index)"
><i
class=
"fa fa-minus"
></i></a>
</label>
<label
class=
"gf-form-label"
>
<a
class=
"pointer"
ng-click=
"add()"
><i
class=
"fa fa-plus"
></i></a>
</label>
</div>
<div
class=
"gf-form offset-width-17"
ng-if=
"$index !== 0"
>
<input
type=
"text"
class=
"gf-form-input max-width-12"
ng-model=
"var.name"
placeholder=
"Variable name"
ng-blur=
"onChangeInternal()"
spellcheck=
'false'
>
<metric-segment-model
property=
"var.pipelineAgg"
options=
"options"
on-change=
"onChangeInternal()"
custom=
"false"
css-class=
"width-12"
></metric-segment-model>
<label
class=
"gf-form-label"
>
<a
class=
"pointer"
ng-click=
"remove($index)"
><i
class=
"fa fa-minus"
></i></a>
</label>
</div>
</div>
public/app/plugins/datasource/elasticsearch/pipeline_variables.ts
0 → 100644
View file @
b45f72a1
import
coreModule
from
'app/core/core_module'
;
import
_
from
'lodash'
;
export
function
elasticPipelineVariables
()
{
return
{
templateUrl
:
'public/app/plugins/datasource/elasticsearch/partials/pipeline_variables.html'
,
controller
:
'ElasticPipelineVariablesCtrl'
,
restrict
:
'E'
,
scope
:
{
onChange
:
'&'
,
variables
:
'='
,
options
:
'='
,
},
};
}
const
newVariable
=
index
=>
{
return
{
name
:
'var'
+
index
,
pipelineAgg
:
'select metric'
,
};
};
export
class
ElasticPipelineVariablesCtrl
{
constructor
(
$scope
)
{
$scope
.
variables
=
$scope
.
variables
||
[
newVariable
(
1
)];
$scope
.
onChangeInternal
=
()
=>
{
$scope
.
onChange
();
};
$scope
.
add
=
()
=>
{
$scope
.
variables
.
push
(
newVariable
(
$scope
.
variables
.
length
+
1
));
$scope
.
onChange
();
};
$scope
.
remove
=
index
=>
{
$scope
.
variables
.
splice
(
index
,
1
);
$scope
.
onChange
();
};
}
}
coreModule
.
directive
(
'elasticPipelineVariables'
,
elasticPipelineVariables
);
coreModule
.
controller
(
'ElasticPipelineVariablesCtrl'
,
ElasticPipelineVariablesCtrl
);
public/app/plugins/datasource/elasticsearch/query_builder.ts
View file @
b45f72a1
...
...
@@ -189,7 +189,7 @@ export class ElasticQueryBuilder {
target
.
bucketAggs
=
target
.
bucketAggs
||
[
queryDef
.
defaultBucketAgg
()];
target
.
timeField
=
this
.
timeField
;
let
i
,
nestedAggs
,
metric
;
let
i
,
j
,
pv
,
nestedAggs
,
metric
;
const
query
=
{
size
:
0
,
query
:
{
...
...
@@ -269,6 +269,30 @@ export class ElasticQueryBuilder {
let
metricAgg
=
null
;
if
(
queryDef
.
isPipelineAgg
(
metric
.
type
))
{
if
(
queryDef
.
isPipelineAggWithMultipleBucketPaths
(
metric
.
type
))
{
if
(
metric
.
pipelineVariables
)
{
metricAgg
=
{
buckets_path
:
{},
};
for
(
j
=
0
;
j
<
metric
.
pipelineVariables
.
length
;
j
++
)
{
pv
=
metric
.
pipelineVariables
[
j
];
if
(
pv
.
name
&&
pv
.
pipelineAgg
&&
/^
\d
*$/
.
test
(
pv
.
pipelineAgg
))
{
const
appliedAgg
=
queryDef
.
findMetricById
(
target
.
metrics
,
pv
.
pipelineAgg
);
if
(
appliedAgg
)
{
if
(
appliedAgg
.
type
===
'count'
)
{
metricAgg
.
buckets_path
[
pv
.
name
]
=
'_count'
;
}
else
{
metricAgg
.
buckets_path
[
pv
.
name
]
=
pv
.
pipelineAgg
;
}
}
}
}
}
else
{
continue
;
}
}
else
{
if
(
metric
.
pipelineAgg
&&
/^
\d
*$/
.
test
(
metric
.
pipelineAgg
))
{
const
appliedAgg
=
queryDef
.
findMetricById
(
target
.
metrics
,
metric
.
pipelineAgg
);
if
(
appliedAgg
)
{
...
...
@@ -281,6 +305,7 @@ export class ElasticQueryBuilder {
}
else
{
continue
;
}
}
}
else
{
metricAgg
=
{
field
:
metric
.
field
};
}
...
...
public/app/plugins/datasource/elasticsearch/query_ctrl.ts
View file @
b45f72a1
import
'./bucket_agg'
;
import
'./metric_agg'
;
import
'./pipeline_variables'
;
import
angular
from
'angular'
;
import
_
from
'lodash'
;
...
...
@@ -70,6 +71,9 @@ export class ElasticQueryCtrl extends QueryCtrl {
if
(
aggDef
.
requiresField
)
{
text
+=
metric
.
field
;
}
if
(
aggDef
.
supportsMultipleBucketPaths
)
{
text
+=
metric
.
settings
.
script
.
replace
(
new
RegExp
(
'params.'
,
'g'
),
''
);
}
text
+=
'), '
;
});
...
...
public/app/plugins/datasource/elasticsearch/query_def.ts
View file @
b45f72a1
...
...
@@ -64,6 +64,14 @@ export const metricAggTypes = [
isPipelineAgg
:
true
,
minVersion
:
2
,
},
{
text
:
'Bucket Script'
,
value
:
'bucket_script'
,
requiresField
:
false
,
isPipelineAgg
:
true
,
supportsMultipleBucketPaths
:
true
,
minVersion
:
2
,
},
{
text
:
'Raw Document'
,
value
:
'raw_document'
,
requiresField
:
false
},
];
...
...
@@ -128,6 +136,7 @@ export const pipelineOptions = {
{
text
:
'minimize'
,
default
:
false
},
],
derivative
:
[{
text
:
'unit'
,
default
:
undefined
}],
bucket_script
:
[],
};
export
const
movingAvgModelSettings
=
{
...
...
@@ -171,6 +180,14 @@ export function isPipelineAgg(metricType) {
return
false
;
}
export
function
isPipelineAggWithMultipleBucketPaths
(
metricType
)
{
if
(
metricType
)
{
return
metricAggTypes
.
find
(
t
=>
t
.
value
===
metricType
&&
t
.
supportsMultipleBucketPaths
)
!==
undefined
;
}
return
false
;
}
export
function
getPipelineAggOptions
(
targets
)
{
const
result
=
[];
_
.
each
(
targets
.
metrics
,
metric
=>
{
...
...
public/app/plugins/datasource/elasticsearch/specs/elastic_response.test.ts
View file @
b45f72a1
...
...
@@ -665,4 +665,70 @@ describe('ElasticResponse', () => {
expect
(
result
.
data
[
0
].
datapoints
[
0
].
fieldProp
).
toBe
(
'field'
);
});
});
describe
(
'with bucket_script '
,
()
=>
{
let
result
;
beforeEach
(()
=>
{
targets
=
[
{
refId
:
'A'
,
metrics
:
[
{
id
:
'1'
,
type
:
'sum'
,
field
:
'@value'
},
{
id
:
'3'
,
type
:
'max'
,
field
:
'@value'
},
{
id
:
'4'
,
field
:
'select field'
,
pipelineVariables
:
[{
name
:
'var1'
,
pipelineAgg
:
'1'
},
{
name
:
'var2'
,
pipelineAgg
:
'3'
}],
settings
:
{
script
:
'params.var1 * params.var2'
},
type
:
'bucket_script'
,
},
],
bucketAggs
:
[{
type
:
'date_histogram'
,
field
:
'@timestamp'
,
id
:
'2'
}],
},
];
response
=
{
responses
:
[
{
aggregations
:
{
'2'
:
{
buckets
:
[
{
1
:
{
value
:
2
},
3
:
{
value
:
3
},
4
:
{
value
:
6
},
doc_count
:
60
,
key
:
1000
,
},
{
1
:
{
value
:
3
},
3
:
{
value
:
4
},
4
:
{
value
:
12
},
doc_count
:
60
,
key
:
2000
,
},
],
},
},
},
],
};
result
=
new
ElasticResponse
(
targets
,
response
).
getTimeSeries
();
});
it
(
'should return 3 series'
,
()
=>
{
expect
(
result
.
data
.
length
).
toBe
(
3
);
expect
(
result
.
data
[
0
].
datapoints
.
length
).
toBe
(
2
);
expect
(
result
.
data
[
0
].
target
).
toBe
(
'Sum @value'
);
expect
(
result
.
data
[
1
].
target
).
toBe
(
'Max @value'
);
expect
(
result
.
data
[
2
].
target
).
toBe
(
'Sum @value * Max @value'
);
expect
(
result
.
data
[
0
].
datapoints
[
0
][
0
]).
toBe
(
2
);
expect
(
result
.
data
[
1
].
datapoints
[
0
][
0
]).
toBe
(
3
);
expect
(
result
.
data
[
2
].
datapoints
[
0
][
0
]).
toBe
(
6
);
expect
(
result
.
data
[
0
].
datapoints
[
1
][
0
]).
toBe
(
3
);
expect
(
result
.
data
[
1
].
datapoints
[
1
][
0
]).
toBe
(
4
);
expect
(
result
.
data
[
2
].
datapoints
[
1
][
0
]).
toBe
(
12
);
});
});
});
public/app/plugins/datasource/elasticsearch/specs/query_builder.test.ts
View file @
b45f72a1
...
...
@@ -353,6 +353,83 @@ describe('ElasticQueryBuilder', () => {
expect
(
firstLevel
.
aggs
[
'2'
].
derivative
.
buckets_path
).
toBe
(
'_count'
);
});
it
(
'with bucket_script'
,
()
=>
{
const
query
=
builder
.
build
({
metrics
:
[
{
id
:
'1'
,
type
:
'sum'
,
field
:
'@value'
,
},
{
id
:
'3'
,
type
:
'max'
,
field
:
'@value'
,
},
{
field
:
'select field'
,
id
:
'4'
,
meta
:
{},
pipelineVariables
:
[
{
name
:
'var1'
,
pipelineAgg
:
'1'
,
},
{
name
:
'var2'
,
pipelineAgg
:
'3'
,
},
],
settings
:
{
script
:
'params.var1 * params.var2'
,
},
type
:
'bucket_script'
,
},
],
bucketAggs
:
[{
type
:
'date_histogram'
,
field
:
'@timestamp'
,
id
:
'2'
}],
});
const
firstLevel
=
query
.
aggs
[
'2'
];
expect
(
firstLevel
.
aggs
[
'4'
]).
not
.
toBe
(
undefined
);
expect
(
firstLevel
.
aggs
[
'4'
].
bucket_script
).
not
.
toBe
(
undefined
);
expect
(
firstLevel
.
aggs
[
'4'
].
bucket_script
.
buckets_path
).
toMatchObject
({
var1
:
'1'
,
var2
:
'3'
});
});
it
(
'with bucket_script doc count'
,
()
=>
{
const
query
=
builder
.
build
({
metrics
:
[
{
id
:
'3'
,
type
:
'count'
,
field
:
'select field'
,
},
{
field
:
'select field'
,
id
:
'4'
,
meta
:
{},
pipelineVariables
:
[
{
name
:
'var1'
,
pipelineAgg
:
'3'
,
},
],
settings
:
{
script
:
'params.var1 * 1000'
,
},
type
:
'bucket_script'
,
},
],
bucketAggs
:
[{
type
:
'date_histogram'
,
field
:
'@timestamp'
,
id
:
'2'
}],
});
const
firstLevel
=
query
.
aggs
[
'2'
];
expect
(
firstLevel
.
aggs
[
'4'
]).
not
.
toBe
(
undefined
);
expect
(
firstLevel
.
aggs
[
'4'
].
bucket_script
).
not
.
toBe
(
undefined
);
expect
(
firstLevel
.
aggs
[
'4'
].
bucket_script
.
buckets_path
).
toMatchObject
({
var1
:
'_count'
});
});
it
(
'with histogram'
,
()
=>
{
const
query
=
builder
.
build
({
metrics
:
[{
id
:
'1'
,
type
:
'count'
}],
...
...
public/app/plugins/datasource/elasticsearch/specs/query_def.test.ts
View file @
b45f72a1
...
...
@@ -65,6 +65,24 @@ describe('ElasticQueryDef', () => {
});
});
describe
(
'isPipelineAggWithMultipleBucketPaths'
,
()
=>
{
describe
(
'bucket_script'
,
()
=>
{
const
result
=
queryDef
.
isPipelineAggWithMultipleBucketPaths
(
'bucket_script'
);
test
(
'should have multiple bucket paths support'
,
()
=>
{
expect
(
result
).
toBe
(
true
);
});
});
describe
(
'moving_avg'
,
()
=>
{
const
result
=
queryDef
.
isPipelineAggWithMultipleBucketPaths
(
'moving_avg'
);
test
(
'should not have multiple bucket paths support'
,
()
=>
{
expect
(
result
).
toBe
(
false
);
});
});
});
describe
(
'pipeline aggs depending on esverison'
,
()
=>
{
describe
(
'using esversion undefined'
,
()
=>
{
test
(
'should not get pipeline aggs'
,
()
=>
{
...
...
@@ -80,13 +98,13 @@ describe('ElasticQueryDef', () => {
describe
(
'using esversion 2'
,
()
=>
{
test
(
'should get pipeline aggs'
,
()
=>
{
expect
(
queryDef
.
getMetricAggTypes
(
2
).
length
).
toBe
(
1
1
);
expect
(
queryDef
.
getMetricAggTypes
(
2
).
length
).
toBe
(
1
2
);
});
});
describe
(
'using esversion 5'
,
()
=>
{
test
(
'should get pipeline aggs'
,
()
=>
{
expect
(
queryDef
.
getMetricAggTypes
(
5
).
length
).
toBe
(
1
1
);
expect
(
queryDef
.
getMetricAggTypes
(
5
).
length
).
toBe
(
1
2
);
});
});
});
...
...
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