IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Renamed helperRequest and removed positional args

Browse Source 
From review feedback:

* s/helper/metadata
* combined positional args to _request into options dict
* metadataRequest reuses _request()
* moved consumption of this.httpMethod into _request, can be overwritten
 in options due to spread-after
This commit is contained in:
David Kaltschmidt
2018-04-24 12:27:37 +02:00
parent 53817b7429
commit 006286ac05
2 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/plugins/datasource/prometheus/metric_find_query.ts
View File

@@ -46,7 +46,7 @@ export default class PrometheusMetricFindQuery {
// return label values globally
url = '/api/v1/label/' + label + '/values';
return this.datasource.helperRequest(url).then(function(result) {
return this.datasource.metadataRequest(url).then(function(result) {
return _.map(result.data.data, function(value) {
return { text: value };
});
@@ -56,7 +56,7 @@ export default class PrometheusMetricFindQuery {
var end = this.datasource.getPrometheusTime(this.range.to, true);
url = '/api/v1/series?match[]=' + encodeURIComponent(metric) + '&start=' + start + '&end=' + end;
return this.datasource.helperRequest(url).then(function(result) {
return this.datasource.metadataRequest(url).then(function(result) {
var _labels = _.map(result.data.data, function(metric) {
return metric[label] || '';
}).filter(function(label) {
@@ -76,7 +76,7 @@ export default class PrometheusMetricFindQuery {
metricNameQuery(metricFilterPattern) {
var url = '/api/v1/label/__name__/values';
return this.datasource.helperRequest(url).then(function(result) {
return this.datasource.metadataRequest(url).then(function(result) {
return _.chain(result.data.data)
.filter(function(metricName) {
var r = new RegExp(metricFilterPattern);
@@ -120,7 +120,7 @@ export default class PrometheusMetricFindQuery {
var url = '/api/v1/series?match[]=' + encodeURIComponent(query) + '&start=' + start + '&end=' + end;
var self = this;
return this.datasource.helperRequest(url).then(function(result) {
return this.datasource.metadataRequest(url).then(function(result) {
return _.map(result.data.data, function(metric) {
return {
text: self.datasource.getOriginalMetricName(metric),