Merge pull request #14 from smoors/reframe_commit

add 2 fields to reframe pattern

Author: wpoely86

files/reframe

@@ -1,3 +1,3 @@
-REFRAME_GENERAL username=%{USERNAME_PAT}\|version=%{DATA:version}\|name=%{DATA:name}\|system=%{DATA:system}\|partition=%{DATA:partition}\|environ=%{DATA:environ}\|num_tasks=%{INT:num_tasks:int}\|tags=%{DATA:tags}\|jobid=%{DATA:jobid}
+REFRAME_GENERAL username=%{USERNAME_PAT}\|version=%{DATA:version}\|(?:commit=%{DATA:commit}\|)?name=%{DATA:name}\|system=%{DATA:system}\|partition=%{DATA:partition}\|environ=%{DATA:environ}\|num_tasks=%{INT:num_tasks:int}\|(?:num_tasks_per_node=%{INT:num_tasks_per_node:int}\|)?tags=%{DATA:tags}\|jobid=%{DATA:jobid}
 REFRAME_PERF perf_var=%{DATA:perf_var}\|perf_value=%{NUMBER:perf_value:float}\|ref=%{NUMBER:ref:float}\|lower=%{NUMBER:lower:float}\|upper=%{NUMBER:upper:float}\|unit=%{GREEDYDATA:unit}
 REFRAME_MSG %{REFRAME_GENERAL}\|%{REFRAME_PERF}

setup.py

@@ -32,7 +32,7 @@
 import glob
 
 setup(name="logstash-patterns",
-      version="1.2.7",
+      version="1.2.8",
       description="Grok patterns for logstash",
       long_description="""Grok patterns for parsing log messages with logstash.
 

tests/data/reframe

@@ -1,35 +1,38 @@
 data = [
     {
-        "raw": "<12>1 2021-01-18T04:59:09.645983+01:00 node113 reframe: - reframe:  username=vsc10001|version=3.0|name=OSUBandwidthTest|system=hydra|partition=ivybridge-mpi|environ=intel-2020a|num_tasks=2|tags=prod_small|jobid=3676118.master01.hydra.brussel.vsc|perf_var=bandwidth|perf_value=3381.82|ref=3000|lower=-0.1|upper=1.5|unit=MB/s",
+        "raw": "<12>1 2021-01-18T04:59:09.645983+01:00 node113 reframe: - reframe:  username=vsc10009|version=3.3|commit=0895565|name=OSUBandwidthTest|system=hydra|partition=skylake-mpi|environ=foss-2020a|num_tasks=2|num_tasks_per_node=1|tags=prod_small|jobid=3721799.master01.hydra.brussel.vsc|perf_var=bandwidth|perf_value=9485.01|ref=11500|lower=-0.1|upper=1.5|unit=MB/s",
         "expected": {
-            "environ": "intel-2020a",
-            "jobid": "3676118.master01.hydra.brussel.vsc",
+            "environ": "foss-2020a",
+            "jobid": "3721799.master01.hydra.brussel.vsc",
             "lower": -0.1,
             "name": "OSUBandwidthTest",
             "num_tasks": 2,
-            "partition": "ivybridge-mpi",
-            "perf_value": 3381.82,
+            "num_tasks_per_node": 1,
+            "partition": "skylake-mpi",
+            "perf_value": 9485.01,
             "perf_var": "bandwidth",
             "program": "reframe",
-            "ref": 3000.0,
+            "ref": 11500.0,
             "@source_host": "node113",
             "system": "hydra",
             "tags": "prod_small",
             "@timestamp": "2021-01-18T03:59:09.645Z",
             "unit": "MB/s",
             "upper": 1.5,
-            "username": "vsc10001",
-            "version": "3.0",
+            "username": "vsc10009",
+            "version": "3.3",
+            "commit": "0895565",
         },
     },
     {
-        "raw": "<12>1 2021-01-18T03:47:12.730504+01:00 node309 reframe: - reframe:  username=vsc10001|version=3.0|name=GROMACSBenchMEMSMP|system=hydra|partition=skylake|environ=builtin|num_tasks=4|tags=GROMACS/2020.1-foss-2020a-Python-3.8.2|jobid=3676119.master01.hydra.brussel.vsc|perf_var=perf|perf_value=8.613|ref=8.6|lower=-0.1|upper=3.0|unit=ns/day",
+        "raw": "<12>1 2021-01-18T03:47:12.730504+01:00 node309 reframe: - reframe:  username=vsc10001|version=3.0|commit=0895565|name=GROMACSBenchMEMSMP|system=hydra|partition=skylake|environ=builtin|num_tasks=4|num_tasks_per_node=4|tags=GROMACS/2020.1-foss-2020a-Python-3.8.2|jobid=3676119.master01.hydra.brussel.vsc|perf_var=perf|perf_value=8.613|ref=8.6|lower=-0.1|upper=3.0|unit=ns/day",
         "expected": {
             "environ": "builtin",
             "jobid": "3676119.master01.hydra.brussel.vsc",
             "lower": -0.1,
             "name": "GROMACSBenchMEMSMP",
             "num_tasks": 4,
+            "num_tasks_per_node": 4,
             "partition": "skylake",
             "perf_value": 8.613,
             "perf_var": "perf",
@@ -43,8 +46,10 @@ data = [
             "upper": 3.0,
             "username": "vsc10001",
             "version": "3.0",
+            "commit": "0895565",
         },
     },
+    #without optional fields num_tasks_per_node and commit:
     {
         "raw": "<12>1 2021-01-18T03:01:50.858776+01:00 node381 reframe: - reframe:  username=vsc10001|version=3.0|name=OSULatencyTest|system=hydra|partition=skylake-mpi|environ=foss-2020a|num_tasks=2|tags=prod_small|jobid=3676117.master01.hydra.brussel.vsc|perf_var=latency|perf_value=10.39|ref=11.0|lower=-1|upper=0.1|unit=us",
         "expected": {