Skip to content

[elasticsearch] Fix collection of shard recovery total time#5367

Merged
miltonhultgren merged 4 commits intoelastic:mainfrom
miltonhultgren:34427-mb-collection-shard-activity-total-time
Mar 7, 2023
Merged

[elasticsearch] Fix collection of shard recovery total time#5367
miltonhultgren merged 4 commits intoelastic:mainfrom
miltonhultgren:34427-mb-collection-shard-activity-total-time

Conversation

@miltonhultgren
Copy link
Contributor

@miltonhultgren miltonhultgren commented Feb 23, 2023 •
edited
Loading

NOTE: This cannot be tested until the Metricbeat changes are merged.

Related issue: elastic/beats#34427

Since Metricbeat now reports the total time for a recovery, I've added a missing alias.

Related PRs:
elastic/elasticsearch#94062
elastic/kibana#151983

@miltonhultgren miltonhultgren added Integration:elasticsearch Elasticsearch Team:Infra Monitoring UI - DEPRECATED Label for the Infrastructure Monitoring UI team. - DEPRECATED - Use Team:obs-ux-infra_services labels Feb 23, 2023
@miltonhultgren miltonhultgren requested a review from a team as a code owner February 23, 2023 11:58
@miltonhultgren miltonhultgren self-assigned this Feb 23, 2023
This was referenced Feb 23, 2023
Merged
Merged
Merged
@elasticmachine
Copy link

elasticmachine commented Feb 23, 2023 •
edited
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 preview

Expand to view the summary

Build stats

  • Start Time: 2023-03-07T13:24:01.076+0000

  • Duration: 35 min 18 sec

Test stats 🧪

Test Results
Failed 0
Passed 59
Skipped 0
Total 59

🤖 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

elasticmachine commented Feb 23, 2023 •
edited
Loading

🌐 Coverage report

Name Metrics % (covered/total) Diff
Packages 100.0% (5/5) 💚
Files 100.0% (9/9) 💚
Classes 100.0% (9/9) 💚
Methods 87.5% (98/112) 👍 14.167
Lines 91.98% (562/611) 👎 -8.02
Conditionals 100.0% (0/0) 💚

crespocarlos
crespocarlos reviewed Feb 24, 2023
View reviewed changes
miltonhultgren
miltonhultgren commented Mar 7, 2023
View reviewed changes
packages/elasticsearch/manifest.yml
name: elasticsearch
title: Elasticsearch
version: 1.4.0
version: 1.4.1
Copy link
Contributor Author

@miltonhultgren miltonhultgren Mar 7, 2023

Choose a reason for hiding this comment

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

@klacabane Or should I give it some kind of preview tag?

Copy link
Contributor

@klacabane klacabane Mar 7, 2023

Choose a reason for hiding this comment

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

bumping patch makes sense to me. The change is trivial and is safe to release right away

Copy link
Contributor Author

@miltonhultgren miltonhultgren Mar 7, 2023

Choose a reason for hiding this comment

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

Okay, if you can hit approve I can merge 👍🏼

miltonhultgren
miltonhultgren commented Mar 7, 2023
View reviewed changes
@miltonhultgren miltonhultgren merged commit 8c57935 into elastic:main Mar 7, 2023
@elasticmachine
Copy link

elasticmachine commented Mar 7, 2023

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

agithomas pushed a commit to agithomas/integrations that referenced this pull request Mar 20, 2023
@miltonhultgren @agithomas
[elasticsearch] Fix collection of shard recovery total time (elastic#…
87d452f 
…5367)

* [elasticsearch] Fix collection of shard recovery total time

* Bump required Kibana version

* Revert conditon bump
agithomas pushed a commit to agithomas/integrations that referenced this pull request Mar 21, 2023
@miltonhultgren @agithomas
[elasticsearch] Fix collection of shard recovery total time (elastic#…
0950d60 
…5367)

* [elasticsearch] Fix collection of shard recovery total time

* Bump required Kibana version

* Revert conditon bump
miltonhultgren added a commit to elastic/kibana that referenced this pull request Mar 21, 2023
@miltonhultgren @kibanamachine
[Monitoring] Support Metricbeat format for shard activity (#151983)
469c5a3 
Related issue: elastic/beats#34427

Since Metricbeat now reports the right fields, I've updated the UI to
consume those.

<img width="2935" alt="Screenshot 2023-02-23 at 12 00 05"
src="https://user-images.githubusercontent.com/2564140/220893266-1d82bc16-6bca-4eca-a5a1-1a1573eb139d.png">

Related PRs:
elastic/beats#34653
elastic/elasticsearch#94062
elastic/integrations#5367

---------

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
kibanamachine added a commit to kibanamachine/kibana that referenced this pull request Mar 21, 2023
@miltonhultgren @kibanamachine
[Monitoring] Support Metricbeat format for shard activity (elastic#15…
15b5f1d 
…1983)

Related issue: elastic/beats#34427

Since Metricbeat now reports the right fields, I've updated the UI to
consume those.

<img width="2935" alt="Screenshot 2023-02-23 at 12 00 05"
src="https://user-images.githubusercontent.com/2564140/220893266-1d82bc16-6bca-4eca-a5a1-1a1573eb139d.png">

Related PRs:
elastic/beats#34653
elastic/elasticsearch#94062
elastic/integrations#5367

---------

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
(cherry picked from commit 469c5a3)
kibanamachine added a commit to elastic/kibana that referenced this pull request Mar 21, 2023
@kibanamachine @miltonhultgren
[8.7] [Monitoring] Support Metricbeat format for shard activity (#151983
9308353 
) (#153362)

# Backport

This will backport the following commits from `main` to `8.7`:
- [[Monitoring] Support Metricbeat format for shard activity
(#151983)](#151983)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Milton
Hultgren","email":"milton.hultgren@elastic.co"},"sourceCommit":{"committedDate":"2023-03-21T12:45:46Z","message":"[Monitoring]
Support Metricbeat format for shard activity (#151983)\n\nRelated issue:
https://github.com/elastic/beats/issues/34427\r\n\r\nSince Metricbeat
now reports the right fields, I've updated the UI to\r\nconsume
those.\r\n\r\n<img width=\"2935\" alt=\"Screenshot 2023-02-23 at 12 00
05\"\r\nsrc=\"https://user-images.githubusercontent.com/2564140/220893266-1d82bc16-6bca-4eca-a5a1-1a1573eb139d.png\">\r\n\r\nRelated
PRs:\r\nhttps://github.com/elastic/beats/pull/34653\r\nhttps://github.com/elastic/elasticsearch/pull/94062\r\nhttps://github.com/elastic/integrations/pull/5367\r\n\r\n---------\r\n\r\nCo-authored-by:
Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"469c5a3761fb9cc1bf2223f38463fde37678d760","branchLabelMapping":{"^v8.8.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Infra
Monitoring UI","release_note:skip","Feature:Stack
Monitoring","backport:prev-minor","v8.8.0"],"number":151983,"url":"https://github.com/elastic/kibana/pull/151983","mergeCommit":{"message":"[Monitoring]
Support Metricbeat format for shard activity (#151983)\n\nRelated issue:
https://github.com/elastic/beats/issues/34427\r\n\r\nSince Metricbeat
now reports the right fields, I've updated the UI to\r\nconsume
those.\r\n\r\n<img width=\"2935\" alt=\"Screenshot 2023-02-23 at 12 00
05\"\r\nsrc=\"https://user-images.githubusercontent.com/2564140/220893266-1d82bc16-6bca-4eca-a5a1-1a1573eb139d.png\">\r\n\r\nRelated
PRs:\r\nhttps://github.com/elastic/beats/pull/34653\r\nhttps://github.com/elastic/elasticsearch/pull/94062\r\nhttps://github.com/elastic/integrations/pull/5367\r\n\r\n---------\r\n\r\nCo-authored-by:
Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"469c5a3761fb9cc1bf2223f38463fde37678d760"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.8.0","labelRegex":"^v8.8.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/151983","number":151983,"mergeCommit":{"message":"[Monitoring]
Support Metricbeat format for shard activity (#151983)\n\nRelated issue:
https://github.com/elastic/beats/issues/34427\r\n\r\nSince Metricbeat
now reports the right fields, I've updated the UI to\r\nconsume
those.\r\n\r\n<img width=\"2935\" alt=\"Screenshot 2023-02-23 at 12 00
05\"\r\nsrc=\"https://user-images.githubusercontent.com/2564140/220893266-1d82bc16-6bca-4eca-a5a1-1a1573eb139d.png\">\r\n\r\nRelated
PRs:\r\nhttps://github.com/elastic/beats/pull/34653\r\nhttps://github.com/elastic/elasticsearch/pull/94062\r\nhttps://github.com/elastic/integrations/pull/5367\r\n\r\n---------\r\n\r\nCo-authored-by:
Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"469c5a3761fb9cc1bf2223f38463fde37678d760"}}]}]
BACKPORT-->

Co-authored-by: Milton Hultgren <milton.hultgren@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@klacabane klacabane klacabane approved these changes

@crespocarlos crespocarlos Awaiting requested review from crespocarlos

Assignees

@miltonhultgren miltonhultgren

Labels

Integration:elasticsearch Elasticsearch Team:Infra Monitoring UI - DEPRECATED Label for the Infrastructure Monitoring UI team. - DEPRECATED - Use Team:obs-ux-infra_services

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@miltonhultgren @elasticmachine @crespocarlos @klacabane