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

pluralized for occurrences vs occurrence #74564

Merged
merged 2 commits into from
Aug 11, 2020
Merged

pluralized for occurrences vs occurrence #74564

merged 2 commits into from
Aug 11, 2020

Conversation

brittanyjoiner15
Copy link
Contributor

Resolves #74005

For error details chart, occurrence is singular when there is only one.

image

@brittanyjoiner15 brittanyjoiner15 requested a review from smith August 6, 2020 16:49
@brittanyjoiner15 brittanyjoiner15 requested a review from a team as a code owner August 6, 2020 16:49
@brittanyjoiner15 brittanyjoiner15 self-assigned this Aug 6, 2020
@botelastic botelastic bot added the Team:APM All issues that need APM UI Team support label Aug 6, 2020
@elasticmachine
Copy link
Contributor

Pinging @elastic/apm-ui (Team:apm)

@brittanyjoiner15
Copy link
Contributor Author

@elasticmachine merge upstream

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Build metrics

async chunks size

id value diff baseline
apm 3.7MB +45.0B 3.7MB

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

cauemarcondes
cauemarcondes approved these changes Aug 11, 2020
View reviewed changes
Copy link
Contributor

@cauemarcondes cauemarcondes left a comment

Choose a reason for hiding this comment

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

LGTM

@brittanyjoiner15 brittanyjoiner15 merged commit f621b0e into elastic:master Aug 11, 2020
gmmorris added a commit to gmmorris/kibana that referenced this pull request Aug 11, 2020
@gmmorris
Merge branch 'master' into actions/webhook-remove-header
1dbf2f2 
* master: (106 commits)
  [Functional Tests] Adds a wait time between setting the index pattern and the time field on TSVB (elastic#74736)
  [Lens] Add styling options for x and y axes on the settings popover (elastic#71829)
  [Maps] add initial location option that fits to data bounds (elastic#74583)
  theme function (elastic#73451)
  [data.ui.query] Write filters to query log from default editor. (elastic#74474)
  [data.search.SearchSource] Move some SearchSource dependencies to the server. (elastic#74607)
  [Canvas][tech-debt] Convert renderers (elastic#74134)
  [security solutions][lists] Adds end to end tests (elastic#74473)
  pluralized for occurrences vs occurrence (elastic#74564)
  Update links that pointed to CONTRIBUTING.md (elastic#74757)
  [Ingest pipelines] Implement tabs in processor flyout (elastic#74469)
  [Event log] Use Alerts client & Actions client when fetching these types of SOs (elastic#73257)
  Bump chalk to 4.1.0 (elastic#73397)
  Index pattern field list - transition away from extending array - introduce and use getAll() (elastic#74718)
  [SECURITY] Bugs css/inspect (elastic#74711)
  [telemetry] update README to downplay ui_metrics (elastic#74635)
  Fixed grammar (elastic#74725)
  [Telemetry][API Integration] size_in_bytes to be a number (elastic#74664)
  [ILM] Convert node details flyout to TS (elastic#73707)
  [Ingest Node Pipelines] Sentence-case processor names (elastic#74645)
  ...
jloleysens added a commit to jloleysens/kibana that referenced this pull request Aug 12, 2020
@jloleysens
Merge branch 'master' of github.com:elastic/kibana into ingest-pipeli…
bbbe9d2 
…nes/processor-forms-a-d

* 'master' of github.com:elastic/kibana: (25 commits)
  [ML] Removing full lodash library imports (elastic#74742)
  [Search] Server strategy example (elastic#71679)
  [Reporting] Fix and test for Listing of Reports (elastic#74453)
  [maps] fix drawing shapes (elastic#74689)
  [Resolver] Improve simulator. Add more click-through tests and panel tests. (elastic#74601)
  Deprecate schema-less specs in Vega (elastic#73805)
  [Security Solution] Rename Administration > Hosts subtab to Endpoints (elastic#74287)
  Timelion deprecation doc (elastic#74508)
  [Functional Tests] Adds a wait time between setting the index pattern and the time field on TSVB (elastic#74736)
  [Lens] Add styling options for x and y axes on the settings popover (elastic#71829)
  [Maps] add initial location option that fits to data bounds (elastic#74583)
  theme function (elastic#73451)
  [data.ui.query] Write filters to query log from default editor. (elastic#74474)
  [data.search.SearchSource] Move some SearchSource dependencies to the server. (elastic#74607)
  [Canvas][tech-debt] Convert renderers (elastic#74134)
  [security solutions][lists] Adds end to end tests (elastic#74473)
  pluralized for occurrences vs occurrence (elastic#74564)
  Update links that pointed to CONTRIBUTING.md (elastic#74757)
  [Ingest pipelines] Implement tabs in processor flyout (elastic#74469)
  [Event log] Use Alerts client & Actions client when fetching these types of SOs (elastic#73257)
  ...

# Conflicts:
#	x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/field_components/text_editor.tsx
#	x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/manage_processor_form.tsx
#	x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/append.tsx
#	x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/bytes.tsx
#	x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/circle.tsx
#	x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/common_fields/field_name_field.tsx
#	x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/common_fields/ignore_missing_field.tsx
#	x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/convert.tsx
#	x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/csv.tsx
#	x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/date.tsx
#	x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/date_index_name.tsx
#	x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/dissect.tsx
#	x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/dot_expander.tsx
#	x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/drop.tsx
#	x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/index.ts
#	x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/shared.ts
@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create backports run node scripts/backport --pr 74564 or prevent reminders by adding the backport:skip label.

@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Aug 13, 2020
@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create backports run node scripts/backport --pr 74564 or prevent reminders by adding the backport:skip label.

2 similar comments
@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create backports run node scripts/backport --pr 74564 or prevent reminders by adding the backport:skip label.

@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create backports run node scripts/backport --pr 74564 or prevent reminders by adding the backport:skip label.

@dgieselaar
Copy link
Member

@brittanyjoiner15 should this be backported? If so, do you know how to/are you able to? Otherwise one of us can pick it up.

This was referenced Aug 18, 2020
Merged
Merged
brittanyjoiner15 added a commit to brittanyjoiner15/kibana that referenced this pull request Aug 18, 2020
@brittanyjoiner15 @elasticmachine
pluralized for occurrences vs occurrence (elastic#74564)
ce1beb2 
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
brittanyjoiner15 added a commit to brittanyjoiner15/kibana that referenced this pull request Aug 18, 2020
@brittanyjoiner15 @elasticmachine
pluralized for occurrences vs occurrence (elastic#74564)
8986fd5 
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
@brittanyjoiner15 brittanyjoiner15 mentioned this pull request Aug 18, 2020
Closed
brittanyjoiner15 added a commit to brittanyjoiner15/kibana that referenced this pull request Aug 18, 2020
@brittanyjoiner15 @elasticmachine
pluralized for occurrences vs occurrence (elastic#74564)
d00150b 
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
@brittanyjoiner15 brittanyjoiner15 mentioned this pull request Aug 18, 2020
Closed
brittanyjoiner15 added a commit to brittanyjoiner15/kibana that referenced this pull request Aug 18, 2020
@brittanyjoiner15
pluralized for occurrences vs occurrence (elastic#74564)
5dfeb3b 
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
# Conflicts:
#	x-pack/plugins/apm/public/components/app/ErrorGroupDetails/Distribution/index.tsx
@brittanyjoiner15 brittanyjoiner15 mentioned this pull request Aug 18, 2020
Closed
brittanyjoiner15 added a commit to brittanyjoiner15/kibana that referenced this pull request Aug 18, 2020
@brittanyjoiner15
pluralized for occurrences vs occurrence (elastic#74564)
0fa317e 
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
# Conflicts:
#	x-pack/plugins/apm/public/components/app/ErrorGroupDetails/Distribution/index.tsx
@brittanyjoiner15 brittanyjoiner15 mentioned this pull request Aug 18, 2020
Closed
brittanyjoiner15 added a commit to brittanyjoiner15/kibana that referenced this pull request Aug 18, 2020
@brittanyjoiner15
pluralized for occurrences vs occurrence (elastic#74564)
560e1e4 
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
# Conflicts:
#	x-pack/plugins/apm/public/components/app/ErrorGroupDetails/Distribution/index.tsx
@brittanyjoiner15 brittanyjoiner15 mentioned this pull request Aug 18, 2020
Closed
brittanyjoiner15 added a commit to brittanyjoiner15/kibana that referenced this pull request Aug 18, 2020
@brittanyjoiner15
pluralized for occurrences vs occurrence (elastic#74564)
3e27ecb 
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
# Conflicts:
#	x-pack/plugins/apm/public/components/app/ErrorGroupDetails/Distribution/index.tsx
@brittanyjoiner15 brittanyjoiner15 mentioned this pull request Aug 18, 2020
Closed
brittanyjoiner15 added a commit to brittanyjoiner15/kibana that referenced this pull request Aug 18, 2020
@brittanyjoiner15
pluralized for occurrences vs occurrence (elastic#74564)
9d41281 
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
# Conflicts:
#	x-pack/plugins/apm/public/components/app/ErrorGroupDetails/Distribution/index.tsx
@brittanyjoiner15 brittanyjoiner15 mentioned this pull request Aug 18, 2020
Closed
brittanyjoiner15 added a commit to brittanyjoiner15/kibana that referenced this pull request Aug 18, 2020
@brittanyjoiner15
pluralized for occurrences vs occurrence (elastic#74564)
3f4781c 
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
# Conflicts:
#	x-pack/plugins/apm/public/components/app/ErrorGroupDetails/Distribution/index.tsx
@brittanyjoiner15 brittanyjoiner15 mentioned this pull request Aug 18, 2020
Closed
brittanyjoiner15 added a commit to brittanyjoiner15/kibana that referenced this pull request Aug 18, 2020
@brittanyjoiner15
pluralized for occurrences vs occurrence (elastic#74564)
833acdd 
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
# Conflicts:
#	x-pack/plugins/apm/public/components/app/ErrorGroupDetails/Distribution/index.tsx
@brittanyjoiner15 brittanyjoiner15 mentioned this pull request Aug 18, 2020
Closed
brittanyjoiner15 added a commit to brittanyjoiner15/kibana that referenced this pull request Aug 18, 2020
@brittanyjoiner15
pluralized for occurrences vs occurrence (elastic#74564)
7e868a0 
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
# Conflicts:
#	x-pack/plugins/apm/public/components/app/ErrorGroupDetails/Distribution/index.tsx
@brittanyjoiner15 brittanyjoiner15 mentioned this pull request Aug 18, 2020
Closed
brittanyjoiner15 added a commit to brittanyjoiner15/kibana that referenced this pull request Aug 18, 2020
@brittanyjoiner15
pluralized for occurrences vs occurrence (elastic#74564)
ed4a292 
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
# Conflicts:
#	x-pack/plugins/apm/public/components/app/ErrorGroupDetails/Distribution/index.tsx
@brittanyjoiner15 brittanyjoiner15 mentioned this pull request Aug 18, 2020
Closed
brittanyjoiner15 added a commit to brittanyjoiner15/kibana that referenced this pull request Aug 18, 2020
@brittanyjoiner15
pluralized for occurrences vs occurrence (elastic#74564)
f149245 
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
# Conflicts:
#	x-pack/plugins/apm/public/components/app/ErrorGroupDetails/Distribution/index.tsx
@brittanyjoiner15 brittanyjoiner15 mentioned this pull request Aug 18, 2020
Closed
brittanyjoiner15 added a commit to brittanyjoiner15/kibana that referenced this pull request Aug 18, 2020
@brittanyjoiner15
pluralized for occurrences vs occurrence (elastic#74564)
ba9e0a9 
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
# Conflicts:
#	x-pack/plugins/apm/public/components/app/ErrorGroupDetails/Distribution/index.tsx
@brittanyjoiner15 brittanyjoiner15 mentioned this pull request Aug 18, 2020
Closed
brittanyjoiner15 added a commit to brittanyjoiner15/kibana that referenced this pull request Aug 18, 2020
@brittanyjoiner15
pluralized for occurrences vs occurrence (elastic#74564)
d446c3d 
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
# Conflicts:
#	x-pack/plugins/apm/public/components/app/ErrorGroupDetails/Distribution/index.tsx
@brittanyjoiner15 brittanyjoiner15 mentioned this pull request Aug 18, 2020
Closed
@dgieselaar
Copy link
Member

@brittanyjoiner15 Backporting to 7.x and 7.9 should be good enough - I've closed the other backport PRs.

brittanyjoiner15 added a commit that referenced this pull request Aug 19, 2020
@brittanyjoiner15 @elasticmachine
pluralized for occurrences vs occurrence (#74564) (#75318)
28f7630 
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
brittanyjoiner15 added a commit that referenced this pull request Aug 19, 2020
@brittanyjoiner15 @elasticmachine
pluralized for occurrences vs occurrence (#74564) (#75319)
50f9d27 
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
@kibanamachine kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label Aug 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cauemarcondes cauemarcondes cauemarcondes approved these changes

@smith smith Awaiting requested review from smith

Assignees
No one assigned
Labels
release_note:fix Team:APM All issues that need APM UI Team support v7.9.1 v7.10.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

fix error rate chart pluralization
5 participants
@brittanyjoiner15 @elasticmachine @kibanamachine @dgieselaar @cauemarcondes