From 46d26ee095c7beea0d3ace0e2b3b9b6c93481ac5 Mon Sep 17 00:00:00 2001 From: "Steve L. Nyemba" Date: Fri, 10 Mar 2017 00:44:49 -0600 Subject: [PATCH] Bug fix with display & format function --- src/monitor.py | 5 ++++- src/utils/agents/data-collector.py | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/monitor.py b/src/monitor.py index ad85026..a2276e9 100755 --- a/src/monitor.py +++ b/src/monitor.py @@ -30,6 +30,9 @@ class Analysis: return {"month":d.month,"year":d.year, "day":d.day,"hour":d.hour,"minute":d.minute} def getName(self): return self.__class__.__name__ + def format(self,text): + return re.sub('([0-9]+[a-zA-Z]*)|[^a-zA-Z\s:]',' ',text).strip() + """ This class is designed to analyze environment variables. Environment variables can either be folders, files or simple values @@ -214,7 +217,7 @@ class DetailProcess(Analysis): else: return "crash" def format(self,row): - r= {"memory_usage":row[0],"cpu_usage":row[1],"memory_available":row[2]/1000,"proc_count":row[3],"label":row[4]} + r= {"memory_usage":row[0],"cpu_usage":row[1],"memory_available":row[2]/1000,"proc_count":row[3],"label":self.format(row[4])} status = self.status(r) r['status'] = status return r diff --git a/src/utils/agents/data-collector.py b/src/utils/agents/data-collector.py index 7c2706c..927ef33 100644 --- a/src/utils/agents/data-collector.py +++ b/src/utils/agents/data-collector.py @@ -27,8 +27,6 @@ class ICollector(Thread) : self.factory = DataSourceFactory() self.init() self.name = 'data-collector@'+self.id - def format(self,text): - return re.sub('([0-9]+[a-zA-Z]*)|[^a-zA-Z\s:]',' ',text).strip() def init(self): @@ -90,7 +88,7 @@ class ICollector(Thread) : self.lock.acquire() store = self.factory.instance(type=write_class,args=read_args) store.flush(size=200) - label = self.format(label) + store.write(label=label,row=row) self.lock.release() if 'MONITOR_CONFIG_PATH' in os.environ :