-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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
Move add-cloud-metadata to ECS #9265
Conversation
d6458ec
to
6ad40c3
Compare
0b6df57
to
14d4495
Compare
Pinging @elastic/infrastructure |
14d4495
to
e81a3f4
Compare
49e274d
to
7dc4ef8
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Almost there. The only small problem I see is that the meta.cloud.provider
has been deleted instead of being made an alias to cloud.provider
(both in migration file and actual common fields).
Once that alias is back in, I'm good with this.
Oh and I discovered another name clash with ECS ;-)
@@ -4,34 +4,32 @@ | |||
Metadata from cloud providers added by the add_cloud_metadata processor. | |||
fields: | |||
|
|||
- name: meta.cloud.provider |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
meta.cloud.provider
seems to be directly deleted, instead of becoming an alias to cloud.provider
. Please add it back as an alias
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed
- form: meta.cloud.region | ||
to: cloud.region | ||
alias: true | ||
alias6: true |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Make sure you add the cloud.provider
alias here as well
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done, not sure how that slipped through above :-(
"region": "cn-shenzhen", | ||
"availability_zone": "cn-shenzhen-a", | ||
"cloud": common.MapStr{ | ||
"provider": "ecs", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh jeez. Another thing called ECS. After our schema and AWS' container service (yes, in that order). Moreover, Alibaba's thing is named "Elastic ..." as well.
💯 🤦♂️ 😆
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yep, that one we knew ;-)
Restarted the single Travis test that was failing, and it passed. Likely a transient issue. Not familiar enough with the provider tests to understand the failure in the Alibaba test:
|
@webmat Already tried to reproduce the above failing test locally but couldn't so far. Not sure how it's possible that it fails especially as it's based on local data. Will need to further investigate. |
About the failing test: is there an actual API call being performed? Or is this based on a static fixture file of the API response? May just be a network hiccup if there's an API call. I guess we'll see after this test run. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If tests pass, this looks good to me
Fields renamed: ``` * meta.cloud.instance_id -> cloud.instance.id * meta.cloud.instance_name -> cloud.instance.name * meta.cloud.machine_type -> cloud.machine.type * meta.cloud.availability_zone -> cloud.availability_zone * meta.cloud.project_id -> cloud.project.id * meta.cloud.region -> cloud.region ``` Further changes: * Added alias for old fields * Update asset generation to include ECS assets in libbeat fields.yml. This is needed for testing as the aliases fields are in there.
5af93d1
to
b7251b7
Compare
Fields renamed: ``` * meta.cloud.instance_id -> cloud.instance.id * meta.cloud.instance_name -> cloud.instance.name * meta.cloud.machine_type -> cloud.machine.type * meta.cloud.availability_zone -> cloud.availability_zone * meta.cloud.project_id -> cloud.project.id * meta.cloud.region -> cloud.region ``` Further changes: * Added alias for old fields * Update asset generation to include ECS assets in libbeat fields.yml. This is needed for testing as the aliases fields are in there.
Fields renamed:
Further changes: