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
7c1dc244
Commit
7c1dc244
authored
Jun 04, 2017
by
Dhia MOAKHAR
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change size in raw_document from text to number
update query builder and specs
parent
045f5e11
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
public/app/plugins/datasource/elasticsearch/partials/metric_agg.html
+1
-1
public/app/plugins/datasource/elasticsearch/query_builder.js
+1
-1
public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts
+1
-1
No files found.
public/app/plugins/datasource/elasticsearch/partials/metric_agg.html
View file @
7c1dc244
...
@@ -74,7 +74,7 @@
...
@@ -74,7 +74,7 @@
</div>
</div>
<div
class=
"gf-form offset-width-7"
ng-if=
"agg.type === 'raw_document'"
>
<div
class=
"gf-form offset-width-7"
ng-if=
"agg.type === 'raw_document'"
>
<label
class=
"gf-form-label width-10"
>
Size
</label>
<label
class=
"gf-form-label width-10"
>
Size
</label>
<input
type=
"
text
"
class=
"gf-form-input max-width-12"
ng-model=
"agg.settings.size"
ng-blur=
"onChange()"
></input>
<input
type=
"
number
"
class=
"gf-form-input max-width-12"
ng-model=
"agg.settings.size"
ng-blur=
"onChange()"
></input>
</div>
</div>
...
...
public/app/plugins/datasource/elasticsearch/query_builder.js
View file @
7c1dc244
...
@@ -110,7 +110,7 @@ function (queryDef) {
...
@@ -110,7 +110,7 @@ function (queryDef) {
};
};
ElasticQueryBuilder
.
prototype
.
documentQuery
=
function
(
query
,
size
)
{
ElasticQueryBuilder
.
prototype
.
documentQuery
=
function
(
query
,
size
)
{
query
.
size
=
size
===
undefined
?
500
:
parseInt
(
size
,
10
)
;
query
.
size
=
size
===
undefined
?
500
:
size
;
query
.
sort
=
{};
query
.
sort
=
{};
query
.
sort
[
this
.
timeField
]
=
{
order
:
'desc'
,
unmapped_type
:
'boolean'
};
query
.
sort
[
this
.
timeField
]
=
{
order
:
'desc'
,
unmapped_type
:
'boolean'
};
...
...
public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts
View file @
7c1dc244
...
@@ -165,7 +165,7 @@ describe('ElasticQueryBuilder', function() {
...
@@ -165,7 +165,7 @@ describe('ElasticQueryBuilder', function() {
});
});
it
(
'with raw_document metric size set'
,
function
()
{
it
(
'with raw_document metric size set'
,
function
()
{
var
query
=
builder
.
build
({
var
query
=
builder
.
build
({
metrics
:
[{
type
:
'raw_document'
,
id
:
'1'
,
settings
:
{
size
:
'1337'
}}],
metrics
:
[{
type
:
'raw_document'
,
id
:
'1'
,
settings
:
{
size
:
1337
}}],
timeField
:
'@timestamp'
,
timeField
:
'@timestamp'
,
bucketAggs
:
[],
bucketAggs
:
[],
});
});
...
...
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