Skip to content

[System Diskio] Remove duplicated fields in diskio data_stream#7006

Merged
tetianakravchenko merged 4 commits intoelastic:mainfrom
tetianakravchenko:system-remove-duplications
Jul 25, 2023
Merged

[System Diskio] Remove duplicated fields in diskio data_stream#7006
tetianakravchenko merged 4 commits intoelastic:mainfrom
tetianakravchenko:system-remove-duplications

Conversation

@tetianakravchenko
Copy link
Copy Markdown
Contributor

What does this PR do?

Remove duplicated fields in diskio data_stream

Checklist

  • I have reviewed tips for building integrations and this pull request is aligned with them.
  • I have verified that all data streams collect metrics or logs.
  • I have added an entry to my package's changelog.yml file.
  • I have verified that Kibana version constraints are current according to guidelines.

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Screenshots

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
@tetianakravchenko tetianakravchenko requested a review from a team as a code owner July 19, 2023 07:22
Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
@elasticmachine
Copy link
Copy Markdown

elasticmachine commented Jul 19, 2023

💚 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 preview

Expand to view the summary

Build stats

  • Start Time: 2023-07-25T11:25:22.873+0000

  • Duration: 16 min 5 sec

Test stats 🧪

Test Results
Failed 0
Passed 151
Skipped 0
Total 151

🤖 GitHub comments

Expand to view the GitHub comments

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

  • /test : Re-trigger the build.

@elasticmachine
Copy link
Copy Markdown

elasticmachine commented Jul 19, 2023

🌐 Coverage report

Name Metrics % (covered/total) Diff
Packages 100.0% (3/3) 💚
Files 100.0% (4/4) 💚
Classes 100.0% (4/4) 💚
Methods 63.415% (52/82) 👎 -31.647
Lines 99.863% (2924/2928) 👍 20.018
Conditionals 100.0% (0/0) 💚

# newer versions go on top
- version: "1.38.1"
changes:
- description: Remove duplicated fields in diskio data_stream
Copy link
Copy Markdown
Contributor

@agithomas agithomas Jul 25, 2023

Choose a reason for hiding this comment

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

Can you please revisit the changelog?

Shouldn't this be duplicated field mappings, datastream instead of data_stream?

Also, this change includes additional metric_type mappings. It may be good to add that part to the changelog description/

Copy link
Copy Markdown
Contributor Author

@tetianakravchenko tetianakravchenko Jul 25, 2023

Choose a reason for hiding this comment

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

Shouldn't this be duplicated field mappings,

in fields folder are defined fields that package provide, not the index mapping

datastream instead of data_stream?

folder name: packages/system/data_stream/diskio, so I used data_stream, if you want I can rename it to datastream. I don't have strong preference, please let me know

Also, this change includes additional metric_type mappings. It may be good to add that part to the changelog description/

Not sure, that it should be considered as adding metric_type mappings, since there were defined twice fields host.disk.read.bytes and host.disk.write.bytes - I've removed it from fields/fields.yml file (the one where metric_type was already added, but not affected the mapping as expected due to override) and merged it definition with the remaining host.disk.read.bytes and host.disk.write.bytes defined in fields/agent.yml.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I don't have strong preference, please let me know

Please use datastream for consistency

Shouldn't this be duplicated field mappings,

in fields folder are defined fields that package provide, not the index mapping

datastream instead of data_stream?

folder name: packages/system/data_stream/diskio, so I used data_stream, if you want I can rename it to datastream. I don't have strong preference, please let me know

Also, this change includes additional metric_type mappings. It may be good to add that part to the changelog description/

Not sure, that it should be considered as adding metric_type mappings, since there were defined twice fields host.disk.read.bytes and host.disk.write.bytes - I've removed it from fields/fields.yml file (the one where metric_type was already added, but not affected the mapping as expected due to override) and merged it definition with the remaining host.disk.read.bytes and host.disk.write.bytes defined in fields/agent.yml.

Yes, i understand.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I don't have strong preference, please let me know

Please use datastream for consistency

done - bb6c1f3, please have a look

Copy link
Copy Markdown
Contributor

@agithomas agithomas left a comment

Choose a reason for hiding this comment

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

LGTM!

@tetianakravchenko tetianakravchenko merged commit 8040757 into elastic:main Jul 25, 2023
@elasticmachine
Copy link
Copy Markdown

Package system - 1.38.1 containing this change is available at https://epr.elastic.co/search?package=system

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants