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
63665dcc
Commit
63665dcc
authored
Sep 22, 2015
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(grafana datasource): fixed the built in test data source, fixes #2795
parent
792b194d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
7 deletions
+6
-7
public/app/plugins/datasource/grafana/datasource.js
+6
-7
No files found.
public/app/plugins/datasource/grafana/datasource.js
View file @
63665dcc
define
([
define
([
'angular'
,
'angular'
,
'lodash'
,
'lodash'
,
'kbn'
,
'./directives'
,
'./directives'
,
],
],
function
(
angular
,
_
,
kbn
)
{
function
(
angular
,
_
)
{
'use strict'
;
'use strict'
;
var
module
=
angular
.
module
(
'grafana.services'
);
var
module
=
angular
.
module
(
'grafana.services'
);
...
@@ -15,11 +14,11 @@ function (angular, _, kbn) {
...
@@ -15,11 +14,11 @@ function (angular, _, kbn) {
}
}
GrafanaDatasource
.
prototype
.
query
=
function
(
options
)
{
GrafanaDatasource
.
prototype
.
query
=
function
(
options
)
{
// get from & to in seconds
return
backendSrv
.
get
(
'/api/metrics/test'
,
{
var
from
=
kbn
.
parseDate
(
options
.
range
.
from
).
getTime
();
from
:
options
.
range
.
from
.
valueOf
(),
var
to
=
kbn
.
parseDate
(
options
.
range
.
to
).
getTime
();
to
:
options
.
range
.
to
.
valueOf
(),
maxDataPoints
:
options
.
maxDataPoints
return
backendSrv
.
get
(
'/api/metrics/test'
,
{
from
:
from
,
to
:
to
,
maxDataPoints
:
options
.
maxDataPoints
});
});
};
};
GrafanaDatasource
.
prototype
.
metricFindQuery
=
function
()
{
GrafanaDatasource
.
prototype
.
metricFindQuery
=
function
()
{
...
...
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