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
141f22be
Commit
141f22be
authored
Dec 11, 2015
by
carl bergquist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(elasticsearch): display more info in options
parent
4fa92198
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletions
+6
-1
public/app/plugins/datasource/elasticsearch/metric_agg.js
+6
-1
No files found.
public/app/plugins/datasource/elasticsearch/metric_agg.js
View file @
141f22be
...
@@ -40,12 +40,17 @@ function (angular, _, queryDef) {
...
@@ -40,12 +40,17 @@ function (angular, _, queryDef) {
if
(
queryDef
.
isPipelineAgg
(
$scope
.
agg
.
type
))
{
if
(
queryDef
.
isPipelineAgg
(
$scope
.
agg
.
type
))
{
$scope
.
agg
.
pipelineAgg
=
$scope
.
agg
.
pipelineAgg
||
'select metric'
;
$scope
.
agg
.
pipelineAgg
=
$scope
.
agg
.
pipelineAgg
||
'select metric'
;
$scope
.
agg
.
field
=
$scope
.
agg
.
pipelineAgg
;
$scope
.
agg
.
field
=
$scope
.
agg
.
pipelineAgg
;
$scope
.
settingsLinkText
=
'Options'
;
_
.
each
(
queryDef
.
getPipelineOptions
(
$scope
.
agg
),
function
(
opt
)
{
_
.
each
(
queryDef
.
getPipelineOptions
(
$scope
.
agg
),
function
(
opt
)
{
$scope
.
agg
.
settings
[
opt
.
text
]
=
$scope
.
agg
.
settings
[
opt
.
text
]
||
opt
.
default
;
$scope
.
agg
.
settings
[
opt
.
text
]
=
$scope
.
agg
.
settings
[
opt
.
text
]
||
opt
.
default
;
});
});
var
appliedAgg
=
_
.
findWhere
(
metricAggs
,
{
id
:
$scope
.
agg
.
pipelineAgg
});
if
(
appliedAgg
)
{
$scope
.
settingsLinkText
=
'Options: Based on => '
+
queryDef
.
describeMetric
(
appliedAgg
);
}
else
{
$scope
.
settingsLinkText
=
'Options'
;
}
}
else
if
(
!
$scope
.
agg
.
field
)
{
}
else
if
(
!
$scope
.
agg
.
field
)
{
$scope
.
agg
.
field
=
'select field'
;
$scope
.
agg
.
field
=
'select field'
;
}
}
...
...
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