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
16847fdb
Commit
16847fdb
authored
Dec 17, 2015
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(elasticsearch): trim edges, minor refactoring of #3541
parent
dc30b9d3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
7 deletions
+6
-7
public/app/plugins/datasource/elasticsearch/bucket_agg.js
+4
-1
public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
+1
-1
public/app/plugins/datasource/elasticsearch/partials/query.editor.html
+1
-5
No files found.
public/app/plugins/datasource/elasticsearch/bucket_agg.js
View file @
16847fdb
...
...
@@ -95,7 +95,10 @@ function (angular, _, queryDef) {
settings
.
min_doc_count
=
settings
.
min_doc_count
||
0
;
$scope
.
agg
.
field
=
$scope
.
target
.
timeField
;
settingsLinkText
=
'Interval: '
+
settings
.
interval
;
settingsLinkText
+=
', Min Doc Count: '
+
settings
.
min_doc_count
;
if
(
settings
.
min_doc_count
>
0
)
{
settingsLinkText
+=
', Min Doc Count: '
+
settings
.
min_doc_count
;
}
if
(
settings
.
trimEdges
===
undefined
||
settings
.
trimEdges
<
0
)
{
settings
.
trimEdges
=
0
;
...
...
public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
View file @
16847fdb
...
...
@@ -60,7 +60,7 @@
<div
class=
"tight-form last"
>
<ul
class=
"tight-form-list"
>
<li
class=
"tight-form-item"
style=
"width: 170px"
>
Trim edges
on timeserie
Trim edges
points
</li>
<li>
<input
class=
"tight-form-input"
type=
"number"
ng-model=
"agg.settings.trimEdges"
ng-change=
"onChangeInternal()"
>
...
...
public/app/plugins/datasource/elasticsearch/partials/query.editor.html
View file @
16847fdb
...
...
@@ -50,14 +50,10 @@
Alias
</li>
<li>
<input
type=
"text"
class=
"tight-form-input"
style=
"width: 2
6
0px;"
ng-model=
"target.alias"
spellcheck=
'false'
placeholder=
"alias patterns (empty = auto)"
ng-blur=
"get_data()"
>
<input
type=
"text"
class=
"tight-form-input"
style=
"width: 2
0
0px;"
ng-model=
"target.alias"
spellcheck=
'false'
placeholder=
"alias patterns (empty = auto)"
ng-blur=
"get_data()"
>
</li>
</ul>
<div
class=
"clearfix"
></div>
<div
style=
"padding: 10px"
ng-if=
"target.rawQuery"
>
<textarea
ng-model=
"target.rawQuery"
rows=
"8"
spellcheck=
"false"
style=
"width: 100%; box-sizing: border-box;"
ng-blur=
"queryUpdated()"
></textarea>
</div>
</div>
<div
ng-hide=
"target.rawQuery"
>
...
...
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