Skip to content

Commit d3a735e

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into functional_tests/is_cloud
2 parents 936a44d + a91e53f commit d3a735e

1,444 files changed

Lines changed: 30128 additions & 20545 deletions

File tree

Some content is hidden

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

‎.ci/packer_cache.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \
4444
x-pack/legacy/plugins/*/node_modules \
4545
x-pack/legacy/plugins/reporting/.chromium \
4646
test/plugin_functional/plugins/*/node_modules \
47+
examples/*/node_modules \
4748
.es \
4849
.chromedriver \
4950
.geckodriver;

‎.eslintrc.js‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -170,13 +170,6 @@ module.exports = {
170170
'react-hooks/rules-of-hooks': 'off',
171171
},
172172
},
173-
{
174-
files: ['x-pack/legacy/plugins/infra/**/*.{js,ts,tsx}'],
175-
rules: {
176-
'react-hooks/exhaustive-deps': 'off',
177-
'react-hooks/rules-of-hooks': 'off',
178-
},
179-
},
180173
{
181174
files: ['x-pack/legacy/plugins/lens/**/*.{js,ts,tsx}'],
182175
rules: {
@@ -209,13 +202,6 @@ module.exports = {
209202
'react-hooks/rules-of-hooks': 'off',
210203
},
211204
},
212-
{
213-
files: ['x-pack/legacy/plugins/watcher/**/*.{js,ts,tsx}'],
214-
rules: {
215-
'react-hooks/rules-of-hooks': 'off',
216-
'react-hooks/exhaustive-deps': 'off',
217-
},
218-
},
219205

220206
/**
221207
* Prettier

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
# App
66
/x-pack/legacy/plugins/lens/ @elastic/kibana-app
77
/x-pack/legacy/plugins/graph/ @elastic/kibana-app
8+
/src/plugins/share/ @elastic/kibana-app
9+
/src/legacy/server/url_shortening/ @elastic/kibana-app
810
/src/legacy/server/sample_data/ @elastic/kibana-app
911

1012
# App Architecture
@@ -14,7 +16,6 @@
1416
/src/plugins/kibana_react/ @elastic/kibana-app-arch
1517
/src/plugins/kibana_utils/ @elastic/kibana-app-arch
1618
/src/plugins/navigation/ @elastic/kibana-app-arch
17-
/src/plugins/share/ @elastic/kibana-app-arch
1819
/src/plugins/ui_actions/ @elastic/kibana-app-arch
1920
/src/plugins/visualizations/ @elastic/kibana-app-arch
2021
/x-pack/plugins/advanced_ui_actions/ @elastic/kibana-app-arch
@@ -28,7 +29,6 @@
2829
/src/legacy/core_plugins/kibana/server/routes/api/suggestions/ @elastic/kibana-app-arch
2930
/src/legacy/core_plugins/visualizations/ @elastic/kibana-app-arch
3031
/src/legacy/server/index_patterns/ @elastic/kibana-app-arch
31-
/src/legacy/server/url_shortening/ @elastic/kibana-app-arch
3232

3333
# APM
3434
/x-pack/legacy/plugins/apm/ @elastic/apm-ui

‎.i18nrc.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"kbn": "src/legacy/core_plugins/kibana",
1818
"kbnDocViews": "src/legacy/core_plugins/kbn_doc_views",
1919
"kbnVislibVisTypes": "src/legacy/core_plugins/kbn_vislib_vis_types",
20+
"management": "src/legacy/core_plugins/management",
2021
"kibana_react": "src/legacy/core_plugins/kibana_react",
2122
"kibana-react": "src/plugins/kibana_react",
2223
"kibana_utils": "src/plugins/kibana_utils",

‎NOTICE.txt‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -186,32 +186,6 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
186186
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
187187
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
188188

189-
---
190-
This product includes code that is based on facebookincubator/idx, which was
191-
available under a "MIT" license.
192-
193-
MIT License
194-
195-
Copyright (c) 2013-present, Facebook, Inc.
196-
197-
Permission is hereby granted, free of charge, to any person obtaining a copy
198-
of this software and associated documentation files (the "Software"), to deal
199-
in the Software without restriction, including without limitation the rights
200-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
201-
copies of the Software, and to permit persons to whom the Software is
202-
furnished to do so, subject to the following conditions:
203-
204-
The above copyright notice and this permission notice shall be included in all
205-
copies or substantial portions of the Software.
206-
207-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
208-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
209-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
210-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
211-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
212-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
213-
SOFTWARE.
214-
215189
---
216190
This product includes code that was extracted from angular@1.3.
217191
Original license:

‎docs/developer/core/development-functional-tests.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ The `FunctionalTestRunner` comes with three built-in services:
282282
* Source: {blob}src/functional_test_runner/lib/lifecycle.ts[src/functional_test_runner/lib/lifecycle.ts]
283283
* Designed primary for use in services
284284
* Exposes lifecycle events for basic coordination. Handlers can return a promise and resolve/fail asynchronously
285-
* Phases include: `beforeLoadTests`, `beforeTests`, `beforeEachTest`, `cleanup`, `phaseStart`, `phaseEnd`
285+
* Phases include: `beforeLoadTests`, `beforeTests`, `beforeEachTest`, `cleanup`
286286

287287
[float]
288288
===== Kibana Services

‎docs/development/core/public/kibana-plugin-public.httpbody.md‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎docs/development/core/public/kibana-plugin-public.httperrorresponse.md‎

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

1010
```typescript
11-
export interface HttpErrorResponse extends HttpResponse
11+
export interface HttpErrorResponse extends IHttpResponse
1212
```
1313
1414
## Properties

‎docs/development/core/public/kibana-plugin-public.httpfetchoptions.asresponse.md‎

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-public](./kibana-plugin-public.md) &gt; [HttpFetchOptions](./kibana-plugin-public.httpfetchoptions.md) &gt; [asResponse](./kibana-plugin-public.httpfetchoptions.asresponse.md)
4+
5+
## HttpFetchOptions.asResponse property
6+
7+
When `true` the return type of [HttpHandler](./kibana-plugin-public.httphandler.md) will be an [IHttpResponse](./kibana-plugin-public.ihttpresponse.md) with detailed request and response information. When `false`<!-- -->, the return type will just be the parsed response body. Defaults to `false`<!-- -->.
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
asResponse?: boolean;
13+
```

‎docs/development/core/public/kibana-plugin-public.httpfetchoptions.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export interface HttpFetchOptions extends HttpRequestInit
1616
1717
| Property | Type | Description |
1818
| --- | --- | --- |
19+
| [asResponse](./kibana-plugin-public.httpfetchoptions.asresponse.md) | <code>boolean</code> | When <code>true</code> the return type of [HttpHandler](./kibana-plugin-public.httphandler.md) will be an [IHttpResponse](./kibana-plugin-public.ihttpresponse.md) with detailed request and response information. When <code>false</code>, the return type will just be the parsed response body. Defaults to <code>false</code>. |
1920
| [headers](./kibana-plugin-public.httpfetchoptions.headers.md) | <code>HttpHeadersInit</code> | Headers to send with the request. See [HttpHeadersInit](./kibana-plugin-public.httpheadersinit.md)<!-- -->. |
2021
| [prependBasePath](./kibana-plugin-public.httpfetchoptions.prependbasepath.md) | <code>boolean</code> | Whether or not the request should automatically prepend the basePath. Defaults to <code>true</code>. |
2122
| [query](./kibana-plugin-public.httpfetchoptions.query.md) | <code>HttpFetchQuery</code> | The query string for an HTTP request. See [HttpFetchQuery](./kibana-plugin-public.httpfetchquery.md)<!-- -->. |

0 commit comments

Comments
 (0)