Skip to content

Commit 70db06f

Browse files
committed
Consolidate timestamps into fewer regex supporting many more combinations/options.
1 parent 716e871 commit 70db06f

File tree

1 file changed

+13
-42
lines changed

1 file changed

+13
-42
lines changed

components/core/config/schemas.txt

Lines changed: 13 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,49 +2,26 @@
22
// Timestamps
33
// ===
44

5-
// E.g. 2015-01-31T15:50:45.392
6-
// E.g. 2015-01-31T15:50:45,392
7-
// E.g. 2015-01-31 15:50:45.392
8-
// E.g. 2015-01-31 15:50:45,392
9-
// E.g. 2015/01/31T15:50:45.123
10-
// E.g. 2015/01/31T15:50:45,123
11-
// E.g. 2015/01/31 15:50:45.123
12-
// E.g. 2015/01/31 15:50:45,123
13-
timestamp:\d{4}[\-/]\d{2}[\-/]\d{2}[T ]\d{2}:\d{2}:\d{2}[,\.]\d{3}
14-
15-
// E.g. 2015-01-31T15:50:45
16-
// E.g. 2015-01-31T15:50:45
17-
// E.g. 2015-01-31 15:50:45
18-
// E.g. 2015-01-31 15:50:45
19-
// E.g. 2015/01/31T15:50:45
20-
// E.g. 2015/01/31T15:50:45
21-
// E.g. 2015/01/31 15:50:45
22-
// E.g. 2015/01/31 15:50:45
23-
timestamp:\d{4}[\-/]\d{2}[\-/]\d{2}[T ]\d{2}:\d{2}:\d{2}
24-
25-
// E.g. [2015-01-31T15:50:45
26-
timestamp:\[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}
27-
28-
// E.g. [20170106-16:56:41]
29-
timestamp:\[\d{4}\d{2}\d{2}\-\d{2}:\d{2}:\d{2}\]
30-
31-
// E.g. [2015-01-31 15:50:45,085]
32-
timestamp:\[\d{4}\-\d{2}\-\d{2} \d{2}:\d{2}:\d{2},\d{3}\]
33-
34-
// E.g. 2015-01-31 15:50:45
5+
// E.g. 2015-01-31T15:50:45,123
6+
// supported options:
7+
// - date punctuation: "2015-01-31" "2015/01/31" "20150131"
8+
// - date-time separator: "31 15" "31-15" "31T15"
9+
// - enclosing symbols:
10+
// - prefixes: "2015" "<<<2015" "[2015"
11+
// - suffixes: ":45,123" ":45,123]"
12+
// - hour leading digit: "T05:50" "T 5:50"
13+
// - precision from tenths to microseconds: ":45,123" ":45,123456"
14+
// - separator: ":45,123" ":45.123" ":45:123"
15+
// - year notation: "2015-01" "15-01"
16+
timestamp:(\<{3}|\[){0,1}(\d{2}|\d{4})[\-/]{0,1}\d{2}[\-/]{0,1}\d{2}[ -T][ \d]\d:\d{2}:\d{2}([,\.:]\d{1,6}){0,1}(\]){0,1}
17+
3518
// E.g. Started POST /api/v3/internal/allowed for 127.0.0.1 at 2017-06-18 00:20:44
3619
// E.g. update-alternatives 2015-01-31 15:50:45
3720
timestamp:\d{4}\-\d{2}\-\d{2} \d{2}:\d{2}:\d{2}
3821

3922
// E.g. Start-Date: 2015-01-31 15:50:45
4023
timestamp:\d{4}\-\d{2}\-\d{2} \d{2}:\d{2}:\d{2}
4124

42-
// E.g. 15/01/31 15:50:45
43-
timestamp:\d{2}/\d{2}/\d{2} \d{2}:\d{2}:\d{2}
44-
45-
// E.g. 150131 9:50:45
46-
timestamp:\d{2}\d{2}\d{2} [ \d]\d:\d{2}:\d{2}
47-
4825
// E.g. 01 Jan 2016 15:50:17,085
4926
timestamp:[ \d]\d [A-Z][a-z]{2} \d{4} \d{2}:\d{2}:\d{2},\d{3}
5027

@@ -65,18 +42,12 @@ timestamp:\[\d{2}/\d{2}/\d{4}:\d{2}:\d{2}:\d{2}
6542
// E.g. ERROR: apport (pid 4557) Sun Jan 1 15:50:45 2015
6643
timestamp:[A-Z][a-z]{2} [A-Z][a-z]{2} [ \d]\d \d{2}:\d{2}:\d{2} \d{4}
6744

68-
// E.g. <<<2016-11-10 03:02:29:936
69-
timestamp:\<\<\<\d{4}\-\d{2}\-\d{2} \d{2}:\d{2}:\d{2}:\d{3}
70-
7145
// E.g. Jan 21 11:56:42
7246
timestamp:[A-Z][a-z]{2} [ \d]\d \d{2}:\d{2}:\d{2}
7347

7448
// E.g. 01-21 11:56:42.392
7549
timestamp:\d{2}\-\d{2} \d{2}:\d{2}:\d{2}\.\d{3}
7650

77-
// E.g. 2016-05-08 11:34:04.083464
78-
timestamp:\d{4}\-\d{2}\-\d{2} \d{2}:\d{2}:\d{2}\.\d{6}
79-
8051
// ===
8152
// Delimiters
8253
// ===

0 commit comments

Comments
 (0)