Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

[metricbeat] support deployment/daemonset specific metrics #820

Merged
merged 2 commits into from Oct 2, 2020

Conversation

v1r7u
Copy link
Contributor

@v1r7u v1r7u commented Sep 23, 2020

  • Chart version not bumped (the versions are all bumped and released at the same time)
  • README.md updated with any new values or changes
  • Updated template tests in ${CHART}/tests/*.py
  • Updated integration tests in ${CHART}/examples/*/test/goss.yaml

Closes #812

Turned out, initially labeling was completely implemented for DaemonSet (both daemon-set and pod labels), but only partially for Deployment (only pod-level labels). I decided to make these properties to be consistent for both object types, while still keeping to the design we agreed in the linked issue

@elasticmachine
Copy link
Collaborator

Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually?

@cla-checker-service
Copy link

cla-checker-service bot commented Sep 23, 2020

💚 CLA has been signed

@v1r7u
Copy link
Contributor Author

v1r7u commented Sep 24, 2020

I think I've signed the Agreement yesterday evening. Should I re-create the PR or you can re-run the check?

After posting the comment, the check was re-evaluated automatically 🤷

@jmlrt
Copy link
Member

jmlrt commented Oct 2, 2020

jenkins test this please

@jmlrt jmlrt added metricbeat enhancement New feature or request labels Oct 2, 2020
jmlrt
jmlrt previously approved these changes Oct 2, 2020
Copy link
Member

@jmlrt jmlrt left a comment

Choose a reason for hiding this comment

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

LGTM, just a nit on test naming

@@ -968,24 +968,101 @@ def test_cluster_role_rules():
assert rules["resources"][0] == "something"


def test_adding_pod_labels():
def test_adding_legacy_labels():
Copy link
Member

Choose a reason for hiding this comment

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

I would prefer naming this test test_adding_deprecated_labels to be more consistent with the other related test names.

@jmlrt
Copy link
Member

jmlrt commented Oct 2, 2020

jenkins test this please

Copy link
Member

@jmlrt jmlrt left a comment

Choose a reason for hiding this comment

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

LGTM⛴

@jmlrt jmlrt merged commit cc19a78 into elastic:master Oct 2, 2020
jmlrt pushed a commit that referenced this pull request Oct 2, 2020
* [metricbeat] support deployment/daemonset specific metrics
* chore: rename test_adding_legacy_labels to test_adding_deprecated_labels
jmlrt pushed a commit that referenced this pull request Oct 2, 2020
* [metricbeat] support deployment/daemonset specific metrics
* chore: rename test_adding_legacy_labels to test_adding_deprecated_labels
jmlrt pushed a commit that referenced this pull request Oct 2, 2020
* [metricbeat] support deployment/daemonset specific metrics
* chore: rename test_adding_legacy_labels to test_adding_deprecated_labels
@jmlrt
Copy link
Member

jmlrt commented Oct 2, 2020

backported to 6.8, 7.9 and 7.x branches

@nkammah nkammah mentioned this pull request Oct 19, 2020
@jmlrt jmlrt mentioned this pull request Oct 28, 2020
This was referenced Nov 17, 2020
@jmlrt jmlrt mentioned this pull request Nov 23, 2020
@jmlrt jmlrt mentioned this pull request Feb 8, 2021
This was referenced Mar 15, 2021
@jmlrt jmlrt mentioned this pull request May 25, 2021
@jmlrt jmlrt mentioned this pull request Mar 8, 2022
@jmlrt jmlrt mentioned this pull request Apr 21, 2022
This was referenced Sep 14, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support metricbeat deployment labels
3 participants