Skip to content

[rsa2elk/sophos] Upgrade to ECS 8.0.0 #2596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adriansr merged 5 commits into from
Jan 26, 2022
Merged

[rsa2elk/sophos] Upgrade to ECS 8.0.0 #2596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
13e79b8
rsa2elk package: Upgrade ECS to 8.0.0
adriansr Jan 25, 2022
6b7313b
Fix handlebars indent
adriansr Jan 25, 2022
cd63205
Update xg data stream too
adriansr Jan 25, 2022
a3a1787
Missing update
adriansr Jan 25, 2022
71a19ef
Remove unnecessary level tags in ECS fields
adriansr Jan 26, 2022
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/sophos/_dev/build/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dependencies:
ecs:
reference: git@1.12
reference: git@8.0
5 changes: 5 additions & 0 deletions packages/sophos/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "1.2.0"
changes:
- description: Update to ECS 8.0.0
type: enhancement
link: https://github.com/elastic/integrations/pull/2596
- version: "1.1.3"
changes:
- description: Fix KV splitting and syslog header handling
Expand Down
600 changes: 300 additions & 300 deletions packages/sophos/data_stream/utm/_dev/test/pipeline/test-generated.log-expected.json
View file
Open in desktop

Large diffs are not rendered by default.

19 changes: 9 additions & 10 deletions packages/sophos/data_stream/utm/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ fields:
{{#contains "forwarded" tags}}
publisher_pipeline.disable_host: true
{{/contains}}

processors:
{{#if processors}}
{{processors}}
Expand Down Expand Up @@ -830,7 +829,7 @@ processors:
if (value != null && (result = fn(value))!== undefined) {
evt.Put(FIELDS_PREFIX + dst, result);
} else {
console.error(fn.name + " failed for '" + value + "'");
console.debug(fn.name + " failed for '" + value + "'");
}
};
}
Expand Down Expand Up @@ -1042,8 +1041,8 @@ processors:
"child_process": {to:[{field: "process.name", setter: fld_prio, prio: 1}]},
"city.dst": {to:[{field: "destination.geo.city_name", setter: fld_set}]},
"city.src": {to:[{field: "source.geo.city_name", setter: fld_set}]},
"daddr": {convert: to_ip, to:[{field: "destination.ip", setter: fld_append},{field: "related.ip", setter: fld_append}]},
"daddr_v6": {convert: to_ip, to:[{field: "destination.ip", setter: fld_append},{field: "related.ip", setter: fld_append}]},
"daddr": {convert: to_ip, to:[{field: "destination.ip", setter: fld_set},{field: "related.ip", setter: fld_append}]},
"daddr_v6": {convert: to_ip, to:[{field: "destination.ip", setter: fld_set},{field: "related.ip", setter: fld_append}]},
"ddomain": {to:[{field: "destination.domain", setter: fld_prio, prio: 0}]},
"devicehostip": {convert: to_ip, to:[{field: "host.ip", setter: fld_prio, prio: 2},{field: "related.ip", setter: fld_append}]},
"devicehostmac": {convert: to_mac, to:[{field: "host.mac", setter: fld_prio, prio: 0}]},
Expand Down Expand Up @@ -1101,11 +1100,11 @@ processors:
"macaddr": {convert: to_mac, to:[{field: "host.mac", setter: fld_prio, prio: 2}]},
"messageid": {to:[{field: "event.code", setter: fld_prio, prio: 1}]},
"method": {to:[{field: "http.request.method", setter: fld_set}]},
"msg": {to:[{field: "log.original", setter: fld_set}]},
"msg": {to:[{field: "message", setter: fld_set}]},
"orig_ip": {convert: to_ip, to:[{field: "network.forwarded_ip", setter: fld_prio, prio: 1},{field: "related.ip", setter: fld_append}]},
"owner": {to:[{field: "related.user", setter: fld_append},{field: "user.name", setter: fld_prio, prio: 6}]},
"packets": {convert: to_long, to:[{field: "network.packets", setter: fld_set}]},
"parent_pid": {convert: to_long, to:[{field: "process.ppid", setter: fld_prio, prio: 0}]},
"parent_pid": {convert: to_long, to:[{field: "process.parent.pid", setter: fld_prio, prio: 0}]},
"parent_pid_val": {to:[{field: "process.parent.title", setter: fld_set}]},
"parent_process": {to:[{field: "process.parent.name", setter: fld_prio, prio: 0}]},
"patient_fullname": {to:[{field: "user.full_name", setter: fld_prio, prio: 1}]},
Expand All @@ -1115,16 +1114,16 @@ processors:
"port.trans.src": {convert: to_long, to:[{field: "source.nat.port", setter: fld_prio, prio: 1}]},
"process": {to:[{field: "process.name", setter: fld_prio, prio: 0}]},
"process_id": {convert: to_long, to:[{field: "process.pid", setter: fld_prio, prio: 0}]},
"process_id_src": {convert: to_long, to:[{field: "process.ppid", setter: fld_prio, prio: 1}]},
"process_id_src": {convert: to_long, to:[{field: "process.parent.pid", setter: fld_prio, prio: 1}]},
"process_src": {to:[{field: "process.parent.name", setter: fld_prio, prio: 1}]},
"product": {to:[{field: "observer.product", setter: fld_set}]},
"protocol": {to:[{field: "network.protocol", setter: fld_set}]},
"query": {to:[{field: "url.query", setter: fld_prio, prio: 2}]},
"rbytes": {convert: to_long, to:[{field: "destination.bytes", setter: fld_set}]},
"referer": {to:[{field: "http.request.referrer", setter: fld_prio, prio: 1}]},
"rulename": {to:[{field: "rule.name", setter: fld_set}]},
"saddr": {convert: to_ip, to:[{field: "source.ip", setter: fld_append},{field: "related.ip", setter: fld_append}]},
"saddr_v6": {convert: to_ip, to:[{field: "source.ip", setter: fld_append},{field: "related.ip", setter: fld_append}]},
"saddr": {convert: to_ip, to:[{field: "source.ip", setter: fld_set},{field: "related.ip", setter: fld_append}]},
"saddr_v6": {convert: to_ip, to:[{field: "source.ip", setter: fld_set},{field: "related.ip", setter: fld_append}]},
"sbytes": {convert: to_long, to:[{field: "source.bytes", setter: fld_set}]},
"sdomain": {to:[{field: "source.domain", setter: fld_prio, prio: 0}]},
"service": {to:[{field: "service.name", setter: fld_prio, prio: 1}]},
Expand Down Expand Up @@ -2563,8 +2562,8 @@ processors:
builder.Add(save_flags);
builder.Add(strip_syslog_priority);
builder.Add(chain1);
builder.Add(populate_fields);
builder.Add(restore_flags);
builder.Add(populate_fields);
var chain = builder.Build();
return {
process: chain.Run,
Expand Down
19 changes: 9 additions & 10 deletions packages/sophos/data_stream/utm/agent/stream/tcp.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ fields:
{{#contains "forwarded" tags}}
publisher_pipeline.disable_host: true
{{/contains}}

processors:
{{#if processors}}
{{processors}}
Expand Down Expand Up @@ -827,7 +826,7 @@ processors:
if (value != null && (result = fn(value))!== undefined) {
evt.Put(FIELDS_PREFIX + dst, result);
} else {
console.error(fn.name + " failed for '" + value + "'");
console.debug(fn.name + " failed for '" + value + "'");
}
};
}
Expand Down Expand Up @@ -1039,8 +1038,8 @@ processors:
"child_process": {to:[{field: "process.name", setter: fld_prio, prio: 1}]},
"city.dst": {to:[{field: "destination.geo.city_name", setter: fld_set}]},
"city.src": {to:[{field: "source.geo.city_name", setter: fld_set}]},
"daddr": {convert: to_ip, to:[{field: "destination.ip", setter: fld_append},{field: "related.ip", setter: fld_append}]},
"daddr_v6": {convert: to_ip, to:[{field: "destination.ip", setter: fld_append},{field: "related.ip", setter: fld_append}]},
"daddr": {convert: to_ip, to:[{field: "destination.ip", setter: fld_set},{field: "related.ip", setter: fld_append}]},
"daddr_v6": {convert: to_ip, to:[{field: "destination.ip", setter: fld_set},{field: "related.ip", setter: fld_append}]},
"ddomain": {to:[{field: "destination.domain", setter: fld_prio, prio: 0}]},
"devicehostip": {convert: to_ip, to:[{field: "host.ip", setter: fld_prio, prio: 2},{field: "related.ip", setter: fld_append}]},
"devicehostmac": {convert: to_mac, to:[{field: "host.mac", setter: fld_prio, prio: 0}]},
Expand Down Expand Up @@ -1098,11 +1097,11 @@ processors:
"macaddr": {convert: to_mac, to:[{field: "host.mac", setter: fld_prio, prio: 2}]},
"messageid": {to:[{field: "event.code", setter: fld_prio, prio: 1}]},
"method": {to:[{field: "http.request.method", setter: fld_set}]},
"msg": {to:[{field: "log.original", setter: fld_set}]},
"msg": {to:[{field: "message", setter: fld_set}]},
"orig_ip": {convert: to_ip, to:[{field: "network.forwarded_ip", setter: fld_prio, prio: 1},{field: "related.ip", setter: fld_append}]},
"owner": {to:[{field: "related.user", setter: fld_append},{field: "user.name", setter: fld_prio, prio: 6}]},
"packets": {convert: to_long, to:[{field: "network.packets", setter: fld_set}]},
"parent_pid": {convert: to_long, to:[{field: "process.ppid", setter: fld_prio, prio: 0}]},
"parent_pid": {convert: to_long, to:[{field: "process.parent.pid", setter: fld_prio, prio: 0}]},
"parent_pid_val": {to:[{field: "process.parent.title", setter: fld_set}]},
"parent_process": {to:[{field: "process.parent.name", setter: fld_prio, prio: 0}]},
"patient_fullname": {to:[{field: "user.full_name", setter: fld_prio, prio: 1}]},
Expand All @@ -1112,16 +1111,16 @@ processors:
"port.trans.src": {convert: to_long, to:[{field: "source.nat.port", setter: fld_prio, prio: 1}]},
"process": {to:[{field: "process.name", setter: fld_prio, prio: 0}]},
"process_id": {convert: to_long, to:[{field: "process.pid", setter: fld_prio, prio: 0}]},
"process_id_src": {convert: to_long, to:[{field: "process.ppid", setter: fld_prio, prio: 1}]},
"process_id_src": {convert: to_long, to:[{field: "process.parent.pid", setter: fld_prio, prio: 1}]},
"process_src": {to:[{field: "process.parent.name", setter: fld_prio, prio: 1}]},
"product": {to:[{field: "observer.product", setter: fld_set}]},
"protocol": {to:[{field: "network.protocol", setter: fld_set}]},
"query": {to:[{field: "url.query", setter: fld_prio, prio: 2}]},
"rbytes": {convert: to_long, to:[{field: "destination.bytes", setter: fld_set}]},
"referer": {to:[{field: "http.request.referrer", setter: fld_prio, prio: 1}]},
"rulename": {to:[{field: "rule.name", setter: fld_set}]},
"saddr": {convert: to_ip, to:[{field: "source.ip", setter: fld_append},{field: "related.ip", setter: fld_append}]},
"saddr_v6": {convert: to_ip, to:[{field: "source.ip", setter: fld_append},{field: "related.ip", setter: fld_append}]},
"saddr": {convert: to_ip, to:[{field: "source.ip", setter: fld_set},{field: "related.ip", setter: fld_append}]},
"saddr_v6": {convert: to_ip, to:[{field: "source.ip", setter: fld_set},{field: "related.ip", setter: fld_append}]},
"sbytes": {convert: to_long, to:[{field: "source.bytes", setter: fld_set}]},
"sdomain": {to:[{field: "source.domain", setter: fld_prio, prio: 0}]},
"service": {to:[{field: "service.name", setter: fld_prio, prio: 1}]},
Expand Down Expand Up @@ -2560,8 +2559,8 @@ processors:
builder.Add(save_flags);
builder.Add(strip_syslog_priority);
builder.Add(chain1);
builder.Add(populate_fields);
builder.Add(restore_flags);
builder.Add(populate_fields);
var chain = builder.Build();
return {
process: chain.Run,
Expand Down
19 changes: 9 additions & 10 deletions packages/sophos/data_stream/utm/agent/stream/udp.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ fields:
{{#contains "forwarded" tags}}
publisher_pipeline.disable_host: true
{{/contains}}

processors:
{{#if processors}}
{{processors}}
Expand Down Expand Up @@ -827,7 +826,7 @@ processors:
if (value != null && (result = fn(value))!== undefined) {
evt.Put(FIELDS_PREFIX + dst, result);
} else {
console.error(fn.name + " failed for '" + value + "'");
console.debug(fn.name + " failed for '" + value + "'");
}
};
}
Expand Down Expand Up @@ -1039,8 +1038,8 @@ processors:
"child_process": {to:[{field: "process.name", setter: fld_prio, prio: 1}]},
"city.dst": {to:[{field: "destination.geo.city_name", setter: fld_set}]},
"city.src": {to:[{field: "source.geo.city_name", setter: fld_set}]},
"daddr": {convert: to_ip, to:[{field: "destination.ip", setter: fld_append},{field: "related.ip", setter: fld_append}]},
"daddr_v6": {convert: to_ip, to:[{field: "destination.ip", setter: fld_append},{field: "related.ip", setter: fld_append}]},
"daddr": {convert: to_ip, to:[{field: "destination.ip", setter: fld_set},{field: "related.ip", setter: fld_append}]},
"daddr_v6": {convert: to_ip, to:[{field: "destination.ip", setter: fld_set},{field: "related.ip", setter: fld_append}]},
"ddomain": {to:[{field: "destination.domain", setter: fld_prio, prio: 0}]},
"devicehostip": {convert: to_ip, to:[{field: "host.ip", setter: fld_prio, prio: 2},{field: "related.ip", setter: fld_append}]},
"devicehostmac": {convert: to_mac, to:[{field: "host.mac", setter: fld_prio, prio: 0}]},
Expand Down Expand Up @@ -1098,11 +1097,11 @@ processors:
"macaddr": {convert: to_mac, to:[{field: "host.mac", setter: fld_prio, prio: 2}]},
"messageid": {to:[{field: "event.code", setter: fld_prio, prio: 1}]},
"method": {to:[{field: "http.request.method", setter: fld_set}]},
"msg": {to:[{field: "log.original", setter: fld_set}]},
"msg": {to:[{field: "message", setter: fld_set}]},
"orig_ip": {convert: to_ip, to:[{field: "network.forwarded_ip", setter: fld_prio, prio: 1},{field: "related.ip", setter: fld_append}]},
"owner": {to:[{field: "related.user", setter: fld_append},{field: "user.name", setter: fld_prio, prio: 6}]},
"packets": {convert: to_long, to:[{field: "network.packets", setter: fld_set}]},
"parent_pid": {convert: to_long, to:[{field: "process.ppid", setter: fld_prio, prio: 0}]},
"parent_pid": {convert: to_long, to:[{field: "process.parent.pid", setter: fld_prio, prio: 0}]},
"parent_pid_val": {to:[{field: "process.parent.title", setter: fld_set}]},
"parent_process": {to:[{field: "process.parent.name", setter: fld_prio, prio: 0}]},
"patient_fullname": {to:[{field: "user.full_name", setter: fld_prio, prio: 1}]},
Expand All @@ -1112,16 +1111,16 @@ processors:
"port.trans.src": {convert: to_long, to:[{field: "source.nat.port", setter: fld_prio, prio: 1}]},
"process": {to:[{field: "process.name", setter: fld_prio, prio: 0}]},
"process_id": {convert: to_long, to:[{field: "process.pid", setter: fld_prio, prio: 0}]},
"process_id_src": {convert: to_long, to:[{field: "process.ppid", setter: fld_prio, prio: 1}]},
"process_id_src": {convert: to_long, to:[{field: "process.parent.pid", setter: fld_prio, prio: 1}]},
"process_src": {to:[{field: "process.parent.name", setter: fld_prio, prio: 1}]},
"product": {to:[{field: "observer.product", setter: fld_set}]},
"protocol": {to:[{field: "network.protocol", setter: fld_set}]},
"query": {to:[{field: "url.query", setter: fld_prio, prio: 2}]},
"rbytes": {convert: to_long, to:[{field: "destination.bytes", setter: fld_set}]},
"referer": {to:[{field: "http.request.referrer", setter: fld_prio, prio: 1}]},
"rulename": {to:[{field: "rule.name", setter: fld_set}]},
"saddr": {convert: to_ip, to:[{field: "source.ip", setter: fld_append},{field: "related.ip", setter: fld_append}]},
"saddr_v6": {convert: to_ip, to:[{field: "source.ip", setter: fld_append},{field: "related.ip", setter: fld_append}]},
"saddr": {convert: to_ip, to:[{field: "source.ip", setter: fld_set},{field: "related.ip", setter: fld_append}]},
"saddr_v6": {convert: to_ip, to:[{field: "source.ip", setter: fld_set},{field: "related.ip", setter: fld_append}]},
"sbytes": {convert: to_long, to:[{field: "source.bytes", setter: fld_set}]},
"sdomain": {to:[{field: "source.domain", setter: fld_prio, prio: 0}]},
"service": {to:[{field: "service.name", setter: fld_prio, prio: 1}]},
Expand Down Expand Up @@ -2560,8 +2559,8 @@ processors:
builder.Add(save_flags);
builder.Add(strip_syslog_priority);
builder.Add(chain1);
builder.Add(populate_fields);
builder.Add(restore_flags);
builder.Add(populate_fields);
var chain = builder.Build();
return {
process: chain.Run,
Expand Down
2 changes: 1 addition & 1 deletion packages/sophos/data_stream/utm/elasticsearch/ingest_pipeline/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ processors:
value: '{{_ingest.timestamp}}'
- set:
field: ecs.version
value: '1.12.0'
value: '8.0.0'
# User agent
- user_agent:
field: user_agent.original
Expand Down
4 changes: 1 addition & 3 deletions packages/sophos/data_stream/utm/fields/ecs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,6 @@
name: http.request.referrer
- external: ecs
name: log.level
- external: ecs
name: log.original
- external: ecs
name: log.syslog.facility.code
- external: ecs
Expand Down Expand Up @@ -152,7 +150,7 @@
- external: ecs
name: process.pid
- external: ecs
name: process.ppid
name: process.parent.pid
- external: ecs
name: process.title
- external: ecs
Expand Down
20 changes: 10 additions & 10 deletions packages/sophos/data_stream/utm/sample_event.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@
{
"@timestamp": "2016-01-29T06:09:59.000Z",
"agent": {
"ephemeral_id": "940686a8-4ed1-415f-bf45-45b7e42b90ef",
"hostname": "docker-fleet-agent",
"id": "58328c6f-d43f-44a6-879a-f7e5ff9d9b02",
"ephemeral_id": "4a4dd5d5-8f82-4911-b531-99290943b6c6",
"id": "9a015053-a5c0-4959-99ab-2b6556a2a396",
"name": "docker-fleet-agent",
"type": "filebeat",
"version": "7.16.0"
"version": "8.0.0"
},
"data_stream": {
"dataset": "sophos.utm",
"namespace": "ep",
"type": "logs"
},
"ecs": {
"version": "1.12.0"
"version": "8.0.0"
},
"elastic_agent": {
"id": "58328c6f-d43f-44a6-879a-f7e5ff9d9b02",
"snapshot": false,
"version": "7.16.0"
"id": "9a015053-a5c0-4959-99ab-2b6556a2a396",
"snapshot": true,
"version": "8.0.0"
},
"event": {
"agent_id_status": "verified",
"code": "smtpd",
"dataset": "sophos.utm",
"ingested": "2021-12-16T04:39:30Z",
"ingested": "2022-01-25T18:04:29Z",
"timezone": "+00:00"
},
"host": {
Expand All @@ -36,9 +35,10 @@
},
"log": {
"source": {
"address": "192.168.128.4:48831"
"address": "172.25.0.7:39467"
}
},
"message": "smtpd: MASTER:QR globally disabled, status one set to disabled.",
"observer": {
"product": "UTM",
"type": "Firewall",
Expand Down
Loading