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
0d34740a
Commit
0d34740a
authored
May 10, 2016
by
Leandro Piccilli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add support to ElasticSearch 5.0
parent
ecf5b61e
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
54 additions
and
5 deletions
+54
-5
public/app/plugins/datasource/elasticsearch/config_ctrl.ts
+1
-0
public/app/plugins/datasource/elasticsearch/datasource.js
+4
-3
public/app/plugins/datasource/elasticsearch/query_builder.js
+49
-2
No files found.
public/app/plugins/datasource/elasticsearch/config_ctrl.ts
View file @
0d34740a
...
@@ -24,6 +24,7 @@ export class ElasticConfigCtrl {
...
@@ -24,6 +24,7 @@ export class ElasticConfigCtrl {
esVersions
=
[
esVersions
=
[
{
name
:
'1.x'
,
value
:
1
},
{
name
:
'1.x'
,
value
:
1
},
{
name
:
'2.x'
,
value
:
2
},
{
name
:
'2.x'
,
value
:
2
},
{
name
:
'5.x'
,
value
:
5
},
];
];
indexPatternTypeChanged
()
{
indexPatternTypeChanged
()
{
...
...
public/app/plugins/datasource/elasticsearch/datasource.js
View file @
0d34740a
...
@@ -182,7 +182,7 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
...
@@ -182,7 +182,7 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
luceneQuery
=
luceneQuery
.
substr
(
1
,
luceneQuery
.
length
-
2
);
luceneQuery
=
luceneQuery
.
substr
(
1
,
luceneQuery
.
length
-
2
);
esQuery
=
esQuery
.
replace
(
"$lucene_query"
,
luceneQuery
);
esQuery
=
esQuery
.
replace
(
"$lucene_query"
,
luceneQuery
);
var
searchType
=
queryObj
.
size
===
0
?
'count'
:
'query_then_fetch'
;
var
searchType
=
(
queryObj
.
size
===
0
&&
this
.
esVersion
<
5
)
?
'count'
:
'query_then_fetch'
;
var
header
=
this
.
getQueryHeader
(
searchType
,
options
.
range
.
from
,
options
.
range
.
to
);
var
header
=
this
.
getQueryHeader
(
searchType
,
options
.
range
.
from
,
options
.
range
.
to
);
payload
+=
header
+
'
\
n'
;
payload
+=
header
+
'
\
n'
;
...
@@ -243,7 +243,8 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
...
@@ -243,7 +243,8 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
this
.
getTerms
=
function
(
queryDef
)
{
this
.
getTerms
=
function
(
queryDef
)
{
var
range
=
timeSrv
.
timeRange
();
var
range
=
timeSrv
.
timeRange
();
var
header
=
this
.
getQueryHeader
(
'count'
,
range
.
from
,
range
.
to
);
var
searchType
=
this
.
esVersion
>=
5
?
'query_then_fetch'
:
'count'
;
var
header
=
this
.
getQueryHeader
(
searchType
,
range
.
from
,
range
.
to
);
var
esQuery
=
angular
.
toJson
(
this
.
queryBuilder
.
getTermsQuery
(
queryDef
));
var
esQuery
=
angular
.
toJson
(
this
.
queryBuilder
.
getTermsQuery
(
queryDef
));
esQuery
=
esQuery
.
replace
(
"$lucene_query"
,
queryDef
.
query
||
'*'
);
esQuery
=
esQuery
.
replace
(
"$lucene_query"
,
queryDef
.
query
||
'*'
);
...
@@ -251,7 +252,7 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
...
@@ -251,7 +252,7 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
esQuery
=
esQuery
.
replace
(
/
\$
timeTo/g
,
range
.
to
.
valueOf
());
esQuery
=
esQuery
.
replace
(
/
\$
timeTo/g
,
range
.
to
.
valueOf
());
esQuery
=
header
+
'
\
n'
+
esQuery
+
'
\
n'
;
esQuery
=
header
+
'
\
n'
+
esQuery
+
'
\
n'
;
return
this
.
_post
(
'/_msearch?search_type=
count'
,
esQuery
).
then
(
function
(
res
)
{
return
this
.
_post
(
'/_msearch?search_type=
'
+
searchType
,
esQuery
).
then
(
function
(
res
)
{
var
buckets
=
res
.
responses
[
0
].
aggregations
[
"1"
].
buckets
;
var
buckets
=
res
.
responses
[
0
].
aggregations
[
"1"
].
buckets
;
return
_
.
map
(
buckets
,
function
(
bucket
)
{
return
_
.
map
(
buckets
,
function
(
bucket
)
{
return
{
text
:
bucket
.
key
,
value
:
bucket
.
key
};
return
{
text
:
bucket
.
key
,
value
:
bucket
.
key
};
...
...
public/app/plugins/datasource/elasticsearch/query_builder.js
View file @
0d34740a
...
@@ -75,6 +75,14 @@ function (queryDef) {
...
@@ -75,6 +75,14 @@ function (queryDef) {
for
(
var
i
=
0
;
i
<
aggDef
.
settings
.
filters
.
length
;
i
++
)
{
for
(
var
i
=
0
;
i
<
aggDef
.
settings
.
filters
.
length
;
i
++
)
{
var
query
=
aggDef
.
settings
.
filters
[
i
].
query
;
var
query
=
aggDef
.
settings
.
filters
[
i
].
query
;
if
(
this
.
esVersion
>=
5
)
{
filterObj
[
query
]
=
{
query_string
:
{
query
:
query
,
analyze_wildcard
:
true
}
};
}
else
{
filterObj
[
query
]
=
{
filterObj
[
query
]
=
{
query
:
{
query
:
{
query_string
:
{
query_string
:
{
...
@@ -84,6 +92,7 @@ function (queryDef) {
...
@@ -84,6 +92,7 @@ function (queryDef) {
}
}
};
};
}
}
}
return
filterObj
;
return
filterObj
;
};
};
...
@@ -106,7 +115,25 @@ function (queryDef) {
...
@@ -106,7 +115,25 @@ function (queryDef) {
target
.
timeField
=
this
.
timeField
;
target
.
timeField
=
this
.
timeField
;
var
i
,
nestedAggs
,
metric
;
var
i
,
nestedAggs
,
metric
;
var
query
=
{
var
query
=
{};
if
(
this
.
esVersion
>=
5
)
{
query
=
{
"size"
:
0
,
"query"
:
{
"bool"
:
{
"must"
:
[
{
"range"
:
this
.
getRangeFilter
()},
{
"query_string"
:
{
"analyze_wildcard"
:
true
,
"query"
:
'$lucene_query'
}
}
]
}
}
};
}
else
{
query
=
{
"size"
:
0
,
"size"
:
0
,
"query"
:
{
"query"
:
{
"filtered"
:
{
"filtered"
:
{
...
@@ -124,6 +151,7 @@ function (queryDef) {
...
@@ -124,6 +151,7 @@ function (queryDef) {
}
}
}
}
};
};
}
// handle document query
// handle document query
if
(
target
.
bucketAggs
.
length
===
0
)
{
if
(
target
.
bucketAggs
.
length
===
0
)
{
...
@@ -199,7 +227,25 @@ function (queryDef) {
...
@@ -199,7 +227,25 @@ function (queryDef) {
};
};
ElasticQueryBuilder
.
prototype
.
getTermsQuery
=
function
(
queryDef
)
{
ElasticQueryBuilder
.
prototype
.
getTermsQuery
=
function
(
queryDef
)
{
var
query
=
{
var
query
=
{};
if
(
this
.
esVersion
>=
5
)
{
query
=
{
"size"
:
0
,
"query"
:
{
"bool"
:
{
"must"
:
[
{
"range"
:
this
.
getRangeFilter
()},
{
"query_string"
:
{
"analyze_wildcard"
:
true
,
"query"
:
'$lucene_query'
}
}
]
}
}
};
}
else
{
query
=
{
"size"
:
0
,
"size"
:
0
,
"query"
:
{
"query"
:
{
"filtered"
:
{
"filtered"
:
{
...
@@ -217,6 +263,7 @@ function (queryDef) {
...
@@ -217,6 +263,7 @@ function (queryDef) {
}
}
}
}
};
};
}
query
.
aggs
=
{
query
.
aggs
=
{
"1"
:
{
"1"
:
{
"terms"
:
{
"terms"
:
{
...
...
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