Skip to content

Commit ffdd91c

Browse files
committed
Merge branch 'security/record-subfeature-usage' of github.com:legrego/kibana into security/record-subfeature-usage
2 parents 2974118 + 9a4e07d commit ffdd91c

File tree

215 files changed

+27160
-3244
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

215 files changed

+27160
-3244
lines changed

.eslintignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ target
2626
/src/plugins/vis_type_timelion/public/_generated_/**
2727
/src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.*
2828
/x-pack/legacy/plugins/**/__tests__/fixtures/**
29-
/x-pack/plugins/apm/e2e/cypress/**/snapshots.js
29+
/x-pack/plugins/apm/e2e/**/snapshots.js
30+
/x-pack/plugins/apm/e2e/tmp/*
3031
/x-pack/plugins/canvas/canvas_plugin
3132
/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts
3233
/x-pack/plugins/canvas/shareable_runtime/build

.github/CODEOWNERS

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
/x-pack/plugins/dashboard_enhanced/ @elastic/kibana-app
77
/x-pack/plugins/lens/ @elastic/kibana-app
88
/x-pack/plugins/graph/ @elastic/kibana-app
9-
/src/legacy/server/url_shortening/ @elastic/kibana-app
10-
/src/legacy/server/sample_data/ @elastic/kibana-app
119
/src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
12-
/src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
1310
/src/plugins/dashboard/ @elastic/kibana-app
1411
/src/plugins/discover/ @elastic/kibana-app
1512
/src/plugins/input_control_vis/ @elastic/kibana-app

.gitignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ package-lock.json
4444
*.sublime-*
4545
npm-debug.log*
4646
.tern-project
47-
x-pack/plugins/apm/tsconfig.json
48-
apm.tsconfig.json
49-
/x-pack/legacy/plugins/apm/e2e/snapshots.js
50-
/x-pack/plugins/apm/e2e/snapshots.js
5147
.nyc_output
48+
49+
# apm plugin
50+
/x-pack/plugins/apm/tsconfig.json
51+
apm.tsconfig.json

CONTRIBUTING.md

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,44 @@ A high level overview of our contributing guidelines.
1313
- ["My issue isn't getting enough attention"](#my-issue-isnt-getting-enough-attention)
1414
- ["I want to help!"](#i-want-to-help)
1515
- [How We Use Git and GitHub](#how-we-use-git-and-github)
16+
- [Forking](#forking)
1617
- [Branching](#branching)
1718
- [Commits and Merging](#commits-and-merging)
19+
- [Rebasing and fixing merge conflicts](#rebasing-and-fixing-merge-conflicts)
1820
- [What Goes Into a Pull Request](#what-goes-into-a-pull-request)
1921
- [Contributing Code](#contributing-code)
2022
- [Setting Up Your Development Environment](#setting-up-your-development-environment)
23+
- [Increase node.js heap size](#increase-nodejs-heap-size)
24+
- [Running Elasticsearch Locally](#running-elasticsearch-locally)
25+
- [Nightly snapshot (recommended)](#nightly-snapshot-recommended)
26+
- [Keeping data between snapshots](#keeping-data-between-snapshots)
27+
- [Source](#source)
28+
- [Archive](#archive)
29+
- [Sample Data](#sample-data)
30+
- [Running Elasticsearch Remotely](#running-elasticsearch-remotely)
31+
- [Running remote clusters](#running-remote-clusters)
32+
- [Running Kibana](#running-kibana)
33+
- [Running Kibana in Open-Source mode](#running-kibana-in-open-source-mode)
34+
- [Unsupported URL Type](#unsupported-url-type)
2135
- [Customizing `config/kibana.dev.yml`](#customizing-configkibanadevyml)
36+
- [Potential Optimization Pitfalls](#potential-optimization-pitfalls)
2237
- [Setting Up SSL](#setting-up-ssl)
2338
- [Linting](#linting)
39+
- [Setup Guide for VS Code Users](#setup-guide-for-vs-code-users)
2440
- [Internationalization](#internationalization)
2541
- [Localization](#localization)
42+
- [Styling with SASS](#styling-with-sass)
2643
- [Testing and Building](#testing-and-building)
2744
- [Debugging server code](#debugging-server-code)
2845
- [Instrumenting with Elastic APM](#instrumenting-with-elastic-apm)
29-
- [Debugging Unit Tests](#debugging-unit-tests)
30-
- [Unit Testing Plugins](#unit-testing-plugins)
31-
- [Automated Accessibility Testing](#automated-accessibility-testing)
32-
- [Cross-browser compatibility](#cross-browser-compatibility)
33-
- [Testing compatibility locally](#testing-compatibility-locally)
34-
- [Running Browser Automation Tests](#running-browser-automation-tests)
35-
- [Browser Automation Notes](#browser-automation-notes)
46+
- [Unit testing frameworks](#unit-testing-frameworks)
47+
- [Running specific Kibana tests](#running-specific-kibana-tests)
48+
- [Debugging Unit Tests](#debugging-unit-tests)
49+
- [Unit Testing Plugins](#unit-testing-plugins)
50+
- [Automated Accessibility Testing](#automated-accessibility-testing)
51+
- [Cross-browser compatibility](#cross-browser-compatibility)
52+
- [Testing compatibility locally](#testing-compatibility-locally)
53+
- [Running Browser Automation Tests](#running-browser-automation-tests)
3654
- [Building OS packages](#building-os-packages)
3755
- [Writing documentation](#writing-documentation)
3856
- [Release Notes Process](#release-notes-process)
@@ -414,7 +432,7 @@ extract them to a `JSON` file or integrate translations back to Kibana. To know
414432
We cannot support accepting contributions to the translations from any source other than the translators we have engaged to do the work.
415433
We are still to develop a proper process to accept any contributed translations. We certainly appreciate that people care enough about the localization effort to want to help improve the quality. We aim to build out a more comprehensive localization process for the future and will notify you once contributions can be supported, but for the time being, we are not able to incorporate suggestions.
416434

417-
### Syling with SASS
435+
### Styling with SASS
418436

419437
When writing a new component, create a sibling SASS file of the same name and import directly into the JS/TS component file. Doing so ensures the styles are never separated or lost on import and allows for better modularization (smaller individual plugin asset footprint).
420438

@@ -467,10 +485,10 @@ macOS users on a machine with a discrete graphics card may see significant speed
467485
- Uncheck the "Prefer integrated to discrete GPU" option
468486
- Restart iTerm
469487

470-
### Debugging Server Code
488+
#### Debugging Server Code
471489
`yarn debug` will start the server with Node's inspect flag. Kibana's development mode will start three processes on ports `9229`, `9230`, and `9231`. Chrome's developer tools need to be configured to connect to all three connections. Add `localhost:<port>` for each Kibana process in Chrome's developer tools connection tab.
472490

473-
### Instrumenting with Elastic APM
491+
#### Instrumenting with Elastic APM
474492
Kibana ships with the [Elastic APM Node.js Agent](https://github.com/elastic/apm-agent-nodejs) built-in for debugging purposes.
475493

476494
Its default configuration is meant to be used by core Kibana developers only, but it can easily be re-configured to your needs.
@@ -501,13 +519,13 @@ ELASTIC_APM_ACTIVE=true yarn start
501519
Once the agent is active, it will trace all incoming HTTP requests to Kibana, monitor for errors, and collect process-level metrics.
502520
The collected data will be sent to the APM Server and is viewable in the APM UI in Kibana.
503521

504-
### Unit testing frameworks
522+
#### Unit testing frameworks
505523
Kibana is migrating unit testing from Mocha to Jest. Legacy unit tests still
506524
exist in Mocha but all new unit tests should be written in Jest. Mocha tests
507525
are contained in `__tests__` directories. Whereas Jest tests are stored in
508526
the same directory as source code files with the `.test.js` suffix.
509527

510-
### Running specific Kibana tests
528+
#### Running specific Kibana tests
511529

512530
The following table outlines possible test file locations and how to invoke them:
513531

@@ -540,7 +558,7 @@ Test runner arguments:
540558
yarn test:ftr:runner --config test/api_integration/config.js --grep='should return 404 if id does not match any sample data sets'
541559
```
542560
543-
### Debugging Unit Tests
561+
#### Debugging Unit Tests
544562
545563
The standard `yarn test` task runs several sub tasks and can take several minutes to complete, making debugging failures pretty painful. In order to ease the pain specialized tasks provide alternate methods for running the tests.
546564
@@ -567,7 +585,7 @@ In the screenshot below, you'll notice the URL is `localhost:9876/debug.html`. Y
567585

568586
![Browser test debugging](http://i.imgur.com/DwHxgfq.png)
569587

570-
### Unit Testing Plugins
588+
#### Unit Testing Plugins
571589

572590
This should work super if you're using the [Kibana plugin generator](https://github.com/elastic/kibana/tree/master/packages/kbn-plugin-generator). If you're not using the generator, well, you're on your own. We suggest you look at how the generator works.
573591

@@ -578,7 +596,7 @@ yarn test:mocha
578596
yarn test:karma:debug # remove the debug flag to run them once and close
579597
```
580598

581-
### Automated Accessibility Testing
599+
#### Automated Accessibility Testing
582600

583601
To run the tests locally:
584602

@@ -595,11 +613,11 @@ can be run locally using their browser plugins:
595613
- [Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US)
596614
- [Firefox](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/)
597615

598-
### Cross-browser Compatibility
616+
#### Cross-browser Compatibility
599617

600-
#### Testing Compatibility Locally
618+
##### Testing Compatibility Locally
601619

602-
##### Testing IE on OS X
620+
###### Testing IE on OS X
603621

604622
* [Download VMWare Fusion](http://www.vmware.com/products/fusion/fusion-evaluation.html).
605623
* [Download IE virtual machines](https://developer.microsoft.com/en-us/microsoft-edge/tools/vms/#downloads) for VMWare.
@@ -610,7 +628,7 @@ can be run locally using their browser plugins:
610628
* Now you can run your VM, open the browser, and navigate to `http://computer.local:5601` to test Kibana.
611629
* Alternatively you can use browserstack
612630

613-
#### Running Browser Automation Tests
631+
##### Running Browser Automation Tests
614632

615633
[Read about the `FunctionalTestRunner`](https://www.elastic.co/guide/en/kibana/current/development-functional-tests.html) to learn more about how you can run and develop functional tests for Kibana core and plugins.
616634

docs/development/core/public/kibana-plugin-core-public.chromenavlink.euiicontype.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
## ChromeNavLink.euiIconType property
66

7-
A EUI iconType that will be used for the app's icon. This icon takes precendence over the `icon` property.
7+
A EUI iconType that will be used for the app's icon. This icon takes precedence over the `icon` property.
88

99
<b>Signature:</b>
1010

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [ChromeNavLink](./kibana-plugin-core-public.chromenavlink.md) &gt; [href](./kibana-plugin-core-public.chromenavlink.href.md)
4+
5+
## ChromeNavLink.href property
6+
7+
Settled state between `url`<!-- -->, `baseUrl`<!-- -->, and `active`
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
readonly href?: string;
13+
```

docs/development/core/public/kibana-plugin-core-public.chromenavlink.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ export interface ChromeNavLink
2020
| [category](./kibana-plugin-core-public.chromenavlink.category.md) | <code>AppCategory</code> | The category the app lives in |
2121
| [disabled](./kibana-plugin-core-public.chromenavlink.disabled.md) | <code>boolean</code> | Disables a link from being clickable. |
2222
| [disableSubUrlTracking](./kibana-plugin-core-public.chromenavlink.disablesuburltracking.md) | <code>boolean</code> | A flag that tells legacy chrome to ignore the link when tracking sub-urls |
23-
| [euiIconType](./kibana-plugin-core-public.chromenavlink.euiicontype.md) | <code>string</code> | A EUI iconType that will be used for the app's icon. This icon takes precendence over the <code>icon</code> property. |
23+
| [euiIconType](./kibana-plugin-core-public.chromenavlink.euiicontype.md) | <code>string</code> | A EUI iconType that will be used for the app's icon. This icon takes precedence over the <code>icon</code> property. |
2424
| [hidden](./kibana-plugin-core-public.chromenavlink.hidden.md) | <code>boolean</code> | Hides a link from the navigation. |
25+
| [href](./kibana-plugin-core-public.chromenavlink.href.md) | <code>string</code> | Settled state between <code>url</code>, <code>baseUrl</code>, and <code>active</code> |
2526
| [icon](./kibana-plugin-core-public.chromenavlink.icon.md) | <code>string</code> | A URL to an image file used as an icon. Used as a fallback if <code>euiIconType</code> is not provided. |
2627
| [id](./kibana-plugin-core-public.chromenavlink.id.md) | <code>string</code> | A unique identifier for looking up links. |
2728
| [linkToLastSubUrl](./kibana-plugin-core-public.chromenavlink.linktolastsuburl.md) | <code>boolean</code> | Whether or not the subUrl feature should be enabled. |

docs/development/core/public/kibana-plugin-core-public.chromenavlinkupdateablefields.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
<b>Signature:</b>
99

1010
```typescript
11-
export declare type ChromeNavLinkUpdateableFields = Partial<Pick<ChromeNavLink, 'active' | 'disabled' | 'hidden' | 'url' | 'subUrlBase'>>;
11+
export declare type ChromeNavLinkUpdateableFields = Partial<Pick<ChromeNavLink, 'active' | 'disabled' | 'hidden' | 'url' | 'subUrlBase' | 'href'>>;
1212
```

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
<b>Signature:</b>
88

99
```typescript
10-
QueryStringInput: React.FC<Pick<Props, "query" | "placeholder" | "onChange" | "onSubmit" | "prepend" | "indexPatterns" | "screenTitle" | "dataTestSubj" | "disableAutoFocus" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition">>
10+
QueryStringInput: React.FC<Pick<Props, "query" | "placeholder" | "onChange" | "onSubmit" | "prepend" | "indexPatterns" | "dataTestSubj" | "screenTitle" | "disableAutoFocus" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition">>
1111
```

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<b>Signature:</b>
88

99
```typescript
10-
SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "intl" | "indexPatterns" | "customSubmitButton" | "screenTitle" | "dataTestSubj" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "timeHistory" | "onFiltersUpdated">, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "indexPatterns" | "customSubmitButton" | "screenTitle" | "dataTestSubj" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "timeHistory" | "onFiltersUpdated">, any> & {
11-
WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "intl" | "indexPatterns" | "customSubmitButton" | "screenTitle" | "dataTestSubj" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "timeHistory" | "onFiltersUpdated"> & ReactIntl.InjectedIntlProps>;
10+
SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "intl" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "timeHistory" | "onFiltersUpdated">, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "timeHistory" | "onFiltersUpdated">, any> & {
11+
WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "intl" | "indexPatterns" | "dataTestSubj" | "customSubmitButton" | "screenTitle" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "timeHistory" | "onFiltersUpdated"> & ReactIntl.InjectedIntlProps>;
1212
}
1313
```

0 commit comments

Comments
 (0)