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

Cherry-pick #7281 to 6.3: Keep different registry entry per container stream #7300

Merged
merged 2 commits into from
Jun 14, 2018

Conversation

exekias
Copy link
Contributor

@exekias exekias commented Jun 12, 2018

Cherry-pick of PR #7281 to 6.3 branch. Original message:

This PR adds a metadata map to prospectors state. Adding metadata to states allows having a different state per unique metadata for the same file.

This change is used by the docker prospector to have different states per stream, as some users configure a container prospector per stream (stdout & stderr).

Probably fixes #7045

This PR adds a metadata map to prospectors state. Adding metadata to states allows having a different state per unique metadata for the same file.

This change is used by the `docker` prospector to have different states per stream, as some users configure a container prospector per stream (`stdout` & `stderr`).

Probably fixes elastic#7045

(cherry picked from commit d37c114)
Timestamp time.Time `json:"timestamp"`
TTL time.Duration `json:"ttl"`
Type string `json:"type"`
Id string `json:"-"` // local unique id to make comparison more efficient

Choose a reason for hiding this comment

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

struct field Id should be ID

@exekias
Copy link
Contributor Author

exekias commented Jun 12, 2018

to be merged after 6.3.0 release

@exekias
Copy link
Contributor Author

exekias commented Jun 13, 2018

@urso I had to add 1e600f3 here to make it compatible with 6.3 branch (older Go version), could you please have a look?

@exekias exekias requested a review from urso June 13, 2018 14:40
@urso urso merged commit 5383e48 into elastic:6.3 Jun 14, 2018
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
…ntainer stream (elastic#7300)

Cherry-pick of PR elastic#7281 to 6.3 branch. Original message: 

This PR adds a metadata map to prospectors state. Adding metadata to states allows having a different state per unique metadata for the same file.

This change is used by the `docker` prospector to have different states per stream, as some users configure a container prospector per stream (`stdout` & `stderr`).

Probably fixes elastic#7045
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants