AIX issue - fifo_reader regex match some monitors into header #29

guilhemmarchand · Jun 4, 2017 · 4d91432 · 4d91432
1 parent e9180ad
commit 4d91432
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/TA-nmon/bin/fifo_reader.pl b/TA-nmon/bin/fifo_reader.pl
@@ -186,7 +186,7 @@
             chomp($_);
 
             $nmon_config_match     = '^[AAA|BBB].+';
-            $nmon_header_match     = '^(?!AAA|BBB|TOP)[a-zA-Z0-9\-\_]*,(?!T\d{3,})[^,]*,(?!T\d{3,})[^,]*,.*';
+            $nmon_header_match     = '^(?!AAA|BBB|TOP)[a-zA-Z0-9\-\_]*,(?!T\d{3,})[^,]*,(?!T\d{3,})[^,]*.*';
             $nmon_header_TOP_match = '^TOP,(?!\d*,)';
             $nmon_timestamp_match  = '^ZZZZ,T\d*';
 

diff --git a/TA-nmon/bin/fifo_reader.py b/TA-nmon/bin/fifo_reader.py
@@ -146,7 +146,7 @@
 
         # Manage nmon config
         nmon_config_match = re.match(r'^[AAA|BBB].+', line)
-        nmon_header_match = re.match(r'^(?!AAA|BBB|TOP)[a-zA-Z0-9\-\_]*,(?!T\d{3,})[^,]*,(?!T\d{3,})[^,]*,.*', line)
+        nmon_header_match = re.match(r'^(?!AAA|BBB|TOP)[a-zA-Z0-9\-\_]*,(?!T\d{3,})[^,]*,(?!T\d{3,})[^,]*.*', line)
         nmon_header_TOP_match = re.match(r'^TOP,(?!\d*,)', line)
         nmon_timestamp_match = re.match(r'^ZZZZ,T\d*', line)
 

diff --git a/TA-nmon_1320.tgz b/TA-nmon_1320.tgz