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
91a814d2
Commit
91a814d2
authored
Oct 23, 2015
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3017 from volter/master
"No limit" was not effective for ES terms aggregation
parents
6fe6a33d
6b9b08da
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
public/app/plugins/datasource/elasticsearch/query_builder.js
+2
-3
No files found.
public/app/plugins/datasource/elasticsearch/query_builder.js
View file @
91a814d2
...
@@ -15,15 +15,14 @@ function (angular) {
...
@@ -15,15 +15,14 @@ function (angular) {
};
};
ElasticQueryBuilder
.
prototype
.
buildTermsAgg
=
function
(
aggDef
,
queryNode
,
target
)
{
ElasticQueryBuilder
.
prototype
.
buildTermsAgg
=
function
(
aggDef
,
queryNode
,
target
)
{
var
metricRef
,
metric
,
size
,
y
;
var
metricRef
,
metric
,
y
;
queryNode
.
terms
=
{
"field"
:
aggDef
.
field
};
queryNode
.
terms
=
{
"field"
:
aggDef
.
field
};
if
(
!
aggDef
.
settings
)
{
if
(
!
aggDef
.
settings
)
{
return
queryNode
;
return
queryNode
;
}
}
size
=
parseInt
(
aggDef
.
settings
.
size
,
10
);
queryNode
.
terms
.
size
=
parseInt
(
aggDef
.
settings
.
size
,
10
);
if
(
size
>
0
)
{
queryNode
.
terms
.
size
=
size
;
}
if
(
aggDef
.
settings
.
orderBy
!==
void
0
)
{
if
(
aggDef
.
settings
.
orderBy
!==
void
0
)
{
queryNode
.
terms
.
order
=
{};
queryNode
.
terms
.
order
=
{};
queryNode
.
terms
.
order
[
aggDef
.
settings
.
orderBy
]
=
aggDef
.
settings
.
order
;
queryNode
.
terms
.
order
[
aggDef
.
settings
.
orderBy
]
=
aggDef
.
settings
.
order
;
...
...
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