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

Fix rebase, fix empty field still issuing query problem

Browse Source
This commit is contained in:
David Kaltschmidt
2018-10-23 17:04:33 +02:00
parent 0cd89e80ca
commit f19ffee5b4
4 changed files with 46 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/plugins/datasource/prometheus/datasource.ts
View File

@@ -196,6 +196,7 @@ export class PrometheusDatasource {
query: queries[index].expr,
responseListLength: responseList.length,
refId: activeTargets[index].refId,
valueWithRefId: activeTargets[index].valueWithRefId,
};
const series = this.resultTransformer.transform(response, transformerOptions);
result = [...result, ...series];

13
public/app/plugins/datasource/prometheus/result_transformer.ts
View File

@@ -8,7 +8,14 @@ export class ResultTransformer {
const prometheusResult = response.data.data.result;
if (options.format === 'table') {
return [this.transformMetricDataToTable(prometheusResult, options.responseListLength, options.refId)];
return [
this.transformMetricDataToTable(
prometheusResult,
options.responseListLength,
options.refId,
options.valueWithRefId
),
];
} else if (options.format === 'heatmap') {
let seriesList = [];
prometheusResult.sort(sortSeriesByLabel);
@@ -70,7 +77,7 @@ export class ResultTransformer {
};
}
transformMetricDataToTable(md, resultCount: number, refId: string) {
transformMetricDataToTable(md, resultCount: number, refId: string, valueWithRefId?: boolean) {
const table = new TableModel();
let i, j;
const metricLabels = {};
@@ -95,7 +102,7 @@ export class ResultTransformer {
metricLabels[label] = labelIndex + 1;
table.columns.push({ text: label, filterable: !label.startsWith('__') });
});
const valueText = resultCount > 1 ? `Value #${refId}` : 'Value';
const valueText = resultCount > 1 || valueWithRefId ? `Value #${refId}` : 'Value';
table.columns.push({ text: valueText });
// Populate rows, set value to empty string when label not present.