From bd9d67ccc05d1e00af6f1b04ed536bcba94b22c4 Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Tue, 14 Jan 2020 20:19:35 -0600 Subject: [PATCH] Upgrade EUI to v18.2.0 (#54786) * 18.2.0 * ts update * Updated `euiColorVis0` * Update `euiColorVis1` * Updating `euiColorVis2` * Updated `euiColorVis3` * Updated the rest * Updated hard-coded viz palette hexes to latest * src snapshot updates * x-pack test updates * mock jest fn * Updated two vegalite visualization screenshots Co-authored-by: Caroline Horn <549577+cchaos@users.noreply.github.com> Co-authored-by: Chandler Prall --- package.json | 2 +- packages/kbn-ui-shared-deps/package.json | 2 +- .../public/__tests__/vegalite_graph.hjson | 2 +- .../public/__tests__/vegalite_image_256.png | Bin 7849 -> 9287 bytes .../public/__tests__/vegalite_image_512.png | Bin 20902 -> 23449 bytes .../data_model/__tests__/vega_parser.js | 20 +- .../public/data_model/vega_parser.js | 2 +- .../styles/bootstrap/_custom_variables.less | 2 +- .../editors/default/controls/precision.tsx | 2 +- .../__snapshots__/field_icon.test.tsx.snap | 6 +- .../plugins/kbn_tp_run_pipeline/package.json | 2 +- .../kbn_tp_custom_visualizations/package.json | 2 +- .../kbn_tp_embeddable_explorer/package.json | 2 +- .../kbn_tp_sample_panel_action/package.json | 2 +- .../ServiceOverview.test.tsx.snap | 4 +- .../waterfall_helpers.test.ts.snap | 2 +- .../__snapshots__/CustomPlot.test.js.snap | 560 +++++++++--------- .../__tests__/chartSelectors.test.ts | 4 +- .../lib/transactions/breakdown/index.test.ts | 2 +- .../canvas_plugin_src/uis/tags/chart.ts | 4 +- .../canvas_plugin_src/uis/tags/filter.ts | 5 +- .../canvas_plugin_src/uis/tags/graphic.ts | 4 +- .../canvas_plugin_src/uis/tags/proportion.js | 5 +- .../canvas_plugin_src/uis/tags/proportion.ts | 5 +- .../canvas_plugin_src/uis/tags/report.ts | 4 +- .../element_card.examples.storyshot | 12 +- .../element_grid.examples.storyshot | 10 +- .../__snapshots__/tag.examples.storyshot | 4 +- .../__snapshots__/tag_list.examples.storyshot | 26 +- .../infra/common/color_palette.test.ts | 2 +- .../plugins/infra/common/color_palette.ts | 23 +- .../helpers/create_tsvb_link.test.ts | 16 +- .../infra/public/containers/with_options.tsx | 5 +- .../plugins/lens/public/assets/chart_area.svg | 2 +- .../lens/public/assets/chart_area_stacked.svg | 2 +- .../plugins/lens/public/assets/chart_bar.svg | 2 +- .../public/assets/chart_bar_horizontal.svg | 2 +- .../assets/chart_bar_horizontal_stacked.svg | 2 +- .../lens/public/assets/chart_bar_stacked.svg | 2 +- .../lens/public/assets/chart_datatable.svg | 2 +- .../plugins/lens/public/assets/chart_line.svg | 2 +- .../lens/public/assets/chart_metric.svg | 2 +- .../lens/public/assets/chart_mixed_xy.svg | 2 +- .../indexpattern_plugin/field_icon.test.tsx | 10 +- .../lens_field_icon.test.tsx | 4 +- .../__snapshots__/xy_expression.test.tsx.snap | 84 +-- .../validated_range.test.js.snap | 3 + .../components/charts/areachart.test.tsx | 28 +- .../components/charts/barchart.test.tsx | 36 +- .../components/embeddables/__mocks__/mock.ts | 6 +- .../components/embeddables/map_config.test.ts | 1 + .../components/embeddables/map_config.ts | 8 +- .../note_card_body.test.tsx.snap | 90 ++- .../__snapshots__/index.test.tsx.snap | 18 +- .../components/page/hosts/kpi_hosts/types.ts | 10 +- .../page/network/kpi_network/index.tsx | 15 +- .../page/network/kpi_network/mock.ts | 28 +- .../__snapshots__/index.test.tsx.snap | 90 ++- .../__snapshots__/index.test.tsx.snap | 36 +- .../components/stat_items/index.test.tsx | 16 +- .../customize_space_avatar.test.tsx.snap | 2 +- .../spaces_grid_pages.test.tsx.snap | 8 +- .../__snapshots__/space_avatar.test.tsx.snap | 6 +- .../location_status_tags.test.tsx.snap | 24 +- .../monitor_ssl_certificate.test.tsx.snap | 3 +- x-pack/package.json | 2 +- .../nav_control/nav_control_service.test.ts | 2 +- .../es_archives/maps/kibana/data.json | 2 +- yarn.lock | 8 +- 69 files changed, 712 insertions(+), 591 deletions(-) diff --git a/package.json b/package.json index 85151466f1dfa..365f597fe04fe 100644 --- a/package.json +++ b/package.json @@ -118,7 +118,7 @@ "@elastic/charts": "^16.1.0", "@elastic/datemath": "5.0.2", "@elastic/ems-client": "7.6.0", - "@elastic/eui": "18.0.0", + "@elastic/eui": "18.2.0", "@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 c9434f3ec1c38..af44991e625a2 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.0.0", + "@elastic/eui": "18.2.0", "@elastic/charts": "^16.1.0", "@kbn/dev-utils": "1.0.0", "@yarnpkg/lockfile": "^1.1.0", diff --git a/src/legacy/core_plugins/vis_type_vega/public/__tests__/vegalite_graph.hjson b/src/legacy/core_plugins/vis_type_vega/public/__tests__/vegalite_graph.hjson index ebdc5a07af06d..fd7eb1ae7d878 100644 --- a/src/legacy/core_plugins/vis_type_vega/public/__tests__/vegalite_graph.hjson +++ b/src/legacy/core_plugins/vis_type_vega/public/__tests__/vegalite_graph.hjson @@ -39,7 +39,7 @@ range: { category: {scheme: "elastic"} } - mark: {color: "#00B3A4"} + mark: {color: "#54B399"} } autosize: {type: "fit", contains: "padding"} } diff --git a/src/legacy/core_plugins/vis_type_vega/public/__tests__/vegalite_image_256.png b/src/legacy/core_plugins/vis_type_vega/public/__tests__/vegalite_image_256.png index 3f247b57905d4bcc141bdc7b324f38151519af7b..8f2d146287b08086081cc8aca548b294010a301b 100644 GIT binary patch literal 9287 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 diff --git a/src/legacy/core_plugins/vis_type_vega/public/__tests__/vegalite_image_512.png b/src/legacy/core_plugins/vis_type_vega/public/__tests__/vegalite_image_512.png index c387c3ec789d3587d4ce9f1683422770114042a3..82077a1096b997e21355c7e6fe0b3da6df44c2d3 100644 GIT binary patch literal 23449 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 IM6N<$f{kYmIsgCw diff --git a/src/legacy/core_plugins/vis_type_vega/public/data_model/__tests__/vega_parser.js b/src/legacy/core_plugins/vis_type_vega/public/data_model/__tests__/vega_parser.js index c442f8f17884a..50bcff2469710 100644 --- a/src/legacy/core_plugins/vis_type_vega/public/data_model/__tests__/vega_parser.js +++ b/src/legacy/core_plugins/vis_type_vega/public/data_model/__tests__/vega_parser.js @@ -53,7 +53,7 @@ describe(`VegaParser._setDefaultColors`, () => { test({}, true, { config: { range: { category: { scheme: 'elastic' } }, - mark: { color: '#5BBAA0' }, + mark: { color: '#54B399' }, }, }) ); @@ -63,15 +63,15 @@ describe(`VegaParser._setDefaultColors`, () => { test({}, false, { config: { range: { category: { scheme: 'elastic' } }, - arc: { fill: '#5BBAA0' }, - area: { fill: '#5BBAA0' }, - line: { stroke: '#5BBAA0' }, - path: { stroke: '#5BBAA0' }, - rect: { fill: '#5BBAA0' }, - rule: { stroke: '#5BBAA0' }, - shape: { stroke: '#5BBAA0' }, - symbol: { fill: '#5BBAA0' }, - trail: { fill: '#5BBAA0' }, + arc: { fill: '#54B399' }, + area: { fill: '#54B399' }, + line: { stroke: '#54B399' }, + path: { stroke: '#54B399' }, + rect: { fill: '#54B399' }, + rule: { stroke: '#54B399' }, + shape: { stroke: '#54B399' }, + symbol: { fill: '#54B399' }, + trail: { fill: '#54B399' }, }, }) ); diff --git a/src/legacy/core_plugins/vis_type_vega/public/data_model/vega_parser.js b/src/legacy/core_plugins/vis_type_vega/public/data_model/vega_parser.js index 452397877a003..7c2638d1f5165 100644 --- a/src/legacy/core_plugins/vis_type_vega/public/data_model/vega_parser.js +++ b/src/legacy/core_plugins/vis_type_vega/public/data_model/vega_parser.js @@ -577,7 +577,7 @@ export class VegaParser { this._setDefaultValue({ scheme: 'elastic' }, 'config', 'range', 'category'); if (this.isVegaLite) { - // Vega-Lite: set default color, works for fill and strike -- config: { mark: { color: '#00B3A4' }} + // Vega-Lite: set default color, works for fill and strike -- config: { mark: { color: '#54B399' }} this._setDefaultValue(defaultColor, 'config', 'mark', 'color'); } else { // Vega - global mark has very strange behavior, must customize each mark type individually diff --git a/src/legacy/ui/public/styles/bootstrap/_custom_variables.less b/src/legacy/ui/public/styles/bootstrap/_custom_variables.less index aa174684a622b..a348e7bfa86b8 100644 --- a/src/legacy/ui/public/styles/bootstrap/_custom_variables.less +++ b/src/legacy/ui/public/styles/bootstrap/_custom_variables.less @@ -345,7 +345,7 @@ //** Background color of the whole progress component @progress-bg: shade(@gray-lighter, 13%); //** Default progress bar color -@progress-bar-bg: #00B3A4; +@progress-bar-bg: #54B399; //== List group // diff --git a/src/legacy/ui/public/vis/editors/default/controls/precision.tsx b/src/legacy/ui/public/vis/editors/default/controls/precision.tsx index 88f389cb7c009..4fe9eede8465e 100644 --- a/src/legacy/ui/public/vis/editors/default/controls/precision.tsx +++ b/src/legacy/ui/public/vis/editors/default/controls/precision.tsx @@ -40,7 +40,7 @@ function PrecisionParamEditor({ agg, value, setValue }: AggParamEditorProps | React.MouseEvent) => setValue(Number(ev.currentTarget.value)) } diff --git a/src/plugins/kibana_react/public/field_icon/__snapshots__/field_icon.test.tsx.snap b/src/plugins/kibana_react/public/field_icon/__snapshots__/field_icon.test.tsx.snap index fb56bf0e4255e..870dbdc533267 100644 --- a/src/plugins/kibana_react/public/field_icon/__snapshots__/field_icon.test.tsx.snap +++ b/src/plugins/kibana_react/public/field_icon/__snapshots__/field_icon.test.tsx.snap @@ -11,7 +11,7 @@ exports[`FieldIcon renders a blackwhite icon for a string 1`] = ` exports[`FieldIcon renders a colored icon for a number 1`] = ` @@ -20,7 +20,7 @@ exports[`FieldIcon renders a colored icon for a number 1`] = ` exports[`FieldIcon renders an icon for an unknown type 1`] = ` @@ -30,7 +30,7 @@ exports[`FieldIcon renders with className if provided 1`] = ` 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 1eac93c8538e4..96efd952e6ba2 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.0.0", + "@elastic/eui": "18.2.0", "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 1bfb1e8ba4bca..7693d6f9c07bc 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.0.0", + "@elastic/eui": "18.2.0", "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 6d6b04fba889c..bf58535e57994 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.0.0", + "@elastic/eui": "18.2.0", "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 964adacb2ac09..98dd9ab51da96 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.0.0", + "@elastic/eui": "18.2.0", "react": "^16.12.0" }, "scripts": { diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap index 9b2a2c8f2490a..0ddf23cb932fb 100644 --- a/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap +++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap @@ -295,7 +295,7 @@ NodeList [ class="euiTableCellContent euiTableCellContent--overflowingContent" > , }, Object { - "color": "#fae181", + "color": "#d6bf57", "disabled": undefined, "onClick": [Function], "text": @@ -22,7 +22,7 @@ Array [ , }, Object { - "color": "#f19f58", + "color": "#da8b45", "disabled": undefined, "onClick": [Function], "text": @@ -442,7 +442,7 @@ Array [ style={ Object { "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeDasharray": undefined, "strokeWidth": undefined, } @@ -463,9 +463,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -480,9 +480,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -497,9 +497,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -514,9 +514,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -531,9 +531,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -548,9 +548,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -565,9 +565,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -582,9 +582,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -599,9 +599,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -616,9 +616,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -633,9 +633,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -650,9 +650,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -667,9 +667,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -684,9 +684,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -701,9 +701,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -718,9 +718,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -735,9 +735,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -752,9 +752,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -769,9 +769,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -786,9 +786,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -803,9 +803,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -820,9 +820,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -837,9 +837,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -854,9 +854,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -871,9 +871,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -888,9 +888,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -905,9 +905,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -922,9 +922,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -939,9 +939,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -956,9 +956,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -973,9 +973,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -995,7 +995,7 @@ Array [ style={ Object { "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeDasharray": undefined, "strokeWidth": undefined, } @@ -1016,9 +1016,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1033,9 +1033,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1050,9 +1050,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1067,9 +1067,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1084,9 +1084,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1101,9 +1101,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1118,9 +1118,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1135,9 +1135,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1152,9 +1152,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1169,9 +1169,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1186,9 +1186,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1203,9 +1203,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1220,9 +1220,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1237,9 +1237,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1254,9 +1254,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1271,9 +1271,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1288,9 +1288,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1305,9 +1305,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1322,9 +1322,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1339,9 +1339,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1356,9 +1356,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1373,9 +1373,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1390,9 +1390,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1407,9 +1407,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1424,9 +1424,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1441,9 +1441,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1458,9 +1458,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1475,9 +1475,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1492,9 +1492,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1509,9 +1509,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -1526,9 +1526,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -2659,7 +2659,7 @@ Array [ width: 11px; height: 11px; margin-right: 5.5px; - background: #fae181; + background: #d6bf57; border-radius: 100%; } @@ -2667,7 +2667,7 @@ Array [ width: 11px; height: 11px; margin-right: 5.5px; - background: #f19f58; + background: #da8b45; border-radius: 100%; } @@ -2764,14 +2764,14 @@ Array [ onClick={[Function]} > @@ -2798,14 +2798,14 @@ Array [ onClick={[Function]} > @@ -2854,12 +2854,12 @@ Array [ "value": 438704.4, }, Object { - "color": "#fae181", + "color": "#d6bf57", "text": "95th", "value": 1557383.999999999, }, Object { - "color": "#f19f58", + "color": "#da8b45", "text": "99th", "value": 1820377.1200000006, }, @@ -2899,7 +2899,7 @@ Array [ width: 8px; height: 8px; margin-right: 4px; - background: #fae181; + background: #d6bf57; border-radius: 100%; } @@ -2907,7 +2907,7 @@ Array [ width: 8px; height: 8px; margin-right: 4px; - background: #f19f58; + background: #da8b45; border-radius: 100%; } @@ -3378,7 +3378,7 @@ Array [ style={ Object { "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeDasharray": undefined, "strokeWidth": undefined, } @@ -3399,9 +3399,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3416,9 +3416,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3433,9 +3433,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3450,9 +3450,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3467,9 +3467,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3484,9 +3484,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3501,9 +3501,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3518,9 +3518,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3535,9 +3535,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3552,9 +3552,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3569,9 +3569,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3586,9 +3586,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3603,9 +3603,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3620,9 +3620,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3637,9 +3637,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3654,9 +3654,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3671,9 +3671,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3688,9 +3688,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3705,9 +3705,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3722,9 +3722,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3739,9 +3739,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3756,9 +3756,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3773,9 +3773,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3790,9 +3790,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3807,9 +3807,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3824,9 +3824,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3841,9 +3841,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3858,9 +3858,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3875,9 +3875,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3892,9 +3892,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3909,9 +3909,9 @@ Array [ r={0.5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -3931,7 +3931,7 @@ Array [ style={ Object { "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeDasharray": undefined, "strokeWidth": undefined, } @@ -3952,9 +3952,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -3969,9 +3969,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -3986,9 +3986,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4003,9 +4003,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4020,9 +4020,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4037,9 +4037,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4054,9 +4054,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4071,9 +4071,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4088,9 +4088,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4105,9 +4105,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4122,9 +4122,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4139,9 +4139,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4156,9 +4156,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4173,9 +4173,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4190,9 +4190,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4207,9 +4207,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4224,9 +4224,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4241,9 +4241,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4258,9 +4258,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4275,9 +4275,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4292,9 +4292,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4309,9 +4309,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4326,9 +4326,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4343,9 +4343,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4360,9 +4360,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4377,9 +4377,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4394,9 +4394,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4411,9 +4411,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4428,9 +4428,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4445,9 +4445,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -4462,9 +4462,9 @@ Array [ r={0.5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -5072,9 +5072,9 @@ Array [ r={5} style={ Object { - "fill": "#f19f58", + "fill": "#da8b45", "opacity": 1, - "stroke": "#f19f58", + "stroke": "#da8b45", "strokeWidth": 1, } } @@ -5089,9 +5089,9 @@ Array [ r={5} style={ Object { - "fill": "#fae181", + "fill": "#d6bf57", "opacity": 1, - "stroke": "#fae181", + "stroke": "#d6bf57", "strokeWidth": 1, } } @@ -5204,7 +5204,7 @@ Array [ className="c3" > @@ -5220,14 +5220,14 @@ Array [ fontSize="12px" > @@ -5250,7 +5250,7 @@ Array [ className="c3" > @@ -5266,14 +5266,14 @@ Array [ fontSize="12px" > @@ -5838,7 +5838,7 @@ Array [ width: 11px; height: 11px; margin-right: 5.5px; - background: #fae181; + background: #d6bf57; border-radius: 100%; } @@ -5846,7 +5846,7 @@ Array [ width: 11px; height: 11px; margin-right: 5.5px; - background: #f19f58; + background: #da8b45; border-radius: 100%; } @@ -5943,14 +5943,14 @@ Array [ onClick={[Function]} > @@ -5977,14 +5977,14 @@ Array [ onClick={[Function]} > diff --git a/x-pack/legacy/plugins/apm/public/selectors/__tests__/chartSelectors.test.ts b/x-pack/legacy/plugins/apm/public/selectors/__tests__/chartSelectors.test.ts index 1218bc726c3b7..252c49cc09fb9 100644 --- a/x-pack/legacy/plugins/apm/public/selectors/__tests__/chartSelectors.test.ts +++ b/x-pack/legacy/plugins/apm/public/selectors/__tests__/chartSelectors.test.ts @@ -67,7 +67,7 @@ describe('chartSelectors', () => { type: 'linemark' }, { - color: '#fae181', + color: '#d6bf57', data: [ { x: 0, y: 200 }, { x: 1000, y: 300 } @@ -77,7 +77,7 @@ describe('chartSelectors', () => { type: 'linemark' }, { - color: '#f19f58', + color: '#da8b45', data: [ { x: 0, y: 300 }, { x: 1000, y: 400 } diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/breakdown/index.test.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/breakdown/index.test.ts index 870b02fa7ba6d..476928a5bcb63 100644 --- a/x-pack/legacy/plugins/apm/server/lib/transactions/breakdown/index.test.ts +++ b/x-pack/legacy/plugins/apm/server/lib/transactions/breakdown/index.test.ts @@ -70,7 +70,7 @@ describe('getTransactionBreakdown', () => { expect(response.kpis[0]).toEqual({ name: 'app', - color: '#5bbaa0', + color: '#54b399', percentage: 0.5408550899466306 }); diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/chart.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/chart.ts index aca30780d77cd..4c535a42c3c44 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/chart.ts +++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/chart.ts @@ -4,10 +4,12 @@ * you may not use this file except in compliance with the Elastic License. */ +import { euiPaletteColorBlind } from '@elastic/eui'; import { TagFactory } from '../../../public/lib/tag'; import { TagStrings as strings } from '../../../i18n'; +const euiVisPalette = euiPaletteColorBlind(); export const chart: TagFactory = () => ({ name: strings.chart(), - color: '#FEB6DB', + color: euiVisPalette[4], }); diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/filter.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/filter.ts index d3d251026e9b0..5249856dec271 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/filter.ts +++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/filter.ts @@ -4,10 +4,13 @@ * you may not use this file except in compliance with the Elastic License. */ +import { euiPaletteColorBlind } from '@elastic/eui'; import { TagFactory } from '../../../public/lib/tag'; import { TagStrings as strings } from '../../../i18n'; +const euiVisPalette = euiPaletteColorBlind(); + export const filter: TagFactory = () => ({ name: strings.filter(), - color: '#3185FC', + color: euiVisPalette[1], }); diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/graphic.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/graphic.ts index 325a531b219ee..36d66801ef681 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/graphic.ts +++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/graphic.ts @@ -4,10 +4,12 @@ * you may not use this file except in compliance with the Elastic License. */ +import { euiPaletteColorBlind } from '@elastic/eui'; import { TagFactory } from '../../../public/lib/tag'; import { TagStrings as strings } from '../../../i18n'; +const euiVisPalette = euiPaletteColorBlind(); export const graphic: TagFactory = () => ({ name: strings.graphic(), - color: '#E6C220', + color: euiVisPalette[5], }); diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/proportion.js b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/proportion.js index ac6447ffd9dc0..6a59a6795d45a 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/proportion.js +++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/proportion.js @@ -4,4 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -export const proportion = () => ({ name: 'proportion', color: '#490092' }); +import { euiPaletteColorBlind } from '@elastic/eui'; +const euiVisPalette = euiPaletteColorBlind(); + +export const proportion = () => ({ name: 'proportion', color: euiVisPalette[3] }); diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/proportion.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/proportion.ts index e538b4bf53103..4d37ecfaa367a 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/proportion.ts +++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/proportion.ts @@ -4,11 +4,12 @@ * you may not use this file except in compliance with the Elastic License. */ +import { euiPaletteColorBlind } from '@elastic/eui'; import { TagFactory } from '../../../public/lib/tag'; - import { TagStrings as strings } from '../../../i18n'; +const euiVisPalette = euiPaletteColorBlind(); export const proportion: TagFactory = () => ({ name: strings.proportion(), - color: '#490092', + color: euiVisPalette[3], }); diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/report.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/report.ts index 5df30581cd070..8dfbe1cb21614 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/report.ts +++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/report.ts @@ -4,10 +4,12 @@ * you may not use this file except in compliance with the Elastic License. */ +import { euiPaletteColorBlind } from '@elastic/eui'; import { TagFactory } from '../../../public/lib/tag'; import { TagStrings as strings } from '../../../i18n'; +const euiVisPalette = euiPaletteColorBlind(); export const report: TagFactory = () => ({ name: strings.report(), - color: '#DB1374', + color: euiVisPalette[2], }); diff --git a/x-pack/legacy/plugins/canvas/public/components/element_card/__examples__/__snapshots__/element_card.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/element_card/__examples__/__snapshots__/element_card.examples.storyshot index 5eedf32020e4c..328e25e995189 100644 --- a/x-pack/legacy/plugins/canvas/public/components/element_card/__examples__/__snapshots__/element_card.examples.storyshot +++ b/x-pack/legacy/plugins/canvas/public/components/element_card/__examples__/__snapshots__/element_card.examples.storyshot @@ -163,7 +163,7 @@ exports[`Storyshots components/Elements/ElementCard with tags 1`] = ` style={ Object { "backgroundColor": "#666666", - "color": "#FFFFFF", + "color": "#fff", } } > @@ -182,7 +182,7 @@ exports[`Storyshots components/Elements/ElementCard with tags 1`] = ` style={ Object { "backgroundColor": "#666666", - "color": "#FFFFFF", + "color": "#fff", } } > @@ -201,7 +201,7 @@ exports[`Storyshots components/Elements/ElementCard with tags 1`] = ` style={ Object { "backgroundColor": "#666666", - "color": "#FFFFFF", + "color": "#fff", } } > @@ -220,7 +220,7 @@ exports[`Storyshots components/Elements/ElementCard with tags 1`] = ` style={ Object { "backgroundColor": "#666666", - "color": "#FFFFFF", + "color": "#fff", } } > @@ -239,7 +239,7 @@ exports[`Storyshots components/Elements/ElementCard with tags 1`] = ` style={ Object { "backgroundColor": "#666666", - "color": "#FFFFFF", + "color": "#fff", } } > @@ -258,7 +258,7 @@ exports[`Storyshots components/Elements/ElementCard with tags 1`] = ` style={ Object { "backgroundColor": "#666666", - "color": "#FFFFFF", + "color": "#fff", } } > diff --git a/x-pack/legacy/plugins/canvas/public/components/element_types/__examples__/__snapshots__/element_grid.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/element_types/__examples__/__snapshots__/element_grid.examples.storyshot index c9fb77061572d..3a52402400822 100644 --- a/x-pack/legacy/plugins/canvas/public/components/element_types/__examples__/__snapshots__/element_grid.examples.storyshot +++ b/x-pack/legacy/plugins/canvas/public/components/element_types/__examples__/__snapshots__/element_grid.examples.storyshot @@ -525,7 +525,7 @@ exports[`Storyshots components/Elements/ElementGrid with tags filter 1`] = ` style={ Object { "backgroundColor": "#666666", - "color": "#FFFFFF", + "color": "#fff", } } > @@ -605,7 +605,7 @@ exports[`Storyshots components/Elements/ElementGrid with text filter 1`] = ` style={ Object { "backgroundColor": "#666666", - "color": "#FFFFFF", + "color": "#fff", } } > @@ -685,7 +685,7 @@ exports[`Storyshots components/Elements/ElementGrid without controls 1`] = ` style={ Object { "backgroundColor": "#666666", - "color": "#FFFFFF", + "color": "#fff", } } > @@ -750,7 +750,7 @@ exports[`Storyshots components/Elements/ElementGrid without controls 1`] = ` style={ Object { "backgroundColor": "#666666", - "color": "#FFFFFF", + "color": "#fff", } } > @@ -815,7 +815,7 @@ exports[`Storyshots components/Elements/ElementGrid without controls 1`] = ` style={ Object { "backgroundColor": "#666666", - "color": "#FFFFFF", + "color": "#fff", } } > diff --git a/x-pack/legacy/plugins/canvas/public/components/tag/__examples__/__snapshots__/tag.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/tag/__examples__/__snapshots__/tag.examples.storyshot index 562feb8111e41..754724a957e2d 100644 --- a/x-pack/legacy/plugins/canvas/public/components/tag/__examples__/__snapshots__/tag.examples.storyshot +++ b/x-pack/legacy/plugins/canvas/public/components/tag/__examples__/__snapshots__/tag.examples.storyshot @@ -6,7 +6,7 @@ exports[`Storyshots components/Tags/Tag as badge 1`] = ` style={ Object { "backgroundColor": "#666666", - "color": "#FFFFFF", + "color": "#fff", } } > @@ -28,7 +28,7 @@ exports[`Storyshots components/Tags/Tag as badge with color 1`] = ` style={ Object { "backgroundColor": "#327b53", - "color": "#FFFFFF", + "color": "#fff", } } > diff --git a/x-pack/legacy/plugins/canvas/public/components/tag_list/__examples__/__snapshots__/tag_list.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/tag_list/__examples__/__snapshots__/tag_list.examples.storyshot index 9dcf55642c66f..7671b0bfb4937 100644 --- a/x-pack/legacy/plugins/canvas/public/components/tag_list/__examples__/__snapshots__/tag_list.examples.storyshot +++ b/x-pack/legacy/plugins/canvas/public/components/tag_list/__examples__/__snapshots__/tag_list.examples.storyshot @@ -9,7 +9,7 @@ Array [ style={ Object { "backgroundColor": "#cc3b54", - "color": "#FFFFFF", + "color": "#fff", } } > @@ -28,7 +28,7 @@ Array [ style={ Object { "backgroundColor": "#5bc149", - "color": "#000000", + "color": "#000", } } > @@ -47,7 +47,7 @@ Array [ style={ Object { "backgroundColor": "#fbc545", - "color": "#000000", + "color": "#000", } } > @@ -172,7 +172,7 @@ Array [ style={ Object { "backgroundColor": "#cc3b54", - "color": "#FFFFFF", + "color": "#fff", } } > @@ -191,7 +191,7 @@ Array [ style={ Object { "backgroundColor": "#5bc149", - "color": "#000000", + "color": "#000", } } > @@ -210,7 +210,7 @@ Array [ style={ Object { "backgroundColor": "#fbc545", - "color": "#000000", + "color": "#000", } } > @@ -229,7 +229,7 @@ Array [ style={ Object { "backgroundColor": "#9b3067", - "color": "#FFFFFF", + "color": "#fff", } } > @@ -248,7 +248,7 @@ Array [ style={ Object { "backgroundColor": "#1819bd", - "color": "#FFFFFF", + "color": "#fff", } } > @@ -267,7 +267,7 @@ Array [ style={ Object { "backgroundColor": "#d41e93", - "color": "#FFFFFF", + "color": "#fff", } } > @@ -286,7 +286,7 @@ Array [ style={ Object { "backgroundColor": "#3486d2", - "color": "#000000", + "color": "#000", } } > @@ -305,7 +305,7 @@ Array [ style={ Object { "backgroundColor": "#b870d8", - "color": "#000000", + "color": "#000", } } > @@ -324,7 +324,7 @@ Array [ style={ Object { "backgroundColor": "#f4a4a7", - "color": "#000000", + "color": "#000", } } > @@ -343,7 +343,7 @@ Array [ style={ Object { "backgroundColor": "#072d6d", - "color": "#FFFFFF", + "color": "#fff", } } > diff --git a/x-pack/legacy/plugins/infra/common/color_palette.test.ts b/x-pack/legacy/plugins/infra/common/color_palette.test.ts index ce0219862480d..ced45c39c710c 100644 --- a/x-pack/legacy/plugins/infra/common/color_palette.test.ts +++ b/x-pack/legacy/plugins/infra/common/color_palette.test.ts @@ -32,7 +32,7 @@ describe('Color Palette', () => { }); describe('colorTransformer()', () => { it('should just work', () => { - expect(colorTransformer(MetricsExplorerColor.color0)).toBe('#3185FC'); + expect(colorTransformer(MetricsExplorerColor.color0)).toBe('#6092C0'); }); }); }); diff --git a/x-pack/legacy/plugins/infra/common/color_palette.ts b/x-pack/legacy/plugins/infra/common/color_palette.ts index c43c17b9b0ef3..51962150d8424 100644 --- a/x-pack/legacy/plugins/infra/common/color_palette.ts +++ b/x-pack/legacy/plugins/infra/common/color_palette.ts @@ -4,6 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ import { difference, first, values } from 'lodash'; +import { euiPaletteColorBlind } from '@elastic/eui'; export enum MetricsExplorerColor { color0 = 'color0', @@ -31,17 +32,19 @@ export interface MetricsExplorerPalette { [MetricsExplorerColor.color9]: string; } +const euiPalette = euiPaletteColorBlind(); + export const defaultPalette: MetricsExplorerPalette = { - [MetricsExplorerColor.color0]: '#3185FC', // euiColorVis1 (blue) - [MetricsExplorerColor.color1]: '#DB1374', // euiColorVis2 (red-ish) - [MetricsExplorerColor.color2]: '#00B3A4', // euiColorVis0 (green-ish) - [MetricsExplorerColor.color3]: '#490092', // euiColorVis3 (purple) - [MetricsExplorerColor.color4]: '#FEB6DB', // euiColorVis4 (pink) - [MetricsExplorerColor.color5]: '#E6C220', // euiColorVis5 (yellow) - [MetricsExplorerColor.color6]: '#BFA180', // euiColorVis6 (tan) - [MetricsExplorerColor.color7]: '#F98510', // euiColorVis7 (orange) - [MetricsExplorerColor.color8]: '#461A0A', // euiColorVis8 (brown) - [MetricsExplorerColor.color9]: '#920000', // euiColorVis9 (maroon) + [MetricsExplorerColor.color0]: euiPalette[1], // (blue) + [MetricsExplorerColor.color1]: euiPalette[2], // (pink) + [MetricsExplorerColor.color2]: euiPalette[0], // (green-ish) + [MetricsExplorerColor.color3]: euiPalette[3], // (purple) + [MetricsExplorerColor.color4]: euiPalette[4], // (light pink) + [MetricsExplorerColor.color5]: euiPalette[5], // (yellow) + [MetricsExplorerColor.color6]: euiPalette[6], // (tan) + [MetricsExplorerColor.color7]: euiPalette[7], // (orange) + [MetricsExplorerColor.color8]: euiPalette[8], // (brown) + [MetricsExplorerColor.color9]: euiPalette[9], // (red) }; export const createPaletteTransformer = (palette: MetricsExplorerPalette) => ( diff --git a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/create_tsvb_link.test.ts b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/create_tsvb_link.test.ts index 860c4f1ba406c..111f6678081f7 100644 --- a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/create_tsvb_link.test.ts +++ b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/create_tsvb_link.test.ts @@ -23,7 +23,7 @@ describe('createTSVBLink()', () => { it('should just work', () => { const link = createTSVBLink(source, options, series, timeRange, chartOptions); expect(link).toBe( - "../app/kibana#/visualize/create?type=metrics&_g=(refreshInterval:(pause:!t,value:0),time:(from:now-1h,to:now))&_a=(filters:!(),linked:!f,query:(language:kuery,query:''),uiState:(),vis:(aggs:!(),params:(axis_formatter:number,axis_min:0,axis_position:left,axis_scale:normal,default_index_pattern:'metricbeat-*',filter:(language:kuery,query:'host.name : \"example-01\"'),id:test-id,index_pattern:'metricbeat-*',interval:auto,series:!((axis_position:right,chart_type:line,color:%233185FC,fill:0,formatter:percent,id:test-id,label:'avg(system.cpu.user.pct)',line_width:2,metrics:!((field:system.cpu.user.pct,id:test-id,type:avg)),point_size:0,separate_axis:0,split_mode:everything,stacked:none,value_template:{{value}})),show_grid:1,show_legend:1,time_field:'@timestamp',type:timeseries),title:example-01,type:metrics))" + "../app/kibana#/visualize/create?type=metrics&_g=(refreshInterval:(pause:!t,value:0),time:(from:now-1h,to:now))&_a=(filters:!(),linked:!f,query:(language:kuery,query:''),uiState:(),vis:(aggs:!(),params:(axis_formatter:number,axis_min:0,axis_position:left,axis_scale:normal,default_index_pattern:'metricbeat-*',filter:(language:kuery,query:'host.name : \"example-01\"'),id:test-id,index_pattern:'metricbeat-*',interval:auto,series:!((axis_position:right,chart_type:line,color:%236092C0,fill:0,formatter:percent,id:test-id,label:'avg(system.cpu.user.pct)',line_width:2,metrics:!((field:system.cpu.user.pct,id:test-id,type:avg)),point_size:0,separate_axis:0,split_mode:everything,stacked:none,value_template:{{value}})),show_grid:1,show_legend:1,time_field:'@timestamp',type:timeseries),title:example-01,type:metrics))" ); }); @@ -34,14 +34,14 @@ describe('createTSVBLink()', () => { }; const link = createTSVBLink(source, customOptions, series, timeRange, chartOptions); expect(link).toBe( - "../app/kibana#/visualize/create?type=metrics&_g=(refreshInterval:(pause:!t,value:0),time:(from:now-1h,to:now))&_a=(filters:!(),linked:!f,query:(language:kuery,query:''),uiState:(),vis:(aggs:!(),params:(axis_formatter:number,axis_min:0,axis_position:left,axis_scale:normal,default_index_pattern:'metricbeat-*',filter:(language:kuery,query:'host.name : \"example-01\"'),id:test-id,index_pattern:'metricbeat-*',interval:auto,series:!((axis_position:right,chart_type:line,color:%233185FC,fill:0,formatter:bytes,id:test-id,label:'rate(system.network.out.bytes)',line_width:2,metrics:!((field:system.network.out.bytes,id:test-id,type:max),(field:test-id,id:test-id,type:derivative,unit:'1s'),(field:test-id,id:test-id,type:positive_only)),point_size:0,separate_axis:0,split_mode:everything,stacked:none,value_template:{{value}}/s)),show_grid:1,show_legend:1,time_field:'@timestamp',type:timeseries),title:example-01,type:metrics))" + "../app/kibana#/visualize/create?type=metrics&_g=(refreshInterval:(pause:!t,value:0),time:(from:now-1h,to:now))&_a=(filters:!(),linked:!f,query:(language:kuery,query:''),uiState:(),vis:(aggs:!(),params:(axis_formatter:number,axis_min:0,axis_position:left,axis_scale:normal,default_index_pattern:'metricbeat-*',filter:(language:kuery,query:'host.name : \"example-01\"'),id:test-id,index_pattern:'metricbeat-*',interval:auto,series:!((axis_position:right,chart_type:line,color:%236092C0,fill:0,formatter:bytes,id:test-id,label:'rate(system.network.out.bytes)',line_width:2,metrics:!((field:system.network.out.bytes,id:test-id,type:max),(field:test-id,id:test-id,type:derivative,unit:'1s'),(field:test-id,id:test-id,type:positive_only)),point_size:0,separate_axis:0,split_mode:everything,stacked:none,value_template:{{value}}/s)),show_grid:1,show_legend:1,time_field:'@timestamp',type:timeseries),title:example-01,type:metrics))" ); }); it('should work with time range', () => { const customTimeRange = { ...timeRange, from: 'now-10m', to: 'now' }; const link = createTSVBLink(source, options, series, customTimeRange, chartOptions); expect(link).toBe( - "../app/kibana#/visualize/create?type=metrics&_g=(refreshInterval:(pause:!t,value:0),time:(from:now-10m,to:now))&_a=(filters:!(),linked:!f,query:(language:kuery,query:''),uiState:(),vis:(aggs:!(),params:(axis_formatter:number,axis_min:0,axis_position:left,axis_scale:normal,default_index_pattern:'metricbeat-*',filter:(language:kuery,query:'host.name : \"example-01\"'),id:test-id,index_pattern:'metricbeat-*',interval:auto,series:!((axis_position:right,chart_type:line,color:%233185FC,fill:0,formatter:percent,id:test-id,label:'avg(system.cpu.user.pct)',line_width:2,metrics:!((field:system.cpu.user.pct,id:test-id,type:avg)),point_size:0,separate_axis:0,split_mode:everything,stacked:none,value_template:{{value}})),show_grid:1,show_legend:1,time_field:'@timestamp',type:timeseries),title:example-01,type:metrics))" + "../app/kibana#/visualize/create?type=metrics&_g=(refreshInterval:(pause:!t,value:0),time:(from:now-10m,to:now))&_a=(filters:!(),linked:!f,query:(language:kuery,query:''),uiState:(),vis:(aggs:!(),params:(axis_formatter:number,axis_min:0,axis_position:left,axis_scale:normal,default_index_pattern:'metricbeat-*',filter:(language:kuery,query:'host.name : \"example-01\"'),id:test-id,index_pattern:'metricbeat-*',interval:auto,series:!((axis_position:right,chart_type:line,color:%236092C0,fill:0,formatter:percent,id:test-id,label:'avg(system.cpu.user.pct)',line_width:2,metrics:!((field:system.cpu.user.pct,id:test-id,type:avg)),point_size:0,separate_axis:0,split_mode:everything,stacked:none,value_template:{{value}})),show_grid:1,show_legend:1,time_field:'@timestamp',type:timeseries),title:example-01,type:metrics))" ); }); it('should work with source', () => { @@ -52,7 +52,7 @@ describe('createTSVBLink()', () => { }; const link = createTSVBLink(customSource, options, series, timeRange, chartOptions); expect(link).toBe( - "../app/kibana#/visualize/create?type=metrics&_g=(refreshInterval:(pause:!t,value:0),time:(from:now-1h,to:now))&_a=(filters:!(),linked:!f,query:(language:kuery,query:''),uiState:(),vis:(aggs:!(),params:(axis_formatter:number,axis_min:0,axis_position:left,axis_scale:normal,default_index_pattern:'my-beats-*',filter:(language:kuery,query:'host.name : \"example-01\"'),id:test-id,index_pattern:'my-beats-*',interval:auto,series:!((axis_position:right,chart_type:line,color:%233185FC,fill:0,formatter:percent,id:test-id,label:'avg(system.cpu.user.pct)',line_width:2,metrics:!((field:system.cpu.user.pct,id:test-id,type:avg)),point_size:0,separate_axis:0,split_mode:everything,stacked:none,value_template:{{value}})),show_grid:1,show_legend:1,time_field:time,type:timeseries),title:example-01,type:metrics))" + "../app/kibana#/visualize/create?type=metrics&_g=(refreshInterval:(pause:!t,value:0),time:(from:now-1h,to:now))&_a=(filters:!(),linked:!f,query:(language:kuery,query:''),uiState:(),vis:(aggs:!(),params:(axis_formatter:number,axis_min:0,axis_position:left,axis_scale:normal,default_index_pattern:'my-beats-*',filter:(language:kuery,query:'host.name : \"example-01\"'),id:test-id,index_pattern:'my-beats-*',interval:auto,series:!((axis_position:right,chart_type:line,color:%236092C0,fill:0,formatter:percent,id:test-id,label:'avg(system.cpu.user.pct)',line_width:2,metrics:!((field:system.cpu.user.pct,id:test-id,type:avg)),point_size:0,separate_axis:0,split_mode:everything,stacked:none,value_template:{{value}})),show_grid:1,show_legend:1,time_field:time,type:timeseries),title:example-01,type:metrics))" ); }); it('should work with filterQuery', () => { @@ -64,7 +64,7 @@ describe('createTSVBLink()', () => { const customOptions = { ...options, filterQuery: 'system.network.name:lo*' }; const link = createTSVBLink(customSource, customOptions, series, timeRange, chartOptions); expect(link).toBe( - "../app/kibana#/visualize/create?type=metrics&_g=(refreshInterval:(pause:!t,value:0),time:(from:now-1h,to:now))&_a=(filters:!(),linked:!f,query:(language:kuery,query:''),uiState:(),vis:(aggs:!(),params:(axis_formatter:number,axis_min:0,axis_position:left,axis_scale:normal,default_index_pattern:'my-beats-*',filter:(language:kuery,query:'system.network.name:lo* and host.name : \"example-01\"'),id:test-id,index_pattern:'my-beats-*',interval:auto,series:!((axis_position:right,chart_type:line,color:%233185FC,fill:0,formatter:percent,id:test-id,label:'avg(system.cpu.user.pct)',line_width:2,metrics:!((field:system.cpu.user.pct,id:test-id,type:avg)),point_size:0,separate_axis:0,split_mode:everything,stacked:none,value_template:{{value}})),show_grid:1,show_legend:1,time_field:time,type:timeseries),title:example-01,type:metrics))" + "../app/kibana#/visualize/create?type=metrics&_g=(refreshInterval:(pause:!t,value:0),time:(from:now-1h,to:now))&_a=(filters:!(),linked:!f,query:(language:kuery,query:''),uiState:(),vis:(aggs:!(),params:(axis_formatter:number,axis_min:0,axis_position:left,axis_scale:normal,default_index_pattern:'my-beats-*',filter:(language:kuery,query:'system.network.name:lo* and host.name : \"example-01\"'),id:test-id,index_pattern:'my-beats-*',interval:auto,series:!((axis_position:right,chart_type:line,color:%236092C0,fill:0,formatter:percent,id:test-id,label:'avg(system.cpu.user.pct)',line_width:2,metrics:!((field:system.cpu.user.pct,id:test-id,type:avg)),point_size:0,separate_axis:0,split_mode:everything,stacked:none,value_template:{{value}})),show_grid:1,show_legend:1,time_field:time,type:timeseries),title:example-01,type:metrics))" ); }); @@ -72,7 +72,7 @@ describe('createTSVBLink()', () => { const customChartOptions = { ...chartOptions, yAxisMode: MetricsExplorerYAxisMode.auto }; const link = createTSVBLink(source, options, series, timeRange, customChartOptions); expect(link).toBe( - "../app/kibana#/visualize/create?type=metrics&_g=(refreshInterval:(pause:!t,value:0),time:(from:now-1h,to:now))&_a=(filters:!(),linked:!f,query:(language:kuery,query:''),uiState:(),vis:(aggs:!(),params:(axis_formatter:number,axis_position:left,axis_scale:normal,default_index_pattern:'metricbeat-*',filter:(language:kuery,query:'host.name : \"example-01\"'),id:test-id,index_pattern:'metricbeat-*',interval:auto,series:!((axis_position:right,chart_type:line,color:%233185FC,fill:0,formatter:percent,id:test-id,label:'avg(system.cpu.user.pct)',line_width:2,metrics:!((field:system.cpu.user.pct,id:test-id,type:avg)),point_size:0,separate_axis:0,split_mode:everything,stacked:none,value_template:{{value}})),show_grid:1,show_legend:1,time_field:'@timestamp',type:timeseries),title:example-01,type:metrics))" + "../app/kibana#/visualize/create?type=metrics&_g=(refreshInterval:(pause:!t,value:0),time:(from:now-1h,to:now))&_a=(filters:!(),linked:!f,query:(language:kuery,query:''),uiState:(),vis:(aggs:!(),params:(axis_formatter:number,axis_position:left,axis_scale:normal,default_index_pattern:'metricbeat-*',filter:(language:kuery,query:'host.name : \"example-01\"'),id:test-id,index_pattern:'metricbeat-*',interval:auto,series:!((axis_position:right,chart_type:line,color:%236092C0,fill:0,formatter:percent,id:test-id,label:'avg(system.cpu.user.pct)',line_width:2,metrics:!((field:system.cpu.user.pct,id:test-id,type:avg)),point_size:0,separate_axis:0,split_mode:everything,stacked:none,value_template:{{value}})),show_grid:1,show_legend:1,time_field:'@timestamp',type:timeseries),title:example-01,type:metrics))" ); }); @@ -80,7 +80,7 @@ describe('createTSVBLink()', () => { const customChartOptions = { ...chartOptions, type: MetricsExplorerChartType.area }; const link = createTSVBLink(source, options, series, timeRange, customChartOptions); expect(link).toBe( - "../app/kibana#/visualize/create?type=metrics&_g=(refreshInterval:(pause:!t,value:0),time:(from:now-1h,to:now))&_a=(filters:!(),linked:!f,query:(language:kuery,query:''),uiState:(),vis:(aggs:!(),params:(axis_formatter:number,axis_min:0,axis_position:left,axis_scale:normal,default_index_pattern:'metricbeat-*',filter:(language:kuery,query:'host.name : \"example-01\"'),id:test-id,index_pattern:'metricbeat-*',interval:auto,series:!((axis_position:right,chart_type:line,color:%233185FC,fill:0.5,formatter:percent,id:test-id,label:'avg(system.cpu.user.pct)',line_width:2,metrics:!((field:system.cpu.user.pct,id:test-id,type:avg)),point_size:0,separate_axis:0,split_mode:everything,stacked:none,value_template:{{value}})),show_grid:1,show_legend:1,time_field:'@timestamp',type:timeseries),title:example-01,type:metrics))" + "../app/kibana#/visualize/create?type=metrics&_g=(refreshInterval:(pause:!t,value:0),time:(from:now-1h,to:now))&_a=(filters:!(),linked:!f,query:(language:kuery,query:''),uiState:(),vis:(aggs:!(),params:(axis_formatter:number,axis_min:0,axis_position:left,axis_scale:normal,default_index_pattern:'metricbeat-*',filter:(language:kuery,query:'host.name : \"example-01\"'),id:test-id,index_pattern:'metricbeat-*',interval:auto,series:!((axis_position:right,chart_type:line,color:%236092C0,fill:0.5,formatter:percent,id:test-id,label:'avg(system.cpu.user.pct)',line_width:2,metrics:!((field:system.cpu.user.pct,id:test-id,type:avg)),point_size:0,separate_axis:0,split_mode:everything,stacked:none,value_template:{{value}})),show_grid:1,show_legend:1,time_field:'@timestamp',type:timeseries),title:example-01,type:metrics))" ); }); @@ -92,7 +92,7 @@ describe('createTSVBLink()', () => { }; const link = createTSVBLink(source, options, series, timeRange, customChartOptions); expect(link).toBe( - "../app/kibana#/visualize/create?type=metrics&_g=(refreshInterval:(pause:!t,value:0),time:(from:now-1h,to:now))&_a=(filters:!(),linked:!f,query:(language:kuery,query:''),uiState:(),vis:(aggs:!(),params:(axis_formatter:number,axis_min:0,axis_position:left,axis_scale:normal,default_index_pattern:'metricbeat-*',filter:(language:kuery,query:'host.name : \"example-01\"'),id:test-id,index_pattern:'metricbeat-*',interval:auto,series:!((axis_position:right,chart_type:line,color:%233185FC,fill:0.5,formatter:percent,id:test-id,label:'avg(system.cpu.user.pct)',line_width:2,metrics:!((field:system.cpu.user.pct,id:test-id,type:avg)),point_size:0,separate_axis:0,split_mode:everything,stacked:stacked,value_template:{{value}})),show_grid:1,show_legend:1,time_field:'@timestamp',type:timeseries),title:example-01,type:metrics))" + "../app/kibana#/visualize/create?type=metrics&_g=(refreshInterval:(pause:!t,value:0),time:(from:now-1h,to:now))&_a=(filters:!(),linked:!f,query:(language:kuery,query:''),uiState:(),vis:(aggs:!(),params:(axis_formatter:number,axis_min:0,axis_position:left,axis_scale:normal,default_index_pattern:'metricbeat-*',filter:(language:kuery,query:'host.name : \"example-01\"'),id:test-id,index_pattern:'metricbeat-*',interval:auto,series:!((axis_position:right,chart_type:line,color:%236092C0,fill:0.5,formatter:percent,id:test-id,label:'avg(system.cpu.user.pct)',line_width:2,metrics:!((field:system.cpu.user.pct,id:test-id,type:avg)),point_size:0,separate_axis:0,split_mode:everything,stacked:stacked,value_template:{{value}})),show_grid:1,show_legend:1,time_field:'@timestamp',type:timeseries),title:example-01,type:metrics))" ); }); diff --git a/x-pack/legacy/plugins/infra/public/containers/with_options.tsx b/x-pack/legacy/plugins/infra/public/containers/with_options.tsx index 4294697fd4103..972722890ffef 100644 --- a/x-pack/legacy/plugins/infra/public/containers/with_options.tsx +++ b/x-pack/legacy/plugins/infra/public/containers/with_options.tsx @@ -7,9 +7,12 @@ import moment from 'moment'; import React from 'react'; +import { euiPaletteColorBlind } from '@elastic/eui'; import { InfraFormatterType, InfraOptions, InfraWaffleMapLegendMode } from '../lib/lib'; import { RendererFunction } from '../utils/typed_react'; +const euiVisColorPalette = euiPaletteColorBlind(); + const initialState = { options: { timerange: { @@ -34,7 +37,7 @@ const initialState = { }, { value: 1, - color: '#3185FC', + color: euiVisColorPalette[1], }, ], }, diff --git a/x-pack/legacy/plugins/lens/public/assets/chart_area.svg b/x-pack/legacy/plugins/lens/public/assets/chart_area.svg index 78f27300f90d3..d291a084028db 100644 --- a/x-pack/legacy/plugins/lens/public/assets/chart_area.svg +++ b/x-pack/legacy/plugins/lens/public/assets/chart_area.svg @@ -1,6 +1,6 @@ - + diff --git a/x-pack/legacy/plugins/lens/public/assets/chart_area_stacked.svg b/x-pack/legacy/plugins/lens/public/assets/chart_area_stacked.svg index 2da6f38eaebfd..6ae48bf6a640b 100644 --- a/x-pack/legacy/plugins/lens/public/assets/chart_area_stacked.svg +++ b/x-pack/legacy/plugins/lens/public/assets/chart_area_stacked.svg @@ -1,6 +1,6 @@ - + diff --git a/x-pack/legacy/plugins/lens/public/assets/chart_bar.svg b/x-pack/legacy/plugins/lens/public/assets/chart_bar.svg index a0dbc9dca9b57..44553960a5cce 100644 --- a/x-pack/legacy/plugins/lens/public/assets/chart_bar.svg +++ b/x-pack/legacy/plugins/lens/public/assets/chart_bar.svg @@ -1,6 +1,6 @@ - + diff --git a/x-pack/legacy/plugins/lens/public/assets/chart_bar_horizontal.svg b/x-pack/legacy/plugins/lens/public/assets/chart_bar_horizontal.svg index 4b934c99740d7..e0d9dc8385971 100644 --- a/x-pack/legacy/plugins/lens/public/assets/chart_bar_horizontal.svg +++ b/x-pack/legacy/plugins/lens/public/assets/chart_bar_horizontal.svg @@ -1,6 +1,6 @@ - + diff --git a/x-pack/legacy/plugins/lens/public/assets/chart_bar_horizontal_stacked.svg b/x-pack/legacy/plugins/lens/public/assets/chart_bar_horizontal_stacked.svg index 3b60d22868bbc..602a06e696ecd 100644 --- a/x-pack/legacy/plugins/lens/public/assets/chart_bar_horizontal_stacked.svg +++ b/x-pack/legacy/plugins/lens/public/assets/chart_bar_horizontal_stacked.svg @@ -1,6 +1,6 @@ - + diff --git a/x-pack/legacy/plugins/lens/public/assets/chart_bar_stacked.svg b/x-pack/legacy/plugins/lens/public/assets/chart_bar_stacked.svg index 8b875af8a12d3..a954cce83873d 100644 --- a/x-pack/legacy/plugins/lens/public/assets/chart_bar_stacked.svg +++ b/x-pack/legacy/plugins/lens/public/assets/chart_bar_stacked.svg @@ -1,6 +1,6 @@ - + diff --git a/x-pack/legacy/plugins/lens/public/assets/chart_datatable.svg b/x-pack/legacy/plugins/lens/public/assets/chart_datatable.svg index eb479dfbd0ea7..aba1f104264cb 100644 --- a/x-pack/legacy/plugins/lens/public/assets/chart_datatable.svg +++ b/x-pack/legacy/plugins/lens/public/assets/chart_datatable.svg @@ -1,6 +1,6 @@ - + diff --git a/x-pack/legacy/plugins/lens/public/assets/chart_line.svg b/x-pack/legacy/plugins/lens/public/assets/chart_line.svg index 177e999496210..412c9f88f652b 100644 --- a/x-pack/legacy/plugins/lens/public/assets/chart_line.svg +++ b/x-pack/legacy/plugins/lens/public/assets/chart_line.svg @@ -1,6 +1,6 @@ - + diff --git a/x-pack/legacy/plugins/lens/public/assets/chart_metric.svg b/x-pack/legacy/plugins/lens/public/assets/chart_metric.svg index d48264868f734..84f0dc181587b 100644 --- a/x-pack/legacy/plugins/lens/public/assets/chart_metric.svg +++ b/x-pack/legacy/plugins/lens/public/assets/chart_metric.svg @@ -1,4 +1,4 @@ - + diff --git a/x-pack/legacy/plugins/lens/public/assets/chart_mixed_xy.svg b/x-pack/legacy/plugins/lens/public/assets/chart_mixed_xy.svg index f7c78f3eb2ba8..943d5a08bcc0b 100644 --- a/x-pack/legacy/plugins/lens/public/assets/chart_mixed_xy.svg +++ b/x-pack/legacy/plugins/lens/public/assets/chart_mixed_xy.svg @@ -1,6 +1,6 @@ - + diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/field_icon.test.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/field_icon.test.tsx index e0e33ef03d3d1..6b12bb5feef1b 100644 --- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/field_icon.test.tsx +++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/field_icon.test.tsx @@ -19,35 +19,35 @@ describe('FieldIcon', () => { expect(shallow()).toMatchInlineSnapshot(` `); expect(shallow()).toMatchInlineSnapshot(` `); expect(shallow()).toMatchInlineSnapshot(` `); expect(shallow()).toMatchInlineSnapshot(` `); expect(shallow()).toMatchInlineSnapshot(` `); diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/lens_field_icon.test.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/lens_field_icon.test.tsx index a470f5fc51cfb..961e22380bdca 100644 --- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/lens_field_icon.test.tsx +++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/lens_field_icon.test.tsx @@ -20,10 +20,10 @@ test('LensFieldIcon renders properly', () => { test('LensFieldIcon getColorForDataType for a valid type', () => { const color = getColorForDataType('date'); - expect(color).toEqual('#F19F58'); + expect(color).toEqual('#DA8B45'); }); test('LensFieldIcon getColorForDataType for an invalid type', () => { const color = getColorForDataType('invalid'); - expect(color).toEqual('#5BBAA0'); + expect(color).toEqual('#54B399'); }); diff --git a/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/__snapshots__/xy_expression.test.tsx.snap b/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/__snapshots__/xy_expression.test.tsx.snap index 76802e701b387..495d7a7bcd77e 100644 --- a/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/__snapshots__/xy_expression.test.tsx.snap +++ b/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/__snapshots__/xy_expression.test.tsx.snap @@ -88,15 +88,15 @@ exports[`xy_expression XYChart component it renders area 1`] = ` "colors": Object { "defaultVizColor": "#6092C0", "vizColors": Array [ - "#5BBAA0", + "#54B399", "#6092C0", "#D36086", "#9170B8", - "#EEAFCF", - "#FAE181", - "#CDBD9D", - "#F19F58", - "#B46F5F", + "#CA8EAE", + "#D6BF57", + "#B9A888", + "#DA8B45", + "#AA6556", "#E7664C", ], }, @@ -274,15 +274,15 @@ exports[`xy_expression XYChart component it renders bar 1`] = ` "colors": Object { "defaultVizColor": "#6092C0", "vizColors": Array [ - "#5BBAA0", + "#54B399", "#6092C0", "#D36086", "#9170B8", - "#EEAFCF", - "#FAE181", - "#CDBD9D", - "#F19F58", - "#B46F5F", + "#CA8EAE", + "#D6BF57", + "#B9A888", + "#DA8B45", + "#AA6556", "#E7664C", ], }, @@ -460,15 +460,15 @@ exports[`xy_expression XYChart component it renders horizontal bar 1`] = ` "colors": Object { "defaultVizColor": "#6092C0", "vizColors": Array [ - "#5BBAA0", + "#54B399", "#6092C0", "#D36086", "#9170B8", - "#EEAFCF", - "#FAE181", - "#CDBD9D", - "#F19F58", - "#B46F5F", + "#CA8EAE", + "#D6BF57", + "#B9A888", + "#DA8B45", + "#AA6556", "#E7664C", ], }, @@ -646,15 +646,15 @@ exports[`xy_expression XYChart component it renders line 1`] = ` "colors": Object { "defaultVizColor": "#6092C0", "vizColors": Array [ - "#5BBAA0", + "#54B399", "#6092C0", "#D36086", "#9170B8", - "#EEAFCF", - "#FAE181", - "#CDBD9D", - "#F19F58", - "#B46F5F", + "#CA8EAE", + "#D6BF57", + "#B9A888", + "#DA8B45", + "#AA6556", "#E7664C", ], }, @@ -832,15 +832,15 @@ exports[`xy_expression XYChart component it renders stacked area 1`] = ` "colors": Object { "defaultVizColor": "#6092C0", "vizColors": Array [ - "#5BBAA0", + "#54B399", "#6092C0", "#D36086", "#9170B8", - "#EEAFCF", - "#FAE181", - "#CDBD9D", - "#F19F58", - "#B46F5F", + "#CA8EAE", + "#D6BF57", + "#B9A888", + "#DA8B45", + "#AA6556", "#E7664C", ], }, @@ -1022,15 +1022,15 @@ exports[`xy_expression XYChart component it renders stacked bar 1`] = ` "colors": Object { "defaultVizColor": "#6092C0", "vizColors": Array [ - "#5BBAA0", + "#54B399", "#6092C0", "#D36086", "#9170B8", - "#EEAFCF", - "#FAE181", - "#CDBD9D", - "#F19F58", - "#B46F5F", + "#CA8EAE", + "#D6BF57", + "#B9A888", + "#DA8B45", + "#AA6556", "#E7664C", ], }, @@ -1212,15 +1212,15 @@ exports[`xy_expression XYChart component it renders stacked horizontal bar 1`] = "colors": Object { "defaultVizColor": "#6092C0", "vizColors": Array [ - "#5BBAA0", + "#54B399", "#6092C0", "#D36086", "#9170B8", - "#EEAFCF", - "#FAE181", - "#CDBD9D", - "#F19F58", - "#B46F5F", + "#CA8EAE", + "#D6BF57", + "#B9A888", + "#DA8B45", + "#AA6556", "#E7664C", ], }, diff --git a/x-pack/legacy/plugins/maps/public/components/__snapshots__/validated_range.test.js.snap b/x-pack/legacy/plugins/maps/public/components/__snapshots__/validated_range.test.js.snap index 369132068e090..1faf4f0c1105c 100644 --- a/x-pack/legacy/plugins/maps/public/components/__snapshots__/validated_range.test.js.snap +++ b/x-pack/legacy/plugins/maps/public/components/__snapshots__/validated_range.test.js.snap @@ -5,6 +5,7 @@ exports[`Should display error message when value is outside of range 1`] = ` { { x: new Date('2019-05-04T01:00:00.000Z').valueOf(), y: 1096175 }, { x: new Date('2019-05-04T13:00:00.000Z').valueOf(), y: 12382 }, ], - color: '#DB1374', + color: '#D36086', }, { key: 'uniqueDestinationIpsHistogram', @@ -157,7 +157,7 @@ describe('AreaChartBaseComponent', () => { { x: new Date('2019-05-04T01:00:00.000Z').valueOf(), y: 1084366 }, { x: new Date('2019-05-04T13:00:00.000Z').valueOf(), y: 12280 }, ], - color: '#490092', + color: '#9170B8', }, ]; diff --git a/x-pack/legacy/plugins/siem/public/components/charts/barchart.test.tsx b/x-pack/legacy/plugins/siem/public/components/charts/barchart.test.tsx index ac9c4d591232a..d8e5079dd72a6 100644 --- a/x-pack/legacy/plugins/siem/public/components/charts/barchart.test.tsx +++ b/x-pack/legacy/plugins/siem/public/components/charts/barchart.test.tsx @@ -18,41 +18,41 @@ const customWidth = '120px'; const chartDataSets = [ [ [ - { key: 'uniqueSourceIps', value: [{ y: 1714, x: 'uniqueSourceIps' }], color: '#DB1374' }, + { key: 'uniqueSourceIps', value: [{ y: 1714, x: 'uniqueSourceIps' }], color: '#D36086' }, { key: 'uniqueDestinationIps', value: [{ y: 2354, x: 'uniqueDestinationIps' }], - color: '#490092', + color: '#9170B8', }, ], ], [ [ - { key: 'uniqueSourceIps', value: [{ y: 1714, x: '' }], color: '#DB1374' }, + { key: 'uniqueSourceIps', value: [{ y: 1714, x: '' }], color: '#D36086' }, { key: 'uniqueDestinationIps', value: [{ y: 2354, x: '' }], - color: '#490092', + color: '#9170B8', }, ], ], [ [ - { key: 'uniqueSourceIps', value: [{ y: 1714, x: 'uniqueSourceIps' }], color: '#DB1374' }, + { key: 'uniqueSourceIps', value: [{ y: 1714, x: 'uniqueSourceIps' }], color: '#D36086' }, { key: 'uniqueDestinationIps', value: [{ y: 0, x: 'uniqueDestinationIps' }], - color: '#490092', + color: '#9170B8', }, ], ], [ [ - { key: 'uniqueSourceIps', value: [{ y: null, x: 'uniqueSourceIps' }], color: '#DB1374' }, + { key: 'uniqueSourceIps', value: [{ y: null, x: 'uniqueSourceIps' }], color: '#D36086' }, { key: 'uniqueDestinationIps', value: [{ y: 2354, x: 'uniqueDestinationIps' }], - color: '#490092', + color: '#9170B8', }, ], ], @@ -63,40 +63,40 @@ const chartHolderDataSets: Array<[ChartSeriesData[] | undefined | null]> = [ [null], [ [ - { key: 'uniqueSourceIps', color: '#DB1374' }, + { key: 'uniqueSourceIps', color: '#D36086' }, { key: 'uniqueDestinationIps', - color: '#490092', + color: '#9170B8', }, ], ], [ [ - { key: 'uniqueSourceIps', value: [], color: '#DB1374' }, + { key: 'uniqueSourceIps', value: [], color: '#D36086' }, { key: 'uniqueDestinationIps', value: [], - color: '#490092', + color: '#9170B8', }, ], ], [ [ - { key: 'uniqueSourceIps', value: [{}], color: '#DB1374' }, + { key: 'uniqueSourceIps', value: [{}], color: '#D36086' }, { key: 'uniqueDestinationIps', value: [{}], - color: '#490092', + color: '#9170B8', }, ], ], [ [ - { key: 'uniqueSourceIps', value: [{ y: 0, x: 'uniqueSourceIps' }], color: '#DB1374' }, + { key: 'uniqueSourceIps', value: [{ y: 0, x: 'uniqueSourceIps' }], color: '#D36086' }, { key: 'uniqueDestinationIps', value: [{ y: 0, x: 'uniqueDestinationIps' }], - color: '#490092', + color: '#9170B8', }, ], ], @@ -122,12 +122,12 @@ describe('BarChartBaseComponent', () => { { key: 'uniqueSourceIps', value: [{ y: 1714, x: 'uniqueSourceIps', g: 'uniqueSourceIps' }], - color: '#DB1374', + color: '#D36086', }, { key: 'uniqueDestinationIps', value: [{ y: 2354, x: 'uniqueDestinationIps', g: 'uniqueDestinationIps' }], - color: '#490092', + color: '#9170B8', }, ]; diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/__mocks__/mock.ts b/x-pack/legacy/plugins/siem/public/components/embeddables/__mocks__/mock.ts index ede0d3f394789..2a3e69787c05c 100644 --- a/x-pack/legacy/plugins/siem/public/components/embeddables/__mocks__/mock.ts +++ b/x-pack/legacy/plugins/siem/public/components/embeddables/__mocks__/mock.ts @@ -34,7 +34,7 @@ export const mockSourceLayer = { properties: { fillColor: { type: 'STATIC', - options: { color: '#3185FC' }, + options: { color: '#6092C0' }, }, lineColor: { type: 'STATIC', @@ -86,7 +86,7 @@ export const mockDestinationLayer = { properties: { fillColor: { type: 'STATIC', - options: { color: '#DB1374' }, + options: { color: '#D36086' }, }, lineColor: { type: 'STATIC', @@ -135,7 +135,7 @@ export const mockLineLayer = { }, lineColor: { type: 'STATIC', - options: { color: '#3185FC' }, + options: { color: '#6092C0' }, }, lineWidth: { type: 'DYNAMIC', diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/map_config.test.ts b/x-pack/legacy/plugins/siem/public/components/embeddables/map_config.test.ts index bc4e6130f56f4..4004db5f21795 100644 --- a/x-pack/legacy/plugins/siem/public/components/embeddables/map_config.test.ts +++ b/x-pack/legacy/plugins/siem/public/components/embeddables/map_config.test.ts @@ -16,6 +16,7 @@ import { jest.mock('uuid', () => { return { + v1: jest.fn(() => 'uuid.v1()'), v4: jest.fn(() => 'uuid.v4()'), }; }); diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/map_config.ts b/x-pack/legacy/plugins/siem/public/components/embeddables/map_config.ts index 637251eb64f70..f2d4505ffd1bf 100644 --- a/x-pack/legacy/plugins/siem/public/components/embeddables/map_config.ts +++ b/x-pack/legacy/plugins/siem/public/components/embeddables/map_config.ts @@ -5,8 +5,10 @@ */ import uuid from 'uuid'; +import { euiPaletteColorBlind } from '@elastic/eui'; import { IndexPatternMapping } from './types'; import * as i18n from './translations'; +const euiVisColorPalette = euiPaletteColorBlind(); // Update source/destination field mappings to modify what fields will be returned to map tooltip const sourceFieldMappings: Record = { @@ -89,7 +91,7 @@ export const getSourceLayer = (indexPatternTitle: string, indexPatternId: string properties: { fillColor: { type: 'STATIC', - options: { color: '#3185FC' }, + options: { color: euiVisColorPalette[1] }, }, lineColor: { type: 'STATIC', @@ -142,7 +144,7 @@ export const getDestinationLayer = (indexPatternTitle: string, indexPatternId: s properties: { fillColor: { type: 'STATIC', - options: { color: '#DB1374' }, + options: { color: euiVisColorPalette[2] }, }, lineColor: { type: 'STATIC', @@ -198,7 +200,7 @@ export const getLineLayer = (indexPatternTitle: string, indexPatternId: string) }, lineColor: { type: 'STATIC', - options: { color: '#3185FC' }, + options: { color: euiVisColorPalette[1] }, }, lineWidth: { type: 'DYNAMIC', diff --git a/x-pack/legacy/plugins/siem/public/components/notes/note_card/__snapshots__/note_card_body.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/notes/note_card/__snapshots__/note_card_body.test.tsx.snap index 11fd78d81052a..ba35940ff0e5f 100644 --- a/x-pack/legacy/plugins/siem/public/components/notes/note_card/__snapshots__/note_card_body.test.tsx.snap +++ b/x-pack/legacy/plugins/siem/public/components/notes/note_card/__snapshots__/note_card_body.test.tsx.snap @@ -24,14 +24,6 @@ exports[`NoteCardBody renders correctly against snapshot 1`] = ` "size": "64px", }, }, - "badgeTypes": Object { - "accent": "#e2a7c2", - "danger": "#e65c5c", - "default": "#343741", - "primary": "#388ebc", - "secondary": "#9dc2bc", - "warning": "#ebc98e", - }, "euiAnimSlightBounce": "cubic-bezier(0.34, 1.61, 0.7, 1)", "euiAnimSlightResistance": "cubic-bezier(0.694, 0.0482, 0.335, 1)", "euiAnimSpeedExtraFast": "90ms", @@ -167,16 +159,26 @@ exports[`NoteCardBody renders correctly against snapshot 1`] = ` "euiColorPrimary": "#1ba9f5", "euiColorSecondary": "#7de2d1", "euiColorSuccess": "#7de2d1", - "euiColorVis0": "#5bbaa0", + "euiColorVis0": "#54b399", + "euiColorVis0_behindText": "#6dccb1", "euiColorVis1": "#6092c0", + "euiColorVis1_behindText": "#79aad9", "euiColorVis2": "#d36086", + "euiColorVis2_behindText": "#ee789d", "euiColorVis3": "#9170b8", - "euiColorVis4": "#eeafcf", - "euiColorVis5": "#fae181", - "euiColorVis6": "#cdbd9d", - "euiColorVis7": "#f19f58", - "euiColorVis8": "#b46f5f", + "euiColorVis3_behindText": "#a987d1", + "euiColorVis4": "#ca8eae", + "euiColorVis4_behindText": "#e4a6c7", + "euiColorVis5": "#d6bf57", + "euiColorVis5_behindText": "#f1d86f", + "euiColorVis6": "#b9a888", + "euiColorVis6_behindText": "#d2c0a0", + "euiColorVis7": "#da8b45", + "euiColorVis7_behindText": "#f5a35c", + "euiColorVis8": "#aa6556", + "euiColorVis8_behindText": "#c47c6c", "euiColorVis9": "#e7664c", + "euiColorVis9_behindText": "#ff7e62", "euiColorWarning": "#ffce7a", "euiContextMenuWidth": "256px", "euiControlBarBackground": "#000000", @@ -214,7 +216,7 @@ exports[`NoteCardBody renders correctly against snapshot 1`] = ` "euiFocusBackgroundColor": "#232635", "euiFocusRingAnimStartColor": "rgba(27, 169, 245, 0)", "euiFocusRingColor": "rgba(27, 169, 245, 0.3)", - "euiFocusRingSize": "2px", + "euiFocusRingSize": "3px", "euiFocusRingSizeLarge": "4px", "euiFontFamily": "'Inter UI', '-apple-system', 'BlinkMacSystemFont', 'Segoe UI', 'Helvetica', 'Arial', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'", "euiFontFeatureSettings": "calt 1 kern 1 liga 1", @@ -289,6 +291,48 @@ exports[`NoteCardBody renders correctly against snapshot 1`] = ` "euiNavDrawerWidthCollapsed": "48px", "euiNavDrawerWidthExpanded": "240px", "euiPageBackgroundColor": "#1a1b20", + "euiPaletteColorBlind": Object { + "euiColorVis0": Object { + "behindText": "#6dccb1", + "graphic": "#54b399", + }, + "euiColorVis1": Object { + "behindText": "#79aad9", + "graphic": "#6092c0", + }, + "euiColorVis2": Object { + "behindText": "#ee789d", + "graphic": "#d36086", + }, + "euiColorVis3": Object { + "behindText": "#a987d1", + "graphic": "#9170b8", + }, + "euiColorVis4": Object { + "behindText": "#e4a6c7", + "graphic": "#ca8eae", + }, + "euiColorVis5": Object { + "behindText": "#f1d86f", + "graphic": "#d6bf57", + }, + "euiColorVis6": Object { + "behindText": "#d2c0a0", + "graphic": "#b9a888", + }, + "euiColorVis7": Object { + "behindText": "#f5a35c", + "graphic": "#da8b45", + }, + "euiColorVis8": Object { + "behindText": "#c47c6c", + "graphic": "#aa6556", + }, + "euiColorVis9": Object { + "behindText": "#ff7e62", + "graphic": "#e7664c", + }, + }, "euiPanelPaddingModifiers": Object { "paddingLarge": "24px", "paddingMedium": "16px", @@ -351,16 +395,16 @@ exports[`NoteCardBody renders correctly against snapshot 1`] = ` "warning": "#ffce7a", }, "euiSuggestItemColors": Object { - "tint0": "#5bbaa0", + "tint0": "#54b399", "tint1": "#6092c0", "tint10": "#98a2b3", "tint2": "#d36086", "tint3": "#9170b8", - "tint4": "#eeafcf", - "tint5": "#fae181", - "tint6": "#cdbd9d", - "tint7": "#f19f58", - "tint8": "#b46f5f", + "tint4": "#ca8eae", + "tint5": "#d6bf57", + "tint6": "#b9a888", + "tint7": "#da8b45", + "tint8": "#aa6556", "tint9": "#e7664c", }, "euiSuperDatePickerButtonWidth": "118px", @@ -508,10 +552,10 @@ exports[`NoteCardBody renders correctly against snapshot 1`] = ` "tokenTint01": "#1ba9f5", "tokenTint02": "#f990c0", "tokenTint03": "#9170b8", - "tokenTint04": "#f19f58", + "tokenTint04": "#da8b45", "tokenTint05": "#6092c0", "tokenTint06": "#e6c220", - "tokenTint07": "#5bbaa0", + "tokenTint07": "#54b399", "tokenTint08": "#920000", "tokenTint09": "#ff00ff", "tokenTint10": "#26ab00", diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/__snapshots__/index.test.tsx.snap index 342c814550727..2b2a35945bdf1 100644 --- a/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/__snapshots__/index.test.tsx.snap +++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/__snapshots__/index.test.tsx.snap @@ -9,7 +9,7 @@ exports[`kpiHostsComponent render it should render KpiHostDetailsData 1`] = ` fields={ Array [ Object { - "color": "#00B3A4", + "color": "#54B399", "description": "success", "icon": "check", "key": "authSuccess", @@ -17,7 +17,7 @@ exports[`kpiHostsComponent render it should render KpiHostDetailsData 1`] = ` "value": null, }, Object { - "color": "#920000", + "color": "#E7664C", "description": "fail", "icon": "cross", "key": "authFailure", @@ -37,7 +37,7 @@ exports[`kpiHostsComponent render it should render KpiHostDetailsData 1`] = ` fields={ Array [ Object { - "color": "#DB1374", + "color": "#D36086", "description": "source", "icon": "visMapCoordinate", "key": "uniqueSourceIps", @@ -45,7 +45,7 @@ exports[`kpiHostsComponent render it should render KpiHostDetailsData 1`] = ` "value": null, }, Object { - "color": "#490092", + "color": "#9170B8", "description": "destination", "icon": "visMapCoordinate", "key": "uniqueDestinationIps", @@ -69,7 +69,7 @@ exports[`kpiHostsComponent render it should render KpiHostsData 1`] = ` fields={ Array [ Object { - "color": "#3185FC", + "color": "#6092C0", "icon": "storage", "key": "hosts", "value": null, @@ -87,7 +87,7 @@ exports[`kpiHostsComponent render it should render KpiHostsData 1`] = ` fields={ Array [ Object { - "color": "#00B3A4", + "color": "#54B399", "description": "success", "icon": "check", "key": "authSuccess", @@ -95,7 +95,7 @@ exports[`kpiHostsComponent render it should render KpiHostsData 1`] = ` "value": null, }, Object { - "color": "#920000", + "color": "#E7664C", "description": "fail", "icon": "cross", "key": "authFailure", @@ -115,7 +115,7 @@ exports[`kpiHostsComponent render it should render KpiHostsData 1`] = ` fields={ Array [ Object { - "color": "#DB1374", + "color": "#D36086", "description": "source", "icon": "visMapCoordinate", "key": "uniqueSourceIps", @@ -123,7 +123,7 @@ exports[`kpiHostsComponent render it should render KpiHostsData 1`] = ` "value": null, }, Object { - "color": "#490092", + "color": "#9170B8", "description": "destination", "icon": "visMapCoordinate", "key": "uniqueDestinationIps", diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/types.ts b/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/types.ts index f2f50d72952ac..fd48368124795 100644 --- a/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/types.ts +++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/types.ts @@ -5,9 +5,9 @@ */ export enum KpiHostsChartColors { - authSuccess = '#00B3A4', - authFailure = '#920000', - uniqueSourceIps = '#DB1374', - uniqueDestinationIps = '#490092', - hosts = '#3185FC', + authSuccess = '#54B399', + authFailure = '#E7664C', + uniqueSourceIps = '#D36086', + uniqueDestinationIps = '#9170B8', + hosts = '#6092C0', } diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.tsx index 73602fe3400a9..876df35b7414a 100644 --- a/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.tsx +++ b/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.tsx @@ -6,7 +6,13 @@ import React from 'react'; -import { EuiFlexItem, EuiLoadingSpinner, EuiFlexGroup, EuiSpacer } from '@elastic/eui'; +import { + EuiFlexItem, + EuiLoadingSpinner, + EuiFlexGroup, + EuiSpacer, + euiPaletteColorBlind, +} from '@elastic/eui'; import styled from 'styled-components'; import { chunk as _chunk } from 'lodash/fp'; import { @@ -23,9 +29,10 @@ import { UpdateDateRange } from '../../../charts/common'; const kipsPerRow = 2; const kpiWidgetHeight = 228; -const euiColorVis1 = '#3185FC'; -const euiColorVis2 = '#DB1374'; -const euiColorVis3 = '#490092'; +const euiVisColorPalette = euiPaletteColorBlind(); +const euiColorVis1 = euiVisColorPalette[1]; +const euiColorVis2 = euiVisColorPalette[2]; +const euiColorVis3 = euiVisColorPalette[3]; interface KpiNetworkProps { data: KpiNetworkData; diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/mock.ts b/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/mock.ts index 38d73d5a5895b..4edaf76bb4820 100644 --- a/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/mock.ts +++ b/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/mock.ts @@ -49,7 +49,7 @@ const mockMappingItems: StatItems = { value: null, name: 'Src.', description: 'source', - color: '#DB1374', + color: '#D36086', icon: 'visMapCoordinate', }, { @@ -57,7 +57,7 @@ const mockMappingItems: StatItems = { value: null, name: 'Dest.', description: 'destination', - color: '#490092', + color: '#9170B8', icon: 'visMapCoordinate', }, ], @@ -82,7 +82,7 @@ export const mockDisableChartsInitialData = { value: undefined, name: 'Src.', description: 'source', - color: '#DB1374', + color: '#D36086', icon: 'visMapCoordinate', }, { @@ -90,7 +90,7 @@ export const mockDisableChartsInitialData = { value: undefined, name: 'Dest.', description: 'destination', - color: '#490092', + color: '#9170B8', icon: 'visMapCoordinate', }, ], @@ -109,7 +109,7 @@ export const mockEnableChartsInitialData = { value: undefined, name: 'Src.', description: 'source', - color: '#DB1374', + color: '#D36086', icon: 'visMapCoordinate', }, { @@ -117,7 +117,7 @@ export const mockEnableChartsInitialData = { value: undefined, name: 'Dest.', description: 'destination', - color: '#490092', + color: '#9170B8', icon: 'visMapCoordinate', }, ], @@ -128,7 +128,7 @@ export const mockEnableChartsInitialData = { areaChart: [], barChart: [ { - color: '#DB1374', + color: '#D36086', key: 'uniqueSourcePrivateIps', value: [ { @@ -139,7 +139,7 @@ export const mockEnableChartsInitialData = { ], }, { - color: '#490092', + color: '#9170B8', key: 'uniqueDestinationPrivateIps', value: [ { @@ -165,7 +165,7 @@ export const mockEnableChartsData = { ], name: 'Src.', description: 'source', - color: '#DB1374', + color: '#D36086', icon: 'visMapCoordinate', }, { @@ -176,14 +176,14 @@ export const mockEnableChartsData = { ], name: 'Dest.', description: 'destination', - color: '#490092', + color: '#9170B8', icon: 'visMapCoordinate', }, ], barChart: [ { key: 'uniqueSourcePrivateIps', - color: '#DB1374', + color: '#D36086', value: [ { x: 'Src.', @@ -195,7 +195,7 @@ export const mockEnableChartsData = { }, { key: 'uniqueDestinationPrivateIps', - color: '#490092', + color: '#9170B8', value: [{ x: 'Dest.', y: 18, g: 'uniqueDestinationPrivateIps', y0: 0 }], }, ], @@ -208,7 +208,7 @@ export const mockEnableChartsData = { value: 383, name: 'Src.', description: 'source', - color: '#DB1374', + color: '#D36086', icon: 'visMapCoordinate', }, { @@ -216,7 +216,7 @@ export const mockEnableChartsData = { value: 18, name: 'Dest.', description: 'destination', - color: '#490092', + color: '#9170B8', icon: 'visMapCoordinate', }, ], diff --git a/x-pack/legacy/plugins/siem/public/components/paginated_table/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/paginated_table/__snapshots__/index.test.tsx.snap index 82bcd62c77cbe..59d2d91897254 100644 --- a/x-pack/legacy/plugins/siem/public/components/paginated_table/__snapshots__/index.test.tsx.snap +++ b/x-pack/legacy/plugins/siem/public/components/paginated_table/__snapshots__/index.test.tsx.snap @@ -24,14 +24,6 @@ exports[`Paginated Table Component rendering it renders the default load more ta "size": "64px", }, }, - "badgeTypes": Object { - "accent": "#e2a7c2", - "danger": "#e65c5c", - "default": "#343741", - "primary": "#388ebc", - "secondary": "#9dc2bc", - "warning": "#ebc98e", - }, "euiAnimSlightBounce": "cubic-bezier(0.34, 1.61, 0.7, 1)", "euiAnimSlightResistance": "cubic-bezier(0.694, 0.0482, 0.335, 1)", "euiAnimSpeedExtraFast": "90ms", @@ -167,16 +159,26 @@ exports[`Paginated Table Component rendering it renders the default load more ta "euiColorPrimary": "#1ba9f5", "euiColorSecondary": "#7de2d1", "euiColorSuccess": "#7de2d1", - "euiColorVis0": "#5bbaa0", + "euiColorVis0": "#54b399", + "euiColorVis0_behindText": "#6dccb1", "euiColorVis1": "#6092c0", + "euiColorVis1_behindText": "#79aad9", "euiColorVis2": "#d36086", + "euiColorVis2_behindText": "#ee789d", "euiColorVis3": "#9170b8", - "euiColorVis4": "#eeafcf", - "euiColorVis5": "#fae181", - "euiColorVis6": "#cdbd9d", - "euiColorVis7": "#f19f58", - "euiColorVis8": "#b46f5f", + "euiColorVis3_behindText": "#a987d1", + "euiColorVis4": "#ca8eae", + "euiColorVis4_behindText": "#e4a6c7", + "euiColorVis5": "#d6bf57", + "euiColorVis5_behindText": "#f1d86f", + "euiColorVis6": "#b9a888", + "euiColorVis6_behindText": "#d2c0a0", + "euiColorVis7": "#da8b45", + "euiColorVis7_behindText": "#f5a35c", + "euiColorVis8": "#aa6556", + "euiColorVis8_behindText": "#c47c6c", "euiColorVis9": "#e7664c", + "euiColorVis9_behindText": "#ff7e62", "euiColorWarning": "#ffce7a", "euiContextMenuWidth": "256px", "euiControlBarBackground": "#000000", @@ -214,7 +216,7 @@ exports[`Paginated Table Component rendering it renders the default load more ta "euiFocusBackgroundColor": "#232635", "euiFocusRingAnimStartColor": "rgba(27, 169, 245, 0)", "euiFocusRingColor": "rgba(27, 169, 245, 0.3)", - "euiFocusRingSize": "2px", + "euiFocusRingSize": "3px", "euiFocusRingSizeLarge": "4px", "euiFontFamily": "'Inter UI', '-apple-system', 'BlinkMacSystemFont', 'Segoe UI', 'Helvetica', 'Arial', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'", "euiFontFeatureSettings": "calt 1 kern 1 liga 1", @@ -289,6 +291,48 @@ exports[`Paginated Table Component rendering it renders the default load more ta "euiNavDrawerWidthCollapsed": "48px", "euiNavDrawerWidthExpanded": "240px", "euiPageBackgroundColor": "#1a1b20", + "euiPaletteColorBlind": Object { + "euiColorVis0": Object { + "behindText": "#6dccb1", + "graphic": "#54b399", + }, + "euiColorVis1": Object { + "behindText": "#79aad9", + "graphic": "#6092c0", + }, + "euiColorVis2": Object { + "behindText": "#ee789d", + "graphic": "#d36086", + }, + "euiColorVis3": Object { + "behindText": "#a987d1", + "graphic": "#9170b8", + }, + "euiColorVis4": Object { + "behindText": "#e4a6c7", + "graphic": "#ca8eae", + }, + "euiColorVis5": Object { + "behindText": "#f1d86f", + "graphic": "#d6bf57", + }, + "euiColorVis6": Object { + "behindText": "#d2c0a0", + "graphic": "#b9a888", + }, + "euiColorVis7": Object { + "behindText": "#f5a35c", + "graphic": "#da8b45", + }, + "euiColorVis8": Object { + "behindText": "#c47c6c", + "graphic": "#aa6556", + }, + "euiColorVis9": Object { + "behindText": "#ff7e62", + "graphic": "#e7664c", + }, + }, "euiPanelPaddingModifiers": Object { "paddingLarge": "24px", "paddingMedium": "16px", @@ -351,16 +395,16 @@ exports[`Paginated Table Component rendering it renders the default load more ta "warning": "#ffce7a", }, "euiSuggestItemColors": Object { - "tint0": "#5bbaa0", + "tint0": "#54b399", "tint1": "#6092c0", "tint10": "#98a2b3", "tint2": "#d36086", "tint3": "#9170b8", - "tint4": "#eeafcf", - "tint5": "#fae181", - "tint6": "#cdbd9d", - "tint7": "#f19f58", - "tint8": "#b46f5f", + "tint4": "#ca8eae", + "tint5": "#d6bf57", + "tint6": "#b9a888", + "tint7": "#da8b45", + "tint8": "#aa6556", "tint9": "#e7664c", }, "euiSuperDatePickerButtonWidth": "118px", @@ -508,10 +552,10 @@ exports[`Paginated Table Component rendering it renders the default load more ta "tokenTint01": "#1ba9f5", "tokenTint02": "#f990c0", "tokenTint03": "#9170b8", - "tokenTint04": "#f19f58", + "tokenTint04": "#da8b45", "tokenTint05": "#6092c0", "tokenTint06": "#e6c220", - "tokenTint07": "#5bbaa0", + "tokenTint07": "#54b399", "tokenTint08": "#920000", "tokenTint09": "#ff00ff", "tokenTint10": "#26ab00", diff --git a/x-pack/legacy/plugins/siem/public/components/stat_items/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/stat_items/__snapshots__/index.test.tsx.snap index 31456ba8c4ada..a05fb513dd7ef 100644 --- a/x-pack/legacy/plugins/siem/public/components/stat_items/__snapshots__/index.test.tsx.snap +++ b/x-pack/legacy/plugins/siem/public/components/stat_items/__snapshots__/index.test.tsx.snap @@ -20,7 +20,7 @@ exports[`Stat Items Component disable charts it renders the default widget 1`] = fields={ Array [ Object { - "color": "#3185FC", + "color": "#6092C0", "icon": "cross", "key": "hosts", "value": null, @@ -254,7 +254,7 @@ exports[`Stat Items Component disable charts it renders the default widget 2`] = fields={ Array [ Object { - "color": "#3185FC", + "color": "#6092C0", "icon": "cross", "key": "hosts", "value": null, @@ -483,7 +483,7 @@ exports[`Stat Items Component rendering kpis with charts it renders the default areaChart={ Array [ Object { - "color": "#DB1374", + "color": "#D36086", "key": "uniqueSourceIpsHistogram", "value": Array [ Object { @@ -501,7 +501,7 @@ exports[`Stat Items Component rendering kpis with charts it renders the default ], }, Object { - "color": "#490092", + "color": "#9170B8", "key": "uniqueDestinationIpsHistogram", "value": Array [ Object { @@ -523,7 +523,7 @@ exports[`Stat Items Component rendering kpis with charts it renders the default barChart={ Array [ Object { - "color": "#DB1374", + "color": "#D36086", "key": "uniqueSourceIps", "value": Array [ Object { @@ -533,7 +533,7 @@ exports[`Stat Items Component rendering kpis with charts it renders the default ], }, Object { - "color": "#490092", + "color": "#9170B8", "key": "uniqueDestinationIps", "value": Array [ Object { @@ -550,14 +550,14 @@ exports[`Stat Items Component rendering kpis with charts it renders the default fields={ Array [ Object { - "color": "#DB1374", + "color": "#D36086", "description": "Source", "icon": "cross", "key": "uniqueSourceIps", "value": 1714, }, Object { - "color": "#490092", + "color": "#9170B8", "description": "Dest.", "icon": "cross", "key": "uniqueDestinationIps", @@ -728,7 +728,7 @@ exports[`Stat Items Component rendering kpis with charts it renders the default className="euiFlexItem euiFlexItem--flexGrowZero sc-AykKG dLVTBE" > @@ -754,7 +754,7 @@ exports[`Stat Items Component rendering kpis with charts it renders the default role="img" style={ Object { - "fill": "#DB1374", + "fill": "#D36086", } } viewBox="0 0 16 16" @@ -823,7 +823,7 @@ exports[`Stat Items Component rendering kpis with charts it renders the default className="euiFlexItem euiFlexItem--flexGrowZero sc-AykKG dLVTBE" > @@ -849,7 +849,7 @@ exports[`Stat Items Component rendering kpis with charts it renders the default role="img" style={ Object { - "fill": "#490092", + "fill": "#9170B8", } } viewBox="0 0 16 16" @@ -912,7 +912,7 @@ exports[`Stat Items Component rendering kpis with charts it renders the default barChart={ Array [ Object { - "color": "#DB1374", + "color": "#D36086", "key": "uniqueSourceIps", "value": Array [ Object { @@ -922,7 +922,7 @@ exports[`Stat Items Component rendering kpis with charts it renders the default ], }, Object { - "color": "#490092", + "color": "#9170B8", "key": "uniqueDestinationIps", "value": Array [ Object { @@ -971,7 +971,7 @@ exports[`Stat Items Component rendering kpis with charts it renders the default areaChart={ Array [ Object { - "color": "#DB1374", + "color": "#D36086", "key": "uniqueSourceIpsHistogram", "value": Array [ Object { @@ -989,7 +989,7 @@ exports[`Stat Items Component rendering kpis with charts it renders the default ], }, Object { - "color": "#490092", + "color": "#9170B8", "key": "uniqueDestinationIpsHistogram", "value": Array [ Object { diff --git a/x-pack/legacy/plugins/siem/public/components/stat_items/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/stat_items/index.test.tsx index e68cf47500555..95ef747bc429a 100644 --- a/x-pack/legacy/plugins/siem/public/components/stat_items/index.test.tsx +++ b/x-pack/legacy/plugins/siem/public/components/stat_items/index.test.tsx @@ -58,7 +58,7 @@ describe('Stat Items Component', () => { { areaChart={[]} barChart={[]} description="HOSTS" - fields={[{ key: 'hosts', value: null, color: '#3185FC', icon: 'cross' }]} + fields={[{ key: 'hosts', value: null, color: '#6092C0', icon: 'cross' }]} from={from} id="statItems" index={0} @@ -126,7 +126,7 @@ describe('Stat Items Component', () => { { x: new Date('2019-05-04T01:00:00.000Z').valueOf(), y: 1084366 }, { x: new Date('2019-05-04T13:00:00.000Z').valueOf(), y: 12280 }, ], - color: '#DB1374', + color: '#D36086', }, { key: 'uniqueDestinationIpsHistogram', @@ -135,15 +135,15 @@ describe('Stat Items Component', () => { { x: new Date('2019-05-04T01:00:00.000Z').valueOf(), y: 1084366 }, { x: new Date('2019-05-04T13:00:00.000Z').valueOf(), y: 12280 }, ], - color: '#490092', + color: '#9170B8', }, ], barChart: [ - { key: 'uniqueSourceIps', value: [{ x: 'uniqueSourceIps', y: '1714' }], color: '#DB1374' }, + { key: 'uniqueSourceIps', value: [{ x: 'uniqueSourceIps', y: '1714' }], color: '#D36086' }, { key: 'uniqueDestinationIps', value: [{ x: 'uniqueDestinationIps', y: 2354 }], - color: '#490092', + color: '#9170B8', }, ], description: 'UNIQUE_PRIVATE_IPS', @@ -154,14 +154,14 @@ describe('Stat Items Component', () => { key: 'uniqueSourceIps', description: 'Source', value: 1714, - color: '#DB1374', + color: '#D36086', icon: 'cross', }, { key: 'uniqueDestinationIps', description: 'Dest.', value: 2359, - color: '#490092', + color: '#9170B8', icon: 'cross', }, ], diff --git a/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/__snapshots__/customize_space_avatar.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/__snapshots__/customize_space_avatar.test.tsx.snap index 6514d6aa9eb02..562641d8fca51 100644 --- a/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/__snapshots__/customize_space_avatar.test.tsx.snap +++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/__snapshots__/customize_space_avatar.test.tsx.snap @@ -35,7 +35,7 @@ exports[`renders without crashing 1`] = ` labelType="label" > diff --git a/x-pack/legacy/plugins/spaces/public/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap index 02dccc1de2e27..02dbca28c7b66 100644 --- a/x-pack/legacy/plugins/spaces/public/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap +++ b/x-pack/legacy/plugins/spaces/public/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap @@ -141,7 +141,7 @@ Array [ } > SSL certificate expires {