Merge pull request #93 from mzacharioudakis/v3.1

minor change in disk chart
sonata-nfv · Feb 16, 2018 · 7a7d380 · 7a7d380
2 parents ff00615 + e1f85d3
commit 7a7d380
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 45 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app/js/controllers/VmMonitoringController.js b/app/js/controllers/VmMonitoringController.js
@@ -448,7 +448,13 @@ $scope.historyCPU = function(){
 
           $scope.prdata = [];
 
-          data.data[0].values.forEach(function(element, index) {
+            position = 0;
+            data.data.forEach(function(el,ind){
+                if(el.metric.core=='cpu')
+                    position=ind;
+            })
+
+          data.data[position].values.forEach(function(element, index) {
 
             var timestamp = $rootScope.FixTimestamp(element[0]);
             $scope.prdata.push([timestamp,parseFloat(element[1])]);
@@ -863,7 +869,7 @@ $scope.historyHardDisk = function(){
                               },
 
                               series:[{
-                                  type: 'area', color: '#454e5d',
+                                  type: 'line', color: '#454e5d',
                                   name: 'Disk',
                                   data: $scope.kam_disk
                               }]

diff --git a/app/js/controllers/VnfMonitoring.js b/app/js/controllers/VnfMonitoring.js
@@ -538,6 +538,8 @@ $scope.historyRAM = function(){
 
         var m = Monitoring.getData(encodeURI(url));
         m.then(function(datas){
+            console.log("HISTORY RAM");
+            console.log(datas);
 
           $scope.ramdata = [];
           $scope.vnf.currentMemoryUsage = 100-datas.data[0].values[datas.data[0].values.length-1][1];
@@ -600,11 +602,7 @@ $scope.historyRAM = function(){
                                                       $scope.vnf.currentMemoryUsage = 100-y;
                                                       $scope.drawGaugesRAM();
 
-                                                  })                                  
-
-
-
-
+                                                  })
 
                                           }, 5000));
 
@@ -696,10 +694,16 @@ $scope.historyCPU = function(){
 
           var m = Monitoring.getData(encodeURI(url));
           m.then(function(data){
-
+              console.log("HISTORY CPU");
+              console.log(data);
+              position = 0;
+              data.data.forEach(function(el,ind){
+                  if(el.metric.core=='cpu')
+                      position=ind;
+              })
             $scope.prdata = [];               
-            $scope.vnf.currentCPUUsage = data.data[0].values[data.data[0].values.length-1][1];                    
-            data.data[0].values.forEach(function(element, index) {
+            $scope.vnf.currentCPUUsage = data.data[position].values[data.data[position].values.length-1][1];
+            data.data[position].values.forEach(function(element, index) {
 
                   var timestamp = $rootScope.FixTimestamp(element[0]);
                   $scope.prdata.push([timestamp,parseFloat(element[1])]);