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 #22821 to 7.x: Apache status: adjust field collection in fleet mode #22882

Merged
merged 3 commits into from
Dec 3, 2020

Conversation

mtojek
Copy link
Contributor

@mtojek mtojek commented Dec 3, 2020

Cherry-pick of PR #22821 to 7.x branch. Original message:

What does this PR do?

This PR modified field collection log in the Apache module, "status" metricset, so they're collected according to expectations of the Apache Integration.

apache.status.hostname -> host.hostname (already present)
apache.status.uptime.uptime - >host.uptime (decided not to proceed with this change. host.uptime has a different meaning)

Why is it important?

Migration to Beats (elastic/integrations#370)

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.

Author's Checklist

  • [ ]

How to test this PR locally

(there is an integration test)

Related issues

Use cases

Screenshots

Logs

@mtojek mtojek added [zube]: In Review backport Team:Integrations Label for the Integrations team labels Dec 3, 2020
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 3, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations (Team:Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Dec 3, 2020
@mtojek mtojek requested a review from a team December 3, 2020 08:18
@mtojek mtojek self-assigned this Dec 3, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Dec 3, 2020

💚 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 #22882 updated

  • Start Time: 2020-12-03T11:24:44.513+0000

  • Duration: 54 min 3 sec

Test stats 🧪

Test Results
Failed 0
Passed 16715
Skipped 1398
Total 18113

Steps errors 2

Expand to view the steps failures

Terraform Apply on x-pack/metricbeat/module/aws

  • Took 0 min 15 sec . View more details on here

Terraform Apply on x-pack/metricbeat/module/aws

  • Took 0 min 15 sec . View more details on here

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 16715
Skipped 1398
Total 18113

@mtojek
Copy link
Contributor Author

mtojek commented Dec 3, 2020

jenkins run the tests please

* apache status: adjust collected fields in fleet mode

* Fix: mage check

* Update CHANGELOG

* nit-pick

* Address PR comments

(cherry picked from commit 0c1e54c)
CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
@mtojek mtojek requested a review from jsoriano December 3, 2020 11:25
Copy link
Member

@jsoriano jsoriano left a comment

Choose a reason for hiding this comment

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

👍

@mtojek mtojek merged commit 046b0cc into elastic:7.x Dec 3, 2020
@zube zube bot removed the [zube]: Done label Mar 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Team:Integrations Label for the Integrations team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants