Skip to content

Commit

Permalink
Merge branch 'main' into docs/add-missing-reporting-config
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored Jan 27, 2022
2 parents f40f38a + 3d8697d commit 6a67e64
Show file tree
Hide file tree
Showing 762 changed files with 17,044 additions and 16,774 deletions.
2 changes: 1 addition & 1 deletion .buildkite/pull_requests.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))",
"always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))",
"skip_ci_labels": ["skip-ci", "jenkins-ci"],
"skip_target_branches": ["6.8"]
"skip_target_branches": ["6.8", "7.11", "7.12"]
}
]
}
9 changes: 0 additions & 9 deletions .buildkite/scripts/common/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,3 @@ fi

export BUILD_TS_REFS_DISABLE=true
export DISABLE_BOOTSTRAP_VALIDATION=true

export TEST_KIBANA_HOST=localhost
export TEST_KIBANA_PORT=6101
export TEST_KIBANA_URL="http://elastic:changeme@localhost:6101"
export TEST_ES_URL="http://elastic:changeme@localhost:6102"
export TEST_ES_TRANSPORT_PORT=6301-6309
export TEST_CORS_SERVER_PORT=6106
export ALERTING_PROXY_PORT=6105
export TEST_PROXY_SERVER_PORT=6107
9 changes: 9 additions & 0 deletions .buildkite/scripts/lifecycle/pre_command.sh
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,15 @@ export SYNTHETICS_SERVICE_PASSWORD
SYNTHETICS_SERVICE_MANIFEST="$(retry 5 5 vault read -field=manifest secret/kibana-issues/dev/kibana-ci-synthetics-credentials)"
export SYNTHETICS_SERVICE_MANIFEST

SYNTHETICS_REMOTE_KIBANA_USERNAME="$(retry 5 5 vault read -field=username secret/kibana-issues/dev/kibana-ci-synthetics-remote-credentials)"
export SYNTHETICS_REMOTE_KIBANA_USERNAME

SYNTHETICS_REMOTE_KIBANA_PASSWORD="$(retry 5 5 vault read -field=password secret/kibana-issues/dev/kibana-ci-synthetics-remote-credentials)"
export SYNTHETICS_REMOTE_KIBANA_PASSWORD

SYNTHETICS_REMOTE_KIBANA_URL="$(retry 5 5 vault read -field=url secret/kibana-issues/dev/kibana-ci-synthetics-remote-credentials)"
export SYNTHETICS_REMOTE_KIBANA_URL

# Setup Failed Test Reporter Elasticsearch credentials
{
TEST_FAILURES_ES_CLOUD_ID=$(retry 5 5 vault read -field=cloud_id secret/kibana-issues/dev/failed_tests_reporter_es)
Expand Down
17 changes: 17 additions & 0 deletions .buildkite/scripts/steps/functional/synthetics.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/usr/bin/env bash

set -euo pipefail

source .buildkite/scripts/common/util.sh

.buildkite/scripts/bootstrap.sh
.buildkite/scripts/download_build_artifacts.sh

export JOB=kibana-uptime-playwright

echo "--- Uptime @elastic/synthetics Tests"

cd "$XPACK_DIR"

checks-reporter-with-killswitch "Uptime @elastic/synthetics Tests" \
node plugins/uptime/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" --grep "MonitorManagement*"
7 changes: 7 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -1070,6 +1070,13 @@ module.exports = {
'@typescript-eslint/no-duplicate-imports': ['error'],
},
},
{
files: ['x-pack/plugins/cases/public/**/*.{js,mjs,ts,tsx}'],
excludedFiles: ['x-pack/plugins/cases/**/*.{test,mock,test_helper}.{ts,tsx}'],
rules: {
'react/display-name': ['error', { ignoreTranspilerName: true }],
},
},

/**
* Lists overrides. These rules below are maintained and owned by
Expand Down
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,8 @@
/x-pack/test/functional_with_es_ssl/apps/ml/ @elastic/ml-ui
/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/ml_rule_types/ @elastic/ml-ui
/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/transform_rule_types/ @elastic/ml-ui
/x-pack/test/screenshot_creation/apps/ml_docs @elastic/ml-ui
/x-pack/test/screenshot_creation/services/ml_screenshots.ts @elastic/ml-ui

# ML team owns and maintains the transform plugin despite it living in the Data management section.
/x-pack/plugins/transform/ @elastic/ml-ui
Expand Down
81 changes: 0 additions & 81 deletions .github/workflows/dev-docs-builder.yml

This file was deleted.

2 changes: 1 addition & 1 deletion api_docs/actions.json → api_docs/actions.devdocs.json
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@
"label": "ActionParamsType",
"description": [],
"signature": [
"{ readonly message: string; readonly level: \"error\" | \"info\" | \"trace\" | \"debug\" | \"warn\" | \"fatal\"; }"
"{ readonly message: string; readonly level: \"error\" | \"info\" | \"debug\" | \"trace\" | \"warn\" | \"fatal\"; }"
],
"path": "x-pack/plugins/actions/server/builtin_action_types/server_log.ts",
"deprecated": false,
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 @@ date: 2020-11-16
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
warning: This document is auto-generated and is meant to be viewed inside our experimental, new docs system. Reach out in #docs-engineering for more info.
---
import actionsObj from './actions.json';
import actionsObj from './actions.devdocs.json';



Expand Down
File renamed without changes.
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 @@ date: 2020-11-16
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
warning: This document is auto-generated and is meant to be viewed inside our experimental, new docs system. Reach out in #docs-engineering for more info.
---
import advancedSettingsObj from './advanced_settings.json';
import advancedSettingsObj from './advanced_settings.devdocs.json';



Expand Down
146 changes: 143 additions & 3 deletions api_docs/alerting.json → api_docs/alerting.devdocs.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,15 @@
"label": "alert",
"description": [],
"signature": [
"{ id: string; name: string; tags: string[]; enabled: boolean; params: never; actions: ",
"{ id: string; monitoring?: ",
{
"pluginId": "alerting",
"scope": "common",
"docId": "kibAlertingPluginApi",
"section": "def-common.RuleMonitoring",
"text": "RuleMonitoring"
},
" | undefined; name: string; tags: string[]; enabled: boolean; params: never; actions: ",
{
"pluginId": "alerting",
"scope": "common",
Expand Down Expand Up @@ -770,6 +778,63 @@
}
],
"functions": [
{
"parentPluginId": "alerting",
"id": "def-server.createAbortableEsClientFactory",
"type": "Function",
"tags": [],
"label": "createAbortableEsClientFactory",
"description": [],
"signature": [
"(opts: ",
"CreateAbortableEsClientFactoryOpts",
") => { asInternalUser: { search: <TDocument = unknown, TAggregations = Record<string, ",
"AggregationsAggregate",
">>(query: ",
"SearchRequest",
" | ",
"SearchRequest",
", options?: ",
"TransportRequestOptions",
" | undefined) => Promise<",
"TransportResult",
"<",
"SearchResponse",
"<TDocument, TAggregations>, unknown>>; }; asCurrentUser: { search: <TDocument = unknown, TAggregations = Record<string, ",
"AggregationsAggregate",
">>(query: ",
"SearchRequest",
" | ",
"SearchRequest",
", options?: ",
"TransportRequestOptions",
" | undefined) => Promise<",
"TransportResult",
"<",
"SearchResponse",
"<TDocument, TAggregations>, unknown>>; }; }"
],
"path": "x-pack/plugins/alerting/server/lib/create_abortable_es_client_factory.ts",
"deprecated": false,
"children": [
{
"parentPluginId": "alerting",
"id": "def-server.createAbortableEsClientFactory.$1",
"type": "Object",
"tags": [],
"label": "opts",
"description": [],
"signature": [
"CreateAbortableEsClientFactoryOpts"
],
"path": "x-pack/plugins/alerting/server/lib/create_abortable_es_client_factory.ts",
"deprecated": false,
"isRequired": true
}
],
"returnComment": [],
"initialIsOpen": false
},
{
"parentPluginId": "alerting",
"id": "def-server.getEsErrorMessage",
Expand Down Expand Up @@ -912,6 +977,16 @@
"path": "x-pack/plugins/alerting/server/types.ts",
"deprecated": false
},
{
"parentPluginId": "alerting",
"id": "def-server.AlertExecutorOptions.executionId",
"type": "string",
"tags": [],
"label": "executionId",
"description": [],
"path": "x-pack/plugins/alerting/server/types.ts",
"deprecated": false
},
{
"parentPluginId": "alerting",
"id": "def-server.AlertExecutorOptions.startedAt",
Expand Down Expand Up @@ -2484,7 +2559,7 @@
"section": "def-server.PartialAlert",
"text": "PartialAlert"
},
"<Params>>; enable: ({ id }: { id: string; }) => Promise<void>; disable: ({ id }: { id: string; }) => Promise<void>; muteAll: ({ id }: { id: string; }) => Promise<void>; getAlertState: ({ id }: { id: string; }) => Promise<void | { alertTypeState?: { [x: string]: unknown; } | undefined; alertInstances?: { [x: string]: { state?: { [x: string]: unknown; } | undefined; meta?: { lastScheduledActions?: ({ subgroup?: string | undefined; } & { group: string; date: Date; }) | undefined; } | undefined; }; } | undefined; previousStartedAt?: Date | null | undefined; }>; getAlertSummary: ({ id, dateStart }: ",
"<Params>>; enable: ({ id }: { id: string; }) => Promise<void>; disable: ({ id }: { id: string; }) => Promise<void>; muteAll: ({ id }: { id: string; }) => Promise<void>; getAlertState: ({ id }: { id: string; }) => Promise<void | { alertTypeState?: { [x: string]: unknown; } | undefined; alertInstances?: { [x: string]: { state?: { [x: string]: unknown; } | undefined; meta?: { lastScheduledActions?: ({ subgroup?: string | undefined; } & { group: string; date: Date; }) | undefined; } | undefined; }; } | undefined; previousStartedAt?: Date | null | undefined; }>; getAlertSummary: ({ id, dateStart, numberOfExecutions, }: ",
"GetAlertSummaryParams",
") => Promise<",
{
Expand Down Expand Up @@ -3205,6 +3280,26 @@
],
"path": "x-pack/plugins/alerting/common/alert.ts",
"deprecated": false
},
{
"parentPluginId": "alerting",
"id": "def-common.Alert.monitoring",
"type": "Object",
"tags": [],
"label": "monitoring",
"description": [],
"signature": [
{
"pluginId": "alerting",
"scope": "common",
"docId": "kibAlertingPluginApi",
"section": "def-common.RuleMonitoring",
"text": "RuleMonitoring"
},
" | undefined"
],
"path": "x-pack/plugins/alerting/common/alert.ts",
"deprecated": false
}
],
"initialIsOpen": false
Expand Down Expand Up @@ -3910,6 +4005,43 @@
],
"initialIsOpen": false
},
{
"parentPluginId": "alerting",
"id": "def-common.RuleMonitoring",
"type": "Interface",
"tags": [],
"label": "RuleMonitoring",
"description": [],
"signature": [
{
"pluginId": "alerting",
"scope": "common",
"docId": "kibAlertingPluginApi",
"section": "def-common.RuleMonitoring",
"text": "RuleMonitoring"
},
" extends ",
"SavedObjectAttributes"
],
"path": "x-pack/plugins/alerting/common/alert.ts",
"deprecated": false,
"children": [
{
"parentPluginId": "alerting",
"id": "def-common.RuleMonitoring.execution",
"type": "Object",
"tags": [],
"label": "execution",
"description": [],
"signature": [
"{ history: { success: boolean; timestamp: number; }[]; calculated_metrics: { success_ratio: number; }; }"
],
"path": "x-pack/plugins/alerting/common/alert.ts",
"deprecated": false
}
],
"initialIsOpen": false
},
{
"parentPluginId": "alerting",
"id": "def-common.RuleType",
Expand Down Expand Up @@ -4532,7 +4664,15 @@
"label": "SanitizedAlert",
"description": [],
"signature": [
"{ id: string; name: string; tags: string[]; enabled: boolean; params: Params; actions: ",
"{ id: string; monitoring?: ",
{
"pluginId": "alerting",
"scope": "common",
"docId": "kibAlertingPluginApi",
"section": "def-common.RuleMonitoring",
"text": "RuleMonitoring"
},
" | undefined; name: string; tags: string[]; enabled: boolean; params: Params; actions: ",
{
"pluginId": "alerting",
"scope": "common",
Expand Down
Loading

0 comments on commit 6a67e64

Please sign in to comment.