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

Ensure metadata updates don't replace existing pod metrics #7573

Merged
merged 2 commits into from
Jul 16, 2018

Conversation

exekias
Copy link
Contributor

@exekias exekias commented Jul 11, 2018

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.

@exekias exekias added bug needs_backport PR is waiting to be backported to other branches. containers Related to containers use case v6.4.0 v6.3.2 labels Jul 11, 2018
// 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 exekias force-pushed the fix-metadata-collision branch from 414e5e1 to c1999dc Compare July 11, 2018 19:00
Copy link
Contributor

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

Could you add a changelog entry?

@exekias exekias added the review label Jul 13, 2018
@ruflin
Copy link
Contributor

ruflin commented Jul 13, 2018

Probably you need to rebase on master to also fix the generator header error.

Carlos Pérez-Aradros Herce added 2 commits July 16, 2018 13:37
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.
@exekias exekias force-pushed the fix-metadata-collision branch from 046f58a to e871906 Compare July 16, 2018 11:37
@exekias
Copy link
Contributor Author

exekias commented Jul 16, 2018

rebased, tests should pass now

Copy link
Contributor

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

WFG

@kvch kvch merged commit 3297924 into elastic:master Jul 16, 2018
exekias added a commit to exekias/beats that referenced this pull request Jul 16, 2018
)

* 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)
@exekias exekias added v6.3.2 and removed needs_backport PR is waiting to be backported to other branches. labels Jul 16, 2018
adriansr pushed a commit that referenced this pull request Jul 16, 2018
…ing pod metrics (#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.
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
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants