Skip to content

Commit 91fe607

Browse files
authored
Fix duplicate event entries when running with logstash (#1497)
1 parent 6bc4c14 commit 91fe607

File tree

2 files changed

+145
-0
lines changed

2 files changed

+145
-0
lines changed

internal/stack/_static/logstash.conf.tmpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,6 @@ output {
2929
ssl_enabled => true
3030
ssl_certificate_authorities => "/usr/share/logstash/config/certs/elasticsearch.pem"
3131
data_stream => "true"
32+
document_id => "%{[@metadata][_ingest_document][id]}"
3233
}
3334
}

test/packages/with-logstash/ti_misp/_dev/deploy/docker/files/config.yml

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,150 @@ rules:
339339
Authorization: "test"
340340
Content-Type: application/json
341341
request_body: /^{"limit":"10","page":"3","returnFormat":"json","timestamp":"\d+"/
342+
responses:
343+
- status_code: 200
344+
body: |-
345+
{
346+
"response": [
347+
{
348+
"Event": {
349+
"Attribute": [
350+
{
351+
"Galaxy": [],
352+
"ShadowAttribute": [],
353+
"category": "Payload delivery",
354+
"comment": "filename content for test event 3",
355+
"deleted": false,
356+
"disable_correlation": false,
357+
"distribution": "5",
358+
"event_id": "3633",
359+
"first_seen": null,
360+
"id": "266263",
361+
"last_seen": null,
362+
"object_id": "0",
363+
"object_relation": null,
364+
"sharing_group_id": "0",
365+
"timestamp": "1621589229",
366+
"to_ids": false,
367+
"type": "filename",
368+
"uuid": "3b322e1a-1dd8-490c-ab96-12e1bc3ee6a3",
369+
"value": "thetestfile.txt"
370+
}
371+
],
372+
"EventReport": [],
373+
"Galaxy": [],
374+
"Object": [
375+
{
376+
"Attribute": [
377+
{
378+
"Galaxy": [],
379+
"ShadowAttribute": [],
380+
"category": "Payload delivery",
381+
"comment": "",
382+
"deleted": false,
383+
"disable_correlation": false,
384+
"distribution": "5",
385+
"event_id": "3633",
386+
"first_seen": null,
387+
"id": "266265",
388+
"last_seen": null,
389+
"object_id": "18207",
390+
"object_relation": "sha256",
391+
"sharing_group_id": "0",
392+
"timestamp": "1621589548",
393+
"to_ids": true,
394+
"type": "sha256",
395+
"uuid": "657c5f2b-9d68-4ff7-a9ad-ab9e6a6c953e",
396+
"value": "f33c27745f2bd87344be790465ef984a972fd539dc83bd4f61d4242c607ef1ee"
397+
}
398+
],
399+
"ObjectReference": [],
400+
"comment": "File object for event 3",
401+
"deleted": false,
402+
"description": "File object describing a file with meta-information",
403+
"distribution": "5",
404+
"event_id": "3633",
405+
"first_seen": null,
406+
"id": "18207",
407+
"last_seen": null,
408+
"meta-category": "file",
409+
"name": "file",
410+
"sharing_group_id": "0",
411+
"template_uuid": "688c46fb-5edb-40a3-8273-1af7923e2215",
412+
"template_version": "22",
413+
"timestamp": "1621589548",
414+
"uuid": "42a88ad4-6834-46a9-a18b-aff9e078a4ea"
415+
}
416+
],
417+
"Org": {
418+
"id": "1",
419+
"local": true,
420+
"name": "ORGNAME",
421+
"uuid": "78acad2d-cc2d-4785-94d6-b428a0070488"
422+
},
423+
"Orgc": {
424+
"id": "1",
425+
"local": true,
426+
"name": "ORGNAME",
427+
"uuid": "78acad2d-cc2d-4785-94d6-b428a0070488"
428+
},
429+
"RelatedEvent": [
430+
{
431+
"Event": {
432+
"Org": {
433+
"id": "1",
434+
"name": "ORGNAME",
435+
"uuid": "78acad2d-cc2d-4785-94d6-b428a0070488"
436+
},
437+
"Orgc": {
438+
"id": "1",
439+
"name": "ORGNAME",
440+
"uuid": "78acad2d-cc2d-4785-94d6-b428a0070488"
441+
},
442+
"analysis": "0",
443+
"date": "2021-05-21",
444+
"distribution": "1",
445+
"id": "3631",
446+
"info": "Test event 1 just atrributes",
447+
"org_id": "1",
448+
"orgc_id": "1",
449+
"published": false,
450+
"threat_level_id": "1",
451+
"timestamp": "1621588162",
452+
"uuid": "8ca56ae9-3747-4172-93d2-808da1a4eaf3"
453+
}
454+
}
455+
],
456+
"ShadowAttribute": [],
457+
"analysis": "0",
458+
"attribute_count": "6",
459+
"date": "2021-05-21",
460+
"disable_correlation": false,
461+
"distribution": "1",
462+
"event_creator_email": "admin@admin.test",
463+
"extends_uuid": "",
464+
"id": "3633",
465+
"info": "Test event 3 objects and attributes",
466+
"locked": false,
467+
"org_id": "1",
468+
"orgc_id": "1",
469+
"proposal_email_lock": false,
470+
"publish_timestamp": "0",
471+
"published": false,
472+
"sharing_group_id": "0",
473+
"threat_level_id": "1",
474+
"timestamp": "1621592532",
475+
"uuid": "4edb20c7-8175-484d-bdcd-fce6872c1ef3"
476+
}
477+
}
478+
]
479+
}
480+
- path: /events/restSearch
481+
methods: ["POST"]
482+
request_headers:
483+
Authorization: "test"
484+
Content-Type: application/json
485+
request_body: /^{"limit":"10","page":"4","returnFormat":"json","timestamp":"\d+"/
342486
responses:
343487
- status_code: 200
344488
body: |-

0 commit comments

Comments
 (0)