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
354bfcea
Commit
354bfcea
authored
Dec 03, 2015
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://github.com/skbkontur/grafana
parents
0011beb6
d6935847
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
public/app/plugins/datasource/elasticsearch/datasource.js
+2
-2
No files found.
public/app/plugins/datasource/elasticsearch/datasource.js
View file @
354bfcea
...
...
@@ -94,7 +94,7 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
var
payload
=
angular
.
toJson
(
header
)
+
'
\
n'
+
angular
.
toJson
(
data
)
+
'
\
n'
;
return
this
.
_post
(
'
/
_msearch'
,
payload
).
then
(
function
(
res
)
{
return
this
.
_post
(
'_msearch'
,
payload
).
then
(
function
(
res
)
{
var
list
=
[];
var
hits
=
res
.
responses
[
0
].
hits
.
hits
;
...
...
@@ -192,7 +192,7 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
payload
=
payload
.
replace
(
/
\$
timeTo/g
,
options
.
range
.
to
.
valueOf
());
payload
=
templateSrv
.
replace
(
payload
,
options
.
scopedVars
);
return
this
.
_post
(
'
/
_msearch'
,
payload
).
then
(
function
(
res
)
{
return
this
.
_post
(
'_msearch'
,
payload
).
then
(
function
(
res
)
{
return
new
ElasticResponse
(
sentTargets
,
res
).
getTimeSeries
();
});
};
...
...
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