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
6687409e
Unverified
Commit
6687409e
authored
Apr 25, 2018
by
Marcus Efraimsson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
prometheus: fix variable query to fallback correctly to series query
Using a query of for example up or up{job=job1}
parent
1290087b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletions
+5
-1
public/app/plugins/datasource/prometheus/datasource.ts
+4
-0
public/app/plugins/datasource/prometheus/metric_find_query.ts
+1
-1
No files found.
public/app/plugins/datasource/prometheus/datasource.ts
View file @
6687409e
...
@@ -329,4 +329,8 @@ export class PrometheusDatasource {
...
@@ -329,4 +329,8 @@ export class PrometheusDatasource {
}
}
return Math.ceil(date.valueOf() / 1000);
return Math.ceil(date.valueOf() / 1000);
}
}
getOriginalMetricName(labelData) {
return this.resultTransformer.getOriginalMetricName(labelData);
}
}
}
public/app/plugins/datasource/prometheus/metric_find_query.ts
View file @
6687409e
...
@@ -121,7 +121,7 @@ export default class PrometheusMetricFindQuery {
...
@@ -121,7 +121,7 @@ export default class PrometheusMetricFindQuery {
var
self
=
this
;
var
self
=
this
;
return
this
.
datasource
.
metadataRequest
(
url
).
then
(
function
(
result
)
{
return
this
.
datasource
.
metadataRequest
(
url
).
then
(
function
(
result
)
{
return
_
.
map
(
result
.
data
.
data
,
function
(
metric
)
{
return
_
.
map
(
result
.
data
.
data
,
metric
=>
{
return
{
return
{
text
:
self
.
datasource
.
getOriginalMetricName
(
metric
),
text
:
self
.
datasource
.
getOriginalMetricName
(
metric
),
expandable
:
true
,
expandable
:
true
,
...
...
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