Skip to content

Commit 311e763

Browse files
authored
[Filebeat] Enabled convert_timezone in tests by default in tests (elastic#12123)
In elastic#12120 a default timezone (UTC) is introduced for the tests. This allows us to enabled `convert_timezone` in all tests. It guarantees that we also test the data conversion part in the pipelines. No timestamps changed because they were already assumed in UTC when no timezone is set.
1 parent 73207e1 commit 311e763

46 files changed

Lines changed: 1293 additions & 0 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

filebeat/module/elasticsearch/audit/test/test-access.log-expected.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"elasticsearch.audit.layer": "rest",
77
"event.dataset": "elasticsearch.audit",
88
"event.module": "elasticsearch",
9+
"event.timezone": "+00:00",
910
"fileset.name": "audit",
1011
"input.type": "log",
1112
"log.offset": 0,
@@ -23,6 +24,7 @@
2324
"elasticsearch.node.name": "v_VJhjV",
2425
"event.dataset": "elasticsearch.audit",
2526
"event.module": "elasticsearch",
27+
"event.timezone": "+00:00",
2628
"fileset.name": "audit",
2729
"input.type": "log",
2830
"log.offset": 155,
@@ -42,6 +44,7 @@
4244
"elasticsearch.audit.request.name": "ClearScrollRequest",
4345
"event.dataset": "elasticsearch.audit",
4446
"event.module": "elasticsearch",
47+
"event.timezone": "+00:00",
4548
"fileset.name": "audit",
4649
"input.type": "log",
4750
"log.offset": 306,
@@ -58,6 +61,7 @@
5861
"elasticsearch.node.name": "v_VJhjV",
5962
"event.dataset": "elasticsearch.audit",
6063
"event.module": "elasticsearch",
64+
"event.timezone": "+00:00",
6165
"fileset.name": "audit",
6266
"input.type": "log",
6367
"log.offset": 519,
@@ -73,6 +77,7 @@
7377
"elasticsearch.audit.layer": "rest",
7478
"event.dataset": "elasticsearch.audit",
7579
"event.module": "elasticsearch",
80+
"event.timezone": "+00:00",
7681
"fileset.name": "audit",
7782
"input.type": "log",
7883
"log.offset": 654,
@@ -92,6 +97,7 @@
9297
"elasticsearch.audit.request.name": "MainRequest",
9398
"event.dataset": "elasticsearch.audit",
9499
"event.module": "elasticsearch",
100+
"event.timezone": "+00:00",
95101
"fileset.name": "audit",
96102
"input.type": "log",
97103
"log.offset": 802,
@@ -108,6 +114,7 @@
108114
"elasticsearch.node.name": "v_VJhjV",
109115
"event.dataset": "elasticsearch.audit",
110116
"event.module": "elasticsearch",
117+
"event.timezone": "+00:00",
111118
"fileset.name": "audit",
112119
"http.request.body.content": "body",
113120
"input.type": "log",
@@ -143,6 +150,7 @@
143150
"elasticsearch.node.name": "NodeName-0",
144151
"event.dataset": "elasticsearch.audit",
145152
"event.module": "elasticsearch",
153+
"event.timezone": "+00:00",
146154
"fileset.name": "audit",
147155
"input.type": "log",
148156
"log.offset": 1210,
@@ -161,6 +169,7 @@
161169
"elasticsearch.node.name": "node-0",
162170
"event.dataset": "elasticsearch.audit",
163171
"event.module": "elasticsearch",
172+
"event.timezone": "+00:00",
164173
"fileset.name": "audit",
165174
"http.request.body.content": "{\"metadata\":{\"intelligence\":7},\"full_name\":\"Jack Nicholson\",\"roles\":[\"admin\",\"other_role1\"",
166175
"input.type": "log",

filebeat/module/elasticsearch/audit/test/test-audit.log-expected.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"event.action": "authentication_failed",
99
"event.dataset": "elasticsearch.audit",
1010
"event.module": "elasticsearch",
11+
"event.timezone": "+00:00",
1112
"fileset.name": "audit",
1213
"input.type": "log",
1314
"log.offset": 0,
@@ -28,6 +29,7 @@
2829
"event.action": "authentication_failed",
2930
"event.dataset": "elasticsearch.audit",
3031
"event.module": "elasticsearch",
32+
"event.timezone": "+00:00",
3133
"fileset.name": "audit",
3234
"input.type": "log",
3335
"log.offset": 274,
@@ -54,6 +56,7 @@
5456
"event.action": "access_granted",
5557
"event.dataset": "elasticsearch.audit",
5658
"event.module": "elasticsearch",
59+
"event.timezone": "+00:00",
5760
"fileset.name": "audit",
5861
"input.type": "log",
5962
"log.offset": 558,
@@ -79,6 +82,7 @@
7982
"event.action": "access_granted",
8083
"event.dataset": "elasticsearch.audit",
8184
"event.module": "elasticsearch",
85+
"event.timezone": "+00:00",
8286
"fileset.name": "audit",
8387
"input.type": "log",
8488
"log.offset": 941,
@@ -104,6 +108,7 @@
104108
"event.action": "access_granted",
105109
"event.dataset": "elasticsearch.audit",
106110
"event.module": "elasticsearch",
111+
"event.timezone": "+00:00",
107112
"fileset.name": "audit",
108113
"input.type": "log",
109114
"log.offset": 1309,
@@ -132,6 +137,7 @@
132137
"event.action": "access_granted",
133138
"event.dataset": "elasticsearch.audit",
134139
"event.module": "elasticsearch",
140+
"event.timezone": "+00:00",
135141
"fileset.name": "audit",
136142
"input.type": "log",
137143
"log.offset": 1676,
@@ -154,6 +160,7 @@
154160
"event.action": "authentication_success",
155161
"event.dataset": "elasticsearch.audit",
156162
"event.module": "elasticsearch",
163+
"event.timezone": "+00:00",
157164
"fileset.name": "audit",
158165
"http.request.body.content": "\n{\n \"query\" : {\n \"term\" : { \"user\" : \"kimchy\" }\n }\n}\n",
159166
"http.request.method": "GET",

filebeat/module/elasticsearch/deprecation/test/elasticsearch_deprecation.log-expected.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"elasticsearch.component": "o.e.d.a.a.i.t.p.PutIndexTemplateRequest",
66
"event.dataset": "elasticsearch.deprecation",
77
"event.module": "elasticsearch",
8+
"event.timezone": "+00:00",
89
"fileset.name": "deprecation",
910
"input.type": "log",
1011
"log.level": "WARN",
@@ -18,6 +19,7 @@
1819
"elasticsearch.component": "o.e.d.a.a.i.t.p.PutIndexTemplateRequest",
1920
"event.dataset": "elasticsearch.deprecation",
2021
"event.module": "elasticsearch",
22+
"event.timezone": "+00:00",
2123
"fileset.name": "deprecation",
2224
"input.type": "log",
2325
"log.level": "WARN",
@@ -31,6 +33,7 @@
3133
"elasticsearch.component": "o.e.d.a.a.i.t.p.PutIndexTemplateRequest",
3234
"event.dataset": "elasticsearch.deprecation",
3335
"event.module": "elasticsearch",
36+
"event.timezone": "+00:00",
3437
"fileset.name": "deprecation",
3538
"input.type": "log",
3639
"log.level": "WARN",
@@ -44,6 +47,7 @@
4447
"elasticsearch.component": "o.e.d.a.a.i.t.p.PutIndexTemplateRequest",
4548
"event.dataset": "elasticsearch.deprecation",
4649
"event.module": "elasticsearch",
50+
"event.timezone": "+00:00",
4751
"fileset.name": "deprecation",
4852
"input.type": "log",
4953
"log.level": "WARN",

filebeat/module/elasticsearch/deprecation/test/other_elasticsearch_deprecation.log-expected.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"elasticsearch.component": "o.e.d.c.ParseField",
66
"event.dataset": "elasticsearch.deprecation",
77
"event.module": "elasticsearch",
8+
"event.timezone": "+00:00",
89
"fileset.name": "deprecation",
910
"input.type": "log",
1011
"log.level": "WARN",
@@ -18,6 +19,7 @@
1819
"elasticsearch.component": "o.e.d.c.ParseField",
1920
"event.dataset": "elasticsearch.deprecation",
2021
"event.module": "elasticsearch",
22+
"event.timezone": "+00:00",
2123
"fileset.name": "deprecation",
2224
"input.type": "log",
2325
"log.level": "WARN",
@@ -31,6 +33,7 @@
3133
"elasticsearch.component": "o.e.d.i.m.UidFieldMapper",
3234
"event.dataset": "elasticsearch.deprecation",
3335
"event.module": "elasticsearch",
36+
"event.timezone": "+00:00",
3437
"fileset.name": "deprecation",
3538
"input.type": "log",
3639
"log.level": "WARN",
@@ -44,6 +47,7 @@
4447
"elasticsearch.component": "o.e.d.i.m.UidFieldMapper",
4548
"event.dataset": "elasticsearch.deprecation",
4649
"event.module": "elasticsearch",
50+
"event.timezone": "+00:00",
4751
"fileset.name": "deprecation",
4852
"input.type": "log",
4953
"log.level": "WARN",
@@ -57,6 +61,7 @@
5761
"elasticsearch.component": "o.e.d.i.m.UidFieldMapper",
5862
"event.dataset": "elasticsearch.deprecation",
5963
"event.module": "elasticsearch",
64+
"event.timezone": "+00:00",
6065
"fileset.name": "deprecation",
6166
"input.type": "log",
6267
"log.level": "WARN",
@@ -70,6 +75,7 @@
7075
"elasticsearch.component": "o.e.d.i.m.UidFieldMapper",
7176
"event.dataset": "elasticsearch.deprecation",
7277
"event.module": "elasticsearch",
78+
"event.timezone": "+00:00",
7379
"fileset.name": "deprecation",
7480
"input.type": "log",
7581
"log.level": "WARN",
@@ -83,6 +89,7 @@
8389
"elasticsearch.component": "o.e.d.i.m.UidFieldMapper",
8490
"event.dataset": "elasticsearch.deprecation",
8591
"event.module": "elasticsearch",
92+
"event.timezone": "+00:00",
8693
"fileset.name": "deprecation",
8794
"input.type": "log",
8895
"log.level": "WARN",
@@ -96,6 +103,7 @@
96103
"elasticsearch.component": "o.e.d.i.m.UidFieldMapper",
97104
"event.dataset": "elasticsearch.deprecation",
98105
"event.module": "elasticsearch",
106+
"event.timezone": "+00:00",
99107
"fileset.name": "deprecation",
100108
"input.type": "log",
101109
"log.level": "WARN",
@@ -109,6 +117,7 @@
109117
"elasticsearch.component": "o.e.d.i.m.UidFieldMapper",
110118
"event.dataset": "elasticsearch.deprecation",
111119
"event.module": "elasticsearch",
120+
"event.timezone": "+00:00",
112121
"fileset.name": "deprecation",
113122
"input.type": "log",
114123
"log.level": "WARN",
@@ -122,6 +131,7 @@
122131
"elasticsearch.component": "o.e.d.i.m.AllFieldMapper",
123132
"event.dataset": "elasticsearch.deprecation",
124133
"event.module": "elasticsearch",
134+
"event.timezone": "+00:00",
125135
"fileset.name": "deprecation",
126136
"input.type": "log",
127137
"log.level": "WARN",
@@ -135,6 +145,7 @@
135145
"elasticsearch.component": "o.e.d.i.m.AllFieldMapper",
136146
"event.dataset": "elasticsearch.deprecation",
137147
"event.module": "elasticsearch",
148+
"event.timezone": "+00:00",
138149
"fileset.name": "deprecation",
139150
"input.type": "log",
140151
"log.level": "WARN",
@@ -148,6 +159,7 @@
148159
"elasticsearch.component": "o.e.d.i.m.AllFieldMapper",
149160
"event.dataset": "elasticsearch.deprecation",
150161
"event.module": "elasticsearch",
162+
"event.timezone": "+00:00",
151163
"fileset.name": "deprecation",
152164
"input.type": "log",
153165
"log.level": "WARN",
@@ -161,6 +173,7 @@
161173
"elasticsearch.component": "o.e.d.s.a.InternalOrder$Parser",
162174
"event.dataset": "elasticsearch.deprecation",
163175
"event.module": "elasticsearch",
176+
"event.timezone": "+00:00",
164177
"fileset.name": "deprecation",
165178
"input.type": "log",
166179
"log.level": "WARN",
@@ -174,6 +187,7 @@
174187
"elasticsearch.component": "o.e.d.a.a.i.t.p.PutIndexTemplateRequest",
175188
"event.dataset": "elasticsearch.deprecation",
176189
"event.module": "elasticsearch",
190+
"event.timezone": "+00:00",
177191
"fileset.name": "deprecation",
178192
"input.type": "log",
179193
"log.level": "WARN",
@@ -187,6 +201,7 @@
187201
"elasticsearch.component": "o.e.d.i.m.MapperService",
188202
"event.dataset": "elasticsearch.deprecation",
189203
"event.module": "elasticsearch",
204+
"event.timezone": "+00:00",
190205
"fileset.name": "deprecation",
191206
"input.type": "log",
192207
"log.level": "WARN",
@@ -200,6 +215,7 @@
200215
"elasticsearch.component": "o.e.d.i.m.MapperService",
201216
"event.dataset": "elasticsearch.deprecation",
202217
"event.module": "elasticsearch",
218+
"event.timezone": "+00:00",
203219
"fileset.name": "deprecation",
204220
"input.type": "log",
205221
"log.level": "WARN",

filebeat/module/elasticsearch/deprecation/test/test-json.log-expected.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"elasticsearch.node.name": "es1_1",
1010
"event.dataset": "elasticsearch.deprecation",
1111
"event.module": "elasticsearch",
12+
"event.timezone": "+00:00",
1213
"fileset.name": "deprecation",
1314
"input.type": "log",
1415
"log.level": "WARN",
@@ -26,6 +27,7 @@
2627
"elasticsearch.node.name": "es1_1",
2728
"event.dataset": "elasticsearch.deprecation",
2829
"event.module": "elasticsearch",
30+
"event.timezone": "+00:00",
2931
"fileset.name": "deprecation",
3032
"input.type": "log",
3133
"log.level": "WARN",
@@ -43,6 +45,7 @@
4345
"elasticsearch.node.name": "es1_1",
4446
"event.dataset": "elasticsearch.deprecation",
4547
"event.module": "elasticsearch",
48+
"event.timezone": "+00:00",
4649
"fileset.name": "deprecation",
4750
"input.type": "log",
4851
"log.level": "WARN",
@@ -60,6 +63,7 @@
6063
"elasticsearch.node.name": "es1_1",
6164
"event.dataset": "elasticsearch.deprecation",
6265
"event.module": "elasticsearch",
66+
"event.timezone": "+00:00",
6367
"fileset.name": "deprecation",
6468
"input.type": "log",
6569
"log.level": "WARN",
@@ -77,6 +81,7 @@
7781
"elasticsearch.node.name": "es1_1",
7882
"event.dataset": "elasticsearch.deprecation",
7983
"event.module": "elasticsearch",
84+
"event.timezone": "+00:00",
8085
"fileset.name": "deprecation",
8186
"input.type": "log",
8287
"log.level": "WARN",
@@ -94,6 +99,7 @@
9499
"elasticsearch.node.name": "es1_1",
95100
"event.dataset": "elasticsearch.deprecation",
96101
"event.module": "elasticsearch",
102+
"event.timezone": "+00:00",
97103
"fileset.name": "deprecation",
98104
"input.type": "log",
99105
"log.level": "WARN",
@@ -111,6 +117,7 @@
111117
"elasticsearch.node.name": "es1_1",
112118
"event.dataset": "elasticsearch.deprecation",
113119
"event.module": "elasticsearch",
120+
"event.timezone": "+00:00",
114121
"fileset.name": "deprecation",
115122
"input.type": "log",
116123
"log.level": "WARN",
@@ -128,6 +135,7 @@
128135
"elasticsearch.node.name": "es1_1",
129136
"event.dataset": "elasticsearch.deprecation",
130137
"event.module": "elasticsearch",
138+
"event.timezone": "+00:00",
131139
"fileset.name": "deprecation",
132140
"input.type": "log",
133141
"log.level": "WARN",
@@ -145,6 +153,7 @@
145153
"elasticsearch.node.name": "es1_1",
146154
"event.dataset": "elasticsearch.deprecation",
147155
"event.module": "elasticsearch",
156+
"event.timezone": "+00:00",
148157
"fileset.name": "deprecation",
149158
"input.type": "log",
150159
"log.level": "WARN",
@@ -162,6 +171,7 @@
162171
"elasticsearch.node.name": "es1_1",
163172
"event.dataset": "elasticsearch.deprecation",
164173
"event.module": "elasticsearch",
174+
"event.timezone": "+00:00",
165175
"fileset.name": "deprecation",
166176
"input.type": "log",
167177
"log.level": "WARN",
@@ -179,6 +189,7 @@
179189
"elasticsearch.node.name": "es1_1",
180190
"event.dataset": "elasticsearch.deprecation",
181191
"event.module": "elasticsearch",
192+
"event.timezone": "+00:00",
182193
"fileset.name": "deprecation",
183194
"input.type": "log",
184195
"log.level": "WARN",
@@ -196,6 +207,7 @@
196207
"elasticsearch.node.name": "es1_1",
197208
"event.dataset": "elasticsearch.deprecation",
198209
"event.module": "elasticsearch",
210+
"event.timezone": "+00:00",
199211
"fileset.name": "deprecation",
200212
"input.type": "log",
201213
"log.level": "WARN",
@@ -213,6 +225,7 @@
213225
"elasticsearch.node.name": "es1_1",
214226
"event.dataset": "elasticsearch.deprecation",
215227
"event.module": "elasticsearch",
228+
"event.timezone": "+00:00",
216229
"fileset.name": "deprecation",
217230
"input.type": "log",
218231
"log.level": "WARN",

0 commit comments

Comments
 (0)