Skip to content

Fleet apache: convert status.total_kbytes to status.total_bytes#23022

Merged
mtojek merged 2 commits intoelastic:masterfrom
mtojek:373-total-bytes
Dec 10, 2020
Merged

Fleet apache: convert status.total_kbytes to status.total_bytes#23022
mtojek merged 2 commits intoelastic:masterfrom
mtojek:373-total-bytes

Conversation

@mtojek
Copy link
Copy Markdown
Contributor

@mtojek mtojek commented Dec 9, 2020

What does this PR do?

This PR modifies the the apache.status metricset to report apache.status.total_bytes instead of apache.status.total_kbytes in the fleet mode.

Why is it important?

This change is required to improve overview dashboard and support human readable format (expects bytes input).

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.

How to test this PR locally

It will be tested by the CI in the Integrations project.

Related issues

Use cases

@mtojek mtojek added enhancement Team:Integrations Label for the Integrations team labels Dec 9, 2020
@mtojek mtojek requested a review from a team December 9, 2020 13:52
@mtojek mtojek self-assigned this Dec 9, 2020
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Dec 9, 2020

Pinging @elastic/integrations (Team:Integrations)

@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 Dec 9, 2020
@mtojek mtojek mentioned this pull request Dec 9, 2020
Closed
16 tasks
@mtojek mtojek requested a review from jsoriano December 9, 2020 13:56
@mtojek
Copy link
Copy Markdown
Contributor Author

mtojek commented Dec 9, 2020

@jsoriano let me assign you to this PR as it's similar to the last one in terms of the Apache integration.

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Dec 9, 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: mtojek commented: /test

  • Start Time: 2020-12-09T14:33:29.225+0000

  • Duration: 60 min 6 sec

Test stats 🧪

Test Results
Failed 0
Passed 2282
Skipped 505
Total 2787

Steps errors 2

Expand to view the steps failures

Terraform Apply on x-pack/metricbeat/module/aws
  • Took 0 min 14 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 2282
Skipped 505
Total 2787

@mtojek
Copy link
Copy Markdown
Contributor Author

mtojek commented Dec 9, 2020

/test

@fearful-symmetry
Copy link
Copy Markdown
Contributor

fearful-symmetry commented Dec 9, 2020

in the fleet mode.

I don't see anything here that would make this only function while under fleet? Maybe I'm missing something.

@jsoriano
Copy link
Copy Markdown
Member

jsoriano commented Dec 9, 2020

in the fleet mode.

I don't see anything here that would make this only function while under fleet? Maybe I'm missing something.

The change is introduced in the adjustFleetEvent function, that is only called in fleet mode:

beats/metricbeat/module/apache/status/status.go

Lines 98 to 100 in ad10da0

if m.isFleetMode {
event = adjustFleetEvent(event)
}

@mtojek mtojek merged commit 13ae2e8 into elastic:master Dec 10, 2020
@mtojek
Copy link
Copy Markdown
Contributor Author

mtojek commented Dec 10, 2020

Thanks!

@mtojek mtojek mentioned this pull request Dec 10, 2020
Merged
6 tasks
mtojek added a commit to mtojek/beats that referenced this pull request Dec 10, 2020
@mtojek
Fleet apache: convert status.total_kbytes to status.total_bytes (elas…
18cb13e 
…tic#23022)

* Fleet apache: convert status.total_kbytes to status.total_bytes

* Update CHANGELOG

(cherry picked from commit 13ae2e8)
@mtojek mtojek added the v7.11.0 label Dec 10, 2020
mtojek added a commit that referenced this pull request Dec 10, 2020
@mtojek
Fleet apache: convert status.total_kbytes to status.total_bytes (#23022…
2f1f269 
…) (#23055)

* Fleet apache: convert status.total_kbytes to status.total_bytes

* Update CHANGELOG

(cherry picked from commit 13ae2e8)
@mtojek mtojek mentioned this pull request Dec 15, 2020
Merged
2 tasks
andrewkroh added a commit to andrewkroh/elastic-package that referenced this pull request Dec 15, 2020
@andrewkroh
Update apache.status fields
774a38b 
Update the fields for the apache.status data stream. The fields reported from agent changed
due to elastic/beats#23022.
@andrewkroh andrewkroh mentioned this pull request Dec 15, 2020
Merged
@mtojek mtojek mentioned this pull request Dec 16, 2020
Merged
andrewkroh added a commit to elastic/elastic-package that referenced this pull request Dec 16, 2020
@andrewkroh
Update apache.status fields (#206)
e8f03f0 
Update the fields for the apache.status data stream. The fields reported from agent changed
due to elastic/beats#23022.
@ycombinator ycombinator mentioned this pull request Jun 2, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jsoriano jsoriano jsoriano approved these changes

Assignees

@mtojek mtojek

Labels

enhancement Team:Integrations Label for the Integrations team v7.11.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@mtojek @elasticmachine @fearful-symmetry @jsoriano