Skip to content

Commit

Permalink
Merge branch 'master' into alerts/force-schedule
Browse files Browse the repository at this point in the history
* master: (53 commits)
  Fixing recovered instance reference bug (elastic#85412)
  Switch to new elasticsearch client for Visualizations (elastic#85245)
  Switch to new elasticsearch client for TSVB (elastic#85275)
  Switch to new elasticsearch client for Vega (elastic#85280)
  [ILM] Add shrink field to hot phase (elastic#84087)
  Add rolling-file appender to core logging (elastic#84735)
  [APM] Service overview: Dependencies table (elastic#83416)
  [Uptime ]Update empty message for certs list (elastic#78575)
  [Graph] Fix graph saved object references (elastic#85295)
  [APM] Create new API's to return Latency and Throughput charts (elastic#85242)
  [Advanced settings] Reset to default for empty strings (elastic#85137)
  [SECURITY SOLUTION] Bundles _source -> Fields + able to sort on multiple fields in Timeline (elastic#83761)
  [Fleet] Update agent listing for better status reporting (elastic#84798)
  [APM] enable 'sanitize_field_names' for Go (elastic#85373)
  Update dependency @elastic/charts to v24.4.0 (elastic#85452)
  Introduce external url service (elastic#81234)
  Deprecate disabling the security plugin (elastic#85159)
  [FLEET] New Integration Policy Details page for use in Integrations section (elastic#85355)
  [Security Solutions][Detection Engine] Fixes one liner access control with find_rules REST API
  chore: 🤖 remove extraPublicDirs (elastic#85454)
  ...
  • Loading branch information
gmmorris committed Dec 10, 2020
2 parents cc50874 + 4885915 commit b4defa6
Show file tree
Hide file tree
Showing 712 changed files with 35,551 additions and 21,576 deletions.
3 changes: 2 additions & 1 deletion .ci/teamcity/checks/doc_api_changes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ set -euo pipefail

source "$(dirname "${0}")/../util.sh"

yarn run grunt run:checkDocApiChanges
checks-reporter-with-killswitch "Check Doc API Changes" \
node scripts/check_published_api_changes
8 changes: 8 additions & 0 deletions .ci/teamcity/checks/eslint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/usr/bin/env bash

set -euo pipefail

source "$(dirname "${0}")/../util.sh"

checks-reporter-with-killswitch "Lint: eslint" \
node scripts/eslint --no-cache
3 changes: 2 additions & 1 deletion .ci/teamcity/checks/file_casing.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ set -euo pipefail

source "$(dirname "${0}")/../util.sh"

yarn run grunt run:checkFileCasing
checks-reporter-with-killswitch "Check File Casing" \
node scripts/check_file_casing --quiet
3 changes: 2 additions & 1 deletion .ci/teamcity/checks/i18n.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ set -euo pipefail

source "$(dirname "${0}")/../util.sh"

yarn run grunt run:i18nCheck
checks-reporter-with-killswitch "Check i18n" \
node scripts/i18n_check --ignore-missing
3 changes: 2 additions & 1 deletion .ci/teamcity/checks/licenses.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ set -euo pipefail

source "$(dirname "${0}")/../util.sh"

yarn run grunt run:licenses
checks-reporter-with-killswitch "Check Licenses" \
node scripts/check_licenses --dev
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ set -euo pipefail

source "$(dirname "${0}")/../util.sh"

yarn run grunt run:verifyDependencyVersions
checks-reporter-with-killswitch "Lint: sasslint" \
node scripts/sasslint
3 changes: 2 additions & 1 deletion .ci/teamcity/checks/telemetry.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ set -euo pipefail

source "$(dirname "${0}")/../util.sh"

yarn run grunt run:telemetryCheck
checks-reporter-with-killswitch "Check Telemetry Schema" \
node scripts/telemetry_check
3 changes: 2 additions & 1 deletion .ci/teamcity/checks/test_hardening.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ set -euo pipefail

source "$(dirname "${0}")/../util.sh"

yarn run grunt run:test_hardening
checks-reporter-with-killswitch "Test Hardening" \
node scripts/test_hardening
3 changes: 2 additions & 1 deletion .ci/teamcity/checks/ts_projects.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ set -euo pipefail

source "$(dirname "${0}")/../util.sh"

yarn run grunt run:checkTsProjects
checks-reporter-with-killswitch "Check TypeScript Projects" \
node scripts/check_ts_projects
3 changes: 2 additions & 1 deletion .ci/teamcity/checks/type_check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ set -euo pipefail

source "$(dirname "${0}")/../util.sh"

yarn run grunt run:typeCheck
checks-reporter-with-killswitch "Check Types" \
node scripts/type_check
3 changes: 2 additions & 1 deletion .ci/teamcity/checks/verify_notice.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ set -euo pipefail

source "$(dirname "${0}")/../util.sh"

yarn run grunt run:verifyNotice
checks-reporter-with-killswitch "Verify NOTICE" \
node scripts/notice --validate
12 changes: 12 additions & 0 deletions .ci/teamcity/default/jest.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/bash

set -euo pipefail

source "$(dirname "${0}")/../util.sh"

export JOB=kibana-default-jest

cd "$XPACK_DIR"

checks-reporter-with-killswitch "Jest Unit Tests" \
node scripts/jest --bail --debug
10 changes: 10 additions & 0 deletions .ci/teamcity/oss/api_integration.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash

set -euo pipefail

source "$(dirname "${0}")/../util.sh"

export JOB=kibana-oss-api-integration

checks-reporter-with-killswitch "API Integration Tests" \
node scripts/functional_tests --config test/api_integration/config.js --bail --debug
10 changes: 10 additions & 0 deletions .ci/teamcity/oss/jest.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash

set -euo pipefail

source "$(dirname "${0}")/../util.sh"

export JOB=kibana-oss-jest

checks-reporter-with-killswitch "OSS Jest Unit Tests" \
node scripts/jest --ci --verbose
10 changes: 10 additions & 0 deletions .ci/teamcity/oss/jest_integration.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash

set -euo pipefail

source "$(dirname "${0}")/../util.sh"

export JOB=kibana-oss-jest-integration

checks-reporter-with-killswitch "OSS Jest Integration Tests" \
node scripts/jest_integration --verbose
6 changes: 3 additions & 3 deletions .ci/teamcity/oss/plugin_functional.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ if [[ ! -d "target" ]]; then
fi
cd -

yarn run grunt run:pluginFunctionalTestsRelease --from=source
yarn run grunt run:exampleFunctionalTestsRelease --from=source
yarn run grunt run:interpreterFunctionalTestsRelease
./test/scripts/test/plugin_functional.sh
./test/scripts/test/example_functional.sh
./test/scripts/test/interpreter_functional.sh
19 changes: 19 additions & 0 deletions .ci/teamcity/oss/server_integration.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/bash

set -euo pipefail

source "$(dirname "${0}")/../util.sh"

export JOB=kibana-oss-server-integration
export KIBANA_INSTALL_DIR="$PARENT_DIR/build/kibana-build-oss"

checks-reporter-with-killswitch "Server integration tests" \
node scripts/functional_tests \
--config test/server_integration/http/ssl/config.js \
--config test/server_integration/http/ssl_redirect/config.js \
--config test/server_integration/http/platform/config.ts \
--config test/server_integration/http/ssl_with_p12/config.js \
--config test/server_integration/http/ssl_with_p12_intermediate/config.js \
--bail \
--debug \
--kibana-install-dir $KIBANA_INSTALL_DIR
3 changes: 2 additions & 1 deletion .ci/teamcity/tests/mocha.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ set -euo pipefail

source "$(dirname "${0}")/../util.sh"

yarn run grunt run:mocha
checks-reporter-with-killswitch "Mocha Tests" \
node scripts/mocha
7 changes: 0 additions & 7 deletions .ci/teamcity/tests/test_hardening.sh

This file was deleted.

3 changes: 2 additions & 1 deletion .ci/teamcity/tests/test_projects.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ set -euo pipefail

source "$(dirname "${0}")/../util.sh"

yarn run grunt run:test_projects
checks-reporter-with-killswitch "Test Projects" \
yarn kbn run test --exclude kibana --oss --skip-kibana-plugins
4 changes: 2 additions & 2 deletions .teamcity/src/builds/Lint.kt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ object Lint : BuildType({
scriptContent =
"""
#!/bin/bash
yarn run grunt run:sasslint
./.ci/teamcity/checks/sasslint.sh
""".trimIndent()
}

Expand All @@ -26,7 +26,7 @@ object Lint : BuildType({
scriptContent =
"""
#!/bin/bash
yarn run grunt run:eslint
./.ci/teamcity/checks/eslint.sh
""".trimIndent()
}
}
Expand Down
4 changes: 2 additions & 2 deletions .teamcity/src/builds/test/ApiServerIntegration.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ object ApiServerIntegration : BuildType({
description = "Executes API and Server Integration Tests"

steps {
runbld("API Integration", "yarn run grunt run:apiIntegrationTests")
runbld("Server Integration", "yarn run grunt run:serverIntegrationTests")
runbld("API Integration", "./.ci/teamcity/oss/api_integration.sh")
runbld("Server Integration", "./.ci/teamcity/oss/server_integration.sh")
}

addTestSettings()
Expand Down
2 changes: 1 addition & 1 deletion .teamcity/src/builds/test/Jest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ object Jest : BuildType({
kibanaAgent(8)

steps {
runbld("Jest Unit", "yarn run grunt run:test_jest")
runbld("Jest Unit", "./.ci/teamcity/oss/jest.sh")
}

addTestSettings()
Expand Down
2 changes: 1 addition & 1 deletion .teamcity/src/builds/test/JestIntegration.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ object JestIntegration : BuildType({
description = "Executes Jest Integration Tests"

steps {
runbld("Jest Integration", "yarn run grunt run:test_jest_integration")
runbld("Jest Integration", "./.ci/teamcity/oss/jest_integration.sh")
}

addTestSettings()
Expand Down
2 changes: 1 addition & 1 deletion .teamcity/src/builds/test/QuickTests.kt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ object QuickTests : BuildType({
kibanaAgent(2)

val testScripts = mapOf(
"Test Hardening" to ".ci/teamcity/tests/test_hardening.sh",
"Test Hardening" to ".ci/teamcity/checkes/test_hardening.sh",
"Test Projects" to ".ci/teamcity/tests/test_projects.sh",
"Mocha Tests" to ".ci/teamcity/tests/mocha.sh"
)
Expand Down
5 changes: 1 addition & 4 deletions .teamcity/src/builds/test/XPackJest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ object XPackJest : BuildType({
kibanaAgent(16)

steps {
runbld("X-Pack Jest Unit", """
cd x-pack
node --max-old-space-size=6144 scripts/jest --ci --verbose --maxWorkers=6
""".trimIndent())
runbld("X-Pack Jest Unit", "./.ci/teamcity/default/jest.sh")
}

addTestSettings()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->

[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [HttpSetup](./kibana-plugin-core-public.httpsetup.md) &gt; [externalUrl](./kibana-plugin-core-public.httpsetup.externalurl.md)

## HttpSetup.externalUrl property

<b>Signature:</b>

```typescript
externalUrl: IExternalUrl;
```
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export interface HttpSetup
| [anonymousPaths](./kibana-plugin-core-public.httpsetup.anonymouspaths.md) | <code>IAnonymousPaths</code> | APIs for denoting certain paths for not requiring authentication |
| [basePath](./kibana-plugin-core-public.httpsetup.basepath.md) | <code>IBasePath</code> | APIs for manipulating the basePath on URL segments. See [IBasePath](./kibana-plugin-core-public.ibasepath.md) |
| [delete](./kibana-plugin-core-public.httpsetup.delete.md) | <code>HttpHandler</code> | Makes an HTTP request with the DELETE method. See [HttpHandler](./kibana-plugin-core-public.httphandler.md) for options. |
| [externalUrl](./kibana-plugin-core-public.httpsetup.externalurl.md) | <code>IExternalUrl</code> | |
| [fetch](./kibana-plugin-core-public.httpsetup.fetch.md) | <code>HttpHandler</code> | Makes an HTTP request. Defaults to a GET request unless overriden. See [HttpHandler](./kibana-plugin-core-public.httphandler.md) for options. |
| [get](./kibana-plugin-core-public.httpsetup.get.md) | <code>HttpHandler</code> | Makes an HTTP request with the GET method. See [HttpHandler](./kibana-plugin-core-public.httphandler.md) for options. |
| [head](./kibana-plugin-core-public.httpsetup.head.md) | <code>HttpHandler</code> | Makes an HTTP request with the HEAD method. See [HttpHandler](./kibana-plugin-core-public.httphandler.md) for options. |
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->

[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [IExternalUrl](./kibana-plugin-core-public.iexternalurl.md)

## IExternalUrl interface

APIs for working with external URLs.

<b>Signature:</b>

```typescript
export interface IExternalUrl
```

## Methods

| Method | Description |
| --- | --- |
| [validateUrl(relativeOrAbsoluteUrl)](./kibana-plugin-core-public.iexternalurl.validateurl.md) | Determines if the provided URL is a valid location to send users. Validation is based on the configured allow list in kibana.yml.<!-- -->If the URL is valid, then a URL will be returned. Otherwise, this will return null. |

Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->

[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [IExternalUrl](./kibana-plugin-core-public.iexternalurl.md) &gt; [validateUrl](./kibana-plugin-core-public.iexternalurl.validateurl.md)

## IExternalUrl.validateUrl() method

Determines if the provided URL is a valid location to send users. Validation is based on the configured allow list in kibana.yml.

If the URL is valid, then a URL will be returned. Otherwise, this will return null.

<b>Signature:</b>

```typescript
validateUrl(relativeOrAbsoluteUrl: string): URL | null;
```

## Parameters

| Parameter | Type | Description |
| --- | --- | --- |
| relativeOrAbsoluteUrl | <code>string</code> | |

<b>Returns:</b>

`URL | null`

Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->

[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [IExternalUrlPolicy](./kibana-plugin-core-public.iexternalurlpolicy.md) &gt; [allow](./kibana-plugin-core-public.iexternalurlpolicy.allow.md)

## IExternalUrlPolicy.allow property

Indicates if this policy allows or denies access to the described destination.

<b>Signature:</b>

```typescript
allow: boolean;
```
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->

[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [IExternalUrlPolicy](./kibana-plugin-core-public.iexternalurlpolicy.md) &gt; [host](./kibana-plugin-core-public.iexternalurlpolicy.host.md)

## IExternalUrlPolicy.host property

Optional host describing the external destination. May be combined with `protocol`<!-- -->. Required if `protocol` is not defined.

<b>Signature:</b>

```typescript
host?: string;
```

## Example


```ts
// allows access to all of google.com, using any protocol.
allow: true,
host: 'google.com'

```

Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->

[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [IExternalUrlPolicy](./kibana-plugin-core-public.iexternalurlpolicy.md)

## IExternalUrlPolicy interface

A policy describing whether access to an external destination is allowed.

<b>Signature:</b>

```typescript
export interface IExternalUrlPolicy
```

## Properties

| Property | Type | Description |
| --- | --- | --- |
| [allow](./kibana-plugin-core-public.iexternalurlpolicy.allow.md) | <code>boolean</code> | Indicates if this policy allows or denies access to the described destination. |
| [host](./kibana-plugin-core-public.iexternalurlpolicy.host.md) | <code>string</code> | Optional host describing the external destination. May be combined with <code>protocol</code>. Required if <code>protocol</code> is not defined. |
| [protocol](./kibana-plugin-core-public.iexternalurlpolicy.protocol.md) | <code>string</code> | Optional protocol describing the external destination. May be combined with <code>host</code>. Required if <code>host</code> is not defined. |

Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->

[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [IExternalUrlPolicy](./kibana-plugin-core-public.iexternalurlpolicy.md) &gt; [protocol](./kibana-plugin-core-public.iexternalurlpolicy.protocol.md)

## IExternalUrlPolicy.protocol property

Optional protocol describing the external destination. May be combined with `host`<!-- -->. Required if `host` is not defined.

<b>Signature:</b>

```typescript
protocol?: string;
```

## Example


```ts
// allows access to all destinations over the `https` protocol.
allow: true,
protocol: 'https'

```

Loading

0 comments on commit b4defa6

Please sign in to comment.