Skip to content

Commit

Permalink
Merge branch 'main' into feat/osquery-schema-5-5-1
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored Oct 28, 2022
2 parents f163794 + fe2480d commit 36984ff
Show file tree
Hide file tree
Showing 1,908 changed files with 13,049 additions and 10,860 deletions.
4 changes: 3 additions & 1 deletion .buildkite/ftr_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,8 @@ enabled:
- x-pack/test/functional/apps/lens/group1/config.ts
- x-pack/test/functional/apps/lens/group2/config.ts
- x-pack/test/functional/apps/lens/group3/config.ts
- x-pack/test/functional/apps/lens/open_in_lens/config.ts
- x-pack/test/functional/apps/lens/open_in_lens/tsvb/config.ts
- x-pack/test/functional/apps/lens/open_in_lens/agg_based/config.ts
- x-pack/test/functional/apps/license_management/config.ts
- x-pack/test/functional/apps/logstash/config.ts
- x-pack/test/functional/apps/management/config.ts
Expand Down Expand Up @@ -271,6 +272,7 @@ enabled:
- x-pack/test/upgrade_assistant_integration/config.js
- x-pack/test/usage_collection/config.ts
- x-pack/performance/journeys/ecommerce_dashboard.ts
- x-pack/performance/journeys/ecommerce_dashboard_map_only.ts
- x-pack/performance/journeys/flight_dashboard.ts
- x-pack/performance/journeys/login.ts
- x-pack/performance/journeys/many_fields_discover.ts
Expand Down
11 changes: 0 additions & 11 deletions .buildkite/scripts/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,3 @@ if [[ "$DISABLE_BOOTSTRAP_VALIDATION" != "true" ]]; then
check_for_changed_files 'yarn kbn bootstrap'
fi

###
### upload ts-refs-cache artifacts as quickly as possible so they are available for download
###
if [[ "${BUILD_TS_REFS_CACHE_CAPTURE:-}" == "true" ]]; then
echo "--- Build ts-refs-cache"
node scripts/build_ts_refs.js --ignore-type-failures
echo "--- Upload ts-refs-cache"
cd "$KIBANA_DIR/target/ts_refs_cache"
gsutil cp "*.zip" 'gs://kibana-ci-ts-refs-cache/'
cd "$KIBANA_DIR"
fi
5 changes: 0 additions & 5 deletions .buildkite/scripts/common/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,6 @@ export GCS_UPLOAD_PREFIX=FAKE_UPLOAD_PREFIX # TODO remove the need for this

export KIBANA_BUILD_LOCATION="$WORKSPACE/kibana-build-xpack"

if [[ "${BUILD_TS_REFS_CACHE_ENABLE:-}" != "true" ]]; then
export BUILD_TS_REFS_CACHE_ENABLE=false
fi

export BUILD_TS_REFS_DISABLE=true
export DISABLE_BOOTSTRAP_VALIDATION=true

# Prevent Browserlist from logging on CI about outdated database versions
Expand Down
7 changes: 2 additions & 5 deletions .buildkite/scripts/steps/build_api_docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ set -euo pipefail

.buildkite/scripts/bootstrap.sh

echo "--- Build TS Refs"
node scripts/build_ts_refs \
--clean \
--no-cache \
--force
echo "--- Run scripts/type_check to ensure that all build available"
node scripts/type_check

echo "--- Build API Docs"
node --max-old-space-size=12000 scripts/build_api_docs
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/check_types.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ source .buildkite/scripts/common/util.sh

echo --- Check Types
checks-reporter-with-killswitch "Check Types" \
node scripts/type_check --concurrency 8
node scripts/type_check
1 change: 0 additions & 1 deletion .buildkite/scripts/steps/functional/osquery_cypress.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ set -euo pipefail

source .buildkite/scripts/common/util.sh

export BUILD_TS_REFS_DISABLE=false
.buildkite/scripts/bootstrap.sh
node scripts/build_kibana_platform_plugins.js

Expand Down
1 change: 0 additions & 1 deletion .buildkite/scripts/steps/lint_with_types.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ set -euo pipefail

source .buildkite/scripts/common/util.sh

export BUILD_TS_REFS_DISABLE=false
.buildkite/scripts/bootstrap.sh

echo '--- Lint: eslint (with types)'
Expand Down
3 changes: 0 additions & 3 deletions .buildkite/scripts/steps/on_merge_ts_refs_api_docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@
set -euo pipefail

export BAZEL_CACHE_MODE=buildbuddy # Populate Buildbuddy bazel remote cache for linux
export BUILD_TS_REFS_CACHE_ENABLE=true
export BUILD_TS_REFS_CACHE_CAPTURE=true
export DISABLE_BOOTSTRAP_VALIDATION=true
export BUILD_TS_REFS_DISABLE=false

.buildkite/scripts/bootstrap.sh

Expand Down
3 changes: 0 additions & 3 deletions .ci/Jenkinsfile_baseline_capture
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ kibanaPipeline(timeoutMinutes: 210) {
) {
withGcpServiceAccount.fromVaultSecret('secret/kibana-issues/dev/ci-artifacts-key', 'value') {
withEnv([
'BUILD_TS_REFS_DISABLE=false', // disabled in root config so we need to override that here
'BUILD_TS_REFS_CACHE_ENABLE=true',
'BUILD_TS_REFS_CACHE_CAPTURE=true',
'DISABLE_BOOTSTRAP_VALIDATION=true',
]) {
kibanaPipeline.doSetup()
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/add-fleet-issues-to-ingest-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
project_id: ${{ env.INGEST_PROJECT_ID }}
content_id: ${{ github.event.issue.node_id }}
env:
GITHUB_TOKEN: ${{ secrets.FLEET_TECH_KIBANA_USER_TOKEN }}
GITHUB_TOKEN: ${{ secrets.FLEET_PROJECT_TOKEN }}
- uses: octokit/[email protected]
id: set_fleet_ui_area
if: github.event.label.name == env.FLEET_LABEL
Expand All @@ -48,4 +48,4 @@ jobs:
area_field_id: ${{ env.AREA_FIELD_ID }}
area_id: ${{ env.FLEET_UI_OPTION_ID }}
env:
GITHUB_TOKEN: ${{ secrets.FLEET_TECH_KIBANA_USER_TOKEN }}
GITHUB_TOKEN: ${{ secrets.FLEET_PROJECT_TOKEN }}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ report.asciidoc

# Automatically generated and user-modifiable
/tsconfig.refs.json
tsconfig.base.type_check.json
tsconfig.type_check.json

# Yarn local mirror content
.yarn-local-mirror
Expand Down
2 changes: 1 addition & 1 deletion api_docs/actions.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/actions
title: "actions"
image: https://source.unsplash.com/400x175/?github
description: API docs for the actions plugin
date: 2022-10-27
date: 2022-10-28
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
---
import actionsObj from './actions.devdocs.json';
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 @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/advancedSettings
title: "advancedSettings"
image: https://source.unsplash.com/400x175/?github
description: API docs for the advancedSettings plugin
date: 2022-10-27
date: 2022-10-28
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
---
import advancedSettingsObj from './advanced_settings.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/aiops.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiops
title: "aiops"
image: https://source.unsplash.com/400x175/?github
description: API docs for the aiops plugin
date: 2022-10-27
date: 2022-10-28
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
---
import aiopsObj from './aiops.devdocs.json';
Expand Down
106 changes: 53 additions & 53 deletions api_docs/alerting.devdocs.json
Original file line number Diff line number Diff line change
Expand Up @@ -1717,60 +1717,50 @@
},
{
"parentPluginId": "alerting",
"id": "def-server.RuleExecutorOptions.executionId",
"type": "string",
"id": "def-server.RuleExecutorOptions.createdBy",
"type": "CompoundType",
"tags": [],
"label": "executionId",
"label": "createdBy",
"description": [],
"signature": [
"string | null"
],
"path": "x-pack/plugins/alerting/server/types.ts",
"deprecated": false,
"trackAdoption": false
},
{
"parentPluginId": "alerting",
"id": "def-server.RuleExecutorOptions.startedAt",
"type": "Object",
"id": "def-server.RuleExecutorOptions.executionId",
"type": "string",
"tags": [],
"label": "startedAt",
"label": "executionId",
"description": [],
"signature": [
"Date"
],
"path": "x-pack/plugins/alerting/server/types.ts",
"deprecated": false,
"trackAdoption": false
},
{
"parentPluginId": "alerting",
"id": "def-server.RuleExecutorOptions.previousStartedAt",
"type": "CompoundType",
"id": "def-server.RuleExecutorOptions.logger",
"type": "Object",
"tags": [],
"label": "previousStartedAt",
"label": "logger",
"description": [],
"signature": [
"Date | null"
"Logger"
],
"path": "x-pack/plugins/alerting/server/types.ts",
"deprecated": false,
"trackAdoption": false
},
{
"parentPluginId": "alerting",
"id": "def-server.RuleExecutorOptions.services",
"type": "Object",
"id": "def-server.RuleExecutorOptions.name",
"type": "string",
"tags": [],
"label": "services",
"label": "name",
"description": [],
"signature": [
{
"pluginId": "alerting",
"scope": "server",
"docId": "kibAlertingPluginApi",
"section": "def-server.RuleExecutorServices",
"text": "RuleExecutorServices"
},
"<InstanceState, InstanceContext, ActionGroupIds>"
],
"path": "x-pack/plugins/alerting/server/types.ts",
"deprecated": false,
"trackAdoption": false
Expand All @@ -1791,13 +1781,13 @@
},
{
"parentPluginId": "alerting",
"id": "def-server.RuleExecutorOptions.state",
"type": "Uncategorized",
"id": "def-server.RuleExecutorOptions.previousStartedAt",
"type": "CompoundType",
"tags": [],
"label": "state",
"label": "previousStartedAt",
"description": [],
"signature": [
"State"
"Date | null"
],
"path": "x-pack/plugins/alerting/server/types.ts",
"deprecated": false,
Expand Down Expand Up @@ -1827,63 +1817,73 @@
},
{
"parentPluginId": "alerting",
"id": "def-server.RuleExecutorOptions.spaceId",
"type": "string",
"id": "def-server.RuleExecutorOptions.services",
"type": "Object",
"tags": [],
"label": "spaceId",
"label": "services",
"description": [],
"signature": [
{
"pluginId": "alerting",
"scope": "server",
"docId": "kibAlertingPluginApi",
"section": "def-server.RuleExecutorServices",
"text": "RuleExecutorServices"
},
"<InstanceState, InstanceContext, ActionGroupIds>"
],
"path": "x-pack/plugins/alerting/server/types.ts",
"deprecated": false,
"trackAdoption": false
},
{
"parentPluginId": "alerting",
"id": "def-server.RuleExecutorOptions.namespace",
"id": "def-server.RuleExecutorOptions.spaceId",
"type": "string",
"tags": [],
"label": "namespace",
"label": "spaceId",
"description": [],
"signature": [
"string | undefined"
],
"path": "x-pack/plugins/alerting/server/types.ts",
"deprecated": false,
"trackAdoption": false
},
{
"parentPluginId": "alerting",
"id": "def-server.RuleExecutorOptions.name",
"type": "string",
"id": "def-server.RuleExecutorOptions.startedAt",
"type": "Object",
"tags": [],
"label": "name",
"label": "startedAt",
"description": [],
"signature": [
"Date"
],
"path": "x-pack/plugins/alerting/server/types.ts",
"deprecated": false,
"trackAdoption": false
},
{
"parentPluginId": "alerting",
"id": "def-server.RuleExecutorOptions.tags",
"type": "Array",
"id": "def-server.RuleExecutorOptions.state",
"type": "Uncategorized",
"tags": [],
"label": "tags",
"label": "state",
"description": [],
"signature": [
"string[]"
"State"
],
"path": "x-pack/plugins/alerting/server/types.ts",
"deprecated": false,
"trackAdoption": false
},
{
"parentPluginId": "alerting",
"id": "def-server.RuleExecutorOptions.createdBy",
"type": "CompoundType",
"id": "def-server.RuleExecutorOptions.tags",
"type": "Array",
"tags": [],
"label": "createdBy",
"label": "tags",
"description": [],
"signature": [
"string | null"
"string[]"
],
"path": "x-pack/plugins/alerting/server/types.ts",
"deprecated": false,
Expand All @@ -1905,13 +1905,13 @@
},
{
"parentPluginId": "alerting",
"id": "def-server.RuleExecutorOptions.logger",
"type": "Object",
"id": "def-server.RuleExecutorOptions.namespace",
"type": "string",
"tags": [],
"label": "logger",
"label": "namespace",
"description": [],
"signature": [
"Logger"
"string | undefined"
],
"path": "x-pack/plugins/alerting/server/types.ts",
"deprecated": false,
Expand Down
2 changes: 1 addition & 1 deletion api_docs/alerting.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/alerting
title: "alerting"
image: https://source.unsplash.com/400x175/?github
description: API docs for the alerting plugin
date: 2022-10-27
date: 2022-10-28
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'alerting']
---
import alertingObj from './alerting.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/apm.devdocs.json
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@
"section": "def-server.LicensingPluginStart",
"text": "LicensingPluginStart"
},
">; }; observability: { setup: { getScopedAnnotationsClient: (requestContext: ",
">; }; observability: { setup: { getAlertDetailsConfig(): Readonly<{} & { apm: Readonly<{} & { enabled: boolean; }>; metrics: Readonly<{} & { enabled: boolean; }>; logs: Readonly<{} & { enabled: boolean; }>; uptime: Readonly<{} & { enabled: boolean; }>; }>; getScopedAnnotationsClient: (requestContext: ",
"RequestHandlerContext",
" & { licensing: Promise<",
{
Expand Down
2 changes: 1 addition & 1 deletion api_docs/apm.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/apm
title: "apm"
image: https://source.unsplash.com/400x175/?github
description: API docs for the apm plugin
date: 2022-10-27
date: 2022-10-28
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'apm']
---
import apmObj from './apm.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/banners.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/banners
title: "banners"
image: https://source.unsplash.com/400x175/?github
description: API docs for the banners plugin
date: 2022-10-27
date: 2022-10-28
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'banners']
---
import bannersObj from './banners.devdocs.json';
Expand Down
Loading

0 comments on commit 36984ff

Please sign in to comment.