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

Use the customMetric's formatter for pipeline aggregations #11933

Merged
merged 2 commits into from
Jul 19, 2017
Merged

Use the customMetric's formatter for pipeline aggregations #11933

merged 2 commits into from
Jul 19, 2017

Conversation

trevan
Copy link
Contributor

@trevan trevan commented May 19, 2017

The pipeline aggregations weren't using the underlying metric's formatter.

@elasticmachine
Copy link
Contributor

Can one of the admins verify this patch?

@thomasneirynck
Copy link
Contributor

jenkins, test

@thomasneirynck thomasneirynck added :Discovery Feature:Visualizations Generic visualization features (in case no more specific feature label is available) labels May 23, 2017
@thomasneirynck
Copy link
Contributor

jenkins, test this

@thomasneirynck thomasneirynck self-requested a review May 23, 2017 16:03
thomasneirynck
thomasneirynck reviewed May 26, 2017
View reviewed changes
Copy link
Contributor

@thomasneirynck thomasneirynck left a comment

Choose a reason for hiding this comment

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

thanks @trevan, looking good as far as I can tell.

Not an expert on pipeline-aggs though. @ppisljar, can you take a second look?

src/ui/public/agg_types/metrics/lib/parent_pipeline_agg_helper.js
let subAgg;
if (agg.params.customMetric) {
subAgg = agg.params.customMetric;
} else {
Copy link
Contributor

Choose a reason for hiding this comment

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

When do we hit this code-path? Not a 100% familiar with htis, but don't all parent pipelines require a custom-metric?

Copy link
Member

Choose a reason for hiding this comment

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

you can also use a predefined one.

ppisljar
ppisljar approved these changes May 29, 2017
View reviewed changes
Copy link
Member

@ppisljar ppisljar left a comment

Choose a reason for hiding this comment

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

LGTM, wanna add a simple test as well ?

thanks a lot trevan!

@thomasneirynck thomasneirynck self-requested a review June 16, 2017 21:47
thomasneirynck
thomasneirynck approved these changes Jul 10, 2017
View reviewed changes
Copy link
Contributor

@thomasneirynck thomasneirynck left a comment

Choose a reason for hiding this comment

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

hey trevan, good for me too (in case that wasn't clear), but would be helpful if you can add corresponding test. thx!

@trevan
Copy link
Contributor Author

trevan commented Jul 18, 2017

@ppisljar, @thomasneirynck, sorry it took so long. I finally added tests.

@thomasneirynck
Copy link
Contributor

thx!

jenkins, test this

@thomasneirynck
Copy link
Contributor

CI failing for most obscure of reasons. https://kibana-ci.elastic.co/job/elastic+kibana+pull-request+multijob-selenium/6095/console

jenkins, test this

@thomasneirynck
Copy link
Contributor

jenkins, test this

@thomasneirynck
Copy link
Contributor

@trevan could you rebase with master, and fix the merge conflict?
should be pretty easy, adding a comma after getFormat: siblingPipelineHelper.getFormat, thx.

@trevan
Copy link
Contributor Author

trevan commented Jul 19, 2017

I rebased.

@thomasneirynck
Copy link
Contributor

jenkins, test this

@thomasneirynck
Copy link
Contributor

Thx!

@thomasneirynck thomasneirynck merged commit 0ee63e6 into elastic:master Jul 19, 2017
@trevan trevan mentioned this pull request Jul 20, 2017
Closed
thomasneirynck pushed a commit to thomasneirynck/kibana that referenced this pull request Jul 20, 2017
@trevan @thomasneirynck
Use the customMetric's formatter for pipeline aggregations (elastic#1…
2c65103 
…1933)

This is a manual backport and required edits.
@thomasneirynck
Copy link
Contributor

thomasneirynck commented Jul 20, 2017 •
edited
Loading

Backports:
5.x: #13018
5.5: #13029

thomasneirynck added a commit that referenced this pull request Jul 21, 2017
@thomasneirynck
Use the customMetric's formatter for pipeline aggregations (#11933) (#…
fdf5ad2 
…13018)

This is a manual backport and required edits.
thomasneirynck added a commit to thomasneirynck/kibana that referenced this pull request Jul 21, 2017
@thomasneirynck
Use the customMetric's formatter for pipeline aggregations (elastic#1…
5ae7598 
…1933) (elastic#13018)

This is a manual backport and required edits.
thomasneirynck added a commit that referenced this pull request Jul 21, 2017
@thomasneirynck
Use the customMetric's formatter for pipeline aggregations (#11933) (#…
aeb4742 
…13018) (#13029)

This is a manual backport and required edits.
@Bargs Bargs mentioned this pull request Sep 6, 2017
Closed
@trevan trevan deleted the formatting-pipeline-aggs branch December 19, 2017 17:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ppisljar ppisljar ppisljar approved these changes

@thomasneirynck thomasneirynck thomasneirynck approved these changes

Assignees
No one assigned
Labels
Feature:Visualizations Generic visualization features (in case no more specific feature label is available) release_note:fix v5.5.2 v5.6.0 v6.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@trevan @elasticmachine @thomasneirynck @ppisljar