Skip to content

Commit f659d27

Browse files
gizasgizas
committed
merging with main
Signed-off-by: Andreas Gkizas <[email protected]>
1 parent 7e4f714 commit f659d27

16 files changed

+0
-536
lines changed

‎packages/cef/data_stream/log/_dev/test/pipeline/test-arcsight.json-expected.json‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,7 @@
132132
"version": "0"
133133
},
134134
"ecs": {
135-
<<<<<<< HEAD
136-
"version": "8.11.0"
137-
=======
138135
"version": "8.17.0"
139-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
140136
},
141137
"event": {
142138
"code": "agent:030",
@@ -210,11 +206,7 @@
210206
"version": "0"
211207
},
212208
"ecs": {
213-
<<<<<<< HEAD
214-
"version": "8.11.0"
215-
=======
216209
"version": "8.17.0"
217-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
218210
},
219211
"event": {
220212
"code": "agent:044",
@@ -295,11 +287,7 @@
295287
"version": "0"
296288
},
297289
"ecs": {
298-
<<<<<<< HEAD
299-
"version": "8.11.0"
300-
=======
301290
"version": "8.17.0"
302-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
303291
},
304292
"event": {
305293
"code": "agent:031",
@@ -333,8 +321,4 @@
333321
]
334322
}
335323
]
336-
<<<<<<< HEAD
337324
}
338-
=======
339-
}
340-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6

‎packages/cef/data_stream/log/_dev/test/pipeline/test-cef.json-expected.json‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,7 @@
146146
}
147147
},
148148
"ecs": {
149-
<<<<<<< HEAD
150-
"version": "8.11.0"
151-
=======
152149
"version": "8.17.0"
153-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
154150
},
155151
"event": {
156152
"code": "18",
@@ -231,11 +227,7 @@
231227
}
232228
},
233229
"ecs": {
234-
<<<<<<< HEAD
235-
"version": "8.11.0"
236-
=======
237230
"version": "8.17.0"
238-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
239231
},
240232
"event": {
241233
"code": "18",
@@ -280,11 +272,7 @@
280272
"ip": "192.168.1.2"
281273
},
282274
"ecs": {
283-
<<<<<<< HEAD
284-
"version": "8.11.0"
285-
=======
286275
"version": "8.17.0"
287-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
288276
},
289277
"event": {
290278
"code": "18",

‎packages/cef/data_stream/log/_dev/test/pipeline/test-checkpoint.json-expected.json‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,7 @@
168168
"port": 25
169169
},
170170
"ecs": {
171-
<<<<<<< HEAD
172-
"version": "8.11.0"
173-
=======
174171
"version": "8.17.0"
175-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
176172
},
177173
"event": {
178174
"action": "Bypass",
@@ -241,11 +237,7 @@
241237
"ip": "::1"
242238
},
243239
"ecs": {
244-
<<<<<<< HEAD
245-
"version": "8.11.0"
246-
=======
247240
"version": "8.17.0"
248-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
249241
},
250242
"event": {
251243
"action": "Drop",

‎packages/cef/data_stream/log/_dev/test/pipeline/test-cisco-asa.json-expected.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,4 @@
151151
]
152152
}
153153
]
154-
<<<<<<< HEAD
155154
}
156-
=======
157-
}
158-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6

‎packages/cef/data_stream/log/_dev/test/pipeline/test-fp-ngfw-smc.json-expected.json‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,7 @@
6868
"version": "0"
6969
},
7070
"ecs": {
71-
<<<<<<< HEAD
72-
"version": "8.11.0"
73-
=======
7471
"version": "8.17.0"
75-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
7672
},
7773
"event": {
7874
"code": "9005",
@@ -130,11 +126,7 @@
130126
"ip": "10.1.1.40"
131127
},
132128
"ecs": {
133-
<<<<<<< HEAD
134-
"version": "8.11.0"
135-
=======
136129
"version": "8.17.0"
137-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
138130
},
139131
"event": {
140132
"action": "Allow",
@@ -227,11 +219,7 @@
227219
"port": 67
228220
},
229221
"ecs": {
230-
<<<<<<< HEAD
231-
"version": "8.11.0"
232-
=======
233222
"version": "8.17.0"
234-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
235223
},
236224
"event": {
237225
"code": "70019",
@@ -304,11 +292,7 @@
304292
"ip": "192.168.1.1"
305293
},
306294
"ecs": {
307-
<<<<<<< HEAD
308-
"version": "8.11.0"
309-
=======
310295
"version": "8.17.0"
311-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
312296
},
313297
"event": {
314298
"action": "Refuse",
@@ -383,11 +367,7 @@
383367
}
384368
},
385369
"ecs": {
386-
<<<<<<< HEAD
387-
"version": "8.11.0"
388-
=======
389370
"version": "8.17.0"
390-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
391371
},
392372
"event": {
393373
"code": "70021",
@@ -448,11 +428,7 @@
448428
"version": "0"
449429
},
450430
"ecs": {
451-
<<<<<<< HEAD
452-
"version": "8.11.0"
453-
=======
454431
"version": "8.17.0"
455-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
456432
},
457433
"event": {
458434
"code": "72714",
@@ -512,11 +488,7 @@
512488
"version": "0"
513489
},
514490
"ecs": {
515-
<<<<<<< HEAD
516-
"version": "8.11.0"
517-
=======
518491
"version": "8.17.0"
519-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
520492
},
521493
"event": {
522494
"code": "72715",
@@ -576,11 +548,7 @@
576548
"version": "0"
577549
},
578550
"ecs": {
579-
<<<<<<< HEAD
580-
"version": "8.11.0"
581-
=======
582551
"version": "8.17.0"
583-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
584552
},
585553
"event": {
586554
"code": "72716",
@@ -639,11 +607,7 @@
639607
"version": "0"
640608
},
641609
"ecs": {
642-
<<<<<<< HEAD
643-
"version": "8.11.0"
644-
=======
645610
"version": "8.17.0"
646-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
647611
},
648612
"event": {
649613
"code": "78002",

‎packages/cef/data_stream/log/_dev/test/pipeline/test-netscaler.json-expected.json‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,7 @@
8686
"version": "0"
8787
},
8888
"ecs": {
89-
<<<<<<< HEAD
90-
"version": "8.11.0"
91-
=======
9289
"version": "8.17.0"
93-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
9490
},
9591
"event": {
9692
"action": "not blocked",
@@ -148,11 +144,7 @@
148144
"version": "0"
149145
},
150146
"ecs": {
151-
<<<<<<< HEAD
152-
"version": "8.11.0"
153-
=======
154147
"version": "8.17.0"
155-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
156148
},
157149
"event": {
158150
"action": "transformed",
@@ -210,11 +202,7 @@
210202
"version": "0"
211203
},
212204
"ecs": {
213-
<<<<<<< HEAD
214-
"version": "8.11.0"
215-
=======
216205
"version": "8.17.0"
217-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
218206
},
219207
"event": {
220208
"action": "transformed",
@@ -272,11 +260,7 @@
272260
"version": "0"
273261
},
274262
"ecs": {
275-
<<<<<<< HEAD
276-
"version": "8.11.0"
277-
=======
278263
"version": "8.17.0"
279-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
280264
},
281265
"event": {
282266
"action": "not blocked",
@@ -307,8 +291,4 @@
307291
}
308292
}
309293
]
310-
<<<<<<< HEAD
311294
}
312-
=======
313-
}
314-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6

‎packages/cef/data_stream/log/_dev/test/pipeline/test-syslog.json-expected.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,4 @@
9595
]
9696
}
9797
]
98-
<<<<<<< HEAD
9998
}
100-
=======
101-
}
102-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6

‎packages/cef/data_stream/log/_dev/test/pipeline/test-trend-micro.json-expected.json‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,7 @@
8282
"version": "0"
8383
},
8484
"ecs": {
85-
<<<<<<< HEAD
86-
"version": "8.11.0"
87-
=======
8885
"version": "8.17.0"
89-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
9086
},
9187
"event": {
9288
"action": "Delete",
@@ -147,11 +143,7 @@
147143
"version": "0"
148144
},
149145
"ecs": {
150-
<<<<<<< HEAD
151-
"version": "8.11.0"
152-
=======
153146
"version": "8.17.0"
154-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
155147
},
156148
"event": {
157149
"action": "detectOnly",
@@ -241,11 +233,7 @@
241233
"port": 80
242234
},
243235
"ecs": {
244-
<<<<<<< HEAD
245-
"version": "8.11.0"
246-
=======
247236
"version": "8.17.0"
248-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
249237
},
250238
"event": {
251239
"action": "Log",
@@ -300,11 +288,7 @@
300288
"version": "0"
301289
},
302290
"ecs": {
303-
<<<<<<< HEAD
304-
"version": "8.11.0"
305-
=======
306291
"version": "8.17.0"
307-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
308292
},
309293
"event": {
310294
"action": "updated",
@@ -397,11 +381,7 @@
397381
"port": 80
398382
},
399383
"ecs": {
400-
<<<<<<< HEAD
401-
"version": "8.11.0"
402-
=======
403384
"version": "8.17.0"
404-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
405385
},
406386
"event": {
407387
"action": "IDS:Reset",
@@ -468,11 +448,7 @@
468448
}
469449
},
470450
"ecs": {
471-
<<<<<<< HEAD
472-
"version": "8.11.0"
473-
=======
474451
"version": "8.17.0"
475-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
476452
},
477453
"event": {
478454
"code": "3002795",
@@ -528,11 +504,7 @@
528504
"version": "0"
529505
},
530506
"ecs": {
531-
<<<<<<< HEAD
532-
"version": "8.11.0"
533-
=======
534507
"version": "8.17.0"
535-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6
536508
},
537509
"event": {
538510
"code": "5000000",
@@ -559,8 +531,4 @@
559531
}
560532
}
561533
]
562-
<<<<<<< HEAD
563534
}
564-
=======
565-
}
566-
>>>>>>> fd8c7f80cf9ad2cf4617b47f93ce304262594ad6

‎packages/checkpoint/changelog.yml.orig‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
# newer versions go on top
22
- version: "1.34.3"
33
changes:
4-
<<<<<<< HEAD
5-
- description: Add instructions on using logfile input
6-
type: bugfix
7-
link: https://github.com/elastic/integrations/pull/11766
8-
=======
94
- description: Align hostname grok pattern with syslog RFC.
105
type: bugfix
116
link: https://github.com/elastic/integrations/pull/11947
12-
>>>>>>> upstream/main
137
- version: "1.34.2"
148
changes:
159
- description: Use triple-brace Mustache templating when referencing variables in ingest pipelines.

0 commit comments

Comments
 (0)