Add cronjob metadata by default by ChrsMark · Pull Request #30637 · elastic/beats

ChrsMark · 2022-03-02T08:53:53Z

What does this PR do?

Makes metadata from cronjob objects available by default
Adds cronjob.name for Pods handled by a Job but are actually created because of a CronJob: https://github.com/elastic/beats/pull/30637/files#diff-e127eb943d1a3edae0a9f12cc7c3849874a256ae557242bf1473a1a28654fe64R101

Why is it important?

In order to make metadata addition for cronjob objects by default.

Related issues

Closes Revisit how metadata are added for jobs/cronjobs #29771

cc: @MichaelKatsoulis

Signed-off-by: chrismark <chrismarkou92@gmail.com>

botelastic · 2022-03-02T08:53:59Z

This pull request doesn't have a Team:<team> label.

Signed-off-by: chrismark <chrismarkou92@gmail.com>

elasticmachine · 2022-03-02T09:02:14Z

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
[](https://ci-stats.elastic.co/app/apm/services/beats-ci/transactions/view?rangeFrom=2022-03-09T20:06:58.934Z&rangeTo=2022-03-09T20:26:58.934Z&transactionName=BUILD Beats/beats/PR-{number}&transactionType=job&latencyAggregationType=avg&traceId=84498d316bc7fafbd42bc2369465ce4c&transactionId=cc5e4aa2841fc490)

Expand to view the summary

Build stats

Start Time: 2022-03-09T20:16:58.934+0000
Duration: 121 min 12 sec

Test stats 🧪

Test	Results
Failed	0
Passed	42437
Skipped	3708
Total	46145

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

/test : Re-trigger the build.
/package : Generate the packages and run the E2E tests.
/beats-tester : Run the installation tests with beats-tester.
run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

MichaelKatsoulis · 2022-03-02T09:30:11Z

metricbeat/module/kubernetes/state_cronjob/_meta/docs.asciidoc

-for versions of k8s >= v1.21.
+This metricset adds metadata by default only for versions of k8s >= v1.21.
+For older versions the APIs are not compatible and one need to configure the
+metricset with `add_metadata: false` and remove the proper `apiGroup` in the `ClusterRole`.


Maybe we should be a bit more specific here of what they need to remove. Why not add an example with the specific part of the cluster role they need to remove?

Signed-off-by: chrismark <chrismarkou92@gmail.com>

MichaelKatsoulis

LGTM

Signed-off-by: chrismark <chrismarkou92@gmail.com>

ChrsMark · 2022-03-04T13:29:42Z

Trying to isolate the CI failures at #30685. Something is really weird here.

ChrsMark · 2022-03-08T08:57:31Z

Waiting for #30732 to see if an upgrade fixes things.

…fixes

Signed-off-by: chrismark <chrismarkou92@gmail.com>

ChrsMark · 2022-03-08T11:42:57Z

Something is odd with the way we test on the CI as described at #30733. For now we can disable metadata addition for state_cronjob tests. I will file a separate issue for this so as to keep it tracked. For reference, the metricset is indirectly tested about this functionality under integrations repo so we can claim that it is safe to skip metadata here for now.

@MichaelKatsoulis let me know what you think about this.

Signed-off-by: chrismark <chrismarkou92@gmail.com>

MichaelKatsoulis · 2022-03-08T12:11:41Z

@MichaelKatsoulis let me know what you think about this.

Although it is a dirty workaround, it does not seem to be another way.

So +1

Signed-off-by: chrismark <chrismarkou92@gmail.com>

libbeat/common/kubernetes/metadata/pod.go

libbeat/docs/shared-autodiscover.asciidoc

…fixes

Signed-off-by: chrismark <chrismarkou92@gmail.com>

Add cronjob metadata by default

7d9a50f

Signed-off-by: chrismark <chrismarkou92@gmail.com>

ChrsMark added backport-v8.1.0 Automated backport with mergify Team:Cloudnative-Monitoring Label for the Cloud Native Monitoring team labels Mar 2, 2022

ChrsMark self-assigned this Mar 2, 2022

botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Mar 2, 2022

ChrsMark requested a review from MichaelKatsoulis March 2, 2022 08:55

Add changelog

831a5a4

Signed-off-by: chrismark <chrismarkou92@gmail.com>

MichaelKatsoulis reviewed Mar 2, 2022

View reviewed changes

ChrsMark added 2 commits March 2, 2022 09:42

fixes

e24689a

Signed-off-by: chrismark <chrismarkou92@gmail.com>

fmt

4bfd660

Signed-off-by: chrismark <chrismarkou92@gmail.com>

MichaelKatsoulis approved these changes Mar 2, 2022

View reviewed changes

ChrsMark added 4 commits March 2, 2022 12:36

test with latest version

41c3233

Signed-off-by: chrismark <chrismarkou92@gmail.com>

Fixes

12239b6

Signed-off-by: chrismark <chrismarkou92@gmail.com>

Try with older ksm

7d9d9f6

Signed-off-by: chrismark <chrismarkou92@gmail.com>

Change cronjob

792d4c9

Signed-off-by: chrismark <chrismarkou92@gmail.com>

ChrsMark added backport-v8.2.0 Automated backport with mergify and removed backport-v8.1.0 Automated backport with mergify labels Mar 4, 2022

ChrsMark added 2 commits March 4, 2022 09:30

Add role for jobs

30f27a3

Signed-off-by: chrismark <chrismarkou92@gmail.com>

Fix leftover

4402ee7

Signed-off-by: chrismark <chrismarkou92@gmail.com>

Merge remote-tracking branch 'upstream/main' into _k8s_compatability_…

716840b

…fixes

ChrsMark requested a review from a team as a code owner March 8, 2022 11:35

Skip metadata for state_cronjob tests

e230b98

Signed-off-by: chrismark <chrismarkou92@gmail.com>

ChrsMark requested a review from MichaelKatsoulis March 8, 2022 11:43

leftover

283c16b

Signed-off-by: chrismark <chrismarkou92@gmail.com>

ChrsMark added 2 commits March 8, 2022 13:01

Init enricher only when metadata are defined

93c4634

Signed-off-by: chrismark <chrismarkou92@gmail.com>

Try to fix tests

0cc1db7

Signed-off-by: chrismark <chrismarkou92@gmail.com>

cmacknz reviewed Mar 8, 2022

View reviewed changes

libbeat/common/kubernetes/metadata/pod.go Show resolved Hide resolved

cmacknz reviewed Mar 8, 2022

View reviewed changes

libbeat/docs/shared-autodiscover.asciidoc Outdated Show resolved Hide resolved

ChrsMark added 3 commits March 9, 2022 18:52

Merge remote-tracking branch 'upstream/main' into _k8s_compatability_…

7405ff1

…fixes

Bring changes back

684d13a

Signed-off-by: chrismark <chrismarkou92@gmail.com>

Improve docs

059c3e7

Signed-off-by: chrismark <chrismarkou92@gmail.com>

ChrsMark requested a review from cmacknz March 9, 2022 19:03

cmacknz approved these changes Mar 9, 2022

View reviewed changes

Fix Cronjob definition

cdafb68

Signed-off-by: chrismark <chrismarkou92@gmail.com>

ChrsMark merged commit 9280c53 into elastic:main Mar 10, 2022

kvch added a commit to kvch/elastic-agent-autodiscover that referenced this pull request May 12, 2022

Pick changes from elastic/beats#30637

da57766

kvch mentioned this pull request May 12, 2022

Pick changes from https://github.com/elastic/beats/pull/30637 elastic/elastic-agent-autodiscover#8

Merged

kvch added a commit to elastic/elastic-agent-autodiscover that referenced this pull request May 12, 2022

Pick changes from elastic/beats#30637 (#8)

9c2e086

thbkrkr mentioned this pull request Jul 4, 2023

Filebeat/autodiscover ES_data_should_pass_validations fails in 8.9.0-SNAPSHOT elastic/cloud-on-k8s#6946

Closed

ynirk mentioned this pull request Sep 25, 2023

[Auditbeat] Kubernetes enrichment not working without cronjob metadata #36674

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add cronjob metadata by default#30637

Add cronjob metadata by default#30637
ChrsMark merged 19 commits intoelastic:mainfrom
ChrsMark:_k8s_compatability_fixes

ChrsMark commented Mar 2, 2022 •

edited

Loading

Uh oh!

botelastic bot commented Mar 2, 2022

Uh oh!

elasticmachine commented Mar 2, 2022 •

edited by jenkins-beats-ci bot

Loading

Build stats

Test stats 🧪

Uh oh!

MichaelKatsoulis Mar 2, 2022

Uh oh!

MichaelKatsoulis left a comment

Uh oh!

ChrsMark commented Mar 4, 2022

Uh oh!

ChrsMark commented Mar 8, 2022

Uh oh!

ChrsMark commented Mar 8, 2022 •

edited

Loading

Uh oh!

MichaelKatsoulis commented Mar 8, 2022

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

ChrsMark commented Mar 2, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Why is it important?

Related issues

Uh oh!

botelastic bot commented Mar 2, 2022

Uh oh!

elasticmachine commented Mar 2, 2022 • edited by jenkins-beats-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

💚 Build Succeeded

Build stats

Test stats 🧪

💚 Flaky test report

🤖 GitHub comments

Uh oh!

MichaelKatsoulis Mar 2, 2022

Choose a reason for hiding this comment

Uh oh!

MichaelKatsoulis left a comment

Choose a reason for hiding this comment

Uh oh!

ChrsMark commented Mar 4, 2022

Uh oh!

ChrsMark commented Mar 8, 2022

Uh oh!

ChrsMark commented Mar 8, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MichaelKatsoulis commented Mar 8, 2022

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ChrsMark commented Mar 2, 2022 •

edited

Loading

elasticmachine commented Mar 2, 2022 •

edited by jenkins-beats-ci bot

Loading

ChrsMark commented Mar 8, 2022 •

edited

Loading