Skip to content
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

add kubernetes and container fields #1785

Merged
merged 6 commits into from
Jan 17, 2019

Conversation

graphaelli
Copy link
Member

replaces #1651
relies on elastic/beats#10060

fixes #1621

also defines all supported container.* and kubernetes.* now that libbeat can support it, to clean
up tests and customize field descriptions
@@ -295,6 +311,16 @@
"platform": "darwin"
}
},
"kubernetes": {
"namespace": "namespace1",
"node": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

out of curiosity, why don't we have same fields as ECS (eg we have node, but not container, labels, etc)?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's because this is the only information we're able to retrieve from within a container.

"maxLength": 1024
}
},
"required": ["id"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is required so as to not have an empty container?
if so, probably i am overthinking this, but it could happen that an id is not possible to retrieve in some case, then at some point we add another field under container like name, but agents can't send container.name without a container.id?

Copy link
Contributor

@jalvz jalvz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

great work!

@graphaelli
Copy link
Member Author

Thanks @jalvz. The corresponding libbeat update is now approved but can't be merged yet due to CI issues - what do you think about merging this now (after resolving conflicts) and following with a beats update?

@jalvz
Copy link
Contributor

jalvz commented Jan 17, 2019

👍

 Conflicts:
	include/fields.go
	model/metadata/metadata.go
	processor/stream/package_tests/metadata_attrs_test.go
	processor/stream/package_tests/span_attrs_test.go
	testdata/intake-v2/errors.ndjson
	testdata/intake-v2/transactions.ndjson
	testdata/intake-v2/transactions_spans.ndjson
@graphaelli
Copy link
Member Author

jenkins, retest this please

2 similar comments
@graphaelli
Copy link
Member Author

jenkins, retest this please

@graphaelli
Copy link
Member Author

jenkins, retest this please

@graphaelli graphaelli merged commit 4d73d4f into elastic:master Jan 17, 2019
@graphaelli graphaelli deleted the docker-k8s-fields branch January 17, 2019 19:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Allow APM Server to receive k8s/container information from agents
2 participants