github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[dashboard+gis] remove dark mode options (#29017)

Browse source 
* [dashboard+gis] remove dark mode options

* [reporting/extract] restore fixtures

* remove mentions of old `.theme-dark` class

* import panel styles from panel/_index.scss
This commit is contained in:
Spencer 2019-01-23 14:29:35 -08:00 • committed by GitHub
parent e0992aa433
commit c052613962
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
52 changed files with 62 additions and 858 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/api/dashboard-import/import.asciidoc
View file

@ -80,7 +80,7 @@ POST api/kibana/dashboards/import?exclude=index-pattern
"hits": 0,
"description": "",
"panelsJSON": "[{\"gridData\":{\"w\":24,\"h\":15,\"x\":0,\"y\":0,\"i\":\"1\"},\"version\":\"7.0.0-alpha1\",\"panelIndex\":\"1\",\"type\":\"visualization\",\"id\":\"80b956f0-b2cd-11e8-ad8e-85441f0c2e5c\",\"embeddableConfig\":{}}]",
"optionsJSON": "{\"darkTheme\":false,\"useMargins\":true,\"hidePanelTitles\":false}",
"optionsJSON": "{\"useMargins\":true,\"hidePanelTitles\":false}",
"version": 1,
"timeRestore": false,
"kibanaSavedObjectMeta": {

2
docs/api/url_shortening/shorten_url.asciidoc
View file

@ -28,7 +28,7 @@ the shortened URL token for the provided request body.
--------------------------------------------------
POST api/shorten_url
{
"url": "/app/kibana#/dashboard?_g=()&_a=(description:'',filters:!(),fullScreenMode:!f,options:(darkTheme:!f,hidePanelTitles:!f,useMargins:!t),panels:!((embeddableConfig:(),gridData:(h:15,i:'1',w:24,x:0,y:0),id:'8f4d0c00-4c86-11e8-b3d7-01146121b73d',panelIndex:'1',type:visualization,version:'7.0.0-alpha1')),query:(language:lucene,query:''),timeRestore:!f,title:'New%20Dashboard',viewMode:edit)",
"url": "/app/kibana#/dashboard?_g=()&_a=(description:'',filters:!(),fullScreenMode:!f,options:(hidePanelTitles:!f,useMargins:!t),panels:!((embeddableConfig:(),gridData:(h:15,i:'1',w:24,x:0,y:0),id:'8f4d0c00-4c86-11e8-b3d7-01146121b73d',panelIndex:'1',type:visualization,version:'7.0.0-alpha1')),query:(language:lucene,query:''),timeRestore:!f,title:'New%20Dashboard',viewMode:edit)",
}
--------------------------------------------------
// KIBANA

1
docs/management/advanced-options.asciidoc
View file

@ -77,7 +77,6 @@ mentioned use "_default_".
`timepicker:timeDefaults`:: The default time filter selection.
`timepicker:refreshIntervalDefaults`:: The time filter's default refresh interval.
`timepicker:quickRanges`:: The list of ranges to show in the Quick section of the time picker. This should be an array of objects, with each object containing `from`, `to` (see {ref}/common-options.html#date-math[accepted formats]), `display` (the title to be displayed), and `section` (which column to put the option in).
`dashboard:defaultDarkTheme`:: Set this property to `true` to make new dashboards use the dark theme by default.
`filters:pinnedByDefault`:: Set this property to `true` to make filters have a global state by default.
`filterEditor:suggestValues`:: Set this property to `false` to prevent the filter editor from suggesting values for fields.
`notifications:banner`:: You can specify a custom banner to display temporary notices to all users. This field supports

1
src/legacy/core_plugins/kibana/public/dashboard/README.md
View file

@ -110,7 +110,6 @@ State communicated to the embeddable.
// TODO:
filters: FilterObject,
timeRange: TimeRangeObject,
darkTheme: boolean,
}
```

188
src/legacy/core_plugins/kibana/public/dashboard/_hacks.scss
View file

@ -18,191 +18,3 @@ dashboard-listing {
flex: 1;
}
}
// Dark theme bootstrap
// Yes, this is a hack because bootstrap will be removed and everything must move to EUI theming
// Can't reliably remove all/any of these because of embeddables
.theme-dark {
@import '@elastic/eui/src/themes/k6/k6_colors_dark';
// /src/ui/public/styles/bootstrap/scaffolding.less
a {
color: $euiColorPrimary;
&:hover,
&:focus {
color: darken($euiColorPrimary, 10%);
}
}
// /src/ui/public/styles/bootstrap/forms.less
// Updated to match EUI dark theme
.form-control {
color: $euiTextColor;
background-color: tintOrShade($euiColorLightestShade, 60%, 25%);
border-color: transparentize($euiColorFullShade, .9);
&[disabled],
&[readonly],
fieldset[disabled] & {
background-color: darken($euiColorLightestShade, 2%);
}
}
// /src/ui/public/styles/bootstrap/tables.less
// Updated to match EUI dark theme
.table {
// Cells
> thead,
> tbody,
> tfoot {
> tr {
> th,
> td {
border-top-color: $euiColorLightShade;
}
}
}
// Bottom align for column headings
> thead > tr > th {
border-bottom-color: $euiColorLightShade;
}
// Account for multiple tbody instances
> tbody + tbody {
border-top-color: $euiColorLightShade;
}
// Nesting
.table {
background-color: transparent;
}
}
table {
th {
i.fa-sort {
color: $euiColorMediumShade;
}
button.fa-sort-asc,
button.fa-sort-down,
i.fa-sort-asc,
i.fa-sort-down {
color: $euiTextColor;
}
button.fa-sort-desc,
button.fa-sort-up,
i.fa-sort-desc,
i.fa-sort-up {
color: $euiTextColor;
}
}
}
// /src/ui/public/styles/bootstrap/list-group.less
.list-group-item {
background-color: $euiColorLightShade;
border-color: $euiColorDarkShade;
&:nth-child(even) {
background-color: $euiColorMediumShade;
}
}
a.list-group-item,
button.list-group-item {
color: $euiColorMediumShade;
.list-group-item-heading {
color: $euiColorLightShade;
}
// Hover state
&:hover,
&:focus {
color: $euiColorMediumShade;
background-color: $euiColorDarkestShade;
}
}
.panel {
> .panel-body + .table,
> .panel-body + .table-responsive,
> .table + .panel-body,
> .table-responsive + .panel-body {
border-top-color: $euiColorMediumShade;
}
}
.panel-group {
.panel-heading {
+ .panel-collapse > .panel-body,
+ .panel-collapse > .list-group {
border-top-color: $euiColorEmptyShade;
}
}
.panel-footer {
border-top: 0;
+ .panel-collapse .panel-body {
border-bottom-color: $euiColorEmptyShade;
}
}
}
.panel-default {
& > .panel-heading {
color: $euiColorPrimary;
background-color: $euiColorEmptyShade;
border-color: $euiColorLightShade;
+ .panel-collapse > .panel-body {
border-top-color: $euiColorLightShade;
}
.badge {
color: $euiColorEmptyShade;
background-color: $euiColorPrimary;
}
}
& > .panel-footer {
+ .panel-collapse > .panel-body {
border-bottom-color: $euiColorLightShade;
}
}
}
// /src/ui/public/styles/bootstrap/navs.less
.nav {
> li {
> a {
&:hover,
&:focus {
background-color: $euiColorDarkShade;
}
}
}
}
.nav-tabs {
border-bottom-color: $euiColorMediumShade;
> li {
> a {
&:hover {
border-color: $euiColorDarkShade;
}
}
&.active > a {
&,
&:hover,
&:focus {
color: $euiColorFullShade;
background-color: $euiColorMediumShade;
border: 0 none transparent;
}
}
}
}
}

35
src/legacy/core_plugins/kibana/public/dashboard/_index.scss
View file

@ -13,35 +13,8 @@
// dshChart__legend--small
// dshChart__legend-isLoading
/**
* 1. Don't duplicate styles in dark mode
*/
.theme-light { /* 1 */
@import 'dashboard_app';
@import 'grid/index';
@import 'panel/index';
@import 'viewport/index';
}
// Imports outside of theme selector don't change between light/dark modes
@import 'dashboard_app';
@import 'grid/index';
@import 'panel/index';
@import 'viewport/index';
@import 'components/index';
// Must be outside of theme selector because it lives in a portal
@import 'panel/panel_header/panel_options_menu_form';
// DARK THEME
// EUI global scope -- dark
@import '@elastic/eui/src/themes/k6/k6_colors_dark';
.theme-dark {
background-color: $euiColorEmptyShade;
@import 'dashboard_app';
@import 'grid/index';
@import 'panel/index';
@import 'viewport/index';
// Vis imports
@import 'src/ui/public/vis/index';
@import 'src/ui/public/vislib/index';
}

27
src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.js
View file

@ -22,7 +22,6 @@ import React from 'react';
import angular from 'angular';
import { uiModules } from 'ui/modules';
import chrome from 'ui/chrome';
import { applyTheme } from 'ui/theme';
import { toastNotifications } from 'ui/notify';
import 'ui/query_bar';
@ -230,8 +229,6 @@ app.directive('dashboardApp', function ($injector) {
$scope.refresh();
};
updateTheme();
$scope.indexPatterns = [];
$scope.onPanelRemoved = (panelIndex) => {
@ -433,11 +430,6 @@ app.directive('dashboardApp', function ($injector) {
navActions[TopNavIds.OPTIONS] = (menuItem, navController, anchorElement) => {
showOptionsPopover({
anchorElement,
darkTheme: dashboardStateManager.getDarkTheme(),
onDarkThemeChange: (isChecked) => {
dashboardStateManager.setDarkTheme(isChecked);
updateTheme();
},
useMargins: dashboardStateManager.getUseMargins(),
onUseMarginsChange: (isChecked) => {
dashboardStateManager.setUseMargins(isChecked);
@ -475,27 +467,8 @@ app.directive('dashboardApp', function ($injector) {
$scope.$on('$destroy', () => {
dashboardStateManager.destroy();
// Remove dark theme to keep it from affecting the appearance of other apps.
setLightTheme();
});
function updateTheme() {
dashboardStateManager.getDarkTheme() ? setDarkTheme() : setLightTheme();
}
function setDarkTheme() {
chrome.removeApplicationClass(['theme-light']);
chrome.addApplicationClass('theme-dark');
applyTheme('dark');
}
function setLightTheme() {
chrome.removeApplicationClass(['theme-dark']);
chrome.addApplicationClass('theme-light');
applyTheme('light');
}
if ($route.current.params && $route.current.params[DashboardConstants.NEW_VISUALIZATION_ID_PARAM]) {
dashboardStateManager.addNewPanel($route.current.params[DashboardConstants.NEW_VISUALIZATION_ID_PARAM], 'visualization');

9
src/legacy/core_plugins/kibana/public/dashboard/dashboard_state_manager.js
View file

@ -369,15 +369,6 @@ export class DashboardStateManager {
this.saveState();
}
getDarkTheme() {
return this.appState.options.darkTheme;
}
setDarkTheme(darkTheme) {
this.appState.options.darkTheme = darkTheme;
this.saveState();
}
getTimeRestore() {
return this.appState.timeRestore;
}

1
src/legacy/core_plugins/kibana/public/dashboard/panel/_index.scss
View file

@ -1 +1,2 @@
@import "./dashboard_panel";
@import 'panel_header/panel_options_menu_form';

1
src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.js
View file

@ -48,7 +48,6 @@ module.factory('SavedDashboard', function (Private, config, i18n) {
description: '',
panelsJSON: '[]',
optionsJSON: angular.toJson({
darkTheme: config.get('dashboard:defaultDarkTheme'),
// for BWC reasons we can't default dashboards that already exist without this setting to true.
useMargins: id ? false : true,
hidePanelTitles: false,

21
src/legacy/core_plugins/kibana/public/dashboard/top_nav/options.js
View file

@ -30,17 +30,10 @@ import {
class OptionsMenuUi extends Component {
state = {
darkTheme: this.props.darkTheme,
useMargins: this.props.useMargins,
hidePanelTitles: this.props.hidePanelTitles,
}
handleDarkThemeChange = (evt) => {
const isChecked = evt.target.checked;
this.props.onDarkThemeChange(isChecked);
this.setState({ darkTheme: isChecked });
}
handleUseMarginsChange = (evt) => {
const isChecked = evt.target.checked;
this.props.onUseMarginsChange(isChecked);
@ -59,18 +52,6 @@ class OptionsMenuUi extends Component {
data-test-subj="dashboardOptionsMenu"
>
<EuiFormRow>
<EuiSwitch
label={this.props.intl.formatMessage({
id: 'kbn.dashboard.topNav.options.useDarkThemeSwitchLabel',
defaultMessage: 'Use dark theme',
})}
checked={this.state.darkTheme}
onChange={this.handleDarkThemeChange}
data-test-subj="dashboardDarkThemeCheckbox"
/>
</EuiFormRow>
<EuiFormRow>
<EuiSwitch
label={this.props.intl.formatMessage({
@ -101,8 +82,6 @@ class OptionsMenuUi extends Component {
}
OptionsMenuUi.propTypes = {
darkTheme: PropTypes.bool.isRequired,
onDarkThemeChange: PropTypes.func.isRequired,
useMargins: PropTypes.bool.isRequired,
onUseMarginsChange: PropTypes.func.isRequired,
hidePanelTitles: PropTypes.bool.isRequired,

4
src/legacy/core_plugins/kibana/public/dashboard/top_nav/show_options_popover.js
View file

@ -38,8 +38,6 @@ const onClose = () => {
export function showOptionsPopover({
anchorElement,
darkTheme,
onDarkThemeChange,
useMargins,
onUseMarginsChange,
hidePanelTitles,
@ -64,8 +62,6 @@ export function showOptionsPopover({
closePopover={onClose}
>
<OptionsMenu
darkTheme={darkTheme}
onDarkThemeChange={onDarkThemeChange}
useMargins={useMargins}
onUseMarginsChange={onUseMarginsChange}
hidePanelTitles={hidePanelTitles}

10
src/legacy/core_plugins/kibana/ui_setting_defaults.js
View file

@ -823,16 +823,6 @@ export function getUiSettingDefaults() {
},
}),
},
'dashboard:defaultDarkTheme': {
name: i18n.translate('kbn.advancedSettings.dashboardDarkThemeTitle', {
defaultMessage: 'Dark theme',
}),
value: false,
description: i18n.translate('kbn.advancedSettings.dashboardDarkThemeText', {
defaultMessage: 'New dashboards use dark theme by default',
}),
category: ['dashboard'],
},
'filters:pinnedByDefault': {
name: i18n.translate('kbn.advancedSettings.pinFiltersTitle', {
defaultMessage: 'Pin filters by default',

24
src/legacy/core_plugins/metrics/public/components/vis_editor.js
View file

@ -26,7 +26,6 @@ import Visualization from './visualization';
import VisPicker from './vis_picker';
import PanelConfig from './panel_config';
import brushHandler from '../lib/create_brush_handler';
import { get } from 'lodash';
import { extractIndexPatterns } from '../lib/extract_index_patterns';
import { fetchFields } from '../lib/fetch_fields';
import chrome from 'ui/chrome';
@ -37,17 +36,14 @@ class VisEditor extends Component {
super(props);
const { vis } = props;
this.appState = vis.API.getAppState();
const reversed = get(this.appState, 'options.darkTheme', false);
this.state = {
model: props.vis.params,
dirty: false,
autoApply: true,
reversed,
visFields: {},
};
this.onBrush = brushHandler(props.vis.API.timeFilter);
this.handleUiState = this.handleUiState.bind(this, props.vis);
this.handleAppStateChange = this.handleAppStateChange.bind(this);
this.getConfig = this.getConfig.bind(this);
this.visDataSubject = new Rx.Subject();
this.visData$ = this.visDataSubject.asObservable().pipe(share());
@ -61,23 +57,6 @@ class VisEditor extends Component {
vis.uiStateVal(...args);
}
componentWillMount() {
if (this.appState) {
this.appState.on('save_with_changes', this.handleAppStateChange);
}
}
handleAppStateChange() {
const reversed = get(this.appState, 'options.darkTheme', false);
this.setState({ reversed });
}
componentWillUnmount() {
if (this.appState) {
this.appState.off('save_with_changes', this.handleAppStateChange);
}
}
fetchIndexPatternFields = async () => {
const { params } = this.props.vis;
const { visFields } = this.state;
@ -134,12 +113,11 @@ class VisEditor extends Component {
if (!this.props.vis.params || !this.props.visData) {
return null;
}
const reversed = this.state.reversed;
return (
<I18nProvider>
<Visualization
dateFormat={this.props.config.get('dateFormat')}
reversed={reversed}
reversed={false}
onBrush={this.onBrush}
onUiState={this.handleUiState}
uiState={this.props.vis.getUiState()}

1
src/legacy/core_plugins/metrics/public/visualizations/components/_metric.scss
View file

@ -3,7 +3,6 @@
// depending on dark/light theme and/or background color provided
// An easier way would be to provide if the theme is dark in the JS,
// but it wasn't passed down.
.tab-dashboard.theme-dark .tvbVisMetric--noBackground &,
.tvbVisMetric--reversed & {
@content;
}

12
src/legacy/core_plugins/timelion/public/directives/chart/_chart.scss
View file

@ -34,10 +34,6 @@
.ngLegendValue {
color: $euiTextColor;
.tab-dashboard.theme-dark & {
color: $euiColorLightShade;
}
&:focus,
&:hover {
text-decoration: underline;
@ -52,10 +48,6 @@
.flot-tick-label {
color: $euiColorDarkShade;
.tab-dashboard.theme-dark & {
color: $euiColorMediumShade;
}
}
}
@ -63,8 +55,4 @@
color: $euiTextColor;
white-space: nowrap;
font-weight: $euiFontWeightBold;
.tab-dashboard.theme-dark & {
color: $euiColorLightShade;
}
}

2
src/server/sample_data/data_sets/ecommerce/saved_objects.js
View file

@ -274,7 +274,7 @@ export const getSavedObjects = () => [
defaultMessage: 'Analyze mock eCommerce orders and revenue',
}),
"panelsJSON": "[{\"embeddableConfig\":{\"vis\":{\"colors\":{\"Men's Accessories\":\"#82B5D8\",\"Men's Clothing\":\"#F9BA8F\",\"Men's Shoes\":\"#F29191\",\"Women's Accessories\":\"#F4D598\",\"Women's Clothing\":\"#70DBED\",\"Women's Shoes\":\"#B7DBAB\"}}},\"gridData\":{\"x\":12,\"y\":18,\"w\":36,\"h\":10,\"i\":\"1\"},\"id\":\"37cc8650-b882-11e8-a6d9-e546fe2bba5f\",\"panelIndex\":\"1\",\"type\":\"visualization\",\"version\":\"7.0.0-alpha1\"},{\"embeddableConfig\":{\"vis\":{\"colors\":{\"FEMALE\":\"#6ED0E0\",\"MALE\":\"#447EBC\"},\"legendOpen\":false}},\"gridData\":{\"x\":12,\"y\":7,\"w\":12,\"h\":11,\"i\":\"2\"},\"id\":\"ed8436b0-b88b-11e8-a6d9-e546fe2bba5f\",\"panelIndex\":\"2\",\"type\":\"visualization\",\"version\":\"7.0.0-alpha1\"},{\"embeddableConfig\":{},\"gridData\":{\"x\":0,\"y\":0,\"w\":18,\"h\":7,\"i\":\"3\"},\"id\":\"09ffee60-b88c-11e8-a6d9-e546fe2bba5f\",\"panelIndex\":\"3\",\"type\":\"visualization\",\"version\":\"7.0.0-alpha1\"},{\"embeddableConfig\":{},\"gridData\":{\"x\":18,\"y\":0,\"w\":30,\"h\":7,\"i\":\"4\"},\"id\":\"1c389590-b88d-11e8-a6d9-e546fe2bba5f\",\"panelIndex\":\"4\",\"type\":\"visualization\",\"version\":\"7.0.0-alpha1\"},{\"embeddableConfig\":{},\"gridData\":{\"x\":0,\"y\":28,\"w\":48,\"h\":11,\"i\":\"5\"},\"id\":\"45e07720-b890-11e8-a6d9-e546fe2bba5f\",\"panelIndex\":\"5\",\"type\":\"visualization\",\"version\":\"7.0.0-alpha1\"},{\"embeddableConfig\":{},\"gridData\":{\"x\":0,\"y\":18,\"w\":12,\"h\":10,\"i\":\"6\"},\"id\":\"10f1a240-b891-11e8-a6d9-e546fe2bba5f\",\"panelIndex\":\"6\",\"type\":\"visualization\",\"version\":\"7.0.0-alpha1\"},{\"embeddableConfig\":{},\"gridData\":{\"x\":0,\"y\":7,\"w\":12,\"h\":11,\"i\":\"7\"},\"id\":\"b80e6540-b891-11e8-a6d9-e546fe2bba5f\",\"panelIndex\":\"7\",\"type\":\"visualization\",\"version\":\"7.0.0-alpha1\"},{\"embeddableConfig\":{\"vis\":{\"colors\":{\"0 - 50\":\"#E24D42\",\"50 - 75\":\"#EAB839\",\"75 - 100\":\"#7EB26D\"},\"defaultColors\":{\"0 - 50\":\"rgb(165,0,38)\",\"50 - 75\":\"rgb(255,255,190)\",\"75 - 100\":\"rgb(0,104,55)\"},\"legendOpen\":false}},\"gridData\":{\"x\":24,\"y\":7,\"w\":12,\"h\":11,\"i\":\"8\"},\"id\":\"4b3ec120-b892-11e8-a6d9-e546fe2bba5f\",\"panelIndex\":\"8\",\"type\":\"visualization\",\"version\":\"7.0.0-alpha1\"},{\"embeddableConfig\":{\"vis\":{\"colors\":{\"0 - 2\":\"#E24D42\",\"2 - 3\":\"#F2C96D\",\"3 - 4\":\"#9AC48A\"},\"defaultColors\":{\"0 - 2\":\"rgb(165,0,38)\",\"2 - 3\":\"rgb(255,255,190)\",\"3 - 4\":\"rgb(0,104,55)\"},\"legendOpen\":false}},\"gridData\":{\"x\":36,\"y\":7,\"w\":12,\"h\":11,\"i\":\"9\"},\"id\":\"9ca7aa90-b892-11e8-a6d9-e546fe2bba5f\",\"panelIndex\":\"9\",\"type\":\"visualization\",\"version\":\"7.0.0-alpha1\"},{\"embeddableConfig\":{},\"gridData\":{\"x\":0,\"y\":54,\"w\":48,\"h\":18,\"i\":\"10\"},\"id\":\"3ba638e0-b894-11e8-a6d9-e546fe2bba5f\",\"panelIndex\":\"10\",\"type\":\"search\",\"version\":\"7.0.0-alpha1\"},{\"embeddableConfig\":{\"mapZoom\":2,\"mapCenter\":[28.304380682962783,-22.148437500000004]},\"gridData\":{\"x\":0,\"y\":39,\"w\":24,\"h\":15,\"i\":\"11\"},\"id\":\"9c6f83f0-bb4d-11e8-9c84-77068524bcab\",\"panelIndex\":\"11\",\"type\":\"visualization\",\"version\":\"7.0.0-alpha1\"},{\"embeddableConfig\":{},\"gridData\":{\"x\":24,\"y\":39,\"w\":24,\"h\":15,\"i\":\"12\"},\"id\":\"b72dd430-bb4d-11e8-9c84-77068524bcab\",\"panelIndex\":\"12\",\"type\":\"visualization\",\"version\":\"7.0.0-alpha1\"}]",
"optionsJSON": "{\"darkTheme\":false,\"hidePanelTitles\":false,\"useMargins\":true}",
"optionsJSON": "{\"hidePanelTitles\":false,\"useMargins\":true}",
"version": 1,
"timeRestore": true,
"timeTo": "now",

2
src/server/sample_data/data_sets/flights/saved_objects.js
View file

File diff suppressed because one or more lines are too long

2
src/server/sample_data/data_sets/logs/saved_objects.js
View file

@ -247,7 +247,7 @@ export const getSavedObjects = () => [
defaultMessage: 'Analyze mock web traffic log data for Elastic\'s website',
}),
"panelsJSON": "[{\"embeddableConfig\":{\"vis\":{\"colors\":{\"Avg. Bytes\":\"#6ED0E0\",\"Unique Visitors\":\"#0A437C\"},\"legendOpen\":false}},\"gridData\":{\"x\":27,\"y\":11,\"w\":21,\"h\":13,\"i\":\"2\"},\"id\":\"e1d0f010-9ee7-11e7-8711-e7a007dcef99\",\"panelIndex\":\"2\",\"type\":\"visualization\",\"version\":\"7.0.0-alpha1\"},{\"gridData\":{\"x\":0,\"y\":49,\"w\":24,\"h\":18,\"i\":\"4\"},\"id\":\"06cf9c40-9ee8-11e7-8711-e7a007dcef99\",\"panelIndex\":\"4\",\"type\":\"visualization\",\"version\":\"7.0.0-alpha1\"},{\"embeddableConfig\":{\"vis\":{\"defaultColors\":{\"0 - 22\":\"rgb(247,251,255)\",\"22 - 44\":\"rgb(208,225,242)\",\"44 - 66\":\"rgb(148,196,223)\",\"66 - 88\":\"rgb(74,152,201)\",\"88 - 110\":\"rgb(23,100,171)\"},\"legendOpen\":false}},\"gridData\":{\"x\":0,\"y\":36,\"w\":24,\"h\":13,\"i\":\"7\"},\"id\":\"935afa20-e0cd-11e7-9d07-1398ccfcefa3\",\"panelIndex\":\"7\",\"type\":\"visualization\",\"version\":\"6.3.0\"},{\"embeddableConfig\":{\"mapCenter\":[36.8092847020594,-96.94335937500001],\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"gridData\":{\"x\":27,\"y\":24,\"w\":21,\"h\":12,\"i\":\"9\"},\"id\":\"4eb6e500-e1c7-11e7-b6d5-4dc382ef7f5b\",\"panelIndex\":\"9\",\"type\":\"visualization\",\"version\":\"6.3.0\"},{\"embeddableConfig\":{\"vis\":{\"colors\":{\"0 - 500\":\"#BF1B00\",\"1000 - 1500\":\"#7EB26D\",\"500 - 1000\":\"#F2C96D\"},\"defaultColors\":{\"0 - 500\":\"rgb(165,0,38)\",\"1000 - 1500\":\"rgb(0,104,55)\",\"500 - 1000\":\"rgb(255,255,190)\"},\"legendOpen\":false}},\"gridData\":{\"x\":10,\"y\":0,\"w\":9,\"h\":11,\"i\":\"11\"},\"id\":\"69a34b00-9ee8-11e7-8711-e7a007dcef99\",\"panelIndex\":\"11\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.3.0\"},{\"gridData\":{\"x\":0,\"y\":24,\"w\":27,\"h\":12,\"i\":\"13\"},\"id\":\"42b997f0-0c26-11e8-b0ec-3bb475f6b6ff\",\"panelIndex\":\"13\",\"type\":\"visualization\",\"version\":\"6.3.0\"},{\"gridData\":{\"x\":24,\"y\":36,\"w\":24,\"h\":31,\"i\":\"14\"},\"id\":\"7cbd2350-2223-11e8-b802-5bcf64c2cfb4\",\"panelIndex\":\"14\",\"type\":\"visualization\",\"version\":\"6.3.0\"},{\"gridData\":{\"x\":0,\"y\":11,\"w\":27,\"h\":13,\"i\":\"15\"},\"id\":\"314c6f60-2224-11e8-b802-5bcf64c2cfb4\",\"panelIndex\":\"15\",\"type\":\"visualization\",\"version\":\"6.3.0\"},{\"gridData\":{\"x\":19,\"y\":0,\"w\":15,\"h\":11,\"i\":\"16\"},\"id\":\"24a3e970-4257-11e8-b3aa-73fdaf54bfc9\",\"panelIndex\":\"16\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.3.0\"},{\"embeddableConfig\":{\"vis\":{\"legendOpen\":false}},\"gridData\":{\"x\":34,\"y\":0,\"w\":14,\"h\":11,\"i\":\"17\"},\"id\":\"14e2e710-4258-11e8-b3aa-73fdaf54bfc9\",\"panelIndex\":\"17\",\"type\":\"visualization\",\"version\":\"6.3.0\"},{\"embeddableConfig\":{},\"gridData\":{\"x\":0,\"y\":0,\"w\":10,\"h\":11,\"i\":\"18\"},\"id\":\"47f2c680-a6e3-11e8-94b4-c30c0228351b\",\"panelIndex\":\"18\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"7.0.0-alpha1\"}]",
"optionsJSON": "{\"darkTheme\":false,\"hidePanelTitles\":false,\"useMargins\":true}",
"optionsJSON": "{\"hidePanelTitles\":false,\"useMargins\":true}",
"version": 1,
"timeRestore": true,
"timeTo": "now",

11
src/ui/public/agg_table/_agg_table.scss
View file

@ -36,14 +36,3 @@ kbn-agg-table-group {
padding: 0;
}
}
.theme-dark {
@import '@elastic/eui/src/themes/k6/k6_colors_dark';
.kbnAggTable__paginated {
tr:hover td,
.kbnTableCellFilter {
background-color: $euiColorLightestShade;
}
}
}

8
src/ui/public/doc_table/components/table_row/_cell.scss
View file

@ -28,11 +28,3 @@
opacity: 1; /* 3 */
}
}
.theme-dark {
@import '@elastic/eui/src/themes/k6/k6_colors_dark';
.kbnDocTableRowFilterButton {
background-color: $euiColorEmptyShade;
}
}

46
src/ui/public/filter_bar/filter_bar.less
View file

@ -224,49 +224,3 @@ filter-bar {
font-size: 0.9em;
background: @filter-bar-bar-condensed-bg;
}
// SASSTODO: Make sure these colors convert to theme variables
.tab-dashboard.theme-dark {
@filter-bar-confirm-bg: @brand-primary;
@filter-bar-confirm-filter-color: @brand-primary;
@filter-bar-confirm-border: @gray-base;
@filter-bar-confirm-filter-bg: @gray-lightest;
@filter-bar-bar-bg: @brand-primary;
@filter-bar-bar-border: @gray-base;
@filter-bar-bar-condensed-bg: darken(@filter-bar-bar-bg, 5%);
@filter-bar-bar-filter-bg: desaturate(@brand-success, 30%);
@filter-bar-bar-filter-color: @white;
@filter-bar-bar-filter-negate-bg: desaturate(@brand-success, 30%);
.filter-bar-confirm {
background: @filter-bar-confirm-bg;
border-bottom-color: @filter-bar-confirm-border;
.filter {
background-color: @filter-bar-confirm-filter-bg;
color: @filter-bar-confirm-filter-color;
}
}
.filter-bar {
background: @filter-bar-bar-bg;
border-bottom-color: @filter-bar-bar-border;
.filter {
background-color: @filter-bar-bar-filter-bg;
color: @filter-bar-bar-filter-color;
&.negate {
background-color: @filter-bar-bar-filter-negate-bg;
}
a {
color: @filter-bar-bar-filter-color;
}
}
}
.filter-bar-condensed {
background: @filter-bar-bar-condensed-bg;
}
}

62
src/ui/public/markdown/_github_markdown.scss
View file

@ -398,65 +398,3 @@
padding-left: $euiSizeXXL !important;
}
}
.theme-dark {
@import '@elastic/eui/src/themes/k6/k6_colors_dark';
.kbnMarkdown__body {
color: $euiTextColor;
a {
-webkit-text-decoration-skip: objects;
color: $euiColorPrimary;
&:active,
&:hover {
color: darken($euiColorPrimary, 10%);
}
}
img {
background-color: $euiColorEmptyShade;
}
hr {
background-color: $euiColorLightShade;
}
table {
&,
td,
th,
tr {
border-color: $euiColorLightShade;
}
}
h1,
h2 {
border-color: $euiColorLightShade;
}
blockquote {
color: $euiColorDarkShade;
border-color: $euiColorLightShade;
}
code,
kbd,
pre {
background-color: $euiCodeBlockBackgroundColor;
color: $euiCodeBlockColor;
}
kbd {
border-color: $euiColorLightShade;
border-bottom-color: shadeOrTint($euiColorLightShade, 10%, 10%);
box-shadow: inset 0 -1px 0 $euiColorLightShade;
}
:checked + .radio-label {
border-color: $euiColorPrimary;
}
}
}

11
src/ui/public/styles/_legacy/components/_config.scss
View file

@ -9,14 +9,3 @@
padding: $euiSizeS;
}
}
// SASSTODO: Make sure these colors convert to theme variables
.theme-dark {
@import '@elastic/eui/src/themes/k6/k6_colors_dark';
.config {
.container-fluid {
background-color: $euiColorLightestShade;
}
}
}

9
src/ui/public/styles/_legacy/components/_input.scss
View file

@ -10,12 +10,3 @@ select {
color: $euiTextColor;
background-color: $euiColorEmptyShade;
}
.theme-dark {
@import '@elastic/eui/src/themes/k6/k6_colors_dark';
select {
color: $euiTextColor;
background-color: $euiColorEmptyShade;
}
}

24
src/ui/public/styles/_legacy/components/_list_group_menu.scss
View file

@ -21,27 +21,3 @@
}
}
}
.theme-dark {
@import '@elastic/eui/src/themes/k6/k6_colors_dark';
.list-group-menu {
&.select-mode a{
color: shade($euiColorPrimary, 10%);
}
.list-group-menu-item {
color: shade($euiColorPrimary, 10%);
&.active {
background-color: $euiColorLightShade;
}
&:hover {
background-color: shade($euiColorPrimary, 90%);
}
li {
color: shade($euiColorPrimary, 10%);
}
}
}
}

21
src/ui/public/styles/_legacy/components/_pagination.scss
View file

@ -54,24 +54,3 @@ paginate {
}
}
}
// SASSTODO: Make sure these colors convert to theme variables
.theme-dark {
@import '@elastic/eui/src/themes/k6/k6_colors_dark';
paginate {
paginate-controls {
.pagination-other-pages-list {
> li {
a {
background-color: $euiColorLightestShade;
color: $euiTextColor;
}
&.active a {
color: $euiColorDarkShade;
}
}
}
}
}
}

21
src/ui/public/styles/_legacy/components/_react_input_range.scss
View file

@ -102,24 +102,3 @@
position: relative;
width: calc(100% - #{$euiSize});
}
.theme-dark {
@import '@elastic/eui/src/themes/k6/k6_colors_dark';
.input-range__track {
background: $euiColorLightShade;
}
.input-range__slider {
background: $euiColorPrimary;
border-color: $euiColorPrimary;
}
.input-range__track--active {
background: $euiColorPrimary;
}
.input-range__label {
color: $euiColorDarkShade;
}
}

6
src/ui/public/styles/_legacy/components/_spinner.scss
View file

@ -4,9 +4,3 @@
opacity: 0;
transition-delay: 0.25s;
}
.theme-dark {
.spinner > div {
background-color: $euiColorEmptyShade;
}
}

14
src/ui/public/styles/_legacy/components/_table.scss
View file

@ -67,17 +67,3 @@ table {
}
}
}
.theme-dark {
@import '@elastic/eui/src/themes/k6/k6_colors_dark';
kbn-table, .kbn-table, tbody[kbn-rows] {
dl.source {
dt {
background-color: transparentize(tint($euiColorPrimary, 60%), .8);
color: $euiTextColor;
}
}
}
}

2
test/functional/apps/dashboard/_bwc_shared_urls.js
View file

@ -34,7 +34,7 @@ export default function ({ getService, getPageObjects }) {
`time:(from:'2012-11-17T00:00:00.000Z',mode:absolute,to:'2015-11-17T18:01:36.621Z'))&` +
`_a=(description:'',filters:!(),` +
`fullScreenMode:!f,` +
`options:(darkTheme:!f),` +
`options:(),` +
`panels:!((col:1,id:Visualization-MetricChart,panelIndex:1,row:1,size_x:6,size_y:3,type:visualization),` +
`(col:7,id:Visualization-PieChart,panelIndex:2,row:1,size_x:6,size_y:3,type:visualization)),` +
`query:(language:lucene,query:'memory:%3E220000'),` +

48
test/functional/apps/dashboard/_dark_theme.js
View file

@ -1,48 +0,0 @@
/*
* Licensed to Elasticsearch B.V. under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch B.V. licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import expect from 'expect.js';
export default function ({ getService, getPageObjects }) {
const testSubjects = getService('testSubjects');
const dashboardAddPanel = getService('dashboardAddPanel');
const PageObjects = getPageObjects(['dashboard']);
describe('dark theme', async () => {
before(async () => {
await PageObjects.dashboard.clickNewDashboard();
});
after(async () => {
await dashboardAddPanel.closeAddPanel();
await PageObjects.dashboard.gotoDashboardLandingPage();
});
// Visual builder applies dark theme by investigating appState for 'options.darkTheme'
// This test ensures everything is properly wired together and Visual Builder adds dark theme classes
it('should display Visual Builder timeseries with reversed class', async () => {
await dashboardAddPanel.addVisualization('Rendering Test: tsvb-ts');
await PageObjects.dashboard.useDarkTheme(true);
const classNames = await testSubjects.getAttribute('timeseriesChart', 'class');
expect(classNames.includes('reversed')).to.be(true);
});
});
}

8
test/functional/apps/dashboard/_dashboard_state.js
View file

@ -164,14 +164,6 @@ export default function ({ getService, getPageObjects }) {
expect(changedTileMapData.length).to.not.equal(tileMapData.length);
});
it('retains dark theme', async function () {
await PageObjects.dashboard.useDarkTheme(true);
await PageObjects.header.clickVisualize();
await PageObjects.header.clickDashboard();
const isDarkThemeOn = await PageObjects.dashboard.isDarkThemeOn();
expect(isDarkThemeOn).to.equal(true);
});
describe('Directly modifying url updates dashboard state', () => {
it('for query parameter', async function () {
await PageObjects.dashboard.gotoDashboardLandingPage();

2
test/functional/apps/dashboard/exports/timezonetest_6_2_4.json
View file

@ -7,7 +7,7 @@
"hits": 0,
"description": "",
"panelsJSON": "[{\"gridData\":{\"h\":3,\"i\":\"1\",\"w\":6,\"x\":0,\"y\":0},\"id\":\"3fe22200-3dcb-11e8-8660-4d65aa086b3c\",\"panelIndex\":\"1\",\"type\":\"visualization\",\"version\":\"6.2.4\"}]",
"optionsJSON": "{\"darkTheme\":false,\"hidePanelTitles\":false,\"useMargins\":true}",
"optionsJSON": "{\"hidePanelTitles\":false,\"useMargins\":true}",
"version": 1,
"timeRestore": true,
"timeTo": "Tue Apr 09 2018 23:00:00 GMT-0500",

1
test/functional/apps/dashboard/index.js
View file

@ -47,7 +47,6 @@ export default function ({ getService, loadTestFile, getPageObjects }) {
after(unloadCurrentData);
loadTestFile(require.resolve('./_empty_dashboard'));
loadTestFile(require.resolve('./_dark_theme'));
loadTestFile(require.resolve('./_embeddable_rendering'));
loadTestFile(require.resolve('./_create_and_add_embeddables'));
loadTestFile(require.resolve('./_time_zones'));

16
test/functional/page_objects/dashboard_page.js
View file

@ -277,22 +277,6 @@ export function DashboardPageProvider({ getService, getPageObjects }) {
await this.gotoDashboardLandingPage();
}
async isDarkThemeOn() {
log.debug('isDarkThemeOn');
await this.openOptions();
const darkThemeCheckbox = await testSubjects.find('dashboardDarkThemeCheckbox');
return await darkThemeCheckbox.getProperty('checked');
}
async useDarkTheme(on) {
log.debug(`useDarkTheme: on ${on}`);
await this.openOptions();
const isDarkThemeOn = await this.isDarkThemeOn();
if (isDarkThemeOn !== on) {
return await testSubjects.click('dashboardDarkThemeCheckbox');
}
}
async isMarginsOn() {
log.debug('isMarginsOn');
await this.openOptions();

36
x-pack/plugins/gis/public/angular/map_controller.js vendored
View file

@ -8,7 +8,6 @@ import chrome from 'ui/chrome';
import React from 'react';
import { render, unmountComponentAtNode } from 'react-dom';
import { uiModules } from 'ui/modules';
import { applyTheme } from 'ui/theme';
import { timefilter } from 'ui/timefilter';
import { Provider } from 'react-redux';
import { getStore } from '../store/store';
@ -21,13 +20,12 @@ import {
replaceLayerList,
setQuery,
} from '../actions/store_actions';
import { getIsDarkTheme, updateFlyout, FLYOUT_STATE } from '../store/ui';
import { updateFlyout, FLYOUT_STATE } from '../store/ui';
import { getDataSources, getUniqueIndexPatternIds } from '../selectors/map_selectors';
import { Inspector } from 'ui/inspector';
import { inspectorAdapters, indexPatternService } from '../kibana_services';
import { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal';
import { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal';
import { showOptionsPopover } from '../components/top_nav/show_options_popover';
import { toastNotifications } from 'ui/notify';
import { getInitialLayers } from './get_initial_layers';
@ -39,7 +37,6 @@ const app = uiModules.get('app/gis', []);
app.controller('GisMapController', ($scope, $route, config, kbnUrl, localStorage, AppState) => {
const savedMap = $scope.map = $route.current.locals.map;
let isDarkTheme;
let unsubscribe;
inspectorAdapters.requests.reset();
@ -141,12 +138,6 @@ app.controller('GisMapController', ($scope, $route, config, kbnUrl, localStorage
function handleStoreChanges(store) {
const state = store.getState();
// theme changes must triggered in digest cycle because top nav is still angular
if (isDarkTheme !== getIsDarkTheme(state)) {
isDarkTheme = getIsDarkTheme(state);
updateTheme();
}
const nextIndexPatternIds = getUniqueIndexPatternIds(state);
if (nextIndexPatternIds !== prevIndexPatternIds) {
prevIndexPatternIds = nextIndexPatternIds;
@ -213,13 +204,6 @@ app.controller('GisMapController', ($scope, $route, config, kbnUrl, localStorage
run() {
Inspector.open(inspectorAdapters, {});
}
}, {
key: 'options',
description: 'Options',
testId: 'optionsButton',
run: async (menuItem, navController, anchorElement) => {
showOptionsPopover(anchorElement);
}
}, {
key: 'save',
description: 'Save map',
@ -256,22 +240,4 @@ app.controller('GisMapController', ($scope, $route, config, kbnUrl, localStorage
}];
timefilter.enableTimeRangeSelector();
timefilter.enableAutoRefreshSelector();
function updateTheme() {
$scope.$evalAsync(() => {
isDarkTheme ? setDarkTheme() : setLightTheme();
});
}
function setDarkTheme() {
chrome.removeApplicationClass(['theme-light']);
chrome.addApplicationClass('theme-dark');
applyTheme('dark');
}
function setLightTheme() {
chrome.removeApplicationClass(['theme-dark']);
chrome.addApplicationClass('theme-light');
applyTheme('light');
}
});

5
x-pack/plugins/gis/public/angular/services/saved_gis_map.js vendored
View file

@ -17,7 +17,6 @@ import {
getRefreshConfig,
getQuery,
} from '../../selectors/map_selectors';
import { getIsDarkTheme } from '../../store/ui';
import { convertMapExtentToPolygon } from '../../elasticsearch_geo_utils';
const module = uiModules.get('app/gis');
@ -84,9 +83,7 @@ module.factory('SavedGisMap', function (Private) {
query: _.omit(getQuery(state), 'queryLastTriggeredAt'),
});
this.uiStateJSON = JSON.stringify({
isDarkMode: getIsDarkTheme(state),
});
this.uiStateJSON = JSON.stringify({});
this.bounds = convertMapExtentToPolygon(getMapExtent(state));
};

40
x-pack/plugins/gis/public/components/top_nav/options_menu.js
View file

@ -1,40 +0,0 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
import React from 'react';
import PropTypes from 'prop-types';
import {
EuiForm,
EuiFormRow,
EuiSwitch,
} from '@elastic/eui';
export function OptionsMenu({ isDarkTheme, onDarkThemeChange }) {
const handleDarkThemeChange = (evt) => {
onDarkThemeChange(evt.target.checked);
};
return (
<EuiForm
data-test-subj="gisOptionsMenu"
>
<EuiFormRow>
<EuiSwitch
label="Use dark theme"
checked={isDarkTheme}
onChange={handleDarkThemeChange}
/>
</EuiFormRow>
</EuiForm>
);
}
OptionsMenu.propTypes = {
isDarkTheme: PropTypes.bool.isRequired,
onDarkThemeChange: PropTypes.func.isRequired,
};

26
x-pack/plugins/gis/public/components/top_nav/options_menu_container.js
View file

@ -1,26 +0,0 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
import { connect } from 'react-redux';
import { getIsDarkTheme, updateIsDarkTheme } from '../../store/ui';
import { OptionsMenu } from './options_menu';
function mapStateToProps(state = {}) {
return {
isDarkTheme: getIsDarkTheme(state),
};
}
function mapDispatchToProps(dispatch) {
return {
onDarkThemeChange: (isDarkTheme) => {
dispatch(updateIsDarkTheme(isDarkTheme));
},
};
}
const connectedOptionsMenu = connect(mapStateToProps, mapDispatchToProps)(OptionsMenu);
export { connectedOptionsMenu as OptionsMenu };

53
x-pack/plugins/gis/public/components/top_nav/show_options_popover.js
View file

@ -1,53 +0,0 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
import React from 'react';
import ReactDOM from 'react-dom';
import { Provider } from 'react-redux';
import { OptionsMenu } from './options_menu_container';
import { getStore } from '../../store/store';
import {
EuiWrappingPopover,
} from '@elastic/eui';
let isOpen = false;
const container = document.createElement('div');
const onClose = () => {
ReactDOM.unmountComponentAtNode(container);
isOpen = false;
};
export async function showOptionsPopover(anchorElement) {
if (isOpen) {
onClose();
return;
}
isOpen = true;
const store = await getStore();
document.body.appendChild(container);
const element = (
<Provider store={store}>
<EuiWrappingPopover
className="navbar__popover"
id="popover"
button={anchorElement}
isOpen={true}
closePopover={onClose}
>
<OptionsMenu/>
</EuiWrappingPopover>
</Provider>
);
ReactDOM.render(element, container);
}

11
x-pack/plugins/gis/public/store/ui.js
View file

@ -11,7 +11,6 @@ import { RESET_LAYER_LOAD } from '../actions/ui_actions';
export const UPDATE_FLYOUT = 'UPDATE_FLYOUT';
export const CLOSE_SET_VIEW = 'CLOSE_SET_VIEW';
export const OPEN_SET_VIEW = 'OPEN_SET_VIEW';
export const UPDATE_IS_DARK_THEME = 'UPDATE_IS_DARK_THEME';
export const FLYOUT_STATE = {
NONE: 'NONE',
LAYER_PANEL: 'LAYER_PANEL',
@ -25,7 +24,6 @@ export const LAYER_LOAD_STATE = {
const INITIAL_STATE = {
flyoutDisplay: FLYOUT_STATE.NONE,
isDarkTheme: false,
layerLoad: {
status: LAYER_LOAD_STATE.inactive,
time: Date()
@ -46,8 +44,6 @@ function ui(state = INITIAL_STATE, action) {
time: Date() } };
case UPDATE_FLYOUT:
return { ...state, flyoutDisplay: action.display };
case UPDATE_IS_DARK_THEME:
return { ...state, isDarkTheme: action.isDarkTheme };
case CLOSE_SET_VIEW:
return { ...state, isSetViewOpen: false };
case OPEN_SET_VIEW:
@ -74,17 +70,10 @@ export function openSetView() {
type: OPEN_SET_VIEW,
};
}
export function updateIsDarkTheme(isDarkTheme) {
return {
type: UPDATE_IS_DARK_THEME,
isDarkTheme
};
}
// Selectors
export const getFlyoutDisplay = ({ ui }) => ui && ui.flyoutDisplay
|| INITIAL_STATE.flyoutDisplay;
export const getIsDarkTheme = ({ ui }) => _.get(ui, 'isDarkTheme', INITIAL_STATE.isDarkTheme);
export const getIsSetViewOpen = ({ ui }) => _.get(ui, 'isSetViewOpen', false);
export default ui;

18
x-pack/plugins/ml/server/models/data_recognizer/modules/apache2/kibana/dashboard/ML-Apache2-Access-Remote-IP-Count-Explorer.json
View file

@ -1,13 +1,13 @@
{
"hits": 0,
"timeRestore": false,
"description": "",
"title": "ML Apache2 Access Remote IP Count Explorer",
"uiStateJSON": "{\"P-3\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-5\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}}",
"panelsJSON": "[{\"size_x\":6,\"size_y\":3,\"panelIndex\":1,\"type\":\"visualization\",\"id\":\"ML-Apache2-Access-Remote-IP-Timechart\",\"col\":1,\"row\":1},{\"size_x\":6,\"size_y\":3,\"panelIndex\":2,\"type\":\"visualization\",\"id\":\"ML-Apache2-Access-Response-Code-Timechart\",\"col\":7,\"row\":1},{\"size_x\":6,\"size_y\":3,\"panelIndex\":3,\"type\":\"visualization\",\"id\":\"ML-Apache2-Access-Top-Remote-IPs-Table\",\"col\":1,\"row\":4},{\"size_x\":6,\"size_y\":3,\"panelIndex\":4,\"type\":\"visualization\",\"id\":\"ML-Apache2-Access-Map\",\"col\":7,\"row\":4},{\"size_x\":12,\"size_y\":9,\"panelIndex\":5,\"type\":\"visualization\",\"id\":\"ML-Apache2-Access-Top-URLs-Table\",\"col\":1,\"row\":7}]",
"optionsJSON": "{\"darkTheme\":false}",
"version": 1,
"hits": 0,
"timeRestore": false,
"description": "",
"title": "ML Apache2 Access Remote IP Count Explorer",
"uiStateJSON": "{\"P-3\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-5\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}}",
"panelsJSON": "[{\"size_x\":6,\"size_y\":3,\"panelIndex\":1,\"type\":\"visualization\",\"id\":\"ML-Apache2-Access-Remote-IP-Timechart\",\"col\":1,\"row\":1},{\"size_x\":6,\"size_y\":3,\"panelIndex\":2,\"type\":\"visualization\",\"id\":\"ML-Apache2-Access-Response-Code-Timechart\",\"col\":7,\"row\":1},{\"size_x\":6,\"size_y\":3,\"panelIndex\":3,\"type\":\"visualization\",\"id\":\"ML-Apache2-Access-Top-Remote-IPs-Table\",\"col\":1,\"row\":4},{\"size_x\":6,\"size_y\":3,\"panelIndex\":4,\"type\":\"visualization\",\"id\":\"ML-Apache2-Access-Map\",\"col\":7,\"row\":4},{\"size_x\":12,\"size_y\":9,\"panelIndex\":5,\"type\":\"visualization\",\"id\":\"ML-Apache2-Access-Top-URLs-Table\",\"col\":1,\"row\":7}]",
"optionsJSON": "{}",
"version": 1,
"kibanaSavedObjectMeta": {
"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"
}
}
}

18
x-pack/plugins/ml/server/models/data_recognizer/modules/apache2/kibana/dashboard/ML-Apache2-Remote-IP-URL-Explorer.json
View file

@ -1,13 +1,13 @@
{
"hits": 0,
"timeRestore": false,
"description": "",
"title": "ML Apache2 Access Remote IP URL Explorer",
"uiStateJSON": "{\"P-2\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-3\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-5\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}}",
"panelsJSON": "[{\"col\":1,\"id\":\"ML-Apache2-Access-Unique-Count-URL-Timechart\",\"panelIndex\":1,\"row\":1,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":7,\"id\":\"ML-Apache2-Access-Response-Code-Timechart\",\"panelIndex\":2,\"row\":1,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"ML-Apache2-Access-Top-Remote-IPs-Table\",\"panelIndex\":3,\"row\":4,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":7,\"id\":\"ML-Apache2-Access-Map\",\"panelIndex\":4,\"row\":4,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"size_x\":12,\"size_y\":8,\"panelIndex\":5,\"type\":\"visualization\",\"id\":\"ML-Apache2-Access-Top-URLs-Table\",\"col\":1,\"row\":7}]",
"optionsJSON": "{\"darkTheme\":false}",
"version": 1,
"hits": 0,
"timeRestore": false,
"description": "",
"title": "ML Apache2 Access Remote IP URL Explorer",
"uiStateJSON": "{\"P-2\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-3\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-5\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}}",
"panelsJSON": "[{\"col\":1,\"id\":\"ML-Apache2-Access-Unique-Count-URL-Timechart\",\"panelIndex\":1,\"row\":1,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":7,\"id\":\"ML-Apache2-Access-Response-Code-Timechart\",\"panelIndex\":2,\"row\":1,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"ML-Apache2-Access-Top-Remote-IPs-Table\",\"panelIndex\":3,\"row\":4,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":7,\"id\":\"ML-Apache2-Access-Map\",\"panelIndex\":4,\"row\":4,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"size_x\":12,\"size_y\":8,\"panelIndex\":5,\"type\":\"visualization\",\"id\":\"ML-Apache2-Access-Top-URLs-Table\",\"col\":1,\"row\":7}]",
"optionsJSON": "{}",
"version": 1,
"kibanaSavedObjectMeta": {
"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"
}
}
}

2
x-pack/plugins/ml/server/models/data_recognizer/modules/auditbeat_process_docker/kibana/dashboard/ml_auditbeat_docker_process_event_rate.json
View file

@ -3,7 +3,7 @@
"hits": 0,
"description": "Dashboard to investigate unusual process event rates in a Docker container",
"panelsJSON": "[{\"embeddableConfig\":{\"vis\":{\"legendOpen\":true}},\"gridData\":{\"x\":0,\"y\":0,\"w\":48,\"h\":14,\"i\":\"1\"},\"id\":\"ml_auditbeat_docker_process_event_rate_vis\",\"panelIndex\":\"1\",\"type\":\"visualization\",\"version\":\"6.6.0\"},{\"embeddableConfig\":{},\"gridData\":{\"x\":0,\"y\":14,\"w\":48,\"h\":15,\"i\":\"2\"},\"id\":\"ml_auditbeat_docker_process_event_rate_by_process\",\"panelIndex\":\"2\",\"type\":\"visualization\",\"version\":\"6.6.0\"},{\"gridData\":{\"x\":0,\"y\":29,\"w\":48,\"h\":20,\"i\":\"3\"},\"version\":\"6.6.0\",\"panelIndex\":\"3\",\"type\":\"search\",\"id\":\"ml_auditbeat_docker_process_events\",\"embeddableConfig\":{}}]",
"optionsJSON": "{\"darkTheme\":false,\"hidePanelTitles\":false,\"useMargins\":true}",
"optionsJSON": "{\"hidePanelTitles\":false,\"useMargins\":true}",
"version": 1,
"timeRestore": false,
"kibanaSavedObjectMeta": {

2
x-pack/plugins/ml/server/models/data_recognizer/modules/auditbeat_process_docker/kibana/dashboard/ml_auditbeat_docker_process_explorer.json
View file

@ -3,7 +3,7 @@
"hits": 0,
"description": "Dashboard to explore processes for a Docker container",
"panelsJSON": "[{\"embeddableConfig\": {},\"gridData\": {\"x\": 0,\"y\": 0,\"w\": 25,\"h\": 22,\"i\": \"1\"},\"id\": \"ml_auditbeat_docker_process_occurrence\",\"panelIndex\": \"1\",\"type\": \"visualization\",\"version\": \"6.6.0\"},{\"gridData\": {\"x\": 0,\"y\": 22,\"w\": 48,\"h\": 35,\"i\": \"2\"},\"version\": \"6.6.0\",\"panelIndex\": \"2\",\"type\": \"search\",\"id\": \"ml_auditbeat_docker_process_events\",\"embeddableConfig\": {}},{\"gridData\": {\"x\": 25,\"y\": 0,\"w\": 23,\"h\": 22,\"i\": \"3\"},\"version\": \"6.6.0\",\"panelIndex\": \"3\",\"type\": \"visualization\",\"id\": \"ml_auditbeat_docker_process_event_rate_by_process\",\"embeddableConfig\": {\"vis\": {\"legendOpen\": true}}}\n]",
"optionsJSON": "{\"darkTheme\": false,\"hidePanelTitles\": false,\"useMargins\": true\n}",
"optionsJSON": "{\"hidePanelTitles\": false,\"useMargins\": true\n}",
"version": 1,
"timeRestore": false,
"kibanaSavedObjectMeta": {

2
x-pack/plugins/ml/server/models/data_recognizer/modules/auditbeat_process_hosts/kibana/dashboard/ml_auditbeat_hosts_process_event_rate.json
View file

@ -3,7 +3,7 @@
"hits": 0,
"description": "Dashboard to investigate unusual process event rates on a host.",
"panelsJSON": "[{\"embeddableConfig\":{\"vis\":{\"legendOpen\":true}},\"gridData\":{\"x\":0,\"y\":0,\"w\":48,\"h\":14,\"i\":\"1\"},\"id\":\"ml_auditbeat_hosts_process_event_rate_vis\",\"panelIndex\":\"1\",\"type\":\"visualization\",\"version\":\"6.6.0\"},{\"embeddableConfig\":{},\"gridData\":{\"x\":0,\"y\":14,\"w\":48,\"h\":15,\"i\":\"2\"},\"id\":\"ml_auditbeat_hosts_process_event_rate_by_process\",\"panelIndex\":\"2\",\"type\":\"visualization\",\"version\":\"6.6.0\"},{\"gridData\":{\"x\":0,\"y\":29,\"w\":48,\"h\":20,\"i\":\"3\"},\"version\":\"6.6.0\",\"panelIndex\":\"3\",\"type\":\"search\",\"id\":\"ml_auditbeat_hosts_process_events\",\"embeddableConfig\":{}}]",
"optionsJSON": "{\"darkTheme\":false,\"hidePanelTitles\":false,\"useMargins\":true}",
"optionsJSON": "{\"hidePanelTitles\":false,\"useMargins\":true}",
"version": 1,
"timeRestore": false,
"kibanaSavedObjectMeta": {

2
x-pack/plugins/ml/server/models/data_recognizer/modules/auditbeat_process_hosts/kibana/dashboard/ml_auditbeat_hosts_process_explorer.json
View file

@ -3,7 +3,7 @@
"hits": 0,
"description": "Dashboard to explore processes for a host",
"panelsJSON": "[{\"embeddableConfig\":{},\"gridData\":{\"x\":0,\"y\":0,\"w\":25,\"h\":22,\"i\":\"1\"},\"id\":\"ml_auditbeat_hosts_process_occurrence\",\"panelIndex\":\"1\",\"type\":\"visualization\",\"version\":\"6.6.0\"},{\"gridData\":{\"x\":0,\"y\":22,\"w\":48,\"h\":35,\"i\":\"2\"},\"version\":\"6.6.0\",\"panelIndex\":\"2\",\"type\":\"search\",\"id\":\"ml_auditbeat_hosts_process_events\",\"embeddableConfig\":{}},{\"gridData\":{\"x\":25,\"y\":0,\"w\":23,\"h\":22,\"i\":\"3\"},\"version\":\"6.6.0\",\"panelIndex\":\"3\",\"type\":\"visualization\",\"id\":\"ml_auditbeat_hosts_process_event_rate_by_process\",\"embeddableConfig\":{\"vis\":{\"legendOpen\":true}}}\n]",
"optionsJSON": "{\"darkTheme\": false,\"hidePanelTitles\": false,\"useMargins\": true\n}",
"optionsJSON": "{\"hidePanelTitles\": false,\"useMargins\": true\n}",
"version": 1,
"timeRestore": false,
"kibanaSavedObjectMeta": {

18
x-pack/plugins/ml/server/models/data_recognizer/modules/nginx/kibana/dashboard/ML-Nginx-Access-Remote-IP-Count-Explorer.json
View file

@ -1,13 +1,13 @@
{
"hits": 0,
"timeRestore": false,
"description": "",
"title": "ML Nginx Access Remote IP Count Explorer",
"uiStateJSON": "{\"P-3\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-5\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}}",
"panelsJSON": "[{\"size_x\":6,\"size_y\":3,\"panelIndex\":1,\"type\":\"visualization\",\"id\":\"ML-Nginx-Access-Remote-IP-Timechart\",\"col\":1,\"row\":1},{\"size_x\":6,\"size_y\":3,\"panelIndex\":2,\"type\":\"visualization\",\"id\":\"ML-Nginx-Access-Response-Code-Timechart\",\"col\":7,\"row\":1},{\"size_x\":6,\"size_y\":3,\"panelIndex\":3,\"type\":\"visualization\",\"id\":\"ML-Nginx-Access-Top-Remote-IPs-Table\",\"col\":1,\"row\":4},{\"size_x\":6,\"size_y\":3,\"panelIndex\":4,\"type\":\"visualization\",\"id\":\"ML-Nginx-Access-Map\",\"col\":7,\"row\":4},{\"size_x\":12,\"size_y\":9,\"panelIndex\":5,\"type\":\"visualization\",\"id\":\"ML-Nginx-Access-Top-URLs-Table\",\"col\":1,\"row\":7}]",
"optionsJSON": "{\"darkTheme\":false}",
"version": 1,
"hits": 0,
"timeRestore": false,
"description": "",
"title": "ML Nginx Access Remote IP Count Explorer",
"uiStateJSON": "{\"P-3\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-5\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}}",
"panelsJSON": "[{\"size_x\":6,\"size_y\":3,\"panelIndex\":1,\"type\":\"visualization\",\"id\":\"ML-Nginx-Access-Remote-IP-Timechart\",\"col\":1,\"row\":1},{\"size_x\":6,\"size_y\":3,\"panelIndex\":2,\"type\":\"visualization\",\"id\":\"ML-Nginx-Access-Response-Code-Timechart\",\"col\":7,\"row\":1},{\"size_x\":6,\"size_y\":3,\"panelIndex\":3,\"type\":\"visualization\",\"id\":\"ML-Nginx-Access-Top-Remote-IPs-Table\",\"col\":1,\"row\":4},{\"size_x\":6,\"size_y\":3,\"panelIndex\":4,\"type\":\"visualization\",\"id\":\"ML-Nginx-Access-Map\",\"col\":7,\"row\":4},{\"size_x\":12,\"size_y\":9,\"panelIndex\":5,\"type\":\"visualization\",\"id\":\"ML-Nginx-Access-Top-URLs-Table\",\"col\":1,\"row\":7}]",
"optionsJSON": "{}",
"version": 1,
"kibanaSavedObjectMeta": {
"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"
}
}
}

18
x-pack/plugins/ml/server/models/data_recognizer/modules/nginx/kibana/dashboard/ML-Nginx-Remote-IP-URL-Explorer.json
View file

@ -1,13 +1,13 @@
{
"hits": 0,
"timeRestore": false,
"description": "",
"title": "ML Nginx Access Remote IP URL Explorer",
"uiStateJSON": "{\"P-2\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-3\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-5\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}}",
"panelsJSON": "[{\"col\":1,\"id\":\"ML-Nginx-Access-Unique-Count-URL-Timechart\",\"panelIndex\":1,\"row\":1,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":7,\"id\":\"ML-Nginx-Access-Response-Code-Timechart\",\"panelIndex\":2,\"row\":1,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"ML-Nginx-Access-Top-Remote-IPs-Table\",\"panelIndex\":3,\"row\":4,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":7,\"id\":\"ML-Nginx-Access-Map\",\"panelIndex\":4,\"row\":4,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"size_x\":12,\"size_y\":8,\"panelIndex\":5,\"type\":\"visualization\",\"id\":\"ML-Nginx-Access-Top-URLs-Table\",\"col\":1,\"row\":7}]",
"optionsJSON": "{\"darkTheme\":false}",
"version": 1,
"hits": 0,
"timeRestore": false,
"description": "",
"title": "ML Nginx Access Remote IP URL Explorer",
"uiStateJSON": "{\"P-2\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-3\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-5\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}}",
"panelsJSON": "[{\"col\":1,\"id\":\"ML-Nginx-Access-Unique-Count-URL-Timechart\",\"panelIndex\":1,\"row\":1,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":7,\"id\":\"ML-Nginx-Access-Response-Code-Timechart\",\"panelIndex\":2,\"row\":1,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"ML-Nginx-Access-Top-Remote-IPs-Table\",\"panelIndex\":3,\"row\":4,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":7,\"id\":\"ML-Nginx-Access-Map\",\"panelIndex\":4,\"row\":4,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"size_x\":12,\"size_y\":8,\"panelIndex\":5,\"type\":\"visualization\",\"id\":\"ML-Nginx-Access-Top-URLs-Table\",\"col\":1,\"row\":7}]",
"optionsJSON": "{}",
"version": 1,
"kibanaSavedObjectMeta": {
"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"
}
}
}

8
x-pack/test/reporting/api/generation_urls.js
View file

@ -10,14 +10,14 @@
// The URL below was captured from release 6.4 and then the layout section was removed to test structure before
// preserve_layout was introduced. See https://github.com/elastic/kibana/issues/23414
export const PDF_PRINT_DASHBOARD_PRE_6_2 = '/api/reporting/generate/printablePdf?jobParams=(browserTimezone:America%2FNew_York,objectType:dashboard,relativeUrls:!(%27%2Fapp%2Fkibana%23%2Fdashboard%2F2ae34a60-3dd4-11e8-b2b9-5d5dc1715159%3F_g%3D(refreshInterval:(pause:!!t,value:0),time:(from:!%27Mon%2BApr%2B09%2B2018%2B17:56:08%2BGMT-0400!%27,mode:absolute,to:!%27Wed%2BApr%2B11%2B2018%2B17:56:08%2BGMT-0400!%27))%26_a%3D(description:!%27!%27,filters:!!(),fullScreenMode:!!f,options:(darkTheme:!!f,hidePanelTitles:!!f,useMargins:!!t),panels:!!((embeddableConfig:(),gridData:(h:15,i:!%271!%27,w:24,x:0,y:0),id:!%27145ced90-3dcb-11e8-8660-4d65aa086b3c!%27,panelIndex:!%271!%27,type:visualization,version:!%276.3.0!%27),(embeddableConfig:(),gridData:(h:15,i:!%272!%27,w:24,x:24,y:0),id:e2023110-3dcb-11e8-8660-4d65aa086b3c,panelIndex:!%272!%27,type:visualization,version:!%276.3.0!%27)),query:(language:lucene,query:!%27!%27),timeRestore:!!f,title:!%27couple%2Bpanels!%27,viewMode:view)%27),title:%27couple%20panels%27)';
export const PDF_PRINT_DASHBOARD_PRE_6_2 = '/api/reporting/generate/printablePdf?jobParams=(browserTimezone:America%2FNew_York,objectType:dashboard,relativeUrls:!(%27%2Fapp%2Fkibana%23%2Fdashboard%2F2ae34a60-3dd4-11e8-b2b9-5d5dc1715159%3F_g%3D(refreshInterval:(pause:!!t,value:0),time:(from:!%27Mon%2BApr%2B09%2B2018%2B17:56:08%2BGMT-0400!%27,mode:absolute,to:!%27Wed%2BApr%2B11%2B2018%2B17:56:08%2BGMT-0400!%27))%26_a%3D(description:!%27!%27,filters:!!(),fullScreenMode:!!f,options:(hidePanelTitles:!!f,useMargins:!!t),panels:!!((embeddableConfig:(),gridData:(h:15,i:!%271!%27,w:24,x:0,y:0),id:!%27145ced90-3dcb-11e8-8660-4d65aa086b3c!%27,panelIndex:!%271!%27,type:visualization,version:!%276.3.0!%27),(embeddableConfig:(),gridData:(h:15,i:!%272!%27,w:24,x:24,y:0),id:e2023110-3dcb-11e8-8660-4d65aa086b3c,panelIndex:!%272!%27,type:visualization,version:!%276.3.0!%27)),query:(language:lucene,query:!%27!%27),timeRestore:!!f,title:!%27couple%2Bpanels!%27,viewMode:view)%27),title:%27couple%20panels%27)';
export const PDF_PRINT_DASHBOARD_6_3 = '/api/reporting/generate/printablePdf?jobParams=(browserTimezone:America%2FNew_York,layout:(id:print),objectType:dashboard,relativeUrls:!(%27%2Fapp%2Fkibana%23%2Fdashboard%2F2ae34a60-3dd4-11e8-b2b9-5d5dc1715159%3F_g%3D(refreshInterval:(display:Off,pause:!!f,value:0),time:(from:!%27Mon%2BApr%2B09%2B2018%2B17:56:08%2BGMT-0400!%27,mode:absolute,to:!%27Wed%2BApr%2B11%2B2018%2B17:56:08%2BGMT-0400!%27))%26_a%3D(description:!%27!%27,filters:!!(),fullScreenMode:!!f,options:(darkTheme:!!f,hidePanelTitles:!!f,useMargins:!!t),panels:!!((embeddableConfig:(),gridData:(h:15,i:!%271!%27,w:24,x:0,y:0),id:!%27145ced90-3dcb-11e8-8660-4d65aa086b3c!%27,panelIndex:!%271!%27,type:visualization,version:!%276.3.0!%27),(embeddableConfig:(),gridData:(h:15,i:!%272!%27,w:24,x:24,y:0),id:e2023110-3dcb-11e8-8660-4d65aa086b3c,panelIndex:!%272!%27,type:visualization,version:!%276.3.0!%27)),query:(language:lucene,query:!%27!%27),timeRestore:!!f,title:!%27couple%2Bpanels!%27,viewMode:view)%27),title:%27couple%20panels%27)';
export const PDF_PRESERVE_DASHBOARD_FILTER_6_3 = '/api/reporting/generate/printablePdf?jobParams=(browserTimezone:America%2FNew_York,layout:(dimensions:(height:439,width:1362),id:preserve_layout),objectType:dashboard,relativeUrls:!(%27%2Fapp%2Fkibana%23%2Fdashboard%2F61c58ad0-3dd3-11e8-b2b9-5d5dc1715159%3F_g%3D(refreshInterval:(display:Off,pause:!!f,value:0),time:(from:!%27Mon%2BApr%2B09%2B2018%2B17:56:08%2BGMT-0400!%27,mode:absolute,to:!%27Wed%2BApr%2B11%2B2018%2B17:56:08%2BGMT-0400!%27))%26_a%3D(description:!%27!%27,filters:!!((!%27$state!%27:(store:appState),meta:(alias:!!n,disabled:!!f,index:a0f483a0-3dc9-11e8-8660-4d65aa086b3c,key:animal,negate:!!f,params:(query:dog,type:phrase),type:phrase,value:dog),query:(match:(animal:(query:dog,type:phrase))))),fullScreenMode:!!f,options:(darkTheme:!!f,hidePanelTitles:!!f,useMargins:!!t),panels:!!((embeddableConfig:(),gridData:(h:15,i:!%271!%27,w:24,x:0,y:0),id:!%2750643b60-3dd3-11e8-b2b9-5d5dc1715159!%27,panelIndex:!%271!%27,type:visualization,version:!%276.3.0!%27),(embeddableConfig:(),gridData:(h:15,i:!%272!%27,w:24,x:24,y:0),id:a16d1990-3dca-11e8-8660-4d65aa086b3c,panelIndex:!%272!%27,type:search,version:!%276.3.0!%27)),query:(language:lucene,query:!%27!%27),timeRestore:!!t,title:!%27dashboard%2Bwith%2Bfilter!%27,viewMode:view)%27),title:%27dashboard%20with%20filter%27)';
export const PDF_PRINT_DASHBOARD_6_3 = '/api/reporting/generate/printablePdf?jobParams=(browserTimezone:America%2FNew_York,layout:(id:print),objectType:dashboard,relativeUrls:!(%27%2Fapp%2Fkibana%23%2Fdashboard%2F2ae34a60-3dd4-11e8-b2b9-5d5dc1715159%3F_g%3D(refreshInterval:(display:Off,pause:!!f,value:0),time:(from:!%27Mon%2BApr%2B09%2B2018%2B17:56:08%2BGMT-0400!%27,mode:absolute,to:!%27Wed%2BApr%2B11%2B2018%2B17:56:08%2BGMT-0400!%27))%26_a%3D(description:!%27!%27,filters:!!(),fullScreenMode:!!f,options:(hidePanelTitles:!!f,useMargins:!!t),panels:!!((embeddableConfig:(),gridData:(h:15,i:!%271!%27,w:24,x:0,y:0),id:!%27145ced90-3dcb-11e8-8660-4d65aa086b3c!%27,panelIndex:!%271!%27,type:visualization,version:!%276.3.0!%27),(embeddableConfig:(),gridData:(h:15,i:!%272!%27,w:24,x:24,y:0),id:e2023110-3dcb-11e8-8660-4d65aa086b3c,panelIndex:!%272!%27,type:visualization,version:!%276.3.0!%27)),query:(language:lucene,query:!%27!%27),timeRestore:!!f,title:!%27couple%2Bpanels!%27,viewMode:view)%27),title:%27couple%20panels%27)';
export const PDF_PRESERVE_DASHBOARD_FILTER_6_3 = '/api/reporting/generate/printablePdf?jobParams=(browserTimezone:America%2FNew_York,layout:(dimensions:(height:439,width:1362),id:preserve_layout),objectType:dashboard,relativeUrls:!(%27%2Fapp%2Fkibana%23%2Fdashboard%2F61c58ad0-3dd3-11e8-b2b9-5d5dc1715159%3F_g%3D(refreshInterval:(display:Off,pause:!!f,value:0),time:(from:!%27Mon%2BApr%2B09%2B2018%2B17:56:08%2BGMT-0400!%27,mode:absolute,to:!%27Wed%2BApr%2B11%2B2018%2B17:56:08%2BGMT-0400!%27))%26_a%3D(description:!%27!%27,filters:!!((!%27$state!%27:(store:appState),meta:(alias:!!n,disabled:!!f,index:a0f483a0-3dc9-11e8-8660-4d65aa086b3c,key:animal,negate:!!f,params:(query:dog,type:phrase),type:phrase,value:dog),query:(match:(animal:(query:dog,type:phrase))))),fullScreenMode:!!f,options:(hidePanelTitles:!!f,useMargins:!!t),panels:!!((embeddableConfig:(),gridData:(h:15,i:!%271!%27,w:24,x:0,y:0),id:!%2750643b60-3dd3-11e8-b2b9-5d5dc1715159!%27,panelIndex:!%271!%27,type:visualization,version:!%276.3.0!%27),(embeddableConfig:(),gridData:(h:15,i:!%272!%27,w:24,x:24,y:0),id:a16d1990-3dca-11e8-8660-4d65aa086b3c,panelIndex:!%272!%27,type:search,version:!%276.3.0!%27)),query:(language:lucene,query:!%27!%27),timeRestore:!!t,title:!%27dashboard%2Bwith%2Bfilter!%27,viewMode:view)%27),title:%27dashboard%20with%20filter%27)';
export const PDF_PRESERVE_PIE_VISUALIZATION_6_3 = '/api/reporting/generate/printablePdf?jobParams=(browserTimezone:America%2FNew_York,layout:(dimensions:(height:441,width:1002),id:preserve_layout),objectType:visualization,relativeUrls:!(%27%2Fapp%2Fkibana%23%2Fvisualize%2Fedit%2F3fe22200-3dcb-11e8-8660-4d65aa086b3c%3F_g%3D(refreshInterval:(display:Off,pause:!!f,value:0),time:(from:!%27Mon%2BApr%2B09%2B2018%2B17:56:08%2BGMT-0400!%27,mode:absolute,to:!%27Wed%2BApr%2B11%2B2018%2B17:56:08%2BGMT-0400!%27))%26_a%3D(filters:!!(),linked:!!f,query:(language:lucene,query:!%27!%27),uiState:(),vis:(aggs:!!((enabled:!!t,id:!%271!%27,params:(),schema:metric,type:count),(enabled:!!t,id:!%272!%27,params:(field:bytes,missingBucket:!!f,missingBucketLabel:Missing,order:desc,orderBy:!%271!%27,otherBucket:!!f,otherBucketLabel:Other,size:5),schema:segment,type:terms)),params:(addLegend:!!t,addTooltip:!!t,isDonut:!!t,labels:(last_level:!!t,show:!!f,truncate:100,values:!!t),legendPosition:right,type:pie),title:!%27Rendering%2BTest:%2Bpie!%27,type:pie))%27),title:%27Rendering%20Test:%20pie%27)';
export const PDF_PRINT_PIE_VISUALIZATION_FILTER_AND_SAVED_SEARCH_6_3 = '/api/reporting/generate/printablePdf?jobParams=(browserTimezone:America%2FNew_York,layout:(id:print),objectType:visualization,relativeUrls:!(%27%2Fapp%2Fkibana%23%2Fvisualize%2Fedit%2Fbefdb6b0-3e59-11e8-9fc3-39e49624228e%3F_g%3D(refreshInterval:(display:Off,pause:!!f,value:0),time:(from:!%27Mon%2BApr%2B09%2B2018%2B17:56:08%2BGMT-0400!%27,mode:absolute,to:!%27Wed%2BApr%2B11%2B2018%2B17:56:08%2BGMT-0400!%27))%26_a%3D(filters:!!((!%27$state!%27:(store:appState),meta:(alias:!!n,disabled:!!f,index:a0f483a0-3dc9-11e8-8660-4d65aa086b3c,key:animal.keyword,negate:!!f,params:(query:dog,type:phrase),type:phrase,value:dog),query:(match:(animal.keyword:(query:dog,type:phrase))))),linked:!!t,query:(language:lucene,query:!%27!%27),uiState:(),vis:(aggs:!!((enabled:!!t,id:!%271!%27,params:(),schema:metric,type:count),(enabled:!!t,id:!%272!%27,params:(field:name.keyword,missingBucket:!!f,missingBucketLabel:Missing,order:desc,orderBy:!%271!%27,otherBucket:!!f,otherBucketLabel:Other,size:5),schema:segment,type:terms)),params:(addLegend:!!t,addTooltip:!!t,isDonut:!!t,labels:(last_level:!!t,show:!!f,truncate:100,values:!!t),legendPosition:right,type:pie),title:!%27Filter%2BTest:%2Banimals:%2Blinked%2Bto%2Bsearch%2Bwith%2Bfilter!%27,type:pie))%27),title:%27Filter%20Test:%20animals:%20linked%20to%20search%20with%20filter%27)';
export const CSV_DISCOVER_KUERY_AND_FILTER_6_3 = '/api/reporting/generate/csv?jobParams=(conflictedTypesFields:!(),fields:!(%27@timestamp%27,agent,bytes,clientip),indexPatternId:%270bf35f60-3dc9-11e8-8660-4d65aa086b3c%27,metaFields:!(_source,_id,_type,_index,_score),searchRequest:(body:(_source:(excludes:!(),includes:!(%27@timestamp%27,agent,bytes,clientip)),docvalue_fields:!(%27@timestamp%27),query:(bool:(filter:!((bool:(minimum_should_match:1,should:!((match:(clientip:%2773.14.212.83%27)))))),must:!((range:(bytes:(gte:100,lt:1000))),(range:(%27@timestamp%27:(format:epoch_millis,gte:1369165215770,lte:1526931615770)))),must_not:!(),should:!())),script_fields:(),sort:!((%27@timestamp%27:(order:desc,unmapped_type:boolean))),stored_fields:!(%27@timestamp%27,agent,bytes,clientip),version:!t),index:%27logstash-*%27),title:%27Bytes%20and%20kuery%20in%20saved%20search%20with%20filter%27,type:search)';
export const PDF_PRINT_DASHBOARD_6_2 = '/api/reporting/generate/printablePdf?jobParams=(browserTimezone:America%2FNew_York,layout:(id:print),objectType:dashboard,queryString:%27_g%3D(refreshInterval:(display:Off,pause:!!f,value:0),time:(from:!%27Mon%2BApr%2B09%2B2018%2B17:56:08%2BGMT-0400!%27,mode:absolute,to:!%27Wed%2BApr%2B11%2B2018%2B17:56:08%2BGMT-0400!%27))%26_a%3D(description:!%27!%27,filters:!!((!%27$state!%27:(store:appState),meta:(alias:!!n,disabled:!!f,field:isDog,index:a0f483a0-3dc9-11e8-8660-4d65aa086b3c,key:isDog,negate:!!f,params:(value:!!t),type:phrase,value:true),script:(script:(inline:!%27boolean%2Bcompare(Supplier%2Bs,%2Bdef%2Bv)%2B%257Breturn%2Bs.get()%2B%253D%253D%2Bv%3B%257Dcompare(()%2B-%253E%2B%257B%2Breturn%2Bdoc%255B!!!%27animal.keyword!!!%27%255D.value%2B%253D%253D%2B!!!%27dog!!!%27%2B%257D,%2Bparams.value)%3B!%27,lang:painless,params:(value:!!t))))),fullScreenMode:!!f,options:(darkTheme:!!f,hidePanelTitles:!!f,useMargins:!!t),panels:!!((gridData:(h:3,i:!%274!%27,w:6,x:6,y:0),id:edb65990-53ca-11e8-b481-c9426d020fcd,panelIndex:!%274!%27,type:visualization,version:!%276.2.4!%27),(gridData:(h:3,i:!%275!%27,w:6,x:0,y:0),id:!%270644f890-53cb-11e8-b481-c9426d020fcd!%27,panelIndex:!%275!%27,type:visualization,version:!%276.2.4!%27)),query:(language:lucene,query:!%27weightLbs:%253E15!%27),timeRestore:!!t,title:!%27Animal%2BWeights%2B(created%2Bin%2B6.2)!%27,viewMode:view)%27,savedObjectId:%271b2f47b0-53cb-11e8-b481-c9426d020fcd%27)';
export const PDF_PRINT_DASHBOARD_6_2 = '/api/reporting/generate/printablePdf?jobParams=(browserTimezone:America%2FNew_York,layout:(id:print),objectType:dashboard,queryString:%27_g%3D(refreshInterval:(display:Off,pause:!!f,value:0),time:(from:!%27Mon%2BApr%2B09%2B2018%2B17:56:08%2BGMT-0400!%27,mode:absolute,to:!%27Wed%2BApr%2B11%2B2018%2B17:56:08%2BGMT-0400!%27))%26_a%3D(description:!%27!%27,filters:!!((!%27$state!%27:(store:appState),meta:(alias:!!n,disabled:!!f,field:isDog,index:a0f483a0-3dc9-11e8-8660-4d65aa086b3c,key:isDog,negate:!!f,params:(value:!!t),type:phrase,value:true),script:(script:(inline:!%27boolean%2Bcompare(Supplier%2Bs,%2Bdef%2Bv)%2B%257Breturn%2Bs.get()%2B%253D%253D%2Bv%3B%257Dcompare(()%2B-%253E%2B%257B%2Breturn%2Bdoc%255B!!!%27animal.keyword!!!%27%255D.value%2B%253D%253D%2B!!!%27dog!!!%27%2B%257D,%2Bparams.value)%3B!%27,lang:painless,params:(value:!!t))))),fullScreenMode:!!f,options:(hidePanelTitles:!!f,useMargins:!!t),panels:!!((gridData:(h:3,i:!%274!%27,w:6,x:6,y:0),id:edb65990-53ca-11e8-b481-c9426d020fcd,panelIndex:!%274!%27,type:visualization,version:!%276.2.4!%27),(gridData:(h:3,i:!%275!%27,w:6,x:0,y:0),id:!%270644f890-53cb-11e8-b481-c9426d020fcd!%27,panelIndex:!%275!%27,type:visualization,version:!%276.2.4!%27)),query:(language:lucene,query:!%27weightLbs:%253E15!%27),timeRestore:!!t,title:!%27Animal%2BWeights%2B(created%2Bin%2B6.2)!%27,viewMode:view)%27,savedObjectId:%271b2f47b0-53cb-11e8-b481-c9426d020fcd%27)';
export const PDF_PRESERVE_VISUALIZATION_6_2 = '/api/reporting/generate/printablePdf?jobParams=(browserTimezone:America%2FNew_York,layout:(dimensions:(height:441,width:1002),id:preserve_layout),objectType:visualization,queryString:%27_g%3D(refreshInterval:(display:Off,pause:!!f,value:0),time:(from:!%27Mon%2BApr%2B09%2B2018%2B17:56:08%2BGMT-0400!%27,mode:absolute,to:!%27Wed%2BApr%2B11%2B2018%2B17:56:08%2BGMT-0400!%27))%26_a%3D(filters:!!(),linked:!!f,query:(language:lucene,query:!%27weightLbs:%253E10!%27),uiState:(),vis:(aggs:!!((enabled:!!t,id:!%271!%27,params:(),schema:metric,type:count),(enabled:!!t,id:!%272!%27,params:(field:weightLbs,missingBucket:!!f,missingBucketLabel:Missing,order:desc,orderBy:!%271!%27,otherBucket:!!f,otherBucketLabel:Other,size:5),schema:segment,type:terms)),params:(addLegend:!!t,addTooltip:!!t,isDonut:!!t,labels:(last_level:!!t,show:!!f,truncate:100,values:!!t),legendPosition:right,type:pie),title:!%27Weight%2Bin%2Blbs%2Bpie%2Bcreated%2Bin%2B6.2!%27,type:pie))%27,savedObjectId:%270644f890-53cb-11e8-b481-c9426d020fcd%27)';
export const CSV_DISCOVER_FILTER_QUERY_6_2 = '/api/reporting/generate/csv?jobParams=(conflictedTypesFields:!(),fields:!(%27@timestamp%27,animal,sound,weightLbs),indexPatternId:a0f483a0-3dc9-11e8-8660-4d65aa086b3c,metaFields:!(_source,_id,_type,_index,_score),searchRequest:(body:(_source:(excludes:!(),includes:!(%27@timestamp%27,animal,sound,weightLbs)),docvalue_fields:!(%27@timestamp%27),query:(bool:(filter:!(),must:!((query_string:(analyze_wildcard:!t,default_field:%27*%27,query:%27weightLbs:%3E10%27)),(match_phrase:(sound.keyword:(query:growl))),(range:(%27@timestamp%27:(format:epoch_millis,gte:1523310968000,lte:1523483768000)))),must_not:!(),should:!())),script_fields:(),sort:!((%27@timestamp%27:(order:desc,unmapped_type:boolean))),stored_fields:!(%27@timestamp%27,animal,sound,weightLbs),version:!t),index:%27animals-*%27),title:%27Search%20created%20in%206.2%27,type:search)';

6
x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json
View file

@ -122,7 +122,7 @@
"hits": 0,
"description": "",
"panelsJSON": "[{\"size_x\":6,\"size_y\":3,\"panelIndex\":1,\"type\":\"visualization\",\"id\":\"dd7caf20-9efd-11e7-acb3-3dab96693fab\",\"col\":1,\"row\":1}]",
"optionsJSON": "{\"darkTheme\":false}",
"optionsJSON": "{}",
"uiStateJSON": "{}",
"version": 1,
"timeRestore": true,
@ -217,7 +217,7 @@
"hits": 0,
"description": "",
"panelsJSON": "[{\"size_x\":6,\"size_y\":3,\"panelIndex\":1,\"type\":\"visualization\",\"id\":\"dd7caf20-9efd-11e7-acb3-3dab96693fab\",\"col\":1,\"row\":1}]",
"optionsJSON": "{\"darkTheme\":false}",
"optionsJSON": "{}",
"uiStateJSON": "{}",
"version": 1,
"timeRestore": true,
@ -313,7 +313,7 @@
"hits": 0,
"description": "",
"panelsJSON": "[{\"size_x\":6,\"size_y\":3,\"panelIndex\":1,\"type\":\"visualization\",\"id\":\"dd7caf20-9efd-11e7-acb3-3dab96693fab\",\"col\":1,\"row\":1}]",
"optionsJSON": "{\"darkTheme\":false}",
"optionsJSON": "{}",
"uiStateJSON": "{}",
"version": 1,
"timeRestore": true,