make new fields optional; bump version

Author: smoors

files/reframe

@@ -1,3 +1,3 @@
-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_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.5",
+      version="1.2.6",
       description="Grok patterns for logstash",
       long_description="""Grok patterns for parsing log messages with logstash.
 

tests/data/reframe

@@ -49,4 +49,27 @@ data = [
             "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": {
+            "environ": "foss-2020a",
+            "jobid": "3676117.master01.hydra.brussel.vsc",
+            "lower": -1.0,
+            "name": "OSULatencyTest",
+            "num_tasks": 2,
+            "partition": "skylake-mpi",
+            "perf_value": 10.39,
+            "perf_var": "latency",
+            "program": "reframe",
+            "ref": 11.0,
+            "@source_host": "node381",
+            "system": "hydra",
+            "tags": "prod_small",
+            "unit": "us",
+            "upper": 0.1,
+            "username": "vsc10001",
+            "version": "3.0",
+        },
+    },
 ]