Skip to content

Commit 92fde40

Browse files
wpoely86wpoely86
authored
Merge pull request #16 from smoors/reframe_update
update reframe pattern
2 parents 3edbb47 + 0a3b524 commit 92fde40

File tree

3 files changed

+43
-49
lines changed

3 files changed

+43
-49
lines changed

‎files/reframe

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
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}
2-
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}
1+
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_cpus_per_task=%{INT:num_cpus_per_task:int}\|num_tasks_per_node=%{INT:num_tasks_per_node:int}\|(?:modules=%{DATA:modules}\|)jobid=%{DATA:jobid}
2+
REFRAME_PERF perf_var=%{DATA:perf_var}\|perf_value=%{NUMBER:perf_value:float}\|unit=%{GREEDYDATA:unit}
33
REFRAME_MSG %{REFRAME_GENERAL}\|%{REFRAME_PERF}

‎setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import glob
3333

3434
setup(name="logstash-patterns",
35-
version="1.2.8",
35+
version="1.2.9",
3636
description="Grok patterns for logstash",
3737
long_description="""Grok patterns for parsing log messages with logstash.
3838
@@ -45,4 +45,4 @@
4545
data_files=[("/usr/share/grok", glob.glob("files/*")),
4646
("/usr/share/logstash/filters", glob.glob("logstash/filters/*")),
4747
],
48-
url="http://www.ugent.be/hpc")
48+
url="https://www.ugent.be/hpc")

‎tests/data/reframe

Lines changed: 39 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,69 @@
11
data = [
22
{
3-
"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",
3+
"raw": "2021-12-23T15:20:18.050421+01:00 login1 reframe: username=vsc10009|version=3.9.1|commit=|name=OSUBandwidthTest|system=hydra|partition=skylake-mn-mpi-ib|environ=foss-2021a|num_tasks=2|num_cpus_per_task=1|num_tasks_per_node=1|modules=|jobid=6090034|perf_var=bandwidth|perf_value=3667.21|unit=MB/s",
44
"expected": {
5-
"environ": "foss-2020a",
6-
"jobid": "3721799.master01.hydra.brussel.vsc",
7-
"lower": -0.1,
5+
"environ": "foss-2021a",
6+
"jobid": "6090034",
87
"name": "OSUBandwidthTest",
98
"num_tasks": 2,
9+
"num_cpus_per_task": 1,
1010
"num_tasks_per_node": 1,
11-
"partition": "skylake-mpi",
12-
"perf_value": 9485.01,
11+
"partition": "skylake-mn-mpi-ib",
12+
"perf_value": 3667.21,
1313
"perf_var": "bandwidth",
1414
"program": "reframe",
15-
"ref": 11500.0,
16-
"@source_host": "node113",
15+
"@source_host": "login1",
1716
"system": "hydra",
18-
"tags": "prod_small",
19-
"@timestamp": "2021-01-18T03:59:09.645Z",
17+
"@timestamp": "2021-12-23T14:20:18.050Z",
2018
"unit": "MB/s",
21-
"upper": 1.5,
2219
"username": "vsc10009",
23-
"version": "3.3",
24-
"commit": "0895565",
20+
"version": "3.9.1",
2521
},
2622
},
2723
{
28-
"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",
24+
"raw": "<12>1 2021-12-16T18:37:30.108580+01:00 login1 reframe: username=vsc10009|version=3.9.1|commit=0895565|name=GMXBenchMEMMC|system=hydra|partition=skylake-sn|environ=builtin|num_tasks=1|num_cpus_per_task=4|num_tasks_per_node=1|modules=GROMACS/2021.3-foss-2021a|jobid=6072020|perf_var=perf|perf_value=9.076|unit=ns/day",
2925
"expected": {
3026
"environ": "builtin",
31-
"jobid": "3676119.master01.hydra.brussel.vsc",
32-
"lower": -0.1,
33-
"name": "GROMACSBenchMEMSMP",
34-
"num_tasks": 4,
35-
"num_tasks_per_node": 4,
36-
"partition": "skylake",
37-
"perf_value": 8.613,
27+
"jobid": "6072020",
28+
"name": "GMXBenchMEMMC",
29+
"num_tasks": 1,
30+
"num_cpus_per_task": 4,
31+
"num_tasks_per_node": 1,
32+
"partition": "skylake-sn",
33+
"perf_value": 9.076,
3834
"perf_var": "perf",
3935
"program": "reframe",
40-
"ref": 8.6,
41-
"@source_host": "node309",
36+
"@source_host": "login1",
4237
"system": "hydra",
43-
"tags": "GROMACS/2020.1-foss-2020a-Python-3.8.2",
44-
"@timestamp": "2021-01-18T02:47:12.730Z",
38+
"modules": "GROMACS/2021.3-foss-2021a",
39+
"@timestamp": "2021-12-16T17:37:30.108Z",
4540
"unit": "ns/day",
46-
"upper": 3.0,
47-
"username": "vsc10001",
48-
"version": "3.0",
41+
"username": "vsc10009",
42+
"version": "3.9.1",
4943
"commit": "0895565",
5044
},
5145
},
52-
#without optional fields num_tasks_per_node and commit:
46+
#without optional field "commit":
5347
{
54-
"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",
48+
"raw": "<12>1 2021-12-16T18:37:30.108580+01:00 login1 reframe: username=vsc10009|version=3.9.1|name=GMXBenchMEMMC|system=hydra|partition=skylake-sn|environ=builtin|num_tasks=1|num_cpus_per_task=4|num_tasks_per_node=1|modules=GROMACS/2021.3-foss-2021a|jobid=6072020|perf_var=perf|perf_value=9.076|unit=ns/day",
5549
"expected": {
56-
"environ": "foss-2020a",
57-
"jobid": "3676117.master01.hydra.brussel.vsc",
58-
"lower": -1.0,
59-
"name": "OSULatencyTest",
60-
"num_tasks": 2,
61-
"partition": "skylake-mpi",
62-
"perf_value": 10.39,
63-
"perf_var": "latency",
50+
"environ": "builtin",
51+
"jobid": "6072020",
52+
"name": "GMXBenchMEMMC",
53+
"num_tasks": 1,
54+
"num_cpus_per_task": 4,
55+
"num_tasks_per_node": 1,
56+
"partition": "skylake-sn",
57+
"perf_value": 9.076,
58+
"perf_var": "perf",
6459
"program": "reframe",
65-
"ref": 11.0,
66-
"@source_host": "node381",
60+
"@source_host": "login1",
6761
"system": "hydra",
68-
"tags": "prod_small",
69-
"unit": "us",
70-
"upper": 0.1,
71-
"username": "vsc10001",
72-
"version": "3.0",
62+
"modules": "GROMACS/2021.3-foss-2021a",
63+
"@timestamp": "2021-12-16T17:37:30.108Z",
64+
"unit": "ns/day",
65+
"username": "vsc10009",
66+
"version": "3.9.1",
7367
},
7468
},
7569
]

0 commit comments

Comments
 (0)