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 to match table column name and order

Browse Source
This commit is contained in:
Mitsuhiro Tanda 2018-04-27 19:34:10 +09:00
parent afce0feb05
commit c2b720835b
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,6 +153,7 @@ export class PrometheusDatasource {
end: end,
responseListLength: responseList.length,
responseIndex: index,
refId: activeTargets[index].refId,
};
this.resultTransformer.transform(result, response, transformerOptions);

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

@ -8,7 +8,7 @@ export class ResultTransformer {
let prometheusResult = response.data.data.result;
if (options.format === 'table') {
result.push(this.transformMetricDataToTable(prometheusResult, options.responseListLength, options.responseIndex));
result.push(this.transformMetricDataToTable(prometheusResult, options.responseListLength, options.refId));
} else if (options.format === 'heatmap') {
let seriesList = [];
prometheusResult.sort(sortSeriesByLabel);
@ -58,7 +58,7 @@ export class ResultTransformer {
return { target: metricLabel, datapoints: dps };
}
transformMetricDataToTable(md, resultCount: number, resultIndex: number) {
transformMetricDataToTable(md, resultCount: number, refId: string) {
var table = new TableModel();
var i, j;
var metricLabels = {};
@ -83,7 +83,7 @@ export class ResultTransformer {
metricLabels[label] = labelIndex + 1;
table.columns.push({ text: label });
});
let valueText = resultCount > 1 ? `Value #${String.fromCharCode(65 + resultIndex)}` : 'Value';
let valueText = resultCount > 1 ? `Value #${refId}` : 'Value';
table.columns.push({ text: valueText });
// Populate rows, set value to empty string when label not present.

5
public/app/plugins/panel/table/module.ts
View File

@ -154,6 +154,11 @@ class TablePanelCtrl extends MetricsPanelCtrl {
this.render();
}
moveQuery(target, direction) {
super.moveQuery(target, direction);
super.refresh();
}
exportCsv() {
var scope = this.$scope.$new(true);
scope.tableData = this.renderer.render_values();