Merge branch 'master' into update-registry-in-ci

.ci/end2end.groovy

@@ -14,6 +14,7 @@ pipeline {
  HOME = "${env.WORKSPACE}"
  E2E_DIR = 'x-pack/plugins/apm/e2e'
  PIPELINE_LOG_LEVEL = 'DEBUG'
+ KBN_OPTIMIZER_THEMES = 'v7light'
  }
  options {
  timeout(time: 1, unit: 'HOURS')

.github/PULL_REQUEST_TEMPLATE.md

@@ -11,7 +11,7 @@ Delete any items that are not applicable to this PR.
 - [ ] [Unit or functional tests](https:/elastic/kibana/blob/master/CONTRIBUTING.md#cross-browser-compatibility) were updated or added to match the most common scenarios
 - [ ] This was checked for [keyboard-only and screenreader accessibility](https://developer.mozilla.org/en-US/docs/Learn/Tools_and_testing/Cross_browser_testing/Accessibility#Accessibility_testing_checklist)
 - [ ] This renders correctly on smaller devices using a responsive layout. (You can test this [in your browser](https://www.browserstack.com/guide/responsive-testing-on-local-server)
-- [ ] This was checked for cross-browser compatibility, [including a check against IE11](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#cross-browser-compatibility)
+- [ ] This was checked for [cross-browser compatibility](https://www.elastic.co/support/matrix#matrix_browsers)
 
 ### For maintainers
 

package.json

@@ -123,7 +123,7 @@
  "@babel/plugin-transform-modules-commonjs": "^7.10.1",
  "@babel/register": "^7.10.1",
  "@elastic/apm-rum": "^5.2.0",
- "@elastic/charts": "19.6.3",
+ "@elastic/charts": "19.7.0",
  "@elastic/datemath": "5.0.3",
  "@elastic/ems-client": "7.9.3",
  "@elastic/eui": "24.1.0",

packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts

@@ -63,7 +63,8 @@ afterAll(async () => {
  await del(TMP_DIR);
 });
 
-it('builds expected bundles, saves bundle counts to metadata', async () => {
+// FLAKY: https:/elastic/kibana/issues/70762
+it.skip('builds expected bundles, saves bundle counts to metadata', async () => {
  const config = OptimizerConfig.create({
  repoRoot: MOCK_REPO_DIR,
  pluginScanDirs: [Path.resolve(MOCK_REPO_DIR, 'plugins')],
@@ -167,7 +168,8 @@ it('builds expected bundles, saves bundle counts to metadata', async () => {
  `);
 });
 
-it('uses cache on second run and exist cleanly', async () => {
+// FLAKY: https:/elastic/kibana/issues/70764
+it.skip('uses cache on second run and exist cleanly', async () => {
  const config = OptimizerConfig.create({
  repoRoot: MOCK_REPO_DIR,
  pluginScanDirs: [Path.resolve(MOCK_REPO_DIR, 'plugins')],

packages/kbn-ui-shared-deps/package.json

@@ -9,7 +9,7 @@
  "kbn:watch": "node scripts/build --dev --watch"
  },
  "dependencies": {
- "@elastic/charts": "19.6.3",
+ "@elastic/charts": "19.7.0",
  "@elastic/eui": "24.1.0",
  "@elastic/numeral": "^2.5.0",
  "@kbn/i18n": "1.0.0",

src/plugins/data/public/ui/query_string_input/no_data_popover.tsx

@@ -56,7 +56,7 @@ export function NoDataPopover({
  <p style={{ maxWidth: 300 }}>
  {i18n.translate('data.noDataPopover.content', {
  defaultMessage:
- "This time range doesn't contain any data. Increase or adjust the time range to see more fields and create charts",
+ "This time range doesn't contain any data. Increase or adjust the time range to see more fields and create charts.",
  })}
  </p>
  </EuiText>
@@ -66,11 +66,13 @@ export function NoDataPopover({
  step={1}
  stepsTotal={1}
  isStepOpen={noDataPopoverVisible}
- subtitle={i18n.translate('data.noDataPopover.title', { defaultMessage: 'Tip' })}
- title=""
+ subtitle={i18n.translate('data.noDataPopover.subtitle', { defaultMessage: 'Tip' })}
+ title={i18n.translate('data.noDataPopover.title', { defaultMessage: 'Empty dataset' })}
  footerAction={
  <EuiButtonEmpty
- size="s"
+ size="xs"
+ flush="right"
+ color="text"
  data-test-subj="noDataPopoverDismissButton"
  onClick={() => {
  storage.set(NO_DATA_POPOVER_STORAGE_KEY, true);

src/plugins/data/server/saved_objects/index.ts

@@ -16,8 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-export { searchSavedObjectType } from './search';
 export { querySavedObjectType } from './query';
 export { indexPatternSavedObjectType } from './index_patterns';
 export { kqlTelemetry } from './kql_telementry';

src/plugins/data/server/search/search_service.ts

@@ -27,7 +27,6 @@ import {
 } from './types';
 import { registerSearchRoute } from './routes';
 import { ES_SEARCH_STRATEGY, esSearchStrategyProvider } from './es_search';
-import { searchSavedObjectType } from '../saved_objects';
 import { DataPluginStart } from '../plugin';
 
 export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
@@ -36,8 +35,6 @@ export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
  constructor(private initializerContext: PluginInitializerContext) {}
 
  public setup(core: CoreSetup<object, DataPluginStart>): ISearchSetup {
- core.savedObjects.registerType(searchSavedObjectType);
-
  this.registerSearchStrategy(
  ES_SEARCH_STRATEGY,
  esSearchStrategyProvider(this.initializerContext.config.legacy.globalConfig$)

src/plugins/discover/server/plugin.ts

@@ -20,11 +20,13 @@
 import { CoreSetup, CoreStart, Plugin } from 'kibana/server';
 import { uiSettings } from './ui_settings';
 import { capabilitiesProvider } from './capabilities_provider';
+import { searchSavedObjectType } from './saved_objects';
 
 export class DiscoverServerPlugin implements Plugin<object, object> {
  public setup(core: CoreSetup) {
  core.capabilities.registerProvider(capabilitiesProvider);
  core.uiSettings.register(uiSettings);
+ core.savedObjects.registerType(searchSavedObjectType);
 
  return {};
  }

src/plugins/discover/server/saved_objects/index.ts

@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+
+export { searchSavedObjectType } from './search';

src/plugins/data/server/saved_objects/search.ts → src/plugins/discover/server/saved_objects/search.ts

@@ -18,7 +18,7 @@
  */
 
 import { SavedObjectsType } from 'kibana/server';
-import { searchSavedObjectTypeMigrations } from './search_migrations';
+import { searchMigrations } from './search_migrations';
 
 export const searchSavedObjectType: SavedObjectsType = {
  name: 'search',
@@ -43,18 +43,18 @@ export const searchSavedObjectType: SavedObjectsType = {
  },
  mappings: {
  properties: {
- columns: { type: 'keyword' },
+ columns: { type: 'keyword', index: false },
  description: { type: 'text' },
- hits: { type: 'integer' },
+ hits: { type: 'integer', index: false },
  kibanaSavedObjectMeta: {
  properties: {
- searchSourceJSON: { type: 'text' },
+ searchSourceJSON: { type: 'text', index: false },
  },
  },
- sort: { type: 'keyword' },
+ sort: { type: 'keyword', index: false },
  title: { type: 'text' },
  version: { type: 'integer' },
  },
  },
- migrations: searchSavedObjectTypeMigrations as any,
+ migrations: searchMigrations as any,
 };

src/plugins/data/server/saved_objects/search_migrations.test.ts → src/plugins/discover/server/saved_objects/search_migrations.test.ts

@@ -18,13 +18,13 @@
  */
 
 import { SavedObjectMigrationContext } from 'kibana/server';
-import { searchSavedObjectTypeMigrations } from './search_migrations';
+import { searchMigrations } from './search_migrations';
 
 const savedObjectMigrationContext = (null as unknown) as SavedObjectMigrationContext;
 
 describe('migration search', () => {
  describe('6.7.2', () => {
- const migrationFn = searchSavedObjectTypeMigrations['6.7.2'];
+ const migrationFn = searchMigrations['6.7.2'];
 
  it('should migrate obsolete match_all query', () => {
  const migratedDoc = migrationFn(
@@ -56,7 +56,7 @@ describe('migration search', () => {
  });
 
  describe('7.0.0', () => {
- const migrationFn = searchSavedObjectTypeMigrations['7.0.0'];
+ const migrationFn = searchMigrations['7.0.0'];
 
  test('skips errors when searchSourceJSON is null', () => {
  const doc = {
@@ -278,7 +278,7 @@ Object {
  });
 
  describe('7.4.0', function () {
- const migrationFn = searchSavedObjectTypeMigrations['7.4.0'];
+ const migrationFn = searchMigrations['7.4.0'];
 
  test('transforms one dimensional sort arrays into two dimensional arrays', () => {
  const doc = {

src/plugins/data/server/saved_objects/search_migrations.ts → src/plugins/discover/server/saved_objects/search_migrations.ts

@@ -19,7 +19,7 @@
 
 import { flow, get } from 'lodash';
 import { SavedObjectMigrationFn } from 'kibana/server';
-import { DEFAULT_QUERY_LANGUAGE } from '../../common';
+import { DEFAULT_QUERY_LANGUAGE } from '../../../data/common';
 
 const migrateMatchAllQuery: SavedObjectMigrationFn<any, any> = (doc) => {
  const searchSourceJSON = get(doc, 'attributes.kibanaSavedObjectMeta.searchSourceJSON');
@@ -121,7 +121,7 @@ const migrateSearchSortToNestedArray: SavedObjectMigrationFn<any, any> = (doc) =
  };
 };
 
-export const searchSavedObjectTypeMigrations = {
+export const searchMigrations = {
  '6.7.2': flow(migrateMatchAllQuery),
  '7.0.0': flow(setNewReferences),
  '7.4.0': flow(migrateSearchSortToNestedArray),

src/plugins/expressions/common/execution/execution.test.ts

@@ -475,17 +475,6 @@ describe('Execution', () => {
  }
  });
 
- test('sets duration to 10 milliseconds when function executes 10 milliseconds', async () => {
- const execution = createExecution('sleep 10', {}, true);
- execution.start(-1);
- await execution.result;
-
- const node = execution.state.get().ast.chain[0];
- expect(typeof node.debug?.duration).toBe('number');
- expect(node.debug?.duration).toBeLessThan(50);
- expect(node.debug?.duration).toBeGreaterThanOrEqual(5);
- });
-
  test('adds .debug field in expression AST on each executed function', async () => {
  const execution = createExecution('add val=1 | add val=2 | add val=3', {}, true);
  execution.start(-1);

src/plugins/home/server/services/tutorials/lib/tutorials_registry_types.ts

@@ -82,7 +82,7 @@ export interface TutorialSchema {
  name: string;
  isBeta?: boolean;
  shortDescription: string;
- euiIconType?: IconType; // EUI icon type string, one of https://elastic.github.io/eui/#/icon;
+ euiIconType?: IconType; // EUI icon type string, one of https://elastic.github.io/eui/#/display/icons;
  longDescription: string;
  completionTimeMinutes?: number;
  previewImagePath?: string;

src/plugins/home/server/tutorials/googlecloud_metrics/index.ts

@@ -0,0 +1,77 @@
+/*
+ * 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 { i18n } from '@kbn/i18n';
+import { TutorialsCategory } from '../../services/tutorials';
+import {
+ onPremInstructions,
+ cloudInstructions,
+ onPremCloudInstructions,
+} from '../instructions/metricbeat_instructions';
+import {
+ TutorialContext,
+ TutorialSchema,
+} from '../../services/tutorials/lib/tutorials_registry_types';
+
+export function googlecloudMetricsSpecProvider(context: TutorialContext): TutorialSchema {
+ const moduleName = 'googlecloud';
+ return {
+ id: 'googlecloudMetrics',
+ name: i18n.translate('home.tutorials.googlecloudMetrics.nameTitle', {
+ defaultMessage: 'Google Cloud metrics',
+ }),
+ category: TutorialsCategory.METRICS,
+ shortDescription: i18n.translate('home.tutorials.googlecloudMetrics.shortDescription', {
+ defaultMessage:
+ 'Fetch monitoring metrics from Google Cloud Platform using Stackdriver Monitoring API.',
+ }),
+ longDescription: i18n.translate('home.tutorials.googlecloudMetrics.longDescription', {
+ defaultMessage:
+ 'The `googlecloud` Metricbeat module fetches monitoring metrics from Google Cloud Platform using Stackdriver Monitoring API. \
+[Learn more]({learnMoreLink}).',
+ values: {
+ learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-googlecloud.html',
+ },
+ }),
+ euiIconType: 'logoGCP',
+ isBeta: false,
+ artifacts: {
+ dashboards: [
+ {
+ id: 'f40ee870-5e4a-11ea-a4f6-717338406083',
+ linkLabel: i18n.translate(
+ 'home.tutorials.googlecloudMetrics.artifacts.dashboards.linkLabel',
+ {
+ defaultMessage: 'Google Cloud metrics dashboard',
+ }
+ ),
+ isOverview: true,
+ },
+ ],
+ exportedFields: {
+ documentationUrl: '{config.docs.beats.metricbeat}/exported-fields-googlecloud.html',
+ },
+ },
+ completionTimeMinutes: 10,
+ previewImagePath: '/plugins/home/assets/googlecloud_metrics/screenshot.png',
+ onPrem: onPremInstructions(moduleName, context),
+ elasticCloud: cloudInstructions(moduleName),
+ onPremElasticCloud: onPremCloudInstructions(moduleName),
+ };
+}

src/plugins/home/server/tutorials/register.ts

@@ -91,6 +91,7 @@ import { openmetricsMetricsSpecProvider } from './openmetrics_metrics';
 import { oracleMetricsSpecProvider } from './oracle_metrics';
 import { iisMetricsSpecProvider } from './iis_metrics';
 import { azureLogsSpecProvider } from './azure_logs';
+import { googlecloudMetricsSpecProvider } from './googlecloud_metrics';
 
 export const builtInTutorials = [
  systemLogsSpecProvider,
@@ -168,4 +169,5 @@ export const builtInTutorials = [
  oracleMetricsSpecProvider,
  iisMetricsSpecProvider,
  azureLogsSpecProvider,
+ googlecloudMetricsSpecProvider,
 ];

test/functional/apps/dashboard/index.js

@@ -49,6 +49,7 @@ export default function ({ getService, loadTestFile }) {
  after(unloadCurrentData);
 
  loadTestFile(require.resolve('./empty_dashboard'));
+ loadTestFile(require.resolve('./url_field_formatter'));
  loadTestFile(require.resolve('./embeddable_rendering'));
  loadTestFile(require.resolve('./create_and_add_embeddables'));
  loadTestFile(require.resolve('./edit_embeddable_redirects'));