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
36953379
Commit
36953379
authored
May 23, 2017
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactoring: Elasticearch filter label PR #8420
parent
648e8a95
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
+1
-1
public/app/plugins/datasource/elasticsearch/query_builder.js
+1
-1
No files found.
public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
View file @
36953379
...
...
@@ -97,7 +97,7 @@
<label
class=
"gf-form-label width-10"
>
Query {{$index + 1}}
</label>
<input
type=
"text"
class=
"gf-form-input max-width-12"
ng-model=
"filter.query"
spellcheck=
'false'
placeholder=
"Lucene query"
ng-blur=
"onChangeInternal()"
>
<label
class=
"gf-form-label width-10"
>
Label {{$index + 1}}
</label>
<input
type=
"text"
class=
"gf-form-input max-width-12"
ng-model=
"filter.label"
spellcheck=
'false'
placeholder=
"
Readable
Label"
ng-blur=
"onChangeInternal()"
>
<input
type=
"text"
class=
"gf-form-input max-width-12"
ng-model=
"filter.label"
spellcheck=
'false'
placeholder=
"Label"
ng-blur=
"onChangeInternal()"
>
</div>
<div
class=
"gf-form"
>
<label
class=
"gf-form-label"
ng-if=
"$first"
>
...
...
public/app/plugins/datasource/elasticsearch/query_builder.js
View file @
36953379
...
...
@@ -97,7 +97,7 @@ function (queryDef) {
for
(
var
i
=
0
;
i
<
aggDef
.
settings
.
filters
.
length
;
i
++
)
{
var
query
=
aggDef
.
settings
.
filters
[
i
].
query
;
var
label
=
aggDef
.
settings
.
filters
[
i
].
label
;
label
=
label
===
''
||
label
===
undefined
?
query
:
label
;
label
=
label
===
''
||
label
===
undefined
?
query
:
label
;
filterObj
[
label
]
=
{
query_string
:
{
query
:
query
,
...
...
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