diff --git a/package.json b/package.json index 2383285504dc5..520d1cd8b9d6a 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,7 @@ "@elastic/charts": "^16.1.0", "@elastic/datemath": "5.0.2", "@elastic/ems-client": "7.6.0", - "@elastic/eui": "18.2.1", + "@elastic/eui": "18.2.2", "@elastic/filesaver": "1.1.2", "@elastic/good": "8.1.1-kibana2", "@elastic/numeral": "2.3.3", diff --git a/packages/kbn-ui-shared-deps/package.json b/packages/kbn-ui-shared-deps/package.json index 47a47449927e4..d1399eea3e9c1 100644 --- a/packages/kbn-ui-shared-deps/package.json +++ b/packages/kbn-ui-shared-deps/package.json @@ -9,7 +9,7 @@ "kbn:watch": "node scripts/build --watch" }, "devDependencies": { - "@elastic/eui": "18.2.1", + "@elastic/eui": "18.2.2", "@elastic/charts": "^16.1.0", "@kbn/dev-utils": "1.0.0", "@kbn/i18n": "1.0.0", diff --git a/src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/add_data.test.js.snap b/src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/add_data.test.js.snap index 35a7216df8bc6..6625b9c26d0d2 100644 --- a/src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/add_data.test.js.snap +++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/add_data.test.js.snap @@ -4,143 +4,198 @@ exports[`apmUiEnabled 1`] = ` - - - -

- -

-
- -

- -

-
-
-
- - - APM automatically collects in-depth performance metrics and errors from inside your applications. - - } - footer={ - - - - } - icon={ - - } - title="APM" + - - - - Ingest logs from popular data sources and easily visualize in preconfigured dashboards. - - } - footer={ - + + - - - } - icon={ - + + + + +

+ +

+
+
+
+ + + + + + + APM automatically collects in-depth performance metrics and errors from inside your applications. + + } + footer={ + + + + } + title="APM" + titleSize="xs" /> - } - title="Logs" - /> + + + + Ingest logs from popular data sources and easily visualize in preconfigured dashboards. + + } + footer={ + + + + } + title="Logs" + titleSize="xs" + /> + + + + Collect metrics from the operating system and services running on your servers. + + } + footer={ + + + + } + title="Metrics" + titleSize="xs" + /> + + - - Collect metrics from the operating system and services running on your servers. - - } - footer={ - + + - - - } - icon={ - - } - title="Metrics" + + + + + +

+ +

+
+
+ +
+ + - - } - icon={ - - } title="SIEM" + titleSize="xs" /> @@ -257,109 +307,169 @@ exports[`isNewKibanaInstance 1`] = ` - - - -

- -

-
- -

- -

-
-
-
- - - Ingest logs from popular data sources and easily visualize in preconfigured dashboards. - - } - footer={ - + + + - - - } - icon={ - + + + + +

+ +

+
+
+
+ + + + + + + Ingest logs from popular data sources and easily visualize in preconfigured dashboards. + + } + footer={ + + + + } + title="Logs" + titleSize="xs" /> - } - title="Logs" - /> + + + + Collect metrics from the operating system and services running on your servers. + + } + footer={ + + + + } + title="Metrics" + titleSize="xs" + /> + + - - Collect metrics from the operating system and services running on your servers. - - } - footer={ - + + - - - } - icon={ - - } - title="Metrics" + + + + + +

+ +

+
+
+ +
+ + - - } - icon={ - - } title="SIEM" + titleSize="xs" /> @@ -476,143 +581,198 @@ exports[`mlEnabled 1`] = ` - - - -

- -

-
- -

- -

-
-
-
- - - APM automatically collects in-depth performance metrics and errors from inside your applications. - - } - footer={ - - - - } - icon={ - - } - title="APM" + - - - - Ingest logs from popular data sources and easily visualize in preconfigured dashboards. - - } - footer={ - + + - - - } - icon={ - + + + + +

+ +

+
+
+
+ + + + + + + APM automatically collects in-depth performance metrics and errors from inside your applications. + + } + footer={ + + + + } + title="APM" + titleSize="xs" /> - } - title="Logs" - /> + + + + Ingest logs from popular data sources and easily visualize in preconfigured dashboards. + + } + footer={ + + + + } + title="Logs" + titleSize="xs" + /> + + + + Collect metrics from the operating system and services running on your servers. + + } + footer={ + + + + } + title="Metrics" + titleSize="xs" + /> + + - - Collect metrics from the operating system and services running on your servers. - - } - footer={ - + + - - - } - icon={ - - } - title="Metrics" + + + + + +

+ +

+
+
+ +
+ + - - } - icon={ - - } title="SIEM" + titleSize="xs" /> @@ -765,109 +920,169 @@ exports[`render 1`] = ` - - - -

- -

-
- -

- -

-
-
-
- - - Ingest logs from popular data sources and easily visualize in preconfigured dashboards. - - } - footer={ - + + + - - - } - icon={ - + + + + +

+ +

+
+
+
+ + + + + + + Ingest logs from popular data sources and easily visualize in preconfigured dashboards. + + } + footer={ + + + + } + title="Logs" + titleSize="xs" /> - } - title="Logs" - /> + + + + Collect metrics from the operating system and services running on your servers. + + } + footer={ + + + + } + title="Metrics" + titleSize="xs" + /> + + - - Collect metrics from the operating system and services running on your servers. - - } - footer={ - + + - - - } - icon={ - - } - title="Metrics" + + + + + +

+ +

+
+
+ +
+ + - - } - icon={ - - } title="SIEM" + titleSize="xs" /> diff --git a/src/legacy/core_plugins/kibana/public/home/np_ready/components/_add_data.scss b/src/legacy/core_plugins/kibana/public/home/np_ready/components/_add_data.scss index 2b87ddbcf4673..5739a36178110 100644 --- a/src/legacy/core_plugins/kibana/public/home/np_ready/components/_add_data.scss +++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/_add_data.scss @@ -1,9 +1,23 @@ .homAddData__card { - max-width: 250px; + max-width: 225px; border: none; box-shadow: none; } +.homAddData__cardDivider { + position: relative; + + &:after { + position: absolute; + content: ''; + width: 1px; + right: -$euiSizeS; + top: 0; + bottom: 0; + background: $euiBorderColor; + } +} + .homAddData__icon { width: $euiSizeXL * 2; height: $euiSizeXL * 2; @@ -30,6 +44,20 @@ } } +@include euiBreakpoint('xs', 's', 'm') { + .homAddData__flexTablet { + flex-direction: column; + } + + .homAddData__card { + max-width: none; + } + + .homAddData__cardDivider:after { + display: none; + } +} + @include euiBreakpoint('l', 'xl') { .homeAddData__flexGroup { flex-wrap: nowrap; diff --git a/src/legacy/core_plugins/kibana/public/home/np_ready/components/add_data.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/add_data.js index a49620be2d229..12861d2f531f9 100644 --- a/src/legacy/core_plugins/kibana/public/home/np_ready/components/add_data.js +++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/add_data.js @@ -94,7 +94,7 @@ const AddDataUi = ({ apmUiEnabled, isNewKibanaInstance, intl, mlEnabled }) => { } + titleSize="xs" title={apmData.title} description={{apmData.description}} footer={ @@ -115,60 +115,115 @@ const AddDataUi = ({ apmUiEnabled, isNewKibanaInstance, intl, mlEnabled }) => { return ( - {apmUiEnabled !== false && getApmCard()} + + + + + + + + + + +

+ +

+
+
+
+
+
+ + + {apmUiEnabled !== false && getApmCard()} - - } - title={loggingData.title} - description={{loggingData.description}} - footer={ - - - - } - /> - + + {loggingData.description} + } + footer={ + + + + } + /> + - - } - title={metricsData.title} - description={{metricsData.description}} - footer={ - - - - } - /> + + {metricsData.description} + } + footer={ + + + + } + /> + +
+ + + + + + + + +

+ +

+
+
+
+
+
+ } title={siemData.title} description={{siemData.description}} footer={ @@ -179,7 +234,7 @@ const AddDataUi = ({ apmUiEnabled, isNewKibanaInstance, intl, mlEnabled }) => { > } @@ -195,29 +250,6 @@ const AddDataUi = ({ apmUiEnabled, isNewKibanaInstance, intl, mlEnabled }) => { return ( - - - -

- -

-
- -

- -

-
-
-
- - - {renderCards()} diff --git a/src/legacy/core_plugins/kibana/server/tutorials/apm/index.js b/src/legacy/core_plugins/kibana/server/tutorials/apm/index.js index ffebd14698a04..fbecfe7dffa15 100644 --- a/src/legacy/core_plugins/kibana/server/tutorials/apm/index.js +++ b/src/legacy/core_plugins/kibana/server/tutorials/apm/index.js @@ -93,7 +93,7 @@ It allows you to monitor the performance of thousands of applications in real ti '{config.docs.base_url}guide/en/apm/get-started/{config.docs.version}/index.html', }, }), - euiIconType: 'logoAPM', + euiIconType: 'apmApp', artifacts, onPrem: onPremInstructions(apmIndexPatternTitle), elasticCloud: createElasticCloudInstructions(cloud), diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json index d96febee7b06d..81cf843265d5d 100644 --- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json +++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json @@ -7,7 +7,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@elastic/eui": "18.2.1", + "@elastic/eui": "18.2.2", "react": "^16.12.0", "react-dom": "^16.12.0" } diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json index 170cc77ca37cc..62bbfce6df258 100644 --- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json +++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json @@ -7,7 +7,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@elastic/eui": "18.2.1", + "@elastic/eui": "18.2.2", "react": "^16.12.0" } } diff --git a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json index 85c76071d1e94..f727317f1c38f 100644 --- a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json +++ b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json @@ -8,7 +8,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@elastic/eui": "18.2.1", + "@elastic/eui": "18.2.2", "react": "^16.12.0" }, "scripts": { diff --git a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json index ade93c9f50099..301bcb8c7ede6 100644 --- a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json +++ b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json @@ -8,7 +8,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@elastic/eui": "18.2.1", + "@elastic/eui": "18.2.2", "react": "^16.12.0" }, "scripts": { diff --git a/x-pack/package.json b/x-pack/package.json index 650dfe90c00a3..8a9499f117155 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -176,7 +176,7 @@ "@babel/runtime": "^7.5.5", "@elastic/datemath": "5.0.2", "@elastic/ems-client": "7.6.0", - "@elastic/eui": "18.2.1", + "@elastic/eui": "18.2.2", "@elastic/filesaver": "1.1.2", "@elastic/maki": "6.1.0", "@elastic/node-crypto": "^1.0.0", diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 4f11e5090bd0c..edbfe4464a014 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -1913,8 +1913,6 @@ "kbn.embeddable.inspectorRequestDescription": "このリクエストは Elasticsearch にクエリをかけ、検索データを取得します。", "kbn.embeddable.search.displayName": "検索", "kbn.embeddable.visualizations.displayName": "ビジュアライゼーション", - "kbn.home.addData.addDataToKibanaDescription": "これらのソリューションで、データを作成済みのダッシュボードと監視システムへとすぐに変えることができます。", - "kbn.home.addData.addDataToKibanaTitle": "Kibana にデータを追加", "kbn.home.addData.apm.addApmButtonLabel": "APM を追加", "kbn.home.addData.apm.nameDescription": "APM は、集約内から自動的に詳細なパフォーマンスメトリックやエラーを集めます。", "kbn.home.addData.apm.nameTitle": "APM", @@ -15308,4 +15306,4 @@ "xpack.watcher.watchEdit.thresholdWatchExpression.aggType.fieldIsRequiredValidationMessage": "フィールドを選択してください。", "xpack.watcher.watcherDescription": "アラートの作成、管理、監視によりデータへの変更を検知します。" } -} +} \ No newline at end of file diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 9fc0ffb9a5558..d3d24b1c35651 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -1914,8 +1914,6 @@ "kbn.embeddable.inspectorRequestDescription": "此请求将查询 Elasticsearch 以获取搜索的数据。", "kbn.embeddable.search.displayName": "搜索", "kbn.embeddable.visualizations.displayName": "可视化", - "kbn.home.addData.addDataToKibanaDescription": "使用这些解决方案可快速将您的数据转换成预建仪表板和监测系统。", - "kbn.home.addData.addDataToKibanaTitle": "将数据添加到 Kibana", "kbn.home.addData.apm.addApmButtonLabel": "添加 APM", "kbn.home.addData.apm.nameDescription": "APM 自动从您的应用程序内收集深入全面的性能指标和错误。", "kbn.home.addData.apm.nameTitle": "APM", @@ -15309,4 +15307,4 @@ "xpack.watcher.watchEdit.thresholdWatchExpression.aggType.fieldIsRequiredValidationMessage": "此字段必填。", "xpack.watcher.watcherDescription": "通过创建、管理和监测警报来检测数据中的更改。" } -} +} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index beab87c029edd..45a01ebe426ad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1942,10 +1942,10 @@ tabbable "^1.1.0" uuid "^3.1.0" -"@elastic/eui@18.2.1": - version "18.2.1" - resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-18.2.1.tgz#6ce6d0bd1d0541052d21f2918305524d71e91678" - integrity sha512-6C5tnWJTlBB++475i0vRoCsnz4JaYznb4zMNFLc+z5GY3vA3/E3AXTjmmBwybEicCCi3h1SnpJxZsgMakiZwRA== +"@elastic/eui@18.2.2": + version "18.2.2" + resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-18.2.2.tgz#24396c8639f6576cf6d4eb904e418c1718460f18" + integrity sha512-8G8jnbi6D+HQXtBEm5seXXiehhKgBwXmtXXtV4+VrdjCgJOqmxNdqGdfc78/hXY6eVqlULOmRPhNn2GjHYhKNw== dependencies: "@types/chroma-js" "^1.4.3" "@types/lodash" "^4.14.116"