Merge branch 'plopp-master'

bergquist · bergquist · commit 854c360defd0 · 2016-02-29T15:02:14.000+01:00
diff --git a/public/app/core/utils/file_export.ts b/public/app/core/utils/file_export.ts
@@ -14,6 +14,41 @@ export function exportSeriesListToCsv(seriesList) {
     saveSaveBlob(text, 'grafana_data_export.csv');
 };
 
+export function exportSeriesListToCsvColumns(seriesList) {
+    var text = 'Time;';
+    // add header
+    _.each(seriesList, function(series) {
+        text += series.alias + ';';
+    });
+    text = text.substring(0,text.length-1);
+    text += '\n';
+
+    // process data
+    var dataArr = [[]];
+    var sIndex = 1;
+    _.each(seriesList, function(series) {
+        var cIndex = 0;
+        dataArr.push([]);
+        _.each(series.datapoints, function(dp) {
+            dataArr[0][cIndex] = new Date(dp[1]).toISOString();
+            dataArr[sIndex][cIndex] = dp[0];
+            cIndex++;
+        });
+        sIndex++;
+    });
+
+    // make text
+    for (var i = 0; i < dataArr[0].length; i++) {
+        text += dataArr[0][i] + ';';
+        for (var j = 1; j < dataArr.length; j++) {
+            text += dataArr[j][i] + ';';
+        }
+        text = text.substring(0,text.length-1);
+        text += '\n';
+    }
+    saveSaveBlob(text, 'grafana_data_export.csv');
+};
+
 export function exportTableDataToCsv(table) {
     var text = '';
     // add header
diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts
@@ -125,7 +125,8 @@ class GraphCtrl extends MetricsPanelCtrl {
 
   getExtendedMenu() {
     var menu = super.getExtendedMenu();
-    menu.push({text: 'Export CSV', click: 'ctrl.exportCsv()'});
+    menu.push({text: 'Export CSV (series as rows)', click: 'ctrl.exportCsv()'});
+    menu.push({text: 'Export CSV (series as columns)', click: 'ctrl.exportCsvColumns()'});
     menu.push({text: 'Toggle legend', click: 'ctrl.toggleLegend()'});
     return menu;
   }
@@ -295,6 +296,10 @@ class GraphCtrl extends MetricsPanelCtrl {
   exportCsv() {
     fileExport.exportSeriesListToCsv(this.seriesList);
   }
+
+  exportCsvColumns() {
+    fileExport.exportSeriesListToCsvColumns(this.seriesList);
+  }
 }
 
 export {GraphCtrl, GraphCtrl as PanelCtrl}

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,8 @@ class GraphCtrl extends MetricsPanelCtrl {`
`125`	`125`
`126`	`126`	`getExtendedMenu() {`
`127`	`127`	`var menu = super.getExtendedMenu();`
`128`		`- menu.push({text: 'Export CSV', click: 'ctrl.exportCsv()'});`
	`128`	`+ menu.push({text: 'Export CSV (series as rows)', click: 'ctrl.exportCsv()'});`
	`129`	`+ menu.push({text: 'Export CSV (series as columns)', click: 'ctrl.exportCsvColumns()'});`
`129`	`130`	`menu.push({text: 'Toggle legend', click: 'ctrl.toggleLegend()'});`
`130`	`131`	`return menu;`
`131`	`132`	`}`
`@@ -295,6 +296,10 @@ class GraphCtrl extends MetricsPanelCtrl {`
`295`	`296`	`exportCsv() {`
`296`	`297`	`fileExport.exportSeriesListToCsv(this.seriesList);`
`297`	`298`	`}`
	`299`	`+`
	`300`	`+ exportCsvColumns() {`
	`301`	`+ fileExport.exportSeriesListToCsvColumns(this.seriesList);`
	`302`	`+ }`
`298`	`303`	`}`
`299`	`304`
`300`	`305`	`export {GraphCtrl, GraphCtrl as PanelCtrl}`