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 #7573 to 6.3: Ensure metadata updates don't replace existing pod metrics #7609

Merged
merged 4 commits into from
Jul 16, 2018

Conversation

exekias
Copy link
Contributor

@exekias exekias commented Jul 16, 2018

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

Before things change, add_kubernetes_metadata would replace everything
under kubernetes.pod when enriching events.

This is not what you want, especially if you are using it in conjunction
with the Kubernetes module, where you could smash pod metrics when
enriching.

)

* Ensure metadata updates don't replace existing pod metrics

Before things change, `add_kubernetes_metadata` would replace everything
under `kubernetes.pod` when enriching events.

This is not what you want, especially if you are using it in conjunction
with the Kubernetes module, where you could smash pod metrics when
enriching.

* Update CHANGELOG.asciidoc

(cherry picked from commit 3297924)
// specific language governing permissions and limitations
// under the License.

package add_kubernetes_metadata

Choose a reason for hiding this comment

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

don't use an underscore in package name

// specific language governing permissions and limitations
// under the License.

package add_kubernetes_metadata

Choose a reason for hiding this comment

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

don't use an underscore in package name

@exekias
Copy link
Contributor Author

exekias commented Jul 16, 2018

Tests are failing because common.MustNewConfigFrom is not available on this branch, will patch this to use common.NewConfigFrom

@exekias exekias added the in progress Pull request is currently in progress. label Jul 16, 2018
@exekias exekias removed the in progress Pull request is currently in progress. label Jul 16, 2018
Copy link
Contributor

@adriansr adriansr left a comment

Choose a reason for hiding this comment

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

LGTM

@adriansr adriansr merged commit 5c40328 into elastic:6.3 Jul 16, 2018
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
…e existing pod metrics (elastic#7609)

Ensure metadata updates don't replace existing pod metrics

Before things change, `add_kubernetes_metadata` would replace everything
under `kubernetes.pod` when enriching events.

This is not what you want, especially if you are using it in conjunction
with the Kubernetes module, where you could smash pod metrics when
enriching.
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