Merge pull request #57 from pkarkazis/master

invert memory usage
sonata-nfv · Jul 31, 2019 · 35c86fd · 35c86fd
2 parents 52075a2 + f9650ac
commit 35c86fd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/sp_mon/VmData.py b/sp_mon/VmData.py
@@ -73,7 +73,7 @@ def prom_parser(self):
         for cp in data_['cpu']:
             vm_cpu_perc += "vm_cpu_perc{resource_id=\""+self.id+"\", core=\""+str(cp['core'])+"\"}" +str(cp['usage']) + timestamp + '\n'
 
-        vm_mem_perc += "vm_mem_perc{resource_id=\""+self.id+"\"}" +str(round(float((data_['ram']['freeRam'])/float(data_['ram']['totalRAM'])*100),2)) + timestamp + '\n'
+        vm_mem_perc += "vm_mem_perc{resource_id=\""+self.id+"\"}" +str(round(100.0 - (float((data_['ram']['freeRam'])/float(data_['ram']['totalRAM'])*100)),2))+ timestamp + '\n'
         vm_mem_free_MB += "vm_mem_free_MB{resource_id=\""+self.id+"\"}" +str(data_['ram']['freeRam']) + timestamp + '\n'
         vm_mem_total_MB += "vm_mem_total_MB{resource_id=\""+self.id+"\"}" +str(data_['ram']['totalRAM']) + timestamp + '\n'
 
@@ -109,7 +109,7 @@ def prom_parser(self):
 
     def getRAM(self):
         meminfo = dict((i.split()[0].rstrip(':'),int(i.split()[1])) for i in open('/proc/meminfo').readlines())
-        return {"freeRam":meminfo["MemFree"], "totalRAM":meminfo["MemTotal"]} 
+        return {"freeRam":meminfo["MemAvailable"], "totalRAM":meminfo["MemTotal"]}  
 
 
     def getCPU(self):