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
f6fc7f7b
Commit
f6fc7f7b
authored
Nov 26, 2018
by
Mattia Rossi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Requested Backend changes, added details to popover description for the offset field
parent
98254841
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
2 deletions
+10
-2
pkg/tsdb/elasticsearch/client/models.go
+1
-0
pkg/tsdb/elasticsearch/time_series_query.go
+3
-0
public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
+2
-1
public/app/plugins/datasource/elasticsearch/query_builder.ts
+4
-1
No files found.
pkg/tsdb/elasticsearch/client/models.go
View file @
f6fc7f7b
...
...
@@ -240,6 +240,7 @@ type DateHistogramAgg struct {
Missing
*
string
`json:"missing,omitempty"`
ExtendedBounds
*
ExtendedBounds
`json:"extended_bounds"`
Format
string
`json:"format"`
Offset
string
`json:"offset,omitempty"`
}
// FiltersAggregation represents a filters aggregation
...
...
pkg/tsdb/elasticsearch/time_series_query.go
View file @
f6fc7f7b
...
...
@@ -134,6 +134,9 @@ func addDateHistogramAgg(aggBuilder es.AggBuilder, bucketAgg *BucketAgg, timeFro
a
.
Interval
=
"$__interval"
}
if
bucketAgg
.
Settings
.
Get
(
"offset"
)
.
MustString
(
""
)
!=
""
{
a
.
Offset
=
bucketAgg
.
Settings
.
Get
(
"offset"
)
.
MustString
(
""
)
}
if
missing
,
err
:=
bucketAgg
.
Settings
.
Get
(
"missing"
)
.
String
();
err
==
nil
{
a
.
Missing
=
&
missing
}
...
...
public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
View file @
f6fc7f7b
...
...
@@ -74,7 +74,8 @@
<label
class=
"gf-form-label width-10"
>
Offset
<info-popover
mode=
"right-normal"
>
Interval Offset
Change the start value of each bucket by the specified positive (+) or negative offset (-) duration, such as 1h for an hour, or 1d for a day,
see https://www.elastic.co/guide/en/elasticsearch/reference/current/common-options.html#time-units for further details
</info-popover>
</label>
<input
class=
"gf-form-input max-width-12"
type=
"text"
ng-model=
"agg.settings.offset"
ng-change=
"onChangeInternal()"
>
...
...
public/app/plugins/datasource/elasticsearch/query_builder.ts
View file @
f6fc7f7b
...
...
@@ -71,7 +71,10 @@ export class ElasticQueryBuilder {
esAgg
.
min_doc_count
=
settings
.
min_doc_count
||
0
;
esAgg
.
extended_bounds
=
{
min
:
'$timeFrom'
,
max
:
'$timeTo'
};
esAgg
.
format
=
'epoch_millis'
;
esAgg
.
offset
=
settings
.
offset
||
'0'
;
if
(
settings
.
offset
!==
''
)
{
esAgg
.
offset
=
settings
.
offset
;
}
if
(
esAgg
.
interval
===
'auto'
)
{
esAgg
.
interval
=
'$__interval'
;
...
...
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