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.

Sign up for GitHub

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

Jump to bottom

Move cloudfoundry tags with metadata to common metadata fields #22150

Merged
merged 10 commits into from
Oct 27, 2020
Merged

Move cloudfoundry tags with metadata to common metadata fields #22150

merged 10 commits into from
Oct 27, 2020

Conversation

jsoriano
Copy link
Member

@jsoriano jsoriano commented Oct 26, 2020 •
edited
Loading

What does this PR do?

In some Cloud Foundry deployments, metadata is included in tags, move these tags to the common fields.

Why is it important?

Adding metadata with add_cloudfoundry_metadata implies querying the app metadata APIs, and storing the returned values in a local cache. This may be not needed in deployments that already include metadata the events from the firehose.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc. (Move cloudfoundry tags with metadata to common metadata fields #22150 (comment))

Related issues

@jsoriano jsoriano added review needs_backport PR is waiting to be backported to other branches. Team:Platforms Label for the Integrations - Platforms team v7.11.0 labels Oct 26, 2020
@jsoriano jsoriano self-assigned this Oct 26, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations-platforms (Team:Platforms)

@botelastic 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 Oct 26, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 26, 2020 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #22150 updated]

  • Start Time: 2020-10-27T09:03:50.815+0000

  • Duration: 63 min 19 sec

Test stats 🧪

Test Results
Failed 0
Passed 4868
Skipped 354
Total 5222

@exekias
Copy link
Contributor

exekias commented Oct 26, 2020

Nice, any info on what versions/settings of CF include these? Should add_cloudfoundry_metadata skip events containing these fields as an optimization?

@jsoriano
Copy link
Member Author

jsoriano commented Oct 26, 2020 •
edited
Loading

any info on what versions/settings of CF include these?

Not sure about this, we know that these fields are included in new VMware Tanzu Application Platform, but is not included in older PCF deployments.

Should add_cloudfoundry_metadata skip events containing these fields as an optimization?

Yes, I will probably end up doing that. I was wondering if it would be better to explicitly use the processor where needed.

jsoriano
jsoriano commented Oct 26, 2020
View reviewed changes
CHANGELOG.next.asciidoc Outdated
@@ -26,6 +26,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Update to Golang 1.12.1. {pull}11330[11330]
- Disable Alibaba Cloud and Tencent Cloud metadata providers by default. {pull}13812[12812]
- API address is a required setting in `add_cloudfoundry_metadata`. {pull}21759[21759]
- Cloud Foundry tags including metadata are moved to common metadata fields. {pull}22150[22150]
Copy link
Member Author

Choose a reason for hiding this comment

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

Cloudfoundry tags will be added in 7.10.0. If we merge this change in time to include it in this release I will remove this changelog entry.

Copy link
Member Author

Choose a reason for hiding this comment

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

Changelog entry removed, will re-add in a different PR if it doesn't reach 7.10.0.

@jsoriano jsoriano merged commit 7c461f8 into elastic:master Oct 27, 2020
@jsoriano jsoriano deleted the cloudfoundry-metadata-from-tags branch October 27, 2020 19:47
@jsoriano jsoriano mentioned this pull request Oct 27, 2020
Merged
6 tasks
@jsoriano jsoriano removed the needs_backport PR is waiting to be backported to other branches. label Oct 27, 2020
jsoriano added a commit to jsoriano/beats that referenced this pull request Oct 27, 2020
@jsoriano
Move cloudfoundry tags with metadata to common metadata fields (elast…
3f7ab5a 
…ic#22150)

In some Cloud Foundry deployments, metadata is included in tags,
move these tags to the common fields so add_cloudfoundry_metadata
is not needed for these cases.

(cherry picked from commit 7c461f8)
@jsoriano jsoriano mentioned this pull request Oct 27, 2020
Merged
6 tasks
jsoriano added a commit to jsoriano/beats that referenced this pull request Oct 27, 2020
@jsoriano
Move cloudfoundry tags with metadata to common metadata fields (elast…
2f369fb 
…ic#22150)

In some Cloud Foundry deployments, metadata is included in tags,
move these tags to the common fields so add_cloudfoundry_metadata
is not needed for these cases.

(cherry picked from commit 7c461f8)
jsoriano added a commit that referenced this pull request Oct 28, 2020
@jsoriano
Move cloudfoundry tags with metadata to common metadata fields (#22150)…
a18319d 
… (#22211)

In some Cloud Foundry deployments, metadata is included in tags,
move these tags to the common fields so add_cloudfoundry_metadata
is not needed for these cases.

(cherry picked from commit 7c461f8)
jsoriano added a commit that referenced this pull request Oct 28, 2020
@jsoriano
Move cloudfoundry tags with metadata to common metadata fields (#22150)…
5436cf3 
… (#22212)

In some Cloud Foundry deployments, metadata is included in tags,
move these tags to the common fields so add_cloudfoundry_metadata
is not needed for these cases.

(cherry picked from commit 7c461f8)
v1v added a commit to v1v/beats that referenced this pull request Oct 29, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/windows-7-64
3f9b862 
* upstream/master: (93 commits)
  Update commands used in the quick start (elastic#22248)
  Add interval documentation to `monitor` metricset (elastic#22152)
  [CI] enable x-pack/packetbeat in the CI (elastic#22252)
  Fix awscloudwatch input documentation (elastic#22247)
  Add support for different Azure Cloud environments in the metricbeat azure module (elastic#21044)
  [CI] support windows-2008-r2 (elastic#19791)
  protect against accessing undefined variables in sysmon module (elastic#22236)
  [CI] archive only if failed steps (elastic#22220)
  Add pe fields to Sysmon module (elastic#22217)
  [CI][flaky] Support 7.x branches and PRs (elastic#22197)
  Perfmon - Fix regular expressions to comply to multiple parentheses in instance name and object (elastic#22146)
  ci: improve linting speed (elastic#22103)
  Move cloudfoundry tags with metadata to common metadata fields (elastic#22150)
  [Docs] Update custom beat docs (elastic#22194)
  [Ingest Manager] Agent fix snapshot download for upgrade (elastic#22175)
  Update shared-autodiscover.asciidoc (elastic#21827)
  [DOCS] Warn about compression and Azure Event Hub for Kafka (elastic#21578)
  [CI][flaky] reporting for PRs in GitHub (elastic#21853)
  [Packetbeat] Create x-pack magefile (elastic#21979)
  [Elastic Agent] Fix deb/rpm installation (elastic#22153)
  ...
v1v added a commit to v1v/beats that referenced this pull request Oct 29, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/windows-7-32
a776d4d 
* upstream/master: (93 commits)
  Update commands used in the quick start (elastic#22248)
  Add interval documentation to `monitor` metricset (elastic#22152)
  [CI] enable x-pack/packetbeat in the CI (elastic#22252)
  Fix awscloudwatch input documentation (elastic#22247)
  Add support for different Azure Cloud environments in the metricbeat azure module (elastic#21044)
  [CI] support windows-2008-r2 (elastic#19791)
  protect against accessing undefined variables in sysmon module (elastic#22236)
  [CI] archive only if failed steps (elastic#22220)
  Add pe fields to Sysmon module (elastic#22217)
  [CI][flaky] Support 7.x branches and PRs (elastic#22197)
  Perfmon - Fix regular expressions to comply to multiple parentheses in instance name and object (elastic#22146)
  ci: improve linting speed (elastic#22103)
  Move cloudfoundry tags with metadata to common metadata fields (elastic#22150)
  [Docs] Update custom beat docs (elastic#22194)
  [Ingest Manager] Agent fix snapshot download for upgrade (elastic#22175)
  Update shared-autodiscover.asciidoc (elastic#21827)
  [DOCS] Warn about compression and Azure Event Hub for Kafka (elastic#21578)
  [CI][flaky] reporting for PRs in GitHub (elastic#21853)
  [Packetbeat] Create x-pack magefile (elastic#21979)
  [Elastic Agent] Fix deb/rpm installation (elastic#22153)
  ...
@jsoriano jsoriano mentioned this pull request Jul 13, 2021
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@exekias exekias exekias approved these changes

@bvader bvader Awaiting requested review from bvader

Assignees

@jsoriano jsoriano

Labels
review Team:Platforms Label for the Integrations - Platforms team v7.10.0 v7.11.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jsoriano @elasticmachine @exekias