-
Notifications
You must be signed in to change notification settings - Fork 602
[awsfirehose] Add routing rules for metrics ingested from Firehose #9916
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.
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
Merged
Changes from 15 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
d7fc0d8
Add routing rules for metrics ingested from Firehose
c296c9d
add changelog
f94d0cf
Fix routing rule for s3 namespace
0d63db5
Remove set cloud.provider processor
4d52850
use subojbects: false for aws.dimensions.*
b77e03d
change format_version
0483d01
add dimension: true
f6cbc02
fix elastic-package check
53e685d
event.original is not needed for metrics
1ad257a
use ecs@mappings for awsfirehose package
8c660c4
change package description to add metrics support
94be9a6
update ecs.version
dc69ca6
Add documentation
b0cab48
only keep dimension:true fields in ecs.yml
64cf10a
Merge remote-tracking branch 'upstream/main' into reroute_metrics
7f3616d
fix doc and add data_stream fields back into ECS
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
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| dependencies: | ||
| ecs: | ||
| reference: git@v8.0.0 | ||
| reference: git@v8.11.0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 17 additions & 17 deletions
34
packages/awsfirehose/data_stream/logs/_dev/test/pipeline/test-cloudfront-log.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,19 @@ | ||
| { | ||
| "events": [ | ||
| { | ||
| "cloud.region": "us-east-1", | ||
| "aws.firehose.arn": "arn:aws:firehose:us-east-2:123456:deliverystream/firehose-cloudfront-logs-to-elastic", | ||
| "data_stream.namespace": "default", | ||
| "message": "2022-04-19 12:29:36 SEA19-C2 10157 81.2.69.143 POST d111111abcdef8.cloudfront.net /getApplications 200 https://test.com/global Mozilla/5.0%20(Windows%20NT%2010.0;%20Win64;%20x64)%20AppleWebKit/537.36%20(KHTML,%20like%20Gecko)%20Chrome/100.0.4896.127%20Safari/537.36 source=global - Miss hrsHM5OM6sTIXUleC1G20YtDxMf5Cq0Jbz0pwhVpod2kgEn_W6akCQ== test.com https 1057 0.238 - TLSv1.3 TLS_AES_128_GCM_SHA256 Miss HTTP/2.0 - - 4203 0.238 Miss application/json;charset=UTF-8 - - -", | ||
| "aws.kinesis.type": "deliverystream", | ||
| "data_stream.type": "logs", | ||
| "aws.firehose.request_id": "971ae05f-a128-4a7f-b623-30f9bc513e55", | ||
| "cloud.provider": "aws", | ||
| "@timestamp": "2023-07-25T21:04:35Z", | ||
| "cloud.account.id": "123456", | ||
| "data_stream.dataset": "awsfirehose", | ||
| "aws.kinesis.name": "firehose-cloudfront-logs-to-elastic", | ||
| "event.id": "37670326805251200781477669690942747782212394134076063744" | ||
| } | ||
| ] | ||
| "events": [ | ||
| { | ||
| "cloud.region": "us-east-1", | ||
| "aws.firehose.arn": "arn:aws:firehose:us-east-2:123456:deliverystream/firehose-cloudfront-logs-to-elastic", | ||
| "data_stream.namespace": "default", | ||
| "message": "2022-04-19 12:29:36 SEA19-C2 10157 81.2.69.143 POST d111111abcdef8.cloudfront.net /getApplications 200 https://test.com/global Mozilla/5.0%20(Windows%20NT%2010.0;%20Win64;%20x64)%20AppleWebKit/537.36%20(KHTML,%20like%20Gecko)%20Chrome/100.0.4896.127%20Safari/537.36 source=global - Miss hrsHM5OM6sTIXUleC1G20YtDxMf5Cq0Jbz0pwhVpod2kgEn_W6akCQ== test.com https 1057 0.238 - TLSv1.3 TLS_AES_128_GCM_SHA256 Miss HTTP/2.0 - - 4203 0.238 Miss application/json;charset=UTF-8 - - -", | ||
| "aws.kinesis.type": "deliverystream", | ||
| "data_stream.type": "logs", | ||
| "aws.firehose.request_id": "971ae05f-a128-4a7f-b623-30f9bc513e55", | ||
| "cloud.provider": "aws", | ||
| "@timestamp": "2023-07-25T21:04:35Z", | ||
| "cloud.account.id": "123456", | ||
| "data_stream.dataset": "awsfirehose", | ||
| "aws.kinesis.name": "firehose-cloudfront-logs-to-elastic", | ||
| "event.id": "37670326805251200781477669690942747782212394134076063744" | ||
| } | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
94 changes: 47 additions & 47 deletions
94
packages/awsfirehose/data_stream/logs/_dev/test/pipeline/test-elb-log.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,49 @@ | ||
| { | ||
| "events": [ | ||
| { | ||
| "cloud.region": "us-east-1", | ||
| "aws.firehose.arn": "arn:aws:firehose:us-east-2:123456:deliverystream/firehose-classic-load-balancer-logs-to-elastic", | ||
| "data_stream.namespace": "default", | ||
| "message": "2015-05-13T23:39:43.945958Z my-loadbalancer 192.168.131.39:2817 10.0.0.1:80 0.000073 0.001048 0.000057 200 200 0 29 \"GET http://www.example.com:80/ HTTP/1.1\" \"curl/7.38.0\" - -", | ||
| "aws.kinesis.type": "deliverystream", | ||
| "data_stream.type": "logs", | ||
| "aws.firehose.request_id": "971ae05f-a128-4a7f-b623-30f9bc513e55", | ||
| "cloud.provider": "aws", | ||
| "@timestamp": "2023-07-25T21:04:35Z", | ||
| "cloud.account.id": "123456", | ||
| "data_stream.dataset": "awsfirehose", | ||
| "aws.kinesis.name": "firehose-classic-load-balancer-logs-to-elastic", | ||
| "event.id": "37670326805251200781477669690942747782212394134076063744" | ||
| }, | ||
| { | ||
| "cloud.region": "us-east-1", | ||
| "aws.firehose.arn": "arn:aws:firehose:us-east-2:123456:deliverystream/firehose-application-load-balancer-logs-to-elastic", | ||
| "data_stream.namespace": "default", | ||
| "message": "http 2018-07-02T22:23:00.186641Z app/my-loadbalancer/50dc6c495c0c9188 192.168.131.39:2817 10.0.0.1:80 0.000 0.001 0.000 200 200 34 366 \"GET http://www.example.com:80/ HTTP/1.1\" \"curl/7.46.0\" - - arn:aws:elasticloadbalancing:us-east-2:123456789012:targetgroup/my-targets/73e2d6bc24d8a067 \"Root=1-58337262-36d228ad5d99923122bbe354\" \"-\" \"-\" 0 2018-07-02T22:22:48.364000Z \"forward\" \"-\" \"-\" \"10.0.0.1:80\" \"200\" \"-\" \"-\"", | ||
| "aws.kinesis.type": "deliverystream", | ||
| "data_stream.type": "logs", | ||
| "aws.firehose.request_id": "971ae05f-a128-4a7f-b623-30f9bc513e55", | ||
| "cloud.provider": "aws", | ||
| "@timestamp": "2023-07-25T21:04:35Z", | ||
| "cloud.account.id": "123456", | ||
| "data_stream.dataset": "awsfirehose", | ||
| "aws.kinesis.name": "firehose-application-load-balancer-logs-to-elastic", | ||
| "event.id": "37670326805251200781477669690942747782212394134076063744" | ||
| }, | ||
| { | ||
| "cloud.region": "us-east-1", | ||
| "aws.firehose.arn": "arn:aws:firehose:us-east-2:123456:deliverystream/firehose-network-load-balancer-logs-to-elastic", | ||
| "data_stream.namespace": "default", | ||
| "message": "tls 2.0 2018-12-20T02:59:40 net/my-network-loadbalancer/c6e77e28c25b2234 g3d4b5e8bb8464cd 72.21.218.154:51341 172.100.100.185:443 5 2 98 246 - arn:aws:acm:us-east-2:671290407336:certificate/2a108f19-aded-46b0-8493-c63eb1ef4a99 - ECDHE-RSA-AES128-SHA tlsv12 - my-network-loadbalancer-c6e77e28c25b2234.elb.us-east-2.amazonaws.com - - - 2018-12-20T02:59:30", | ||
| "aws.kinesis.type": "deliverystream", | ||
| "data_stream.type": "logs", | ||
| "aws.firehose.request_id": "971ae05f-a128-4a7f-b623-30f9bc513e55", | ||
| "cloud.provider": "aws", | ||
| "@timestamp": "2023-07-25T21:04:35Z", | ||
| "cloud.account.id": "123456", | ||
| "data_stream.dataset": "awsfirehose", | ||
| "aws.kinesis.name": "firehose-network-load-balancer-logs-to-elastic", | ||
| "event.id": "37670326805251200781477669690942747782212394134076063744" | ||
| } | ||
| ] | ||
| "events": [ | ||
| { | ||
| "cloud.region": "us-east-1", | ||
| "aws.firehose.arn": "arn:aws:firehose:us-east-2:123456:deliverystream/firehose-classic-load-balancer-logs-to-elastic", | ||
| "data_stream.namespace": "default", | ||
| "message": "2015-05-13T23:39:43.945958Z my-loadbalancer 192.168.131.39:2817 10.0.0.1:80 0.000073 0.001048 0.000057 200 200 0 29 \"GET http://www.example.com:80/ HTTP/1.1\" \"curl/7.38.0\" - -", | ||
| "aws.kinesis.type": "deliverystream", | ||
| "data_stream.type": "logs", | ||
| "aws.firehose.request_id": "971ae05f-a128-4a7f-b623-30f9bc513e55", | ||
| "cloud.provider": "aws", | ||
| "@timestamp": "2023-07-25T21:04:35Z", | ||
| "cloud.account.id": "123456", | ||
| "data_stream.dataset": "awsfirehose", | ||
| "aws.kinesis.name": "firehose-classic-load-balancer-logs-to-elastic", | ||
| "event.id": "37670326805251200781477669690942747782212394134076063744" | ||
| }, | ||
| { | ||
| "cloud.region": "us-east-1", | ||
| "aws.firehose.arn": "arn:aws:firehose:us-east-2:123456:deliverystream/firehose-application-load-balancer-logs-to-elastic", | ||
| "data_stream.namespace": "default", | ||
| "message": "http 2018-07-02T22:23:00.186641Z app/my-loadbalancer/50dc6c495c0c9188 192.168.131.39:2817 10.0.0.1:80 0.000 0.001 0.000 200 200 34 366 \"GET http://www.example.com:80/ HTTP/1.1\" \"curl/7.46.0\" - - arn:aws:elasticloadbalancing:us-east-2:123456789012:targetgroup/my-targets/73e2d6bc24d8a067 \"Root=1-58337262-36d228ad5d99923122bbe354\" \"-\" \"-\" 0 2018-07-02T22:22:48.364000Z \"forward\" \"-\" \"-\" \"10.0.0.1:80\" \"200\" \"-\" \"-\"", | ||
| "aws.kinesis.type": "deliverystream", | ||
| "data_stream.type": "logs", | ||
| "aws.firehose.request_id": "971ae05f-a128-4a7f-b623-30f9bc513e55", | ||
| "cloud.provider": "aws", | ||
| "@timestamp": "2023-07-25T21:04:35Z", | ||
| "cloud.account.id": "123456", | ||
| "data_stream.dataset": "awsfirehose", | ||
| "aws.kinesis.name": "firehose-application-load-balancer-logs-to-elastic", | ||
| "event.id": "37670326805251200781477669690942747782212394134076063744" | ||
| }, | ||
| { | ||
| "cloud.region": "us-east-1", | ||
| "aws.firehose.arn": "arn:aws:firehose:us-east-2:123456:deliverystream/firehose-network-load-balancer-logs-to-elastic", | ||
| "data_stream.namespace": "default", | ||
| "message": "tls 2.0 2018-12-20T02:59:40 net/my-network-loadbalancer/c6e77e28c25b2234 g3d4b5e8bb8464cd 72.21.218.154:51341 172.100.100.185:443 5 2 98 246 - arn:aws:acm:us-east-2:671290407336:certificate/2a108f19-aded-46b0-8493-c63eb1ef4a99 - ECDHE-RSA-AES128-SHA tlsv12 - my-network-loadbalancer-c6e77e28c25b2234.elb.us-east-2.amazonaws.com - - - 2018-12-20T02:59:30", | ||
| "aws.kinesis.type": "deliverystream", | ||
| "data_stream.type": "logs", | ||
| "aws.firehose.request_id": "971ae05f-a128-4a7f-b623-30f9bc513e55", | ||
| "cloud.provider": "aws", | ||
| "@timestamp": "2023-07-25T21:04:35Z", | ||
| "cloud.account.id": "123456", | ||
| "data_stream.dataset": "awsfirehose", | ||
| "aws.kinesis.name": "firehose-network-load-balancer-logs-to-elastic", | ||
| "event.id": "37670326805251200781477669690942747782212394134076063744" | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.