Commit graph

136 commits

Author SHA1 Message Date
Dmitry
8e9876ef59
oss tests: replace grunt task with node script (#82371) (#82633)
# Conflicts:
#	tasks/function_test_groups.js
#	test/scripts/jenkins_ci_group.sh
2020-11-05 13:17:33 +01:00
Spencer
279fbe1172
[7.x] [ci] run server integration tests (#81698) (#82530)
Co-authored-by: spalger <spalger@users.noreply.github.com>
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
2020-11-03 17:45:40 -07:00
Tiago Costa
620cbc8ba5
chore(NA): move into single pkg json (#80015) (#82378)
* chore(NA): update gitignore to include first changes from moving into a single package.json

* chore(NA): update gitignore

* chore(NA): move all the dependencies into the single package.json and apply changes to bootstrap

* chore(NA): fix types problems after the single package json

* chore(NA): include code to find the dependencies used across the code

* chore(NA): introduce pure lockfile for install dependencies on build

* chore(NA): update clean task to not delete anything from xpack node_modules

* chore(NA): update gitignore to remove development temporary rules

* chore(NA): update notice file

* chore(NA): update jest snapshots

* chore(NA): fix whitelisted licenses to include a new specify form of an already included one

* chore(NA): remove check lockfile symlinks from child projects

* chore(NA): fix eslint and add missing declared deps on single pkg json

* chore(NA): correctly update notice

* chore(NA): fix failing jest test for storyshots.test.tsx

* chore(NA): fix cypress multi reporter path

* chore(NA): fix Project tests check

* chore(NA): fix problem with logic to detect used dependes on oss build

* chore(NA): include correct x-pack plugins dep discovery

* chore(NA): discover entries under dynamic requires on vis_type_timelion

* chore(NA): remove canvas

* test(NA): fix jest unit tests

* chore(NA): remove double react declaration from storyshot test file

* chore(NA): try removing isOSS check

* chore(NA): support for plugin development

* chore(NA): update logic to fix unit tests and typechecking

* chore(NA): support to run npm scripts in child kbn projects across all envs

* chore(NA): support github checks reporter on x-pack and remove cpy types as the package correctly provides them

* chore(NA): update cpy version

* chore(NA): include last kbn pm changes

* chore(NA): update style on build_production_projects.ts

* chore(NA): remove any cast fom telemetry opt in stats

* chore(NA): remove del and re-use rm -rf again

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
# Conflicts:
#	package.json
#	packages/kbn-pm/dist/index.js
#	x-pack/package.json
#	yarn.lock
2020-11-02 23:22:35 +00:00
Brian Seeders
aae3c3e3df
[CI] Move kibana build dir outside of repo for functional tests (#80018) (#80046) 2020-10-08 16:58:52 -04:00
Spencer
dbc09a5d42
[7.x] [kbn/optimizer] report limits with ci metrics (#78205) (#79950)
* [kbn/optimizer] report limits with ci metrics (#78205)

Co-authored-by: spalger <spalger@users.noreply.github.com>
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

* update bundle limits for 7.x branch

Co-authored-by: spalger <spalger@users.noreply.github.com>
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
2020-10-07 18:09:38 -07:00
Josh Dover
d055f9f042
[7.x] Delay client-side feature usage registration until start (#79365) (#79856)
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
2020-10-07 11:02:10 -06:00
Tiago Costa
86f628d318
chore(NA): merge and solve conflicts with 7.x (#79237) 2020-10-02 02:40:18 +01:00
Spencer
f9abd1789b
[7.x] [kbn/optimizer] only build xpack examples when building xpack plugins (#78656) (#78681)
Co-authored-by: spalger <spalger@users.noreply.github.com>

Co-authored-by: spalger <spalger@users.noreply.github.com>
2020-09-28 14:56:38 -07:00
Spencer
ae6f0fa9b1
[7.x] remove visual aspects of baseline job (#77815) (#77842)
Co-authored-by: spalger <spalger@users.noreply.github.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: spalger <spalger@users.noreply.github.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
2020-09-17 21:28:29 -07:00
Thomas Watson
95bb064afb
[7.x] [CI] ensure tests for @elastic/safer-lodash-set only runs once (#77146) (#77184) 2020-09-14 12:18:08 +02:00
MadameSheema
bddddc93e4
[SECURITY SOLUTION] Adds 'cypress:open-as-ci' command (#76125) (#76869)
* adds 'cypress:open-as-ci' command

* fixes typecheck error

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
# Conflicts:
#	x-pack/plugins/security_solution/package.json
2020-09-07 17:55:18 +02:00
Brian Seeders
2ece4f12a4
[7.x] [CI] Add pipeline task queue framework and merge workers into one (#71268) (#74276) 2020-08-14 16:41:47 -04:00
Spencer
47897a2780
[7.x] Remove legacy optimizer (#73154) (#74966)
Co-authored-by: spalger <spalger@users.noreply.github.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
2020-08-13 12:36:25 -07:00
Spencer
60ec901f64
[7.x] Remove karma (#73126) (#73328)
Co-authored-by: spalger <spalger@users.noreply.github.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
2020-07-28 10:19:26 -07:00
Spencer
c184115288
[7.x] [kbn/optimizer] report sizes of assets produced by optimizer (#71319) (#71878)
Co-authored-by: spalger <spalger@users.noreply.github.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
2020-07-15 10:09:15 -07:00
spalger
d625f82718 [CI] Add baseline trigger job
(cherry picked from commit a5c9c4ec43)

rename visual_baseline -> baseline_capture

(cherry picked from commit a81d8b55ab)

remove unnecessary context reference from trigger job

(cherry picked from commit 817fdf9b439e85c3ddfda126b3efb4e45c36006b)
(cherry picked from commit b1433e6317)

fix triggered job name

(cherry picked from commit e318ea76dc)
2020-07-14 15:32:20 -07:00
spalger
e535aa6446 Revert "Revert "[7.x] [kbn/optimizer] implement "requiredBundles" property of KP plugins (#70911) (#71355)" (#71382)"
This reverts commit c45fa3dd58.
2020-07-10 20:13:28 -07:00
Brian Seeders
c45fa3dd58
Revert "[7.x] [kbn/optimizer] implement "requiredBundles" property of KP plugins (#70911) (#71355)" (#71382)
This reverts commit 243a864359.
2020-07-10 23:07:01 -04:00
Spencer
243a864359
[7.x] [kbn/optimizer] implement "requiredBundles" property of KP plugins (#70911) (#71355)
Co-authored-by: Josh Dover <me@joshdover.com>
Co-authored-by: spalger <spalger@users.noreply.github.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
# Conflicts:
#	packages/kbn-optimizer/src/integration_tests/__snapshots__/basic_optimization.test.ts.snap
#	src/plugins/embeddable/kibana.json
#	src/plugins/telemetry/kibana.json
#	src/plugins/ui_actions/kibana.json
#	x-pack/plugins/apm/kibana.json
#	x-pack/plugins/upgrade_assistant/kibana.json
2020-07-10 09:37:22 -07:00
Spencer
9ed38ec72b
[7.x] [savedObjects field count] run in baseline job (#70999) (#71328)
Co-authored-by: spalger <spalger@users.noreply.github.com>
2020-07-09 16:59:00 -07:00
Rudolf Meijering
d9707614cf
[7.x] CI Reporter for saved objects field count (#70580) (#70969)
* CI Reporter for saved objects field count (#70580)

* CI Reporter for saved objects field count

* Metrics needs to be an array

* Fix type failures

* Link to field count issue

* Revert "Link to field count issue"

This reverts commit 8c0126b838.

* Break down field count per type

* Don't log total metric as metrics report already calculates this

* Add saved objects field count ci metrics test to codeowners

* Address review comments

* Add field count CI metrics for disabled plugins

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
# Conflicts:
#	.github/CODEOWNERS

* Don't backport CODEOWNERS file to 7.x
2020-07-07 22:24:01 +02:00
liza-mae
77f476152d
Update network idle timeout (#70629) (#70655)
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
2020-07-03 06:49:48 -06:00
MadameSheema
4548d3dbf7
[7.x] [SIEM] Reenabling Cypress tests (#70397) (#70551)
* [SIEM] Reenabling Cypress tests (#70397)

* reenabling cypress

* skips Overview tests

* skips search bar test

* skips URL test

* fixes merge issue

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
2020-07-03 14:03:17 +02:00
spalger
4fc922b89c disable page load metrics task in baseline job too
(cherry picked from commit 848c239bff)
2020-06-29 09:31:37 -07:00
MadameSheema
d12bf131af
renames SIEM to Security Solution (#70070) (#70105)
# Conflicts:
#	test/scripts/jenkins_xpack.sh
2020-06-26 23:11:45 +02:00
Tyler Smalley
bdd66be0ec [SECURITY] Disables Cypress tests
Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
2020-06-24 16:22:52 -07:00
Mikhail Shustov
c521487b30
[7.x] Add functional test for Kibana embedded in iframe (#68544) (#69487)
* Add functional test for Kibana embedded in iframe (#68544)

* convert kbn test config into TS

* add test  for Kibana embedded in iframe

* run embedded tests in functional suite

* ignore tls errors in functional tests by default

* switch test to https

* remove env vars mutation

* allow to pass ssl config to Kibana

* pass ssl config to axios

* adopt KbnClient interfaces

* adopt KibanaServer

* use KbnRequester in security service

* set sameSiteCookies:None in test

* acceptInsecureCerts in chrome

* remove leftovers

* fix type error

* remove unnecessary field

* address comments

* refactor plugin

* refactor test

* make acceptInsecureCerts configurable

* run firefox tests on ci

* up TS version

* fix firefox.sh script

* fix path

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
# Conflicts:
#	test/functional/services/remote/remote.ts
#	test/functional/services/remote/webdriver.ts
#	x-pack/scripts/functional_tests.js

* create browser config. lost during conflict resolution
2020-06-18 15:23:56 +02:00
Spencer
a0e2e976f0
[7.x] [kbn/optimizer] share all plugin bundles (#68986) (#69234)
* [kbn/optimizer] share all plugin bundles (#68986)

Co-authored-by: spalger <spalger@users.noreply.github.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

* [BundleRefPlugin] resolve imports to files too

(cherry picked from commit 2bb6ac1a796c6b8661d9ca6c33bef9e23d7a0764)

* [kbn/optimizer] fix windows compatibility (#69304)

Co-authored-by: spalger <spalger@users.noreply.github.com>
(cherry picked from commit db1df7bed0)

* [BundleRefPlugin] resolve imports to files too (#69241)

Co-authored-by: spalger <spalger@users.noreply.github.com>
(cherry picked from commit e03f2428b1)

* update extraPublicDirs to include latest changes

Co-authored-by: spalger <spalger@users.noreply.github.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
2020-06-16 17:41:32 -07:00
Spencer
31292ed2fc
[7.x] run page_load_metrics tests in visual regresssion jobs (#68570) (#68675)
Co-authored-by: spalger <spalger@users.noreply.github.com>
2020-06-09 18:30:37 -07:00
Dmitry Lemeshko
8e50e59a50
Report page load asset size (#66224) (#68383)
* performance_tests: draft version

* update cli runner and script

* ingest metrics

* save asset type for plugins

* Update src/dev/performance/ingest_metrics.ts

Co-authored-by: Spencer <email@spalger.com>

* follow review comments

* fix size calc, add FTR config, move src to kbn/test

* fix import, remove unused interface

* Update packages/kbn-test/src/page_load_metrics/capture_page_load_metrics.ts

Co-authored-by: Spencer <email@spalger.com>

* start chromium with no-sandbox

* add logging

* check page contains expected element, cut apps to 5

* fix locator & typo

* Update packages/kbn-test/src/page_load_metrics/navigation.ts

Co-authored-by: Spencer <email@spalger.com>

* Update navigation.ts

* Update navigation.ts

* bump puppeteer version

* fix typo

* update navigation script

* update config file

* update yarn.lock

* fix

* take screenshot on failure

* update screenshot title

* fix screenshot saving and error

* invalid locator

* Revert "invalid locator"

This reverts commit 3007539a69.

* run script in a loop 10 times

* Revert "run script in a loop 10 times"

This reverts commit 6cfa219140.

* path config value directly

* fix screenshots directory setup

* update maps locator, common for landing and new map

Co-authored-by: Spencer <email@spalger.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Co-authored-by: Mikhail Shustov <restrry@gmail.com>

Co-authored-by: Spencer <email@spalger.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Co-authored-by: Mikhail Shustov <restrry@gmail.com>
2020-06-05 18:54:31 +02:00
Xavier Mouligneau
3bec71e53e
[SECURITY] Rename siem plugin to security_solution (#67902) (#68246)
* rename siem to security_solution

* rename siem to security solution inside of code

* rename translation keys

* fix snapshot

* replace siem for security solution in tutorial

* missing translation to be renamed

* fix types for api test integration

* updates runner file to match the new path

* change category for kibana settings

* miss renaming in advance settings

* fixes cypress tests

* fix api integration test

* fix new translation

* fix unit test

* update translation i18n

* update translation i18n II

Co-authored-by: Gloria Hornero <snootchie.boochies@gmail.com>

Co-authored-by: Gloria Hornero <snootchie.boochies@gmail.com>
2020-06-04 15:12:05 -04:00
Frank Hassanabad
2ed924822d
[7.x] [SIEM][Lists] Adds circular dependency checker for lists plugin (#67648) (#67717)
* [SIEM][Lists] Adds circular dependency checker for lists plugin

## Summary

* Added dependency checker for the public and common folders for lists

# Conflicts:
#	test/scripts/jenkins_xpack.sh

* Updated from conflict issue
2020-05-28 20:02:46 -06:00
Brian Seeders
64b135594b
[CI] Remove --detectOpenHandles to parallelize Jest tests again (#67413) (#67515) 2020-05-27 14:42:13 -04:00
Josh Dover
0cef765c15
[7.x] Remove slapshot contract tests (#66277) (#66308) 2020-05-13 08:55:55 -06:00
Uladzislau Lasitsa
b9a3f912a0
Migrate test plugins ⇒ NP (kbn_tp_run_pipeline) (#64780) (#65617)
* Migrated kbn_tp_run_pipeline to the new Platform

* Updated config.

* Added tsconfig.

* Updated index.ts for tests

* updated tsconfig

* Updated typescript task

* fixed tests

* Fixed tests

* updated comment

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
2020-05-07 16:27:11 +03:00
Mikhail Shustov
290f7905ab
move core provier to NP. allows to run tests on every page (#64929) (#65608)
* move core provier to NP. allows to run tests on every page

* remove no-base-path

* pass whole KbnTestServer config

* fix build path

* another id

* np

* build kibana tests plugins. it is used in xpack tests

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
2020-05-07 12:38:54 +02:00
Gidi Meir Morris
e61d50cedf
[Alerting] migrates acceptance and functional test fixtures to KP (#64888) (#65430)
This PR migrates the vast majority of Alerting legacy code to the Kibana Platform.

This includes:

1. Removed legacy Task Manager
2. Migrates Fixture plugins in Alerting, Triggers UI and Task Manager Perf

This does not includes:

1. The PagerDuty simulator due to a lack of support for custom responses in the platform. issue opened. https://github.com/elastic/kibana/issues/65045
2. The Webhooks simulator due to a lack of support for custom authorisation. Requires investigation.
2020-05-06 13:12:10 +01:00
Dmitry Lemeshko
d3f151fa2c
Re-enable Firefox functional testing on CI (#64159) (#64479)
* bring testing on Firefox back

* disable some tests

* skip more tests

* cut more suites for Firefox

* skip more tests for Firefox

* replace smoke tag with includeFirefox

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
2020-04-25 17:43:12 +03:00
Ryland Herrick
59f091eb73
[SIEM] Server cutover to New Platform (#63430) (#63912)
* Move server code into NP folder

* NP config is not yet used
* Relative imports are somewhat broken

* Move common folder into NP

* Move cypress folder into NP

* Move scripts folder into NP

* Move misc. config into NP folder

A few of these were moved into the cypress folder as they're
cypress-specific.

I tried to update all the relative paths but some are likely broken. I'm
not going to know until other stuff is fixed, though.

* Move value for siem index pattern into common/constants

The other default values live in there, this is no different.

* Update paths following file move

If this was referencing the full project, it now references both paths
(legacy for UI, and NP for server).

* Fix typescript errors related to module resolution

These are mostly updating imports to the common/ folder on the UI side
(since things changed relative to those files).

* Replace Legacy Config with NP Config

* Updates plugin to use NP config
  * defines new config previously coming from savedObjects config
* cleans up legacy types

 Conflicts:
	x-pack/plugins/siem/server/lib/detection_engine/routes/rules/export_rules_route.ts
	x-pack/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.ts
	x-pack/plugins/siem/server/lib/detection_engine/rules/types.ts
	x-pack/plugins/siem/server/plugin.ts
	x-pack/plugins/siem/server/routes/index.ts
	x-pack/plugins/siem/server/types.ts

* Remove local SIEM tsconfig

This was originally added to address an issue with tsserver, but that
issue is no longer relevant. The presence of this file confuses
typescript into thinking that siem is a separate TS project.

* Update kibana.json to declare our dependencies

These are not necessarily correct in terms of what's required/optional,
but this is what's declared in our types.

* Remove legacy plugin instantiation

* Removes legacy instantiation of server plugin, which is now handled by
NP
* Loosens legacy config spec so we no longer have to duplicate config
types

* Update tests with NP config

These were written against the old Hapi config function; now, we just
have a POJO.

* Update es_archiver helpers' paths

I'm not quite sure if these are working yet, but they're no longer
throwing errors.

* Ignore restricted path on script

This was cribbed from infra, who has made a similar change.

* Ignore restricted path on temporary savedObject mappings import

This will be changed subsequently when we switch to the NP form of
savedObject type registration.

* Add symlink to lockfile

* Fix paths on circular deps script

* Add separate config for Rule and Timeline saved objects

We had previously used the savedObjects' config, but those are not
currently exposed to us on New Platform. For now, we're going to split
this into two sets of values for the SOs we deal with
importing/exporting within the SIEM app, with the same defaults as
savedObjects.

* Fixing relative paths within cypress

These are strings that wouldn't be caught by typescript.
2020-04-17 19:23:46 -05:00
liza-mae
635b0ad79c
Fix visual tests (#62660) (#62718) 2020-04-06 18:53:37 -06:00
Gidi Meir Morris
599054e9a7
[Event Log] adds query support to the Event Log (#62015) (#62653)
Adds a public API for querying the Event Log by a referenced Saved Object at /api/{saved-object-type}/{saved-object-id}/_find
2020-04-06 23:53:09 +01:00
Uladzislau Lasitsa
4c7ad1f8e1
Migrate test plugins ⇒ NP (kbn_tp_sample_panel_action) (#60749) (#62315)
* Migrated sample_action to NP. Panel action tests returned to the test flow.

* fixed names

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
2020-04-02 18:24:26 +03:00
Spencer
b5c9181a93
[7.x] [ci/es] always pull snapshots, break early when they're… (#62066)
* [ci/es] always pull snapshots, break early when they're not available

* move to setup.sh after deps are installed

Co-authored-by: spalger <spalger@users.noreply.github.com>

Co-authored-by: spalger <spalger@users.noreply.github.com>
2020-03-31 15:09:43 -07:00
Gidi Meir Morris
08384027cb
[Alerting] Adds navigation by consumer and alert type to alerting (#58997) (#60605)
Adds Navigation APIs to Alerting.

Parts to this PR:

Adds a client side (Public) plugin to Alerting, including two APIs: registerNavigation & registerDefaultNavigation. These allow a plugin to register navigation handlers for any alerts which it is the consumer of- one for specific AlertTypes and one for a default handler for all AlertTypes created by the plugin.
The Alert Details page now uses these navigation handlers for the View In App button. If there's an AlertType specific handler it uses that, otherwise it uses a default one and if the consumer has not registered a handler - it remains disabled.
A generic Alerting Example plugin that demonstrates usage of these APIs including two AlertTypes - one that always fires, and another that checks how many people are in Outer Space and allows you to trigger based on that. 😉 To enable the plugin run yarn start --ssl --run-examples
2020-03-19 13:05:44 +00:00
Spencer
5cfc73d196
Fix visual baseline job (#59348) (#59470)
* Establish Percy baselines

* move Jenkinsfile changed back to `.ci` directory

* rename xpack workers

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
2020-03-06 08:40:17 -07:00
Spencer
982b2bfe7a
[7.x] expand max-old-space-size for xpack jest tests (#59455) (#59495)
* expand max-old-space-size for xpack jest tests

* turns out we are already at 4GB

* limit to 6GB for now
2020-03-05 16:05:53 -07:00
MadameSheema
30d763accf
[SIEM] Cypress preparation for Jenkins (#59013) (#59179)
* updates events viewer test

* updates login tasks

* updates ml conditional links

* updates url state

* updates timeline screen

* updates timeline tasks

* updates test files

* adds jenkins needed files

* ignoring isAttached lines due to a known error in Cypress (https://github.com/cypress-io/cypress/issues/4408)

* updates loop script

* updates readme with new cypress command explanation

* removes skip

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
2020-03-04 21:45:29 +01:00
Brian Seeders
62ea6e63cd
[CI] Pipeline refactoring (#56447) (#59077) 2020-03-02 17:24:57 -05:00
Spencer
4a3a2d3c2c
[7.x] run jest with --detectOpenHandles on CI to figure out… (#58777)
* run jest with `--detectOpenHandles` on CI to figure out what is happening with pauses

* focus tests on jest integration

* force kill child processes in config reload test

* skip flaky suite

* increase timeout for looking for installed packages

* run all tests again
2020-02-27 16:24:49 -07:00
Jonathan Budzenski
a2716cc373
[7.x] Refactor test entry by runner (#44679) (#57930)
* Refactor test entry by runner (#44679)

Over the last few years we've increased the number of test runners.
Entry points by test type have become too lage of a category for unique
names, so this moves top level test scripts under yarn and replaces test
types with the runner name.

e.g. `yarn test:browser` -> `yarn test:karma`

Closes #41133

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

* fix merge

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
2020-02-21 10:43:49 -06:00