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

Type-agnostic row merge in table transform for multiple queries

Browse Source 
* moved unique value naming to datasource (credit: @bergquist)
* merge rows based on same column-values and empty values
* expanded tests
This commit is contained in:
David Kaltschmidt
2017-12-11 12:42:53 +01:00
parent 011b2cd1b2
commit 8d70f13393
3 changed files with 82 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,7 +118,7 @@ export class PrometheusDatasource {
}
if (activeTargets[index].format === "table") {
result.push(self.transformMetricDataToTable(response.data.data.result));
result.push(self.transformMetricDataToTable(response.data.data.result, responseList.length, index));
} else {
for (let metricData of response.data.data.result) {
if (response.data.data.resultType === 'matrix') {
@@ -301,7 +301,7 @@ export class PrometheusDatasource {
return { target: metricLabel, datapoints: dps };
}
transformMetricDataToTable(md) {
transformMetricDataToTable(md, resultCount: number, resultIndex: number) {
var table = new TableModel();
var i, j;
var metricLabels = {};
@@ -326,7 +326,8 @@ export class PrometheusDatasource {
metricLabels[label] = labelIndex + 1;
table.columns.push({text: label});
});
table.columns.push({text: 'Value'});
let valueText = resultCount > 1 ? `Value #${String.fromCharCode(65 + resultIndex)}` : 'Value';
table.columns.push({text: valueText});
// Populate rows, set value to empty string when label not present.
_.each(md, function(series) {