Merge pull request #38 from pkarkazis/master

Bug fix
sonata-nfv · Aug 28, 2017 · 368bc56 · 368bc56
2 parents 3153f6c + d60118f
commit 368bc56
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/sp_mon/ContData.py b/sp_mon/ContData.py
@@ -34,6 +34,7 @@
 class cntdt:
 
     data = []
+    dt2sent = False
 
     def __init__(self):
         self.data = Statistics().getMonInfo()
@@ -59,6 +60,9 @@ def prom_parser(self):
         cnt_status = "# TYPE cnt_status gauge" + '\n'
 
         for cnt in self.data:
+            if len(cnt['stats']) == 0:
+                continue
+            self.dt2sent = True
             cnt_created += "cnt_created{id=\""+cnt['id']+"\",image_name=\""+cnt['image_name']+"\",image=\""+cnt['image']+"\",name=\""+cnt['name'][0]+"\"}" +str(cnt['created']) + timestamp + '\n'
             cnt_status += "cnt_status{id=\""+cnt['id']+"\",image_name=\""+cnt['image_name']+"\",image=\""+cnt['image']+"\",name=\""+cnt['name'][0]+"\"}" +str(self.checkNone(cnt['status'])) + timestamp + '\n'
             cnt_cpu_perc += "cnt_cpu_perc{id=\""+cnt['id']+"\",image_name=\""+cnt['image_name']+"\",image=\""+cnt['image']+"\",name=\""+cnt['name'][0]+"\"}"+str(self.checkNone(cnt['stats']['cpu_perc'])) + timestamp + '\n'
@@ -71,4 +75,7 @@ def prom_parser(self):
             cnt_block_ou_MB += "cnt_block_ou_MB{id=\""+cnt['id']+"\",image_name=\""+cnt['image_name']+"\",image=\""+cnt['image']+"\",name=\""+cnt['name'][0]+"\"}" +str(self.checkNone(cnt['stats']['block_ou_MB'])) + timestamp + '\n'
 
         data = cnt_created + cnt_cpu_perc +cnt_mem_perc + cnt_mem_usage_MB + cnt_mem_limit_MB + cnt_net_rx_MB + cnt_net_tx_MB + cnt_block_in_MB + cnt_block_ou_MB + cnt_status
-        return data
+        if self.dt2sent:
+            return data
+        else:
+            None
diff --git a/sp_mon/Statistics.py b/sp_mon/Statistics.py
@@ -79,7 +79,10 @@ def collectStats(self):
             con['net_tx_MB'] = self.convert2MB(words[11],words[12])
             con['block_in_MB'] = self.convert2MB(words[13],words[14])
             con['block_ou_MB'] = self.convert2MB(words[16],words[17])
-            self.containers.append(con)
+            if (con['mem_usage_MB'] == 0) and (con['mem_limit_MB'] == 0):
+                continue
+            else:
+                self.containers.append(con)
 
     def collectData(self):
         cli = Client(base_url='unix://var/run/docker.sock')