[7.14] [Enterprise Search] Fix beta notification in sidebar (#104763)

[kibanamachine]

Backports the following commits to 7.14:

• [Enterprise Search] Fix beta notification in sidebar ([Enterprise Search] Fix beta notification in sidebar #104763)

[kibanamachine]

💛 Build succeeded, but was flaky

• continuous-integration/kibana-ci/pull-request

• Commit: 8ce98f9

• Storybooks Preview

• Flaky suites:

  • oss-accessibility

---

Test Failures

Kibana Pipeline / general / Accessibility Tests.test/accessibility/apps/dashboard·ts.Dashboard add a visualization

Link to Jenkins

Standard Out

Failed Tests Reporter:
  - Test has not failed recently on tracked branches

[00:00:00]       │
[00:01:59]         └-: Dashboard
[00:01:59]           └-> "before all" hook for "dashboard"
[00:01:59]           └-> "before all" hook for "dashboard"
[00:01:59]             │ debg navigateToActualUrl http://localhost:6151/app/home#/tutorial_directory/sampleData
[00:01:59]             │ debg browser[INFO] http://localhost:6151/app/home?_t=1625699892392#/tutorial_directory/sampleData 281 Refused to execute inline script because it violates the following Content Security Policy directive: "script-src 'unsafe-eval' 'self'". Either the 'unsafe-inline' keyword, a hash ('sha256-P5polb1UreUSOe5V/Pv7tc+yeZuJXiOi/3fqhGsU7BE='), or a nonce ('nonce-...') is required to enable inline execution.
[00:01:59]             │
[00:01:59]             │ debg browser[INFO] http://localhost:6151/bootstrap.js 41:19 "^ A single error about an inline script not firing due to content security policy is expected!"
[00:01:59]             │ debg currentUrl = http://localhost:6151/app/home#/tutorial_directory/sampleData
[00:01:59]             │          appUrl = http://localhost:6151/app/home#/tutorial_directory/sampleData
[00:01:59]             │ debg TestSubjects.find(kibanaChrome)
[00:01:59]             │ debg Find.findByCssSelector('[data-test-subj="kibanaChrome"]') with timeout=60000
[00:02:01]             │ debg TestSubjects.exists(addSampleDataSetflights)
[00:02:01]             │ debg Find.existsByDisplayedByCssSelector('[data-test-subj="addSampleDataSetflights"]') with timeout=2500
[00:02:02]             │ERROR browser[SEVERE] http://localhost:6151/api/fleet/settings - Failed to load resource: the server responded with a status of 404 (Not Found)
[00:02:02]             │ debg TestSubjects.click(addSampleDataSetflights)
[00:02:02]             │ debg Find.clickByCssSelector('[data-test-subj="addSampleDataSetflights"]') with timeout=10000
[00:02:02]             │ debg Find.findByCssSelector('[data-test-subj="addSampleDataSetflights"]') with timeout=10000
[00:02:02]             │ debg TestSubjects.find(sampleDataSetCardflights)
[00:02:02]             │ debg Find.findByCssSelector('[data-test-subj="sampleDataSetCardflights"]') with timeout=10000
[00:02:03]           └-> dashboard
[00:02:03]             └-> "before each" hook: global before each for "dashboard"
[00:02:03]             │ debg navigating to dashboard url: http://localhost:6151/app/dashboards#/list
[00:02:03]             │ debg navigate to: http://localhost:6151/app/dashboards#/list
[00:02:03]             │ debg browser[INFO] http://localhost:6151/app/dashboards?_t=1625699896346#/list 281 Refused to execute inline script because it violates the following Content Security Policy directive: "script-src 'unsafe-eval' 'self'". Either the 'unsafe-inline' keyword, a hash ('sha256-P5polb1UreUSOe5V/Pv7tc+yeZuJXiOi/3fqhGsU7BE='), or a nonce ('nonce-...') is required to enable inline execution.
[00:02:03]             │
[00:02:03]             │ debg browser[INFO] http://localhost:6151/bootstrap.js 41:19 "^ A single error about an inline script not firing due to content security policy is expected!"
[00:02:03]             │ debg ... sleep(700) start
[00:02:04]             │ debg ... sleep(700) end
[00:02:04]             │ debg returned from get, calling refresh
[00:02:05]             │ debg browser[INFO] http://localhost:6151/app/dashboards?_t=1625699896346#/list 281 Refused to execute inline script because it violates the following Content Security Policy directive: "script-src 'unsafe-eval' 'self'". Either the 'unsafe-inline' keyword, a hash ('sha256-P5polb1UreUSOe5V/Pv7tc+yeZuJXiOi/3fqhGsU7BE='), or a nonce ('nonce-...') is required to enable inline execution.
[00:02:05]             │
[00:02:05]             │ debg browser[INFO] http://localhost:6151/bootstrap.js 41:19 "^ A single error about an inline script not firing due to content security policy is expected!"
[00:02:05]             │ debg currentUrl = http://localhost:6151/app/dashboards#/list
[00:02:05]             │          appUrl = http://localhost:6151/app/dashboards#/list
[00:02:05]             │ debg TestSubjects.find(kibanaChrome)
[00:02:05]             │ debg Find.findByCssSelector('[data-test-subj="kibanaChrome"]') with timeout=60000
[00:02:05]             │ debg ... sleep(501) start
[00:02:06]             │ debg ... sleep(501) end
[00:02:06]             │ debg in navigateTo url = http://localhost:6151/app/dashboards#/list?_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:now-15m,to:now))
[00:02:06]             │ debg --- retry.tryForTime error: URL changed, waiting for it to settle
[00:02:06]             │ debg ... sleep(501) start
[00:02:07]             │ debg ... sleep(501) end
[00:02:07]             │ debg in navigateTo url = http://localhost:6151/app/dashboards#/list?_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:now-15m,to:now))
[00:02:07]             └- ✓ pass  (4.6s) "Dashboard dashboard"
[00:02:07]           └-> create dashboard button
[00:02:07]             └-> "before each" hook: global before each for "create dashboard button"
[00:02:07]             │ debg TestSubjects.exists(newItemButton)
[00:02:07]             │ debg Find.existsByDisplayedByCssSelector('[data-test-subj="newItemButton"]') with timeout=10000
[00:02:10]             │ debg --- retry.tryForTime error: [data-test-subj="newItemButton"] is not displayed
[00:02:13]             │ debg --- retry.tryForTime failed again with the same message...
[00:02:16]             │ debg --- retry.tryForTime failed again with the same message...
[00:02:19]             │ debg --- retry.tryForTime failed again with the same message...
[00:02:20]             │ debg TestSubjects.click(createDashboardPromptButton)
[00:02:20]             │ debg Find.clickByCssSelector('[data-test-subj="createDashboardPromptButton"]') with timeout=10000
[00:02:20]             │ debg Find.findByCssSelector('[data-test-subj="createDashboardPromptButton"]') with timeout=10000
[00:02:20]             │ debg TestSubjects.exists(dashboardCreateConfirm)
[00:02:20]             │ debg Find.existsByDisplayedByCssSelector('[data-test-subj="dashboardCreateConfirm"]') with timeout=2500
[00:02:22]             │ERROR browser[SEVERE] http://localhost:6151/api/index_patterns/_fields_for_wildcard?pattern=logstash-*&meta_fields=_source&meta_fields=_id&meta_fields=_type&meta_fields=_index&meta_fields=_score - Failed to load resource: the server responded with a status of 404 (Not Found)
[00:02:22]             │ debg --- retry.tryForTime error: [data-test-subj="dashboardCreateConfirm"] is not displayed
[00:02:23]             │ debg waitForRenderComplete
[00:02:23]             │ debg in getSharedItemsCount
[00:02:23]             │ debg Find.findByCssSelector('[data-shared-items-count]') with timeout=10000
[00:02:23]             │ debg Renderable.waitForRender for 0 elements
[00:02:23]             │ debg Find.allByCssSelector('[data-render-complete="true"]') with timeout=10000
[00:02:33]             │ debg Find.allByCssSelector('[data-loading]') with timeout=1000
[00:02:34]             └- ✓ pass  (26.9s) "Dashboard create dashboard button"
[00:02:34]           └-> save empty dashboard
[00:02:34]             └-> "before each" hook: global before each for "save empty dashboard"
[00:02:34]             │ debg TestSubjects.click(dashboardSaveMenuItem)
[00:02:34]             │ debg Find.clickByCssSelector('[data-test-subj="dashboardSaveMenuItem"]') with timeout=10000
[00:02:34]             │ debg Find.findByCssSelector('[data-test-subj="dashboardSaveMenuItem"]') with timeout=10000
[00:02:34]             │ debg TestSubjects.find(savedObjectSaveModal)
[00:02:34]             │ debg Find.findByCssSelector('[data-test-subj="savedObjectSaveModal"]') with timeout=10000
[00:02:35]             │ debg entering new title
[00:02:35]             │ debg TestSubjects.setValue(savedObjectTitle, Dashboard Listing A11y)
[00:02:35]             │ debg TestSubjects.click(savedObjectTitle)
[00:02:35]             │ debg Find.clickByCssSelector('[data-test-subj="savedObjectTitle"]') with timeout=10000
[00:02:35]             │ debg Find.findByCssSelector('[data-test-subj="savedObjectTitle"]') with timeout=10000
[00:02:35]             │ debg TestSubjects.exists(saveAsNewCheckbox)
[00:02:35]             │ debg Find.existsByDisplayedByCssSelector('[data-test-subj="saveAsNewCheckbox"]') with timeout=2500
[00:02:37]             │ debg --- retry.tryForTime error: [data-test-subj="saveAsNewCheckbox"] is not displayed
[00:02:38]             │ debg DashboardPage.clickSave
[00:02:38]             │ debg TestSubjects.click(confirmSaveSavedObjectButton)
[00:02:38]             │ debg Find.clickByCssSelector('[data-test-subj="confirmSaveSavedObjectButton"]') with timeout=10000
[00:02:38]             │ debg Find.findByCssSelector('[data-test-subj="confirmSaveSavedObjectButton"]') with timeout=10000
[00:02:38]             │ debg Find.waitForElementStale with timeout=10000
[00:02:38]             │ info [o.e.c.m.MetadataMappingService] [node-01] [.kibana_7.14.0_001/B6Zv6m8eTZO_2t6w9Hgbrg] update_mapping [_doc]
[00:02:39]             │ debg TestSubjects.exists(saveDashboardSuccess)
[00:02:39]             │ debg Find.existsByDisplayedByCssSelector('[data-test-subj="saveDashboardSuccess"]') with timeout=120000
[00:02:39]             │ debg Find.findByCssSelector('.euiToast') with timeout=60000
[00:02:39]             │ debg Find.findByCssSelector('.euiToastHeader__title') with timeout=10000
[00:02:39]             │ debg Find.clickByCssSelector('.euiToast__closeButton') with timeout=10000
[00:02:39]             │ debg Find.findByCssSelector('.euiToast__closeButton') with timeout=10000
[00:02:39]             │ debg isGlobalLoadingIndicatorVisible
[00:02:39]             │ debg TestSubjects.exists(globalLoadingIndicator)
[00:02:39]             │ debg Find.existsByDisplayedByCssSelector('[data-test-subj="globalLoadingIndicator"]') with timeout=1500
[00:02:41]             │ debg --- retry.tryForTime error: [data-test-subj="globalLoadingIndicator"] is not displayed
[00:02:41]             │ debg TestSubjects.exists(globalLoadingIndicator-hidden)
[00:02:41]             │ debg Find.existsByCssSelector('[data-test-subj="globalLoadingIndicator-hidden"]') with timeout=100000
[00:02:41]             │ debg Waiting for save modal to close
[00:02:41]             │ debg TestSubjects.exists(savedObjectSaveModal)
[00:02:41]             │ debg Find.existsByDisplayedByCssSelector('[data-test-subj="savedObjectSaveModal"]') with timeout=2500
[00:02:44]             │ debg --- retry.tryForTime error: [data-test-subj="savedObjectSaveModal"] is not displayed
[00:02:44]             │ debg TestSubjects.exists(dashboardEditMode)
[00:02:44]             │ debg Find.existsByDisplayedByCssSelector('[data-test-subj="dashboardEditMode"]') with timeout=2500
[00:02:47]             │ debg --- retry.tryForTime error: [data-test-subj="dashboardEditMode"] is not displayed
[00:02:47]             │ debg clickCancelOutOfEditMode
[00:02:47]             │ debg getIsInViewMode
[00:02:47]             │ debg TestSubjects.exists(dashboardEditMode)
[00:02:47]             │ debg Find.existsByDisplayedByCssSelector('[data-test-subj="dashboardEditMode"]') with timeout=2500
[00:02:50]             │ debg --- retry.tryForTime error: [data-test-subj="dashboardEditMode"] is not displayed
[00:02:50]             │ debg Waiting up to 20000ms for leave edit mode button enabled...
[00:02:50]             │ debg TestSubjects.find(dashboardViewOnlyMode)
[00:02:50]             │ debg Find.findByCssSelector('[data-test-subj="dashboardViewOnlyMode"]') with timeout=10000
[00:02:50]             │ debg TestSubjects.click(dashboardViewOnlyMode)
[00:02:50]             │ debg Find.clickByCssSelector('[data-test-subj="dashboardViewOnlyMode"]') with timeout=10000
[00:02:50]             │ debg Find.findByCssSelector('[data-test-subj="dashboardViewOnlyMode"]') with timeout=10000
[00:02:50]             │ debg TestSubjects.exists(confirmModalTitleText)
[00:02:50]             │ debg Find.existsByDisplayedByCssSelector('[data-test-subj="confirmModalTitleText"]') with timeout=2500
[00:02:53]             │ debg --- retry.tryForTime error: [data-test-subj="confirmModalTitleText"] is not displayed
[00:02:53]             │ debg isGlobalLoadingIndicatorVisible
[00:02:53]             │ debg TestSubjects.exists(globalLoadingIndicator)
[00:02:53]             │ debg Find.existsByDisplayedByCssSelector('[data-test-subj="globalLoadingIndicator"]') with timeout=1500
[00:02:55]             │ debg --- retry.tryForTime error: [data-test-subj="globalLoadingIndicator"] is not displayed
[00:02:55]             │ debg TestSubjects.exists(globalLoadingIndicator-hidden)
[00:02:55]             │ debg Find.existsByCssSelector('[data-test-subj="globalLoadingIndicator-hidden"]') with timeout=100000
[00:02:56]             └- ✓ pass  (21.4s) "Dashboard save empty dashboard"
[00:02:56]           └-> Open Edit mode
[00:02:56]             └-> "before each" hook: global before each for "Open Edit mode"
[00:02:56]             │ debg Switching to edit mode
[00:02:56]             │ debg TestSubjects.exists(dashboardEditMode)
[00:02:56]             │ debg Find.existsByDisplayedByCssSelector('[data-test-subj="dashboardEditMode"]') with timeout=2500
[00:02:56]             │ debg TestSubjects.click(dashboardEditMode)
[00:02:56]             │ debg Find.clickByCssSelector('[data-test-subj="dashboardEditMode"]') with timeout=10000
[00:02:56]             │ debg Find.findByCssSelector('[data-test-subj="dashboardEditMode"]') with timeout=10000
[00:02:56]             │ debg Waiting up to 20000ms for in edit mode...
[00:02:56]             │ debg TestSubjects.findAll(embeddablePanel)
[00:02:56]             │ debg Find.allByCssSelector('[data-test-subj="embeddablePanel"]') with timeout=2500
[00:02:58]             │ debg TestSubjects.findAll(embeddablePanelToggleMenuIcon)
[00:02:58]             │ debg Find.allByCssSelector('[data-test-subj="embeddablePanelToggleMenuIcon"]') with timeout=2500
[00:03:01]             └- ✓ pass  (5.5s) "Dashboard Open Edit mode"
[00:03:01]           └-> Open add panel
[00:03:01]             └-> "before each" hook: global before each for "Open add panel"
[00:03:01]             │ debg DashboardAddPanel.clickOpenAddPanel
[00:03:01]             │ debg TestSubjects.click(dashboardAddPanelButton)
[00:03:01]             │ debg Find.clickByCssSelector('[data-test-subj="dashboardAddPanelButton"]') with timeout=10000
[00:03:01]             │ debg Find.findByCssSelector('[data-test-subj="dashboardAddPanelButton"]') with timeout=10000
[00:03:02]             └- ✓ pass  (689ms) "Dashboard Open add panel"
[00:03:02]           └-> add a visualization
[00:03:02]             └-> "before each" hook: global before each for "add a visualization"
[00:03:02]             │ debg TestSubjects.click(savedObjectTitle[Flights]-Delay-Buckets)
[00:03:02]             │ debg Find.clickByCssSelector('[data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"]') with timeout=10000
[00:03:02]             │ debg Find.findByCssSelector('[data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"]') with timeout=10000
[00:03:12]             │ debg --- retry.try error: Waiting for element to be located By(css selector, [data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"])
[00:03:12]             │      Wait timed out after 10048ms
[00:03:12]             │ debg Find.findByCssSelector('[data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"]') with timeout=10000
[00:03:22]             │ debg --- retry.try error: Waiting for element to be located By(css selector, [data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"])
[00:03:22]             │      Wait timed out after 10021ms
[00:03:23]             │ debg Find.findByCssSelector('[data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"]') with timeout=10000
[00:03:33]             │ debg --- retry.try error: Waiting for element to be located By(css selector, [data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"])
[00:03:33]             │      Wait timed out after 10053ms
[00:03:34]             │ debg Find.findByCssSelector('[data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"]') with timeout=10000
[00:03:44]             │ debg --- retry.try error: Waiting for element to be located By(css selector, [data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"])
[00:03:44]             │      Wait timed out after 10024ms
[00:03:44]             │ debg Find.findByCssSelector('[data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"]') with timeout=10000
[00:03:54]             │ debg --- retry.try error: Waiting for element to be located By(css selector, [data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"])
[00:03:54]             │      Wait timed out after 10010ms
[00:03:55]             │ debg Find.findByCssSelector('[data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"]') with timeout=10000
[00:04:05]             │ debg --- retry.try error: Waiting for element to be located By(css selector, [data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"])
[00:04:05]             │      Wait timed out after 10037ms
[00:04:05]             │ debg Find.findByCssSelector('[data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"]') with timeout=10000
[00:04:15]             │ debg --- retry.try error: Waiting for element to be located By(css selector, [data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"])
[00:04:15]             │      Wait timed out after 10036ms
[00:04:16]             │ debg Find.findByCssSelector('[data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"]') with timeout=10000
[00:04:26]             │ debg --- retry.try error: Waiting for element to be located By(css selector, [data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"])
[00:04:26]             │      Wait timed out after 10020ms
[00:04:26]             │ debg Find.findByCssSelector('[data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"]') with timeout=10000
[00:04:36]             │ debg --- retry.try error: Waiting for element to be located By(css selector, [data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"])
[00:04:36]             │      Wait timed out after 10057ms
[00:04:37]             │ debg Find.findByCssSelector('[data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"]') with timeout=10000
[00:04:47]             │ debg --- retry.try error: Waiting for element to be located By(css selector, [data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"])
[00:04:47]             │      Wait timed out after 10031ms
[00:04:47]             │ debg Find.findByCssSelector('[data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"]') with timeout=10000
[00:04:54]             │ info [o.e.c.m.MetadataMappingService] [node-01] [.kibana_task_manager_7.14.0_001/SfAthIGpReqlzEskh95EfQ] update_mapping [_doc]
[00:04:57]             │ debg --- retry.try error: Waiting for element to be located By(css selector, [data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"])
[00:04:57]             │      Wait timed out after 10012ms
[00:04:58]             │ debg Find.findByCssSelector('[data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"]') with timeout=10000
[00:05:08]             │ debg --- retry.try error: Waiting for element to be located By(css selector, [data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"])
[00:05:08]             │      Wait timed out after 10014ms
[00:05:08]             │ info Taking screenshot "/dev/shm/workspace/parallel/5/kibana/test/functional/screenshots/failure/Dashboard add a visualization.png"
[00:05:08]             │ info Current URL is: http://localhost:6151/app/dashboards#/view/b0b83070-df79-11eb-b306-f7d6e3ee5c65?_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:now-15m,to:now))
[00:05:09]             │ info Saving page source to: /dev/shm/workspace/parallel/5/kibana/test/functional/failure_debug/html/Dashboard add a visualization.html
[00:05:09]             └- ✖ fail: Dashboard add a visualization
[00:05:09]             │      Error: retry.try timeout: TimeoutError: Waiting for element to be located By(css selector, [data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"])
[00:05:09]             │ Wait timed out after 10014ms
[00:05:09]             │     at /dev/shm/workspace/parallel/5/kibana/node_modules/selenium-webdriver/lib/webdriver.js:842:17
[00:05:09]             │     at runMicrotasks (<anonymous>)
[00:05:09]             │     at processTicksAndRejections (internal/process/task_queues.js:95:5)
[00:05:09]             │       at onFailure (test/common/services/retry/retry_for_success.ts:17:9)
[00:05:09]             │       at retryForSuccess (test/common/services/retry/retry_for_success.ts:57:13)
[00:05:09]             │       at RetryService.try (test/common/services/retry/retry.ts:31:12)
[00:05:09]             │       at Proxy.clickByCssSelector (test/functional/services/common/find.ts:360:5)
[00:05:09]             │       at TestSubjects.click (test/functional/services/common/test_subjects.ts:105:5)
[00:05:09]             │       at Context.<anonymous> (test/accessibility/apps/dashboard.ts:63:7)
[00:05:09]             │       at Object.apply (node_modules/@kbn/test/target_node/functional_test_runner/lib/mocha/wrap_function.js:87:16)
[00:05:09]             │ 
[00:05:09]             │ 

Stack Trace

Error: retry.try timeout: TimeoutError: Waiting for element to be located By(css selector, [data-test-subj="savedObjectTitle[Flights]-Delay-Buckets"])
Wait timed out after 10014ms
    at /dev/shm/workspace/parallel/5/kibana/node_modules/selenium-webdriver/lib/webdriver.js:842:17
    at runMicrotasks (<anonymous>)
    at processTicksAndRejections (internal/process/task_queues.js:95:5)
    at onFailure (test/common/services/retry/retry_for_success.ts:17:9)
    at retryForSuccess (test/common/services/retry/retry_for_success.ts:57:13)
    at RetryService.try (test/common/services/retry/retry.ts:31:12)
    at Proxy.clickByCssSelector (test/functional/services/common/find.ts:360:5)
    at TestSubjects.click (test/functional/services/common/test_subjects.ts:105:5)
    at Context.<anonymous> (test/accessibility/apps/dashboard.ts:63:7)
    at Object.apply (node_modules/@kbn/test/target_node/functional_test_runner/lib/mocha/wrap_function.js:87:16)

---

Metrics [docs]

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id	before	after	diff
enterpriseSearch	2.1MB	2.1MB	-480.0B

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

cc @constancecchen