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
33aa3f0f
Commit
33aa3f0f
authored
Jun 13, 2016
by
utkarshcmu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Made tag_values query more robust
parent
e4e042e3
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
public/app/plugins/datasource/opentsdb/datasource.js
+3
-1
public/app/plugins/datasource/opentsdb/specs/datasource-specs.ts
+2
-2
No files found.
public/app/plugins/datasource/opentsdb/datasource.js
View file @
33aa3f0f
...
@@ -168,7 +168,9 @@ function (angular, _, dateMath) {
...
@@ -168,7 +168,9 @@ function (angular, _, dateMath) {
return
$q
.
when
([]);
return
$q
.
when
([]);
}
}
var
keysArray
=
keys
.
split
(
","
);
var
keysArray
=
keys
.
split
(
","
).
map
(
function
(
key
)
{
return
key
.
trim
();
});
var
key
=
keysArray
[
0
];
var
key
=
keysArray
[
0
];
var
keysQuery
=
key
+
"=*"
;
var
keysQuery
=
key
+
"=*"
;
...
...
public/app/plugins/datasource/opentsdb/specs/datasource-specs.ts
View file @
33aa3f0f
...
@@ -55,14 +55,14 @@ describe('opentsdb', function() {
...
@@ -55,14 +55,14 @@ describe('opentsdb', function() {
ctx
.
ds
.
metricFindQuery
(
'tag_values(cpu, hostname, env=$env)'
).
then
(
function
(
data
)
{
results
=
data
;
});
ctx
.
ds
.
metricFindQuery
(
'tag_values(cpu, hostname, env=$env)'
).
then
(
function
(
data
)
{
results
=
data
;
});
ctx
.
$rootScope
.
$apply
();
ctx
.
$rootScope
.
$apply
();
expect
(
requestOptions
.
url
).
to
.
be
(
'/api/search/lookup'
);
expect
(
requestOptions
.
url
).
to
.
be
(
'/api/search/lookup'
);
expect
(
requestOptions
.
params
.
m
).
to
.
be
(
'cpu{hostname=*,
env=$env}'
);
expect
(
requestOptions
.
params
.
m
).
to
.
be
(
'cpu{hostname=*,env=$env}'
);
});
});
it
(
'tag_values(cpu, test) should generate lookup query'
,
function
()
{
it
(
'tag_values(cpu, test) should generate lookup query'
,
function
()
{
ctx
.
ds
.
metricFindQuery
(
'tag_values(cpu, hostname, env=$env, region=$region)'
).
then
(
function
(
data
)
{
results
=
data
;
});
ctx
.
ds
.
metricFindQuery
(
'tag_values(cpu, hostname, env=$env, region=$region)'
).
then
(
function
(
data
)
{
results
=
data
;
});
ctx
.
$rootScope
.
$apply
();
ctx
.
$rootScope
.
$apply
();
expect
(
requestOptions
.
url
).
to
.
be
(
'/api/search/lookup'
);
expect
(
requestOptions
.
url
).
to
.
be
(
'/api/search/lookup'
);
expect
(
requestOptions
.
params
.
m
).
to
.
be
(
'cpu{hostname=*,
env=$env,
region=$region}'
);
expect
(
requestOptions
.
params
.
m
).
to
.
be
(
'cpu{hostname=*,
env=$env,
region=$region}'
);
});
});
it
(
'suggest_tagk() should generate api suggest query'
,
function
()
{
it
(
'suggest_tagk() should generate api suggest query'
,
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