Merge branch 'master' of github.com:elastic/kibana into feat/hosts-kp…

…i-search-strategy
elastic · Sep 21, 2020 · 6d81c7e · 6d81c7e
2 parents 845f947 + ba8213c
commit 6d81c7e
Show file tree

Hide file tree

Showing 46 changed files with 827 additions and 831 deletions.
diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
@@ -181,6 +181,12 @@ which also contains the timelion APIs and backend, look at the vis_type_timelion
 To integrate with the telemetry services for usage collection of your feature, there are 2 steps:
 
 
+|{kib-repo}blob/{branch}/src/plugins/vis_default_editor/README.md[visDefaultEditor]
+|The default editor is used in most primary visualizations, e.x. Area, Data table, Pie, etc.
+It acts as a container for a particular visualization and options tabs. Contains the default "Data" tab in public/components/sidebar/data_tab.tsx.
+The plugin exposes the static DefaultEditorController class to consume.
+
+
 |{kib-repo}blob/{branch}/src/plugins/vis_type_markdown/README.md[visTypeMarkdown]
 |The markdown visualization that can be used to place text panels on dashboards.
 

diff --git a/src/plugins/charts/kibana.json b/src/plugins/charts/kibana.json
@@ -3,5 +3,5 @@
   "version": "kibana",
   "server": true,
   "ui": true,
-  "requiredBundles": ["kibanaUtils", "kibanaReact", "data"]
+  "requiredBundles": ["visDefaultEditor"]
 }
diff --git a/src/plugins/console/server/lib/spec_definitions/js/mappings.ts b/src/plugins/console/server/lib/spec_definitions/js/mappings.ts
@@ -157,58 +157,65 @@ export const mappings = (specService: SpecDefinitionsService) => {
 
           // dates
           format: {
+            // outer array required to for an array of string values
             __one_of: [
-              ...[
-                'date',
-                'date_time',
-                'date_time_no_millis',
-                'ordinal_date',
-                'ordinal_date_time',
-                'ordinal_date_time_no_millis',
-                'time',
-                'time_no_millis',
-                't_time',
-                't_time_no_millis',
-                'week_date',
-                'week_date_time',
-                'week_date_time_no_millis',
-              ].map(function (s) {
-                return ['basic_' + s, 'strict_' + s];
-              }),
-              ...[
-                'date',
-                'date_hour',
-                'date_hour_minute',
-                'date_hour_minute_second',
-                'date_hour_minute_second_fraction',
-                'date_hour_minute_second_millis',
-                'date_optional_time',
-                'date_time',
-                'date_time_no_millis',
-                'hour',
-                'hour_minute',
-                'hour_minute_second',
-                'hour_minute_second_fraction',
-                'hour_minute_second_millis',
-                'ordinal_date',
-                'ordinal_date_time',
-                'ordinal_date_time_no_millis',
-                'time',
-                'time_no_millis',
-                't_time',
-                't_time_no_millis',
-                'week_date',
-                'week_date_time',
-                'weekDateTimeNoMillis',
-                'week_year',
-                'weekyearWeek',
-                'weekyearWeekDay',
-                'year',
-                'year_month',
-                'year_month_day',
-                'epoch_millis',
-                'epoch_second',
-              ],
+              [
+                ...[
+                  'date',
+                  'date_time',
+                  'date_time_no_millis',
+                  'ordinal_date',
+                  'ordinal_date_time',
+                  'ordinal_date_time_no_millis',
+                  'time',
+                  'time_no_millis',
+                  't_time',
+                  't_time_no_millis',
+                  'week_date',
+                  'week_date_time',
+                  'week_date_time_no_millis',
+                ].flatMap(function (s) {
+                  return ['basic_' + s, 'strict_' + s];
+                }),
+                ...[
+                  'date',
+                  'date_hour',
+                  'date_hour_minute',
+                  'date_hour_minute_second',
+                  'date_hour_minute_second_fraction',
+                  'date_hour_minute_second_millis',
+                  'date_optional_time',
+                  'date_time',
+                  'date_time_no_millis',
+                  'hour',
+                  'hour_minute',
+                  'hour_minute_second',
+                  'hour_minute_second_fraction',
+                  'hour_minute_second_millis',
+                  'ordinal_date',
+                  'ordinal_date_time',
+                  'ordinal_date_time_no_millis',
+                  'time',
+                  'time_no_millis',
+                  't_time',
+                  't_time_no_millis',
+                  'week_date',
+                  'week_date_time',
+                  'weekDateTimeNoMillis',
+                  'weekyear',
+                  'strict_weekyear',
+                  'weekyear_week',
+                  'strict_weekyear_week',
+                  'strict_date_optional_time_nanos',
+                  'weekyear_week_day',
+                  'strict_weekyear_week_day',
+                  'year',
+                  'year_month',
+                  'year_month_day',
+                  'epoch_millis',
+                  'epoch_second',
+                ],
+              ].sort(),
             ],
           },
 

diff --git a/src/plugins/input_control_vis/kibana.json b/src/plugins/input_control_vis/kibana.json
@@ -4,6 +4,6 @@
   "kibanaVersion": "kibana",
   "server": true,
   "ui": true,
-  "requiredPlugins": ["data", "expressions", "visualizations"],
+  "requiredPlugins": ["data", "expressions", "visualizations", "visDefaultEditor"],
   "requiredBundles": ["kibanaReact"]
 }
diff --git a/src/plugins/region_map/kibana.json b/src/plugins/region_map/kibana.json
@@ -14,7 +14,7 @@
   ],
   "requiredBundles": [
     "kibanaUtils",
-    "kibanaReact",
-    "charts"
+    "charts", 
+    "visDefaultEditor"
   ]
 }
diff --git a/src/plugins/tile_map/kibana.json b/src/plugins/tile_map/kibana.json
@@ -14,7 +14,7 @@
   ],
   "requiredBundles": [
     "kibanaUtils",
-    "kibanaReact",
-    "charts"
+    "charts",
+    "visDefaultEditor"
   ]
 }
diff --git a/src/plugins/vis_default_editor/kibana.json b/src/plugins/vis_default_editor/kibana.json
@@ -0,0 +1,6 @@
+{
+  "id": "visDefaultEditor",
+  "version": "kibana",
+  "ui": true,
+  "requiredBundles": ["kibanaUtils", "kibanaReact", "data"]
+}
diff --git a/src/plugins/vis_default_editor/public/index.ts b/src/plugins/vis_default_editor/public/index.ts
@@ -24,3 +24,11 @@ export * from './editor_size';
 export * from './vis_options_props';
 export * from './utils';
 export { ISchemas, Schemas, Schema } from './schemas';
+
+/** dummy plugin, we just want visDefaultEditor to have its own bundle */
+export function plugin() {
+  return new (class VisDefaultEditor {
+    setup() {}
+    start() {}
+  })();
+}
diff --git a/src/plugins/vis_type_markdown/kibana.json b/src/plugins/vis_type_markdown/kibana.json
@@ -4,5 +4,5 @@
     "ui": true,
     "server": true,
     "requiredPlugins": ["expressions", "visualizations"],
-    "requiredBundles": ["kibanaUtils", "kibanaReact", "data", "charts", "visualizations", "expressions"]
+    "requiredBundles": ["kibanaUtils", "kibanaReact", "charts", "visualizations", "expressions", "visDefaultEditor"]
 }
diff --git a/src/plugins/vis_type_metric/kibana.json b/src/plugins/vis_type_metric/kibana.json
@@ -5,5 +5,5 @@
   "server": true,
   "ui": true,
   "requiredPlugins": ["data", "visualizations", "charts", "expressions"],
-  "requiredBundles": ["kibanaUtils", "kibanaReact"]
+  "requiredBundles": ["kibanaUtils", "visDefaultEditor"]
 }
diff --git a/src/plugins/vis_type_table/kibana.json b/src/plugins/vis_type_table/kibana.json
@@ -11,8 +11,8 @@
   ],
   "requiredBundles": [
     "kibanaUtils",
-    "kibanaReact",
     "share",
-    "charts"
+    "charts",
+    "visDefaultEditor"
   ]
 }
diff --git a/src/plugins/vis_type_tagcloud/kibana.json b/src/plugins/vis_type_tagcloud/kibana.json
@@ -4,5 +4,5 @@
   "ui": true,
   "server": true,
   "requiredPlugins": ["data", "expressions", "visualizations", "charts"],
-  "requiredBundles": ["kibanaUtils", "kibanaReact"]
+  "requiredBundles": ["kibanaUtils", "kibanaReact", "visDefaultEditor"]
 }
diff --git a/src/plugins/vis_type_timelion/kibana.json b/src/plugins/vis_type_timelion/kibana.json
@@ -5,5 +5,5 @@
   "server": true,
   "ui": true,
   "requiredPlugins": ["visualizations", "data", "expressions"],
-  "requiredBundles": ["kibanaUtils", "kibanaReact"]
+  "requiredBundles": ["kibanaUtils", "kibanaReact", "visDefaultEditor"]
 }
diff --git a/src/plugins/vis_type_vega/kibana.json b/src/plugins/vis_type_vega/kibana.json
@@ -4,5 +4,5 @@
   "server": true,
   "ui": true,
   "requiredPlugins": ["data", "visualizations", "mapsLegacy", "expressions", "inspector"],
-  "requiredBundles": ["kibanaUtils", "kibanaReact"]
+  "requiredBundles": ["kibanaUtils", "kibanaReact", "visDefaultEditor"]
 }
diff --git a/src/plugins/vis_type_vislib/kibana.json b/src/plugins/vis_type_vislib/kibana.json
@@ -5,5 +5,5 @@
   "ui": true,
   "requiredPlugins": ["charts", "data", "expressions", "visualizations", "kibanaLegacy"],
   "optionalPlugins": ["visTypeXy"],
-  "requiredBundles": ["kibanaUtils", "kibanaReact"]
+  "requiredBundles": ["kibanaUtils", "visDefaultEditor"]
 }
diff --git a/src/plugins/visualize/kibana.json b/src/plugins/visualize/kibana.json
@@ -18,6 +18,7 @@
     "kibanaUtils",
     "kibanaReact",
     "home",
-    "discover"
+    "discover",
+    "visDefaultEditor"
   ]
 }
diff --git a/x-pack/plugins/apm/public/components/app/Settings/anomaly_detection/jobs_list.tsx b/x-pack/plugins/apm/public/components/app/Settings/anomaly_detection/jobs_list.tsx
@@ -97,7 +97,7 @@ export function JobsList({ data, status, onAddEnvironments }: Props) {
           defaultMessage="To add anomaly detection to a new environment, create a machine learning job. Existing machine learning jobs can be managed in {mlJobsLink}."
           values={{
             mlJobsLink: (
-              <MLLink path="jobs">
+              <MLLink path="/jobs">
                 {i18n.translate(
                   'xpack.apm.settings.anomalyDetection.jobList.mlDescriptionText.mlJobsLinkText',
                   {

diff --git a/x-pack/plugins/apm/public/components/shared/Links/MachineLearningLinks/MLLink.test.tsx b/x-pack/plugins/apm/public/components/shared/Links/MachineLearningLinks/MLLink.test.tsx
@@ -21,6 +21,6 @@ test('MLLink produces the correct URL', async () => {
   );
 
   expect(href).toMatchInlineSnapshot(
-    `"/basepath/app/ml#/some/path?_g=(ml:(jobIds:!(something)),refreshInterval:(pause:!t,value:0),time:(from:now-5h,to:now-2h))"`
+    `"/basepath/app/ml#/some/path?_g=(ml:(jobIds:!(something)),refreshInterval:(pause:!t,value:0),time:(from:now-5h,to:now-2h))&mlManagement=(groupIds:!(apm))"`
   );
 });
diff --git a/x-pack/plugins/apm/public/components/shared/Links/MachineLearningLinks/MLLink.tsx b/x-pack/plugins/apm/public/components/shared/Links/MachineLearningLinks/MLLink.tsx
@@ -39,7 +39,9 @@ export function MLLink({ children, path = '', query = {}, external }: Props) {
 
   const href = url.format({
     pathname: core.http.basePath.prepend('/app/ml'),
-    hash: `${path}?_g=${rison.encode(risonQuery as RisonValue)}`,
+    hash: `${path}?_g=${rison.encode(
+      risonQuery as RisonValue
+    )}&mlManagement=${rison.encode({ groupIds: ['apm'] })}`,
   });
 
   return (

diff --git a/x-pack/plugins/apm/scripts/aggregate-latency-metrics/index.ts b/x-pack/plugins/apm/scripts/aggregate-latency-metrics/index.ts
@@ -389,7 +389,7 @@ export async function aggregateLatencyMetrics() {
               return;
             }
 
-            const response = await destClient?.bulk({
+            const response = await (destClient as any)?.bulk({
               refresh: 'wait_for',
               body: flatten(
                 docs.map((doc) => [

diff --git a/x-pack/plugins/apm/scripts/eslint.js b/x-pack/plugins/apm/scripts/eslint.js
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+//eslint-disable-next-line import/no-extraneous-dependencies
+const { CLIEngine } = require('eslint');
+const { resolve } = require('path');
+//eslint-disable-next-line import/no-extraneous-dependencies
+const { argv } = require('yargs');
+
+async function run() {
+  const fix = !!argv.fix;
+
+  const engine = new CLIEngine({
+    fix,
+    cache: true,
+    extensions: ['.js', '.jsx', '.ts', '.tsx'],
+  });
+
+  const report = engine.executeOnFiles(resolve(__dirname, '..'));
+
+  const formatter = engine.getFormatter();
+
+  return formatter(report.results);
+}
+
+run()
+  .then((text) => {
+    //eslint-disable-next-line no-console
+    console.log(text);
+    process.exit(0);
+  })
+  .catch((err) => {
+    console.error(err);
+    process.exit(1);
+  });
diff --git a/x-pack/plugins/apm/scripts/jest.js b/x-pack/plugins/apm/scripts/jest.js
@@ -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.
+ */
+// eslint-disable-next-line import/no-extraneous-dependencies
+require('@babel/register')({
+  extensions: ['.js'],
+  plugins: [],
+  presets: [
+    '@babel/typescript',
+    ['@babel/preset-env', { targets: { node: 'current' } }],
+  ],
+});
+
+// eslint-disable-next-line import/no-extraneous-dependencies
+const { run } = require('jest');
+
+process.env.NODE_ENV = process.env.NODE_ENV || 'test';
+
+const config = require('../jest.config.js');
+
+const argv = [...process.argv.slice(2), '--config', JSON.stringify(config)];
+
+run(argv);