Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into ml-apm-failure-co…
Browse files Browse the repository at this point in the history
…rrelation-in-flyout
  • Loading branch information
qn895 committed Aug 17, 2021
2 parents 6bbb68c + f243b05 commit ad490d2
Show file tree
Hide file tree
Showing 162 changed files with 3,648 additions and 1,115 deletions.
5 changes: 5 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Expand Up @@ -9,6 +9,9 @@
/dev_docs @elastic/kibana-tech-leads
/packages/kbn-docs-utils/ @elastic/kibana-tech-leads @elastic/kibana-operations

# Virtual teams
/x-pack/plugins/rule_registry/ @elastic/rac

# App
/x-pack/plugins/discover_enhanced/ @elastic/kibana-app
/x-pack/plugins/lens/ @elastic/kibana-app
Expand All @@ -31,6 +34,7 @@
/src/plugins/vis_type_pie/ @elastic/kibana-app
/src/plugins/visualize/ @elastic/kibana-app
/src/plugins/visualizations/ @elastic/kibana-app
/src/plugins/url_forwarding/ @elastic/kibana-app
/packages/kbn-tinymath/ @elastic/kibana-app

# Application Services
Expand Down Expand Up @@ -369,6 +373,7 @@
/x-pack/test/plugin_functional/plugins/resolver_test/ @elastic/security-solution
/x-pack/test/plugin_functional/test_suites/resolver/ @elastic/security-solution
/x-pack/plugins/security_solution/ @elastic/security-solution
/x-pack/plugins/metrics_entities/ @elastic/security-solution
/x-pack/test/detection_engine_api_integration @elastic/security-solution
/x-pack/test/lists_api_integration @elastic/security-solution
/x-pack/test/api_integration/apis/security_solution @elastic/security-solution
Expand Down
4 changes: 4 additions & 0 deletions examples/bfetch_explorer/kibana.json
Expand Up @@ -4,6 +4,10 @@
"version": "0.0.1",
"server": true,
"ui": true,
"owner": {
"name": "App Services",
"githubTeam": "kibana-app-services"
},
"requiredPlugins": ["bfetch", "developerExamples"],
"optionalPlugins": [],
"requiredBundles": ["kibanaReact"]
Expand Down
4 changes: 4 additions & 0 deletions examples/developer_examples/kibana.json
@@ -1,5 +1,9 @@
{
"id": "developerExamples",
"owner": {
"name": "Kibana Core",
"githubTeam": "kibana-core"
},
"kibanaVersion": "kibana",
"version": "0.0.1",
"ui": true
Expand Down
4 changes: 4 additions & 0 deletions examples/expressions_explorer/kibana.json
Expand Up @@ -4,6 +4,10 @@
"version": "0.0.1",
"server": false,
"ui": true,
"owner": {
"name": "App Services",
"githubTeam": "kibana-app-services"
},
"requiredPlugins": ["expressions", "inspector", "uiActions", "developerExamples"],
"optionalPlugins": [],
"requiredBundles": []
Expand Down
Expand Up @@ -108,6 +108,7 @@ describe('kuery functions', () => {
const node = nodeTypes.function.buildNode('geoBoundingBox', 'geo', params);
const result = geoBoundingBox.toElasticsearchQuery(node, indexPattern);

// @ts-expect-error @elastic/elasticsearch doesn't support ignore_unmapped in QueryDslGeoBoundingBoxQuery
expect(result.geo_bounding_box!.ignore_unmapped).toBe(true);
});

Expand Down
Expand Up @@ -53,6 +53,7 @@ export function toElasticsearchQuery(
}

return {
// @ts-expect-error @elastic/elasticsearch doesn't support ignore_unmapped in QueryDslGeoBoundingBoxQuery
geo_bounding_box: {
[fieldName]: queryParams,
ignore_unmapped: true,
Expand Down
1 change: 1 addition & 0 deletions packages/kbn-es-query/src/kuery/functions/geo_polygon.ts
Expand Up @@ -49,6 +49,7 @@ export function toElasticsearchQuery(
}

return {
// @ts-expect-error @elastic/elasticsearch doesn't support ignore_unmapped in QueryDslGeoPolygonQuery
geo_polygon: {
[fieldName]: queryParams,
ignore_unmapped: true,
Expand Down
3 changes: 2 additions & 1 deletion src/dev/build/tasks/copy_source_task.ts
Expand Up @@ -29,10 +29,11 @@ export const CopySource: Task = {
'!src/cli/dev.js',
'!src/functional_test_runner/**',
'!src/dev/**',
'!**/jest.config.js',
'!src/plugins/telemetry/schema/**', // Skip telemetry schemas
// this is the dev-only entry
'!src/setup_node_env/index.js',
'!**/public/**/*.{js,ts,tsx,json}',
'!**/public/**/*.{js,ts,tsx,json,scss}',
'typings/**',
'config/kibana.yml',
'config/node.options',
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/advanced_settings/kibana.json
Expand Up @@ -5,7 +5,7 @@
"ui": true,
"requiredPlugins": ["management"],
"optionalPlugins": ["home", "usageCollection"],
"requiredBundles": ["kibanaReact", "kibanaUtils", "home"],
"requiredBundles": ["kibanaReact", "kibanaUtils", "home", "esUiShared"],
"owner": {
"name": "Kibana App",
"githubTeam": "kibana-app"
Expand Down
Expand Up @@ -8,7 +8,6 @@

import React, { PureComponent, Fragment } from 'react';
import classNames from 'classnames';

import 'brace/theme/textmate';
import 'brace/mode/markdown';
import 'brace/mode/json';
Expand All @@ -19,7 +18,6 @@ import {
EuiCodeBlock,
EuiColorPicker,
EuiScreenReaderOnly,
EuiCodeEditor,
EuiDescribedFormGroup,
EuiFieldNumber,
EuiFieldText,
Expand All @@ -40,6 +38,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
import { FieldSetting, FieldState } from '../../types';
import { isDefaultValue } from '../../lib';
import { UiSettingsType, DocLinksStart, ToastsStart } from '../../../../../../core/public';
import { EuiCodeEditor } from '../../../../../es_ui_shared/public';

interface FieldProps {
setting: FieldSetting;
Expand Down
1 change: 1 addition & 0 deletions src/plugins/advanced_settings/tsconfig.json
Expand Up @@ -16,5 +16,6 @@
{ "path": "../home/tsconfig.json" },
{ "path": "../usage_collection/tsconfig.json" },
{ "path": "../kibana_react/tsconfig.json" },
{ "path": "../es_ui_shared/tsconfig.json" },
]
}
4 changes: 4 additions & 0 deletions src/plugins/console/kibana.json
Expand Up @@ -3,6 +3,10 @@
"version": "kibana",
"server": true,
"ui": true,
"owner": {
"name": "Stack Management",
"githubTeam": "kibana-stack-management"
},
"requiredPlugins": ["devTools"],
"optionalPlugins": ["usageCollection", "home"],
"requiredBundles": ["esUiShared", "kibanaReact", "kibanaUtils", "home"]
Expand Down
4 changes: 4 additions & 0 deletions src/plugins/dev_tools/kibana.json
Expand Up @@ -3,5 +3,9 @@
"version": "kibana",
"server": false,
"ui": true,
"owner": {
"name": "Stack Management",
"githubTeam": "kibana-stack-management"
},
"requiredPlugins": ["urlForwarding"]
}
19 changes: 7 additions & 12 deletions src/plugins/embeddable/kibana.json
Expand Up @@ -3,16 +3,11 @@
"version": "kibana",
"server": true,
"ui": true,
"requiredPlugins": [
"inspector",
"uiActions"
],
"extraPublicDirs": [
"public/lib/test_samples"
],
"requiredBundles": [
"savedObjects",
"kibanaReact",
"kibanaUtils"
]
"owner": {
"name": "App Services",
"githubTeam": "kibana-app-services"
},
"requiredPlugins": ["inspector", "uiActions"],
"extraPublicDirs": ["public/lib/test_samples"],
"requiredBundles": ["savedObjects", "kibanaReact", "kibanaUtils"]
}
8 changes: 5 additions & 3 deletions src/plugins/es_ui_shared/kibana.json
Expand Up @@ -3,14 +3,16 @@
"version": "kibana",
"ui": true,
"server": true,
"owner": {
"name": "Stack Management",
"githubTeam": "kibana-stack-management"
},
"extraPublicDirs": [
"static/validators/string",
"static/forms/hook_form_lib",
"static/forms/helpers",
"static/forms/components",
"static/forms/helpers/field_validators/types"
],
"requiredBundles": [
"data"
]
"requiredBundles": ["data"]
}
9 changes: 5 additions & 4 deletions src/plugins/expressions/kibana.json
Expand Up @@ -3,9 +3,10 @@
"version": "kibana",
"server": true,
"ui": true,
"owner": {
"name": "App Services",
"githubTeam": "kibana-app-services"
},
"extraPublicDirs": ["common", "common/fonts"],
"requiredBundles": [
"kibanaUtils",
"inspector"
]
"requiredBundles": ["kibanaUtils", "inspector"]
}
4 changes: 4 additions & 0 deletions src/plugins/inspector/kibana.json
Expand Up @@ -3,6 +3,10 @@
"version": "kibana",
"server": false,
"ui": true,
"owner": {
"name": "App Services",
"githubTeam": "kibana-app-services"
},
"extraPublicDirs": ["common", "common/adapters/request"],
"requiredBundles": ["kibanaReact"]
}
4 changes: 4 additions & 0 deletions src/plugins/kibana_react/kibana.json
Expand Up @@ -3,5 +3,9 @@
"version": "kibana",
"ui": true,
"server": false,
"owner": {
"name": "App Services",
"githubTeam": "kibana-app-services"
},
"extraPublicDirs": ["common"]
}
10 changes: 5 additions & 5 deletions src/plugins/kibana_utils/kibana.json
Expand Up @@ -3,9 +3,9 @@
"version": "kibana",
"ui": true,
"server": false,
"extraPublicDirs": [
"common",
"demos/state_containers/todomvc",
"common/state_containers"
]
"owner": {
"name": "App Services",
"githubTeam": "kibana-app-services"
},
"extraPublicDirs": ["common", "demos/state_containers/todomvc", "common/state_containers"]
}
4 changes: 4 additions & 0 deletions src/plugins/maps_ems/kibana.json
@@ -1,5 +1,9 @@
{
"id": "mapsEms",
"owner": {
"name": "GIS",
"githubTeam": "kibana-gis"
},
"version": "8.0.0",
"kibanaVersion": "kibana",
"configPath": ["map"],
Expand Down
4 changes: 4 additions & 0 deletions src/plugins/maps_legacy/kibana.json
@@ -1,5 +1,9 @@
{
"id": "mapsLegacy",
"owner": {
"name": "GIS",
"githubTeam": "kibana-gis"
},
"version": "8.0.0",
"kibanaVersion": "kibana",
"ui": true,
Expand Down
4 changes: 4 additions & 0 deletions src/plugins/navigation/kibana.json
@@ -1,5 +1,9 @@
{
"id": "navigation",
"owner": {
"name": "App Services",
"githubTeam": "kibana-app-services"
},
"version": "kibana",
"server": false,
"ui": true,
Expand Down
10 changes: 5 additions & 5 deletions src/plugins/region_map/kibana.json
@@ -1,5 +1,9 @@
{
"id": "regionMap",
"owner": {
"name": "GIS",
"githubTeam": "kibana-gis"
},
"version": "8.0.0",
"kibanaVersion": "kibana",
"ui": true,
Expand All @@ -13,9 +17,5 @@
"data",
"share"
],
"requiredBundles": [
"kibanaUtils",
"charts",
"visDefaultEditor"
]
"requiredBundles": ["kibanaUtils", "charts", "visDefaultEditor"]
}
4 changes: 4 additions & 0 deletions src/plugins/screenshot_mode/kibana.json
@@ -1,5 +1,9 @@
{
"id": "screenshotMode",
"owner": {
"name": "App Services",
"githubTeam": "kibana-app-services"
},
"version": "1.0.0",
"kibanaVersion": "kibana",
"ui": true,
Expand Down
4 changes: 4 additions & 0 deletions src/plugins/share/kibana.json
Expand Up @@ -3,6 +3,10 @@
"version": "kibana",
"server": true,
"ui": true,
"owner": {
"name": "App Services",
"githubTeam": "kibana-app-services"
},
"requiredBundles": ["kibanaUtils"],
"optionalPlugins": ["securityOss"]
}
10 changes: 5 additions & 5 deletions src/plugins/tile_map/kibana.json
@@ -1,5 +1,9 @@
{
"id": "tileMap",
"owner": {
"name": "GIS",
"githubTeam": "kibana-gis"
},
"version": "8.0.0",
"kibanaVersion": "kibana",
"ui": true,
Expand All @@ -13,9 +17,5 @@
"data",
"share"
],
"requiredBundles": [
"kibanaUtils",
"charts",
"visDefaultEditor"
]
"requiredBundles": ["kibanaUtils", "charts", "visDefaultEditor"]
}
9 changes: 5 additions & 4 deletions src/plugins/ui_actions/kibana.json
Expand Up @@ -3,8 +3,9 @@
"version": "kibana",
"server": false,
"ui": true,
"requiredBundles": [
"kibanaUtils",
"kibanaReact"
]
"owner": {
"name": "App Services",
"githubTeam": "kibana-app-services"
},
"requiredBundles": ["kibanaUtils", "kibanaReact"]
}
4 changes: 4 additions & 0 deletions src/plugins/url_forwarding/kibana.json
Expand Up @@ -3,5 +3,9 @@
"version": "kibana",
"server": false,
"ui": true,
"owner": {
"name": "Kibana App",
"githubTeam": "kibana-app"
},
"requiredPlugins": ["kibanaLegacy"]
}
2 changes: 1 addition & 1 deletion src/plugins/vis_type_vega/kibana.json
Expand Up @@ -5,7 +5,7 @@
"ui": true,
"requiredPlugins": ["data", "visualizations", "mapsEms", "expressions", "inspector"],
"optionalPlugins": ["home","usageCollection"],
"requiredBundles": ["kibanaUtils", "kibanaReact", "visDefaultEditor"],
"requiredBundles": ["kibanaUtils", "kibanaReact", "visDefaultEditor", "esUiShared"],
"owner": {
"name": "Kibana App",
"githubTeam": "kibana-app"
Expand Down
Expand Up @@ -7,13 +7,13 @@
*/

import React, { useCallback } from 'react';
import { EuiCodeEditor } from '@elastic/eui';
import compactStringify from 'json-stringify-pretty-compact';
import hjson from 'hjson';
import 'brace/mode/hjson';
import { i18n } from '@kbn/i18n';

import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
import { EuiCodeEditor } from '../../../es_ui_shared/public';
import { getNotifications } from '../services';
import { VisParams } from '../vega_fn';
import { VegaHelpMenu } from './vega_help_menu';
Expand Down
1 change: 1 addition & 0 deletions src/plugins/vis_type_vega/tsconfig.json
Expand Up @@ -26,5 +26,6 @@
{ "path": "../kibana_utils/tsconfig.json" },
{ "path": "../kibana_react/tsconfig.json" },
{ "path": "../vis_default_editor/tsconfig.json" },
{ "path": "../es_ui_shared/tsconfig.json" },
]
}

0 comments on commit ad490d2

Please sign in to comment.