Fix monitor bug

Change-Id: I7b94f6dc454da2cf96eb3d4777b51d9c846be450
Issue-Id: USECASEUI-50
Signed-off-by: shentao <shentao@chinamobile.com>

diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/chartLoad.js b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/chartLoad.js
index a52a2de..c94a39c 100644 (file)
--- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/chartLoad.js
+++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/chartLoad.js
@@ -34,31 +34,6 @@ networkBarChart = [
         { "x":'60min' , "y":3.27}
     ] } ];
 
-historicalBarChart1 = [
-    { "type":"bar", "key": "memory", "yAxis": "1", "values": [
-        { "x":'1h' , "y":4}, { "x":'2h' , "y":4}, { "x":'3h' , "y":12},
-        { "x":'4h' , "y":3.27}, { "x":'5h' , "y":34}, { "x":'6h' , "y":34}, { "x":'7h' , "y":34},
-        { "x":'8h' , "y":34}, { "x":'9h' , "y":34}, { "x":'10h' , "y":34}, { "x":'11h' , "y":34},
-        { "x":'12h' , "y":56}, { "x":'13h' , "y":34}, { "x":'14h' , "y":34}, { "x":'15h' , "y":34},
-        { "x":'16h' , "y":12}, { "x":'17h' , "y":34}, { "x":'18h' , "y":50}, { "x":'19h' , "y":34},
-        { "x":'20h' , "y":34}, { "x":'21h' , "y":54}, { "x":'22h' , "y":34}, { "x":'23h' , "y":34},
-        { "x":'24h' , "y":36}
-    ] } ];
-historicalBarChart2 = [
-    { "type":"bar", "key": "memory", "yAxis": "1", "values": [
-        { "x":'1d' , "y":4}, { "x":'2d' , "y":4}, { "x":'3d' , "y":12},
-        { "x":'4d' , "y":3.27}, { "x":'5d' , "y":34},{ "x":'6d' , "y":4}, { "x":'7d' , "y":4}, { "x":'8d' , "y":12},
-        { "x":'9d' , "y":3.27}, { "x":'10d' , "y":34}, { "x":'11d' , "y":34}, { "x":'12d' , "y":34},  { "x":'13d' , "y":4}, { "x":'14d' , "y":4}, { "x":'15' , "y":12},
-        { "x":'16d' , "y":3.27}, { "x":'17d' , "y":34},{ "x":'18d' , "y":4}, { "x":'19d' , "y":4}, { "x":'20d' , "y":12},
-        { "x":'21d' , "y":3.27}, { "x":'22d' , "y":34}, { "x":'23d' , "y":34}, { "x":'24d' , "y":34}, { "x":'25d' , "y":4}, { "x":'26d' , "y":12},
-        { "x":'27d' , "y":3.27}, { "x":'28d' , "y":34}, { "x":'29d' , "y":34}, { "x":'30d' , "y":34}, { "x":'31d' , "y":34}
-    ] } ];
-historicalBarChart3 = [
-    { "type":"bar", "key": "memory", "yAxis": "1", "values": [
-        { "x":'Jan' , "y":4}, { "x":'Feb' , "y":4}, { "x":'Mar' , "y":12},
-        { "x":'Apr' , "y":3.27}, { "x":'May' , "y":34},{ "x":'June' , "y":4}, { "x":'July' , "y":4}, { "x":'Aug' , "y":12},
-        { "x":'Sept' , "y":3.27}, { "x":'Oct' , "y":34}, { "x":'Nov' , "y":34}
-    ] } ];
 var chart1,chart2,chart3,chart4;
 nv.addGraph(function() {
     chart1 = nv.models.multiBarChart()

diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/alarmController.js b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/alarmController.js
index a7fd1c7..1118e73 100644 (file)
--- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/alarmController.js
+++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/alarmController.js
@@ -44,7 +44,6 @@ app.controller('alarmGridCtrl', ['$scope', '$log', '$http', '$timeout', '$interv
             url += arguments[6] === "" ? "/null" : "/" + arguments[6];
             url += arguments[7] === "" ? "/null" : "/" + arguments[7];
             url += arguments[8] === "" ? "/null" : "/" + arguments[8];
-            console.info(url);
             $http.get(url, {
                 headers: {
                     'Access-Control-Allow-Origin': "*",
@@ -54,7 +53,6 @@ app.controller('alarmGridCtrl', ['$scope', '$log', '$http', '$timeout', '$interv
             })
                 .success(function (data) {
                     $scope.gridOptions.totalItems = data.totalRecords;
-                    //console.info($scope.gridOptions.totalItems);
                     $scope.gridOptions.data = data.alarms;
                 });
         };
@@ -88,7 +86,6 @@ app.controller('alarmGridCtrl', ['$scope', '$log', '$http', '$timeout', '$interv
             paginationPageSizes: [10, 15, 20],
             paginationCurrentPage: 1,
             paginationPageSize: 10,
-            //paginationTemplate:"<div></div>",
             totalItems: 0,
             useExternalPagination: true,
             enableFooterTotalSelected: true,
@@ -133,6 +130,12 @@ app.controller('alarmGridCtrl', ['$scope', '$log', '$http', '$timeout', '$interv
             $scope.condition2===""?"":$scope.condition2, $scope.condition3===""?"":$scope.condition3,
             $scope.condition4===""?"":$scope.condition4, $scope.condition5===""?"":$scope.condition5,
             $scope.alarmStatus, $scope.vfstatus);
+        $interval(function () {
+            getPage(1, $scope.gridOptions.paginationPageSize, $scope.condition1===""?"":$scope.condition1,
+                $scope.condition2===""?"":$scope.condition2, $scope.condition3===""?"":$scope.condition3,
+                $scope.condition4===""?"":$scope.condition4, $scope.condition5===""?"":$scope.condition5,
+                $scope.alarmStatus, $scope.vfstatus);
+        },10000)
 
         $scope.generateCsv = function () {
             if ($scope.selectedRows.length == 0){

diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/performance-detailsController.js b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/performance-detailsController.js
index f74928c..44bf8b2 100644 (file)
--- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/performance-detailsController.js
+++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/performance-detailsController.js
@@ -13,13 +13,16 @@
  See the License for the specific language governing permissions and
  limitations under the License.
  */
-app.controller('pertabCtrl', ['$scope', '$http', '$routeParams', function ($scope, $http, $routeParams) {
+app.controller('pertabCtrl', ['$scope', '$http', '$routeParams', '$window' ,
+    function ($scope, $http, $routeParams, $window) {
     $scope.tabes = [
         {title: 'one hour'},
         {title: 'one day'},
         {title: 'one month'},
         {title: 'one year'}
     ];
+    $scope.valuess = [];
+    $scope.csvData = [];
     $scope.barChart = function (unit) {
         $http.get(global_url + '/performance/diagram/' + unit + '/' + permanceId, {
             headers: {
@@ -28,16 +31,15 @@ app.controller('pertabCtrl', ['$scope', '$http', '$routeParams', function ($scop
             }
         })
             .success(function (data) {
+                var v = 0;
+                var i = 0;
                 if (unit === "hour") {
-                    $scope.valuess = [];
-                    for(var i=0;i<4;i++){
-                        $scope.valuess[i] = [
+                    for(var h=0;h<4;h++){
+                        $scope.valuess[h] = [
                             {"x": '15min', "y": 4}, {"x": '30min', "y": 4}, {"x": '45min', "y": 12},
                             {"x": '60min', "y": 3.27}
                         ];
                     };
-                    var v = 0;
-                    var i = 0;
                     angular.forEach(data, function (obj) {
                         for (var j = 0; j < obj.length; j++, i++) {
                             if (i >= 4) {
@@ -47,17 +49,15 @@ app.controller('pertabCtrl', ['$scope', '$http', '$routeParams', function ($scop
                             $scope.valuess[v][i].y = obj[j];
                         }
                     });
-                    console.info($scope.valuess);
-                    for (var i = 0; i < 5; i++) {
+                    for (var d = 0; d < 5; d++) {
                         window.setTimeout(function () {
                             redraw("", $scope.valuess);
                         }, 1500);
                     };
                 }
                 if (unit === "day") {
-                    $scope.valuess = [];
-                    for(var i=0;i<4;i++){
-                        $scope.valuess[i] = [
+                    for(var d=0;d<4;d++){
+                        $scope.valuess[d] = [
                             { "x":'1h' , "y":4}, { "x":'2h' , "y":4}, { "x":'3h' , "y":12},
                             { "x":'4h' , "y":3.27}, { "x":'5h' , "y":34}, { "x":'6h' , "y":34}, { "x":'7h' , "y":34},
                             { "x":'8h' , "y":34}, { "x":'9h' , "y":34}, { "x":'10h' , "y":34}, { "x":'11h' , "y":34},
@@ -67,8 +67,6 @@ app.controller('pertabCtrl', ['$scope', '$http', '$routeParams', function ($scop
                             { "x":'24h' , "y":36}
                         ];
                     };
-                    var v = 0;
-                    var i = 0;
                     angular.forEach(data, function (obj) {
                         for (var j = 0; j < obj.length; j++, i++) {
                             if (i >= 24) {
@@ -77,18 +75,16 @@ app.controller('pertabCtrl', ['$scope', '$http', '$routeParams', function ($scop
                             }
                             $scope.valuess[v][i].y = obj[j];
                         }
-                    });
-                    console.info($scope.valuess);
-                    for (var i = 0; i < 5; i++) {
+                    })
+                    for (var d = 0; d < 5; d++) {
                         window.setTimeout(function () {
                             redraw("1", $scope.valuess);
                         }, 1500);
                     };
                 }
                 if (unit === "month") {
-                    $scope.valuess = [];
-                    for(var i=0;i<4;i++){
-                        $scope.valuess[i] =  [
+                    for(var m=0;m<4;m++){
+                        $scope.valuess[m] =  [
                             { "x":'1d' , "y":4}, { "x":'2d' , "y":4}, { "x":'3d' , "y":12},
                             { "x":'4d' , "y":3.27}, { "x":'5d' , "y":34},{ "x":'6d' , "y":4}, { "x":'7d' , "y":4}, { "x":'8d' , "y":12},
                             { "x":'9d' , "y":3.27}, { "x":'10d' , "y":34}, { "x":'11d' , "y":34}, { "x":'12d' , "y":34},  { "x":'13d' , "y":4}, { "x":'14d' , "y":4}, { "x":'15' , "y":12},
@@ -97,8 +93,6 @@ app.controller('pertabCtrl', ['$scope', '$http', '$routeParams', function ($scop
                             { "x":'27d' , "y":3.27}, { "x":'28d' , "y":34}, { "x":'29d' , "y":34}, { "x":'30d' , "y":34}, { "x":'31d' , "y":34}
                         ];
                     };
-                    var v = 0;
-                    var i = 0;
                     angular.forEach(data, function (obj) {
                         for (var j = 0; j < obj.length; j++, i++) {
                             if (i >= 31) {
@@ -108,25 +102,21 @@ app.controller('pertabCtrl', ['$scope', '$http', '$routeParams', function ($scop
                             $scope.valuess[v][i].y = obj[j];
                         }
                     });
-                    console.info($scope.valuess);
-                    for (var i = 0; i < 5; i++) {
+                    for (var d = 0; d < 5; d++) {
                         window.setTimeout(function () {
                             redraw("2", $scope.valuess);
                         }, 1500);
                     };
                 }
                 if (unit === "year") {
-                    $scope.valuess = [];
-                    for(var i=0;i<12;i++){
-                        $scope.valuess[i] = [
+                    for(var y=0;y<12;y++){
+                        $scope.valuess[y] = [
                             {"x": 'Jan', "y": 4}, {"x": 'Feb', "y": 4}, {"x": 'Mar', "y": 12},
                             {"x": 'Apr', "y": 3.27},  {"x": 'May', "y": 4}, {"x": 'June', "y": 4}, {"x": 'July', "y": 12},
                             {"x": 'Aug', "y": 3.27},  {"x": 'Sept', "y": 4}, {"x": 'Oct', "y": 4}, {"x": 'Nov', "y": 12},
                             {"x": 'Jan', "y": 3.27}
                         ];
                     };
-                    var v = 0;
-                    var i = 0;
                     angular.forEach(data, function (obj) {
                         for (var j = 0; j < obj.length; j++, i++) {
                             if (i >= 12) {
@@ -136,8 +126,7 @@ app.controller('pertabCtrl', ['$scope', '$http', '$routeParams', function ($scop
                             $scope.valuess[v][i].y = obj[j];
                         }
                     });
-                    console.info($scope.valuess);
-                    for (var i = 0; i < 5; i++) {
+                    for (var d = 0; d < 5; d++) {
                         window.setTimeout(function () {
                             redraw("3", $scope.valuess);
                         }, 1500);
@@ -164,4 +153,45 @@ app.controller('pertabCtrl', ['$scope', '$http', '$routeParams', function ($scop
         changerotate(0);
         $scope.barChart('year');
     };
+    $scope.generateCsv = function (name) {
+        if (name == "cpu"){
+            for (var i = 0;i < $scope.valuess[2].length;i++){
+                $scope.csvData[i] = {};
+                $scope.csvData[i]["eventId"] = permanceId;
+                $scope.csvData[i]["name"] = name;
+                $scope.csvData[i]["dateUnit"] = $scope.valuess[2][i].x;
+                $scope.csvData[i]["value"] = $scope.valuess[2][i].y;
+            }
+        }
+        if (name == "disk"){
+            for (var i = 0;i < $scope.valuess[0].length;i++){
+                $scope.csvData[i] = {};
+                $scope.csvData[i]["eventId"] = permanceId;
+                $scope.csvData[i]["name"] = name;
+                $scope.csvData[i]["dateUnit"] = $scope.valuess[0][i].x;
+                $scope.csvData[i]["value"] = $scope.valuess[0][i].y;
+            }
+        }
+        if (name == "memory"){
+            for (var i = 0;i < $scope.valuess[1].length;i++){
+                $scope.csvData[i] = {};
+                $scope.csvData[i]["eventId"] = permanceId;
+                $scope.csvData[i]["name"] = name;
+                $scope.csvData[i]["dateUnit"] = $scope.valuess[1][i].x;
+                $scope.csvData[i]["value"] = $scope.valuess[1][i].y;
+            }
+        }
+        if (name == "network"){
+            for (var i = 0;i < $scope.valuess[3].length;i++){
+                $scope.csvData[i] = {};
+                $scope.csvData[i]["eventId"] = permanceId;
+                $scope.csvData[i]["name"] = name;
+                $scope.csvData[i]["dateUnit"] = $scope.valuess[3][i].x;
+                $scope.csvData[i]["value"] = $scope.valuess[3][i].y;
+            }
+        }
+        if($scope.csvData != null ){
+            $window.location = global_url+"/performance/genDiaCsv/"+JSON.stringify($scope.csvData);
+        }
+    }
 }]);

diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/performanceController.js b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/performanceController.js
index 3ff0658..be2fd37 100644 (file)
--- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/performanceController.js
+++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/performanceController.js
@@ -15,8 +15,8 @@
  */
 //
 var permanceId="";
-app.controller('perGridCtrl', ['$scope', '$http', '$timeout', '$interval', '$window', 'uiGridConstants', 'uiGridGroupingConstants',
-    function ($scope, $http, $timeout, $interval,$window) {
+app.controller('perGridCtrl', ['$scope','$http', '$window', '$interval', 'uiGridConstants', 'uiGridGroupingConstants', '$window' ,
+    function ($scope, $http , $window, $interval ) {
         $scope.jump = function(value){
             console.info(value);
             permanceId=value;
@@ -155,7 +155,6 @@ app.controller('perGridCtrl', ['$scope', '$http', '$timeout', '$interval', '$win
             url += arguments[4] === "" ? "/null" : "/" + arguments[4];
             url += arguments[5] === "" ? "/null" : "/" + arguments[5];
             url += arguments[6] === "" ? "/null" : "/" + arguments[6];
-            console.info(url);
             $http.get(url, {
                 headers: {
                     'Access-Control-Allow-Origin': "*",
@@ -165,19 +164,22 @@ app.controller('perGridCtrl', ['$scope', '$http', '$timeout', '$interval', '$win
             })
                 .success(function (data) {
                     $scope.gridOptions.totalItems = data.totalRecords;
-                    //console.info($scope.gridOptions.totalItems);
                     $scope.gridOptions.data = data.performances;
                 });
         };
         getPage(1, $scope.gridOptions.paginationPageSize, $scope.seek1===""?"null":$scope.seek1,
             $scope.seek2===""?"null":$scope.seek2, $scope.seek3===""?"null":$scope.seek3,
             $scope.seek4===""?"null":$scope.seek4, $scope.seek5===""?"null":$scope.seek5);
-
+        $interval(function () {
+            getPage(1, $scope.gridOptions.paginationPageSize, $scope.seek1===""?"null":$scope.seek1,
+                $scope.seek2===""?"null":$scope.seek2, $scope.seek3===""?"null":$scope.seek3,
+                $scope.seek4===""?"null":$scope.seek4, $scope.seek5===""?"null":$scope.seek5);
+        },10000)
         $scope.generateCsv = function () {
             if ($scope.selectedRows.length == 0){
                 alert("please select row!");
             }else{
-                $window.location =global_url+"/performance/genCsv/"+$scope.selectedRows;
+                $window.location = global_url+"/performance/genCsv/"+$scope.selectedRows;
             }
         };
         //input

diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance-details.html b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance-details.html
index 70112e0..054b5f5 100644 (file)
--- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance-details.html
+++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance-details.html
@@ -54,7 +54,7 @@
                                         <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
                                                 <div class="panel-heading">CPU
-                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button>
+                                                    <button ng-click="generateCsv('cpu');" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button>
                                                 </div>
                                                 <div align="center"><H3></H3></div><div id="CPUchart"> <svg></svg> </div>
                                             </div>
@@ -62,7 +62,7 @@
                                         <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
                                                 <div class="panel-heading">Memory
-                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
+                                                    <button ng-click="generateCsv('memory');" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="Memorychart"> <svg></svg> </div>
                                             </div>
                                         </div>
@@ -71,14 +71,14 @@
                                         <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
                                                 <div class="panel-heading">Disk
-                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
+                                                    <button ng-click="generateCsv('disk');" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="Diskchart"> <svg></svg> </div>
                                             </div>
                                         </div>
                                         <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
                                                 <div class="panel-heading">Network
-                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
+                                                    <button ng-click="generateCsv('network');" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="Networkchart"> <svg></svg> </div>
                                             </div>
                                         </div>
@@ -91,14 +91,14 @@
                                         <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
                                                 <div class="panel-heading">CPU
-                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
+                                                    <button ng-click="generateCsv('cpu');" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="CPUchart1"> <svg></svg> </div>
                                             </div>
                                         </div>
                                         <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
                                                 <div class="panel-heading">Memory
-                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
+                                                    <button ng-click="generateCsv('memory');" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="Memorychart1"> <svg></svg> </div>
                                             </div>
                                         </div>
@@ -107,14 +107,14 @@
                                         <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
                                                 <div class="panel-heading">Disk
-                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
+                                                    <button ng-click="generateCsv('disk');" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="Diskchart1"> <svg></svg> </div>
                                             </div>
                                         </div>
                                         <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
                                                 <div class="panel-heading">Network
-                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
+                                                    <button ng-click="generateCsv('network');" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="Networkchart1"> <svg></svg> </div>
                                             </div>
                                         </div>
@@ -127,14 +127,14 @@
                                         <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
                                                 <div class="panel-heading">CPU
-                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
+                                                    <button ng-click="generateCsv('cpu');" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="CPUchart2"> <svg></svg> </div>
                                             </div>
                                         </div>
                                         <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
                                                 <div class="panel-heading">Memory
-                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
+                                                    <button ng-click="generateCsv('memory');" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="Memorychart2"> <svg></svg> </div>
                                             </div>
                                         </div>
@@ -143,14 +143,14 @@
                                         <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
                                                 <div class="panel-heading">Disk
-                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
+                                                    <button ng-click="generateCsv('disk');" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="Diskchart2"> <svg></svg> </div>
                                             </div>
                                         </div>
                                         <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
                                                 <div class="panel-heading">Network
-                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
+                                                    <button ng-click="generateCsv('network');" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="Networkchart2"> <svg></svg> </div>
                                             </div>
                                         </div>
@@ -163,14 +163,14 @@
                                         <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
                                                 <div class="panel-heading">CPU
-                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
+                                                    <button ng-click="generateCsv('cpu');" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="CPUchart3"> <svg></svg> </div>
                                             </div>
                                         </div>
                                         <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
                                                 <div class="panel-heading">Memory
-                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
+                                                    <button ng-click="generateCsv('memory');" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="Memorychart3"> <svg></svg> </div>
                                             </div>
                                         </div>
@@ -179,14 +179,14 @@
                                         <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
                                                 <div class="panel-heading">Disk
-                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
+                                                    <button ng-click="generateCsv('disk');" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="Diskchart3"> <svg></svg> </div>
                                             </div>
                                         </div>
                                         <div class="col-md-6 col-sm-12">
                                             <div class="panel panel-success">
                                                 <div class="panel-heading">Network
-                                                    <button ng-click="" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
+                                                    <button ng-click="generateCsv('network');" class="btn btn-primary" style="float: right;margin-top:-7px; ">CSV</button></div>
                                                 <div align="center"><H3></H3></div><div id="Networkchart3"> <svg></svg> </div>
                                             </div>
                                         </div>