Merge branch 'master' of github.com:elastic/kibana into 2020-02-26-ac…

…tion-types-2
elastic · Mar 3, 2020 · 4b29831 · 4b29831
2 parents dcdec80 + 5555a6c
commit 4b29831
Show file tree

Hide file tree

Showing 25 changed files with 265 additions and 261 deletions.
diff --git a/...mponents/ml_job_editor/ml_job_editor.d.ts → ...cy/plugins/ml/__mocks__/shared_imports.ts b/...mponents/ml_job_editor/ml_job_editor.d.ts → ...cy/plugins/ml/__mocks__/shared_imports.ts
@@ -4,5 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export function MLJobEditor(props: any): any;
-export const EDITOR_MODE: any;
+export function XJsonMode() {}
diff --git a/x-pack/legacy/plugins/ml/public/application/components/custom_hooks/index.ts b/x-pack/legacy/plugins/ml/public/application/components/custom_hooks/index.ts
@@ -5,3 +5,4 @@
  */
 
 export { usePartialState } from './use_partial_state';
+export { useXJsonMode, xJsonMode } from './use_x_json_mode';
diff --git a/x-pack/legacy/plugins/ml/public/application/components/custom_hooks/use_x_json_mode.ts b/x-pack/legacy/plugins/ml/public/application/components/custom_hooks/use_x_json_mode.ts
@@ -0,0 +1,25 @@
+/*
+ * 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 { useState } from 'react';
+import {
+ collapseLiteralStrings,
+ expandLiteralStrings,
+ XJsonMode,
+} from '../../../../shared_imports';
+
+export const xJsonMode = new XJsonMode();
+
+export const useXJsonMode = (json: string) => {
+ const [xJson, setXJson] = useState(expandLiteralStrings(json));
+
+ return {
+ xJson,
+ setXJson,
+ xJsonMode,
+ convertToJson: collapseLiteralStrings,
+ };
+};
diff --git a/...nagement/components/create_analytics_advanced_editor/create_analytics_advanced_editor.tsx b/...nagement/components/create_analytics_advanced_editor/create_analytics_advanced_editor.tsx
@@ -17,8 +17,10 @@ import {
 } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
+import { collapseLiteralStrings } from '../../../../../../../../../../../src/plugins/es_ui_shared/console_lang/lib/json_xjson_translation_tools';
 
 import { CreateAnalyticsFormProps } from '../../hooks/use_create_analytics_form';
+import { xJsonMode } from '../../../../../components/custom_hooks';
 
 export const CreateAnalyticsAdvancedEditor: FC<CreateAnalyticsFormProps> = ({ actions, state }) => {
  const {
@@ -42,7 +44,8 @@ export const CreateAnalyticsAdvancedEditor: FC<CreateAnalyticsFormProps> = ({ ac
  const onChange = (str: string) => {
  setAdvancedEditorRawString(str);
  try {
- setJobConfig(JSON.parse(str));
+ const resultJobConfig = JSON.parse(collapseLiteralStrings(str));
+ setJobConfig(resultJobConfig);
  } catch (e) {
  resetAdvancedEditorMessages();
  }
@@ -119,7 +122,7 @@ export const CreateAnalyticsAdvancedEditor: FC<CreateAnalyticsFormProps> = ({ ac
  style={{ maxWidth: '100%' }}
  >
  <EuiCodeEditor
- mode="json"
+ mode={xJsonMode}
  width="100%"
  value={advancedEditorRawString}
  onChange={onChange}

diff --git a/.../analytics_management/components/create_analytics_button/create_analytics_button.test.tsx b/.../analytics_management/components/create_analytics_button/create_analytics_button.test.tsx
@@ -29,6 +29,8 @@ jest.mock('react', () => {
  return { ...r, memo: (x: any) => x };
 });
 
+jest.mock('../../../../../../../shared_imports');
+
 describe('Data Frame Analytics: <CreateAnalyticsButton />', () => {
  test('Minimal initialization', () => {
  const { getLastHookValue } = getMountedHook();

diff --git a/...pages/analytics_management/components/create_analytics_flyout/create_analytics_flyout.tsx b/...pages/analytics_management/components/create_analytics_flyout/create_analytics_flyout.tsx
@@ -29,7 +29,7 @@ export const CreateAnalyticsFlyout: FC<CreateAnalyticsFormProps> = ({
  const { isJobCreated, isJobStarted, isModalButtonDisabled, isValid } = state;
 
  return (
- <EuiFlyout size="s" onClose={closeModal} data-test-subj="mlAnalyticsCreateJobFlyout">
+ <EuiFlyout size="m" onClose={closeModal} data-test-subj="mlAnalyticsCreateJobFlyout">
  <EuiFlyoutHeader>
  <EuiTitle>
  <h2 data-test-subj="mlDataFrameAnalyticsFlyoutHeaderTitle">

diff --git a/...ml/public/application/datavisualizer/file_based/components/file_contents/file_contents.js b/...ml/public/application/datavisualizer/file_based/components/file_contents/file_contents.js
@@ -9,12 +9,12 @@ import React from 'react';
 
 import { EuiTitle, EuiSpacer } from '@elastic/eui';
 
-import { MLJobEditor, EDITOR_MODE } from '../../../../jobs/jobs_list/components/ml_job_editor';
+import { MLJobEditor, ML_EDITOR_MODE } from '../../../../jobs/jobs_list/components/ml_job_editor';
 
 export function FileContents({ data, format, numberOfLines }) {
- let mode = EDITOR_MODE.TEXT;
- if (format === EDITOR_MODE.JSON) {
- mode = EDITOR_MODE.JSON;
+ let mode = ML_EDITOR_MODE.TEXT;
+ if (format === ML_EDITOR_MODE.JSON) {
+ mode = ML_EDITOR_MODE.JSON;
  }
 
  const formattedData = limitByNumberOfLines(data, numberOfLines);

diff --git a/...ns/ml/public/application/datavisualizer/file_based/components/import_settings/advanced.js b/...ns/ml/public/application/datavisualizer/file_based/components/import_settings/advanced.js
@@ -17,7 +17,7 @@ import {
  EuiFlexItem,
 } from '@elastic/eui';
 
-import { MLJobEditor, EDITOR_MODE } from '../../../../jobs/jobs_list/components/ml_job_editor';
+import { MLJobEditor, ML_EDITOR_MODE } from '../../../../jobs/jobs_list/components/ml_job_editor';
 const EDITOR_HEIGHT = '300px';
 
 export function AdvancedSettings({
@@ -149,7 +149,7 @@ function IndexSettings({ initialized, data, onChange }) {
  fullWidth
  >
  <MLJobEditor
- mode={EDITOR_MODE.JSON}
+ mode={ML_EDITOR_MODE.JSON}
  readOnly={initialized === true}
  value={data}
  height={EDITOR_HEIGHT}
@@ -175,7 +175,7 @@ function Mappings({ initialized, data, onChange }) {
  fullWidth
  >
  <MLJobEditor
- mode={EDITOR_MODE.JSON}
+ mode={ML_EDITOR_MODE.JSON}
  readOnly={initialized === true}
  value={data}
  height={EDITOR_HEIGHT}
@@ -201,7 +201,7 @@ function IngestPipeline({ initialized, data, onChange }) {
  fullWidth
  >
  <MLJobEditor
- mode={EDITOR_MODE.JSON}
+ mode={ML_EDITOR_MODE.JSON}
  readOnly={initialized === true}
  value={data}
  height={EDITOR_HEIGHT}

diff --git a/...lugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_job_flyout.js b/...lugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_job_flyout.js
@@ -30,6 +30,7 @@ import { mlMessageBarService } from '../../../../components/messagebar';
 import { withKibana } from '../../../../../../../../../../src/plugins/kibana_react/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
+import { collapseLiteralStrings } from '../../../../../../shared_imports';
 
 export class EditJobFlyoutUI extends Component {
  _initialJobFormState = null;
@@ -225,7 +226,7 @@ export class EditJobFlyoutUI extends Component {
  groups: this.state.jobGroups,
  mml: this.state.jobModelMemoryLimit,
  detectorDescriptions: this.state.jobDetectorDescriptions,
- datafeedQuery: this.state.datafeedQuery,
+ datafeedQuery: collapseLiteralStrings(this.state.datafeedQuery),
  datafeedQueryDelay: this.state.datafeedQueryDelay,
  datafeedFrequency: this.state.datafeedFrequency,
  datafeedScrollSize: this.state.datafeedScrollSize,

diff --git a/.../plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/datafeed.js b/.../plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/datafeed.js
@@ -12,7 +12,7 @@ import { EuiFieldText, EuiForm, EuiFormRow, EuiSpacer, EuiFieldNumber } from '@e
 import { calculateDatafeedFrequencyDefaultSeconds } from '../../../../../../../common/util/job_utils';
 import { getNewJobDefaults } from '../../../../../services/ml_server_info';
 import { parseInterval } from '../../../../../../../common/util/parse_interval';
-import { MLJobEditor } from '../../ml_job_editor';
+import { MLJobEditor, ML_EDITOR_MODE } from '../../ml_job_editor';
 import { FormattedMessage } from '@kbn/i18n/react';
 
 function getDefaults(bucketSpan, jobDefaults) {
@@ -85,7 +85,12 @@ export class Datafeed extends Component {
  }
  style={{ maxWidth: 'inherit' }}
  >
- <MLJobEditor value={query} onChange={this.onQueryChange} height="200px" />
+ <MLJobEditor
+ mode={ML_EDITOR_MODE.XJSON}
+ value={query}
+ onChange={this.onQueryChange}
+ height="200px"
+ />
  </EuiFormRow>
  <EuiFormRow
  label={

diff --git a/...ck/legacy/plugins/ml/public/application/jobs/jobs_list/components/job_details/json_tab.js b/...ck/legacy/plugins/ml/public/application/jobs/jobs_list/components/job_details/json_tab.js
@@ -9,14 +9,14 @@ import React from 'react';
 
 import { EuiSpacer } from '@elastic/eui';
 
-import { MLJobEditor } from '../ml_job_editor';
+import { ML_EDITOR_MODE, MLJobEditor } from '../ml_job_editor';
 
 export function JsonPane({ job }) {
  const json = JSON.stringify(job, null, 2);
  return (
  <React.Fragment>
  <EuiSpacer size="s" />
- <MLJobEditor value={json} readOnly={true} />
+ <MLJobEditor value={json} readOnly={true} mode={ML_EDITOR_MODE.XJSON} />
  </React.Fragment>
  );
 }

diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/jobs_list/components/ml_job_editor/index.ts b/x-pack/legacy/plugins/ml/public/application/jobs/jobs_list/components/ml_job_editor/index.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { MLJobEditor, EDITOR_MODE } from './ml_job_editor';
+export { MLJobEditor, ML_EDITOR_MODE } from './ml_job_editor';
diff --git a/...components/ml_job_editor/ml_job_editor.js → ...omponents/ml_job_editor/ml_job_editor.tsx b/...components/ml_job_editor/ml_job_editor.js → ...omponents/ml_job_editor/ml_job_editor.tsx
@@ -4,23 +4,38 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import PropTypes from 'prop-types';
-import React from 'react';
+import React, { FC } from 'react';
 
 import { EuiCodeEditor } from '@elastic/eui';
+import { expandLiteralStrings } from '../../../../../../shared_imports';
+import { xJsonMode } from '../../../../components/custom_hooks';
 
-export const EDITOR_MODE = { TEXT: 'text', JSON: 'json' };
+export const ML_EDITOR_MODE = { TEXT: 'text', JSON: 'json', XJSON: xJsonMode };
 
-export function MLJobEditor({
+interface MlJobEditorProps {
+ value: string;
+ height?: string;
+ width?: string;
+ mode?: typeof ML_EDITOR_MODE[keyof typeof ML_EDITOR_MODE];
+ readOnly?: boolean;
+ syntaxChecking?: boolean;
+ theme?: string;
+ onChange?: Function;
+}
+export const MLJobEditor: FC<MlJobEditorProps> = ({
  value,
  height = '500px',
  width = '100%',
- mode = EDITOR_MODE.JSON,
+ mode = ML_EDITOR_MODE.JSON,
  readOnly = false,
  syntaxChecking = true,
  theme = 'textmate',
  onChange = () => {},
-}) {
+}) => {
+ if (mode === ML_EDITOR_MODE.XJSON) {
+ value = expandLiteralStrings(value);
+ }
+
  return (
  <EuiCodeEditor
  value={value}
@@ -40,14 +55,4 @@ export function MLJobEditor({
  onChange={onChange}
  />
  );
-}
-MLJobEditor.propTypes = {
- value: PropTypes.string.isRequired,
- height: PropTypes.string,
- width: PropTypes.string,
- mode: PropTypes.string,
- readOnly: PropTypes.bool,
- syntaxChecking: PropTypes.bool,
- theme: PropTypes.string,
- onChange: PropTypes.func,
 };
diff --git a/...pplication/jobs/new_job/pages/components/common/json_editor_flyout/json_editor_flyout.tsx b/...pplication/jobs/new_job/pages/components/common/json_editor_flyout/json_editor_flyout.tsx
@@ -18,8 +18,9 @@ import {
  EuiFlyoutBody,
  EuiSpacer,
 } from '@elastic/eui';
+import { collapseLiteralStrings } from '../../../../../../../../shared_imports';
 import { Datafeed } from '../../../../common/job_creator/configs';
-import { MLJobEditor } from '../../../../../jobs_list/components/ml_job_editor';
+import { ML_EDITOR_MODE, MLJobEditor } from '../../../../../jobs_list/components/ml_job_editor';
 import { isValidJson } from '../../../../../../../../common/util/validation_utils';
 import { JobCreatorContext } from '../../job_creator_context';
 
@@ -68,10 +69,11 @@ export const JsonEditorFlyout: FC<Props> = ({ isDisabled, jobEditorMode, datafee
 
  function onDatafeedChange(json: string) {
  setDatafeedConfigString(json);
- let valid = isValidJson(json);
+ const jsonValue = collapseLiteralStrings(json);
+ let valid = isValidJson(jsonValue);
  if (valid) {
  // ensure that the user hasn't altered the indices list in the json.
- const { indices }: Datafeed = JSON.parse(json);
+ const { indices }: Datafeed = JSON.parse(jsonValue);
  const originalIndices = jobCreator.indices.sort();
  valid =
  originalIndices.length === indices.length &&
@@ -82,7 +84,7 @@ export const JsonEditorFlyout: FC<Props> = ({ isDisabled, jobEditorMode, datafee
 
  function onSave() {
  const jobConfig = JSON.parse(jobConfigString);
- const datafeedConfig = JSON.parse(datafeedConfigString);
+ const datafeedConfig = JSON.parse(collapseLiteralStrings(datafeedConfigString));
  jobCreator.cloneFromExistingJob(jobConfig, datafeedConfig);
  jobCreatorUpdate();
  setShowJsonFlyout(false);
@@ -191,6 +193,7 @@ const Contents: FC<{
  <MLJobEditor
  value={value}
  height={EDITOR_HEIGHT}
+ mode={ML_EDITOR_MODE.XJSON}
  readOnly={editJson === false}
  onChange={onChange}
  />

diff --git a/x-pack/legacy/plugins/ml/public/application/routing/routes/timeseriesexplorer.test.tsx b/x-pack/legacy/plugins/ml/public/application/routing/routes/timeseriesexplorer.test.tsx
@@ -52,6 +52,8 @@ jest.mock('../../util/dependency_cache', () => ({
  getToastNotifications: () => ({ addSuccess: jest.fn(), addDanger: jest.fn() }),
 }));
 
+jest.mock('../../../../shared_imports');
+
 describe('TimeSeriesExplorerUrlStateManager', () => {
  test('Initial render shows "No single metric jobs found"', () => {
  const props = {

diff --git a/x-pack/legacy/plugins/ml/shared_imports.ts b/x-pack/legacy/plugins/ml/shared_imports.ts
@@ -0,0 +1,12 @@
+/*
+ * 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.
+ */
+
+export { XJsonMode } from '../../../plugins/es_ui_shared/console_lang/ace/modes/x_json';
+
+export {
+ collapseLiteralStrings,
+ expandLiteralStrings,
+} from '../../../../src/plugins/es_ui_shared/console_lang/lib';
diff --git a/...legacy/plugins/monitoring/public/components/logstash/pipeline_listing/pipeline_listing.js b/...legacy/plugins/monitoring/public/components/logstash/pipeline_listing/pipeline_listing.js
@@ -145,6 +145,10 @@ export class PipelineListing extends Component {
  className,
  } = this.props;
 
+ const sortingOptions = sorting || { field: 'id', direction: 'asc' };
+ if (sortingOptions.field === 'name') {
+ sortingOptions.field = 'id';
+ }
  const columns = this.getColumns();
 
  return (
@@ -165,7 +169,7 @@ export class PipelineListing extends Component {
  className={className || 'logstashNodesTable'}
  rows={data}
  columns={columns}
- sorting={sorting}
+ sorting={sortingOptions}
  message={upgradeMessage}
  pagination={pagination}
  fetchMoreData={fetchMoreData}

diff --git a/x-pack/legacy/plugins/monitoring/server/lib/cluster/get_clusters_from_request.js b/x-pack/legacy/plugins/monitoring/server/lib/cluster/get_clusters_from_request.js
@@ -11,7 +11,7 @@ import { flagSupportedClusters } from './flag_supported_clusters';
 import { getMlJobsForCluster } from '../elasticsearch';
 import { getKibanasForClusters } from '../kibana';
 import { getLogstashForClusters } from '../logstash';
-import { getPipelines } from '../logstash/get_pipelines';
+import { getLogstashPipelineIds } from '../logstash/get_pipeline_ids';
 import { getBeatsForClusters } from '../beats';
 import { alertsClustersAggregation } from '../../cluster_alerts/alerts_clusters_aggregation';
 import { alertsClusterSearch } from '../../cluster_alerts/alerts_cluster_search';
@@ -36,7 +36,6 @@ import { checkCcrEnabled } from '../elasticsearch/ccr';
 import { getStandaloneClusterDefinition, hasStandaloneClusters } from '../standalone_clusters';
 import { getLogTypes } from '../logs';
 import { isInCodePath } from './is_in_code_path';
-import { getLogstashPipelineIds } from '../logstash/get_pipeline_ids';
 
 /**
  * Get all clusters or the cluster associated with {@code clusterUuid} when it is defined.
@@ -57,7 +56,6 @@ export async function getClustersFromRequest(
  } = indexPatterns;
 
  const config = req.server.config();
- const size = config.get('monitoring.ui.max_bucket_size');
  const isStandaloneCluster = clusterUuid === STANDALONE_CLUSTER_CLUSTER_UUID;
 
  let clusters = [];
@@ -181,22 +179,14 @@ export async function getClustersFromRequest(
  // add logstash data
  if (isInCodePath(codePaths, [CODE_PATH_LOGSTASH])) {
  const logstashes = await getLogstashForClusters(req, lsIndexPattern, clusters);
- const pipelines = await getLogstashPipelineIds(req, lsIndexPattern, { clusterUuid }, size);
- const clusterPipelineNodesCount = await getPipelines(req, lsIndexPattern, pipelines, [
- 'logstash_cluster_pipeline_nodes_count',
- ]);
- // add the logstash data to each cluster
+ const pipelines = await getLogstashPipelineIds(req, lsIndexPattern, { clusterUuid }, 1);
  logstashes.forEach(logstash => {
  const clusterIndex = findIndex(clusters, { cluster_uuid: logstash.clusterUuid });
 
- // withhold LS overview stats until pipeline metrics have at least one full bucket
- if (
- logstash.clusterUuid === req.params.clusterUuid &&
- clusterPipelineNodesCount.length === 0
- ) {
+ // withhold LS overview stats until there is at least 1 pipeline
+ if (logstash.clusterUuid === clusterUuid && !pipelines.length) {
  logstash.stats = {};
  }
-
  set(clusters[clusterIndex], 'logstash', logstash.stats);
  });
  }