Skip to content

Commit

Permalink
Merge with master and resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
stratoula committed Nov 24, 2021
2 parents 4db74a3 + 6eae6b8 commit cb77a2e
Show file tree
Hide file tree
Showing 511 changed files with 37,742 additions and 33,640 deletions.
2 changes: 1 addition & 1 deletion .buildkite/pipelines/hourly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ steps:
- command: .buildkite/scripts/steps/checks.sh
label: 'Checks'
agents:
queue: c2-4
queue: c2-8
key: checks
timeout_in_minutes: 120

Expand Down
2 changes: 2 additions & 0 deletions .buildkite/scripts/common/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ export TEST_BROWSER_HEADLESS=1

export ELASTIC_APM_ENVIRONMENT=ci
export ELASTIC_APM_TRANSACTION_SAMPLE_RATE=0.1
export ELASTIC_APM_SERVER_URL=https://kibana-ci-apm.apm.us-central1.gcp.cloud.es.io
export ELASTIC_APM_SECRET_TOKEN=7YKhoXsO4MzjhXjx2c

if is_pr; then
if [[ "${GITHUB_PR_LABELS:-}" == *"ci:collect-apm"* ]]; then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ checks-reporter-with-killswitch "Build TS Refs" \
--no-cache \
--force

set +e;
echo "--- running check types and build api docs in parallel";

checks-reporter-with-killswitch "Check Types" \
node scripts/type_check &> target/check_types.log &
check_types_pid=$!
Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
/src/plugins/embeddable/ @elastic/kibana-app-services
/src/plugins/expressions/ @elastic/kibana-app-services
/src/plugins/field_formats/ @elastic/kibana-app-services
/src/plugins/index_pattern_editor/ @elastic/kibana-app-services
/src/plugins/data_view_editor/ @elastic/kibana-app-services
/src/plugins/inspector/ @elastic/kibana-app-services
/src/plugins/kibana_react/ @elastic/kibana-app-services
/src/plugins/kibana_react/public/code_editor @elastic/kibana-presentation
Expand Down
2 changes: 1 addition & 1 deletion .i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"monaco": "packages/kbn-monaco/src",
"esQuery": "packages/kbn-es-query/src",
"presentationUtil": "src/plugins/presentation_util",
"indexPatternEditor": "src/plugins/index_pattern_editor",
"indexPatternEditor": "src/plugins/data_view_editor",
"indexPatternFieldEditor": "src/plugins/data_view_field_editor",
"indexPatternManagement": "src/plugins/data_view_management",
"interactiveSetup": "src/plugins/interactive_setup",
Expand Down
37 changes: 24 additions & 13 deletions api_docs/advanced_settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,14 @@
"type": "Function",
"tags": [],
"label": "register",
"description": [],
"description": [
"/**\n * Attempts to register the provided component, with the ability to optionally allow\n * the component to override an existing one.\n *\n * If the intent is to override, then `allowOverride` must be set to true, otherwise an exception is thrown.\n *\n * @param id the id of the component to register\n * @param component the component\n * @param allowOverride (default: false) - optional flag to allow this component to override a previously registered component\n */"
],
"signature": [
"(id: Id, component: React.ComponentType<Record<string, any> | undefined>, allowOverride?: boolean) => void"
],
"path": "src/plugins/advanced_settings/public/component_registry/component_registry.ts",
"deprecated": false,
"returnComment": [],
"children": [
{
"parentPluginId": "advancedSettings",
Expand All @@ -138,10 +139,11 @@
"label": "id",
"description": [],
"signature": [
"\"advanced_settings_page_title\" | \"advanced_settings_page_subtitle\" | \"advanced_settings_page_footer\""
"Id"
],
"path": "src/plugins/advanced_settings/public/component_registry/component_registry.ts",
"deprecated": false
"deprecated": false,
"isRequired": true
},
{
"parentPluginId": "advancedSettings",
Expand All @@ -151,10 +153,11 @@
"label": "component",
"description": [],
"signature": [
"React.ComponentClass<Record<string, any> | undefined, any> | React.FunctionComponent<Record<string, any> | undefined>"
"React.ComponentType<Record<string, any> | undefined>"
],
"path": "src/plugins/advanced_settings/public/component_registry/component_registry.ts",
"deprecated": false
"deprecated": false,
"isRequired": true
},
{
"parentPluginId": "advancedSettings",
Expand All @@ -163,10 +166,15 @@
"tags": [],
"label": "allowOverride",
"description": [],
"signature": [
"boolean"
],
"path": "src/plugins/advanced_settings/public/component_registry/component_registry.ts",
"deprecated": false
"deprecated": false,
"isRequired": true
}
]
],
"returnComment": []
}
]
},
Expand Down Expand Up @@ -199,13 +207,14 @@
"type": "Function",
"tags": [],
"label": "get",
"description": [],
"description": [
"/**\n * Retrieve a registered component by its ID.\n * If the component does not exist, then an exception is thrown.\n *\n * @param id the ID of the component to retrieve\n */"
],
"signature": [
"(id: Id) => React.ComponentType<Record<string, any> | undefined>"
],
"path": "src/plugins/advanced_settings/public/component_registry/component_registry.ts",
"deprecated": false,
"returnComment": [],
"children": [
{
"parentPluginId": "advancedSettings",
Expand All @@ -215,12 +224,14 @@
"label": "id",
"description": [],
"signature": [
"\"advanced_settings_page_title\" | \"advanced_settings_page_subtitle\" | \"advanced_settings_page_footer\""
"Id"
],
"path": "src/plugins/advanced_settings/public/component_registry/component_registry.ts",
"deprecated": false
"deprecated": false,
"isRequired": true
}
]
],
"returnComment": []
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion api_docs/advanced_settings.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Contact [Vis Editors](https://github.com/orgs/elastic/teams/kibana-vis-editors)

| Public API count | Any count | Items lacking comments | Missing exports |
|-------------------|-----------|------------------------|-----------------|
| 23 | 0 | 22 | 1 |
| 23 | 0 | 20 | 1 |

## Client

Expand Down
44 changes: 43 additions & 1 deletion api_docs/alerting.json
Original file line number Diff line number Diff line change
Expand Up @@ -3552,7 +3552,13 @@
"label": "executionDuration",
"description": [],
"signature": [
"{ average: number; values: number[]; }"
{
"pluginId": "alerting",
"scope": "common",
"docId": "kibAlertingPluginApi",
"section": "def-common.ExecutionDuration",
"text": "ExecutionDuration"
}
],
"path": "x-pack/plugins/alerting/common/alert_summary.ts",
"deprecated": false
Expand Down Expand Up @@ -3764,6 +3770,42 @@
],
"initialIsOpen": false
},
{
"parentPluginId": "alerting",
"id": "def-common.ExecutionDuration",
"type": "Interface",
"tags": [],
"label": "ExecutionDuration",
"description": [],
"path": "x-pack/plugins/alerting/common/alert_summary.ts",
"deprecated": false,
"children": [
{
"parentPluginId": "alerting",
"id": "def-common.ExecutionDuration.average",
"type": "number",
"tags": [],
"label": "average",
"description": [],
"path": "x-pack/plugins/alerting/common/alert_summary.ts",
"deprecated": false
},
{
"parentPluginId": "alerting",
"id": "def-common.ExecutionDuration.valuesWithTimestamp",
"type": "Object",
"tags": [],
"label": "valuesWithTimestamp",
"description": [],
"signature": [
"{ [x: string]: number; }"
],
"path": "x-pack/plugins/alerting/common/alert_summary.ts",
"deprecated": false
}
],
"initialIsOpen": false
},
{
"parentPluginId": "alerting",
"id": "def-common.IntervalSchedule",
Expand Down
2 changes: 1 addition & 1 deletion api_docs/alerting.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Contact [Kibana Alerting](https://github.com/orgs/elastic/teams/kibana-alerting-

| Public API count | Any count | Items lacking comments | Missing exports |
|-------------------|-----------|------------------------|-----------------|
| 260 | 0 | 252 | 18 |
| 263 | 0 | 255 | 18 |

## Client

Expand Down
2 changes: 1 addition & 1 deletion api_docs/apm.json
Original file line number Diff line number Diff line change
Expand Up @@ -4510,7 +4510,7 @@
"section": "def-common.PackagePolicy",
"text": "PackagePolicy"
},
" | undefined; }, ",
" | undefined; has_apm_integrations: boolean; }, ",
"APMRouteCreateOptions",
">; } & { \"POST /internal/apm/fleet/cloud_apm_package_policy\": ",
{
Expand Down
Loading

0 comments on commit cb77a2e

Please sign in to comment.