Skip to content

Commit

Permalink
Merge branch 'main' of github.com:elastic/kibana into updating_action…
Browse files Browse the repository at this point in the history
…s_migration_logic
  • Loading branch information
yctercero committed Apr 26, 2022
2 parents c648433 + caedd86 commit 8ad20a3
Show file tree
Hide file tree
Showing 669 changed files with 10,307 additions and 11,550 deletions.
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/functional/synthetics.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ 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-monitor*"
node plugins/synthetics/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" --grep "MonitorManagement-monitor*"
1 change: 1 addition & 0 deletions docs/api/actions-and-connectors/create.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ The API returns the following:
"executionTimeField": null
},
"is_preconfigured": false,
"is_deprecated": false,
"is_missing_secrets": false
}
--------------------------------------------------
1 change: 1 addition & 0 deletions docs/api/actions-and-connectors/get.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ The API returns the following:
"executionTimeField": null
},
"is_preconfigured": false,
"is_deprecated": false,
"is_missing_secrets": false
}
--------------------------------------------------
2 changes: 2 additions & 0 deletions docs/api/actions-and-connectors/get_all.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ The API returns the following:
"connector_type_id": ".email",
"name": "email: preconfigured-mail-connector",
"is_preconfigured": true,
"is_deprecated": false,
"referenced_by_count": 0 <1>
},
{
Expand All @@ -56,6 +57,7 @@ The API returns the following:
"executionTimeField": null
},
"is_preconfigured": false,
"is_deprecated": false,
"is_missing_secrets": false,
"referenced_by_count": 3
}
Expand Down
1 change: 1 addition & 0 deletions docs/api/actions-and-connectors/legacy/create.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ The API returns the following:
"executionTimeField": null
},
"isPreconfigured": false,
"isDeprecated": false,
"isMissingSecrets": false
}
--------------------------------------------------
1 change: 1 addition & 0 deletions docs/api/actions-and-connectors/legacy/get.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ The API returns the following:
"executionTimeField": null
},
"isPreconfigured": false,
"isDeprecated": false,
"isMissingSecrets": false
}
--------------------------------------------------
4 changes: 3 additions & 1 deletion docs/api/actions-and-connectors/legacy/get_all.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ The API returns the following:
"id": "preconfigured-mail-action",
"actionTypeId": ".email",
"name": "email: preconfigured-mail-action",
"isPreconfigured": true
"isPreconfigured": true,
"isDeprecated": false
},
{
"id": "c55b6eb0-6bad-11eb-9f3b-611eebc6c3ad",
Expand All @@ -57,6 +58,7 @@ The API returns the following:
"executionTimeField": null
},
"isPreconfigured": false,
"isDeprecated": false,
"isMissingSecrets": false
}
]
Expand Down
1 change: 1 addition & 0 deletions docs/api/actions-and-connectors/legacy/update.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ The API returns the following:
"executionTimeField": null
},
"isPreconfigured": false,
"isDeprecated": false,
"isMissingSecrets": false
}
--------------------------------------------------
1 change: 1 addition & 0 deletions docs/api/actions-and-connectors/update.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ The API returns the following:
"executionTimeField": null
},
"is_preconfigured": false,
"is_deprecated": false,
"is_missing_secrets": false
}
--------------------------------------------------
1 change: 1 addition & 0 deletions docs/api/cases/cases-api-find-connectors.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ The API returns a JSON object describing the connectors and their settings:
"projectKey":"ES"
},
"isPreconfigured":false,
"isDeprecated": false,
"referencedByCount":0
}]
--------------------------------------------------
2 changes: 2 additions & 0 deletions docs/management/connectors/action-types/email.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ The email connector uses the SMTP protocol to send mail messages, using an integ

NOTE: For emails to have a footer with a link back to {kib}, set the <<server-publicBaseUrl, `server.publicBaseUrl`>> configuration setting.

NOTE: When the <<action-config-email-domain-allowlist, `xpack.actions.email.domain_allowlist`>> configuration setting is used, the email addresses used for all of the Sender (from), To, CC, and BCC properties must have email domains specified in the configuration setting.

[float]
[[email-connector-configuration]]
==== Connector configuration
Expand Down
26 changes: 22 additions & 4 deletions docs/settings/alert-action-settings.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,11 @@ The contents of a PEM-encoded certificate file, or multiple files appended
into a single string. This configuration can be used for environments where
the files cannot be made available.

[[action-config-email-domain-allowlist]] `xpack.actions.email.domain_allowlist` {ess-icon}::
A list of allowed email domains which can be used with the email connector. When this setting is not used, all email domains are allowed. When this setting is used, if any email is attempted to be sent that includes an addressee with an email domain that is not in the allowlist, or the from address domain is not in the allowlist, the run of the connector will fail with a message indicating the emails not allowed.

WARNING: This feature is available in {kib} 7.17.4 and 8.3.0 onwards but is not supported in {kib} 8.0, 8.1 or 8.2. As such this settings should be removed before upgrading from 7.17 to 8.0, 8.1 or 8.2. It is possible to configure the settings in 7.17.4 and then upgrade to 8.3.0 directly.

`xpack.actions.enabledActionTypes` {ess-icon}::
A list of action types that are enabled. It defaults to `[*]`, enabling all types. The names for built-in {kib} action types are prefixed with a `.` and include: `.email`, `.index`, `.jira`, `.pagerduty`, `.resilient`, `.server-log`, `.servicenow`, .`servicenow-itom`, `.servicenow-sir`, `.slack`, `.swimlane`, `.teams`, `.xmatters`, and `.webhook`. An empty list `[]` will disable all action types.
+
Expand Down Expand Up @@ -211,13 +216,26 @@ For example, `20m`, `24h`, `7d`, `1w`. Default: `5m`.
`xpack.alerting.rules.run.ruleTypeOverrides`::
Overrides the configs under `xpack.alerting.rules.run` for the rule type with the given ID. List the rule identifier and its settings in an array of objects.
+
--
For example:
```
[source,yaml]
--
xpack.alerting.rules.run:
timeout: '5m'
ruleTypeOverrides:
- id: '.index-threshold'
timeout: '15m'
```
--
--

`xpack.alerting.rules.run.actions.connectorTypeOverrides`::
Overrides the configs under `xpack.alerting.rules.run.actions` for the connector type with the given ID. List the connector type identifier and its settings in an array of objects.
+
For example:
[source,yaml]
--
xpack.alerting.rules.run:
actions:
max: 10
connectorTypeOverrides:
- id: '.server-log'
max: 5
--
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ $ kbn-action ls
"service": null
},
"isPreconfigured": false,
"isDeprecated": false,
"referencedByCount": 0
}
]
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@
"deepmerge": "^4.2.2",
"del": "^5.1.0",
"elastic-apm-node": "^3.31.0",
"email-addresses": "^5.0.0",
"execa": "^4.0.2",
"exit-hook": "^2.2.0",
"expiry-js": "0.1.7",
Expand Down
1 change: 1 addition & 0 deletions packages/kbn-optimizer/limits.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
pageLoadAssetSize:
advancedSettings: 27596
actions: 20000
alerting: 106936
apm: 64385
canvas: 1066647
Expand Down
1 change: 1 addition & 0 deletions packages/kbn-tooling-log/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ TYPES_DEPS = [
"@npm//tslib",
"@npm//@types/node",
"@npm//@types/jest",
"//packages/kbn-jest-serializers:npm_module_types" # needed for windows development, only used in tests
]

jsts_transpiler(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ kibana_vars=(
vis_type_vega.enableExternalUrls
xpack.actions.allowedHosts
xpack.actions.customHostSettings
xpack.actions.email.domain_allowlist
xpack.actions.enabledActionTypes
xpack.actions.maxResponseContentLength
xpack.actions.preconfigured
Expand All @@ -211,6 +212,7 @@ kibana_vars=(
xpack.alerting.rules.minimumScheduleInterval.value
xpack.alerting.rules.minimumScheduleInterval.enforce
xpack.alerting.rules.run.actions.max
xpack.alerting.rules.run.actions.connectorTypeOverrides
xpack.alerts.healthCheck.interval
xpack.alerts.invalidateApiKeysTask.interval
xpack.alerts.invalidateApiKeysTask.removalDelay
Expand Down
13 changes: 13 additions & 0 deletions src/dev/prs/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Pulling a list of PRs

This folder contains files used to pull lists of Kibana PRs for release testing.

`scripts/download_pr_list.js` is the cli wrapper.

You must have a `GITHUB_TOKEN` either set in your environment or on command line like

`GITHUB_TOKEN=<your token here> node scripts/download_pr_list.js`

Run it with `--help` or without arguments for help.

`kibana_qa_pr_list.json` is the file currently used by the Kibana QA team and also serves as an example.
135 changes: 135 additions & 0 deletions src/dev/prs/kibana_qa_pr_list.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
{
"include": [
"v8.3.0"
],
"exclude": [
"v8.2.0",
"v8.1.3",
"v8.1.2",
"v8.1.1",
"v8.1.0",
"v8.0.1",
"v8.0.0",
"v7.17.3",
"v7.17.2",
"v7.17.1",
"v7.17.0",
"v7.16.3",
"v7.16.2",
"v7.16.1",
"v7.16.0",
"v7.15.3",
"v7.15.2",
"v7.15.1",
"v7.15.0",
"v7.14.3",
"v7.14.2",
"v7.14.1",
"v7.14.0",
"v7.13.3",
"v7.13.2",
"v7.13.1",
"v7.13.0",
"v7.12.3",
"v7.12.2",
"v7.12.1",
"v7.12.0",
"v7.11.3",
"v7.11.2",
"v7.11.1",
"v7.11.0",
"v7.10.3",
"v7.10.2",
"v7.10.1",
"v7.10.0",
"v7.9.3",
"v7.9.2",
"v7.9.1",
"v7.9.0",
"v7.8.3",
"v7.8.2",
"v7.8.1",
"v7.8.0",
"v7.7.3",
"v7.7.2",
"v7.7.1",
"v7.7.0",
"v7.6.3",
"v7.6.2",
"v7.6.1",
"v7.6.0",
"v7.5.3",
"v7.5.2",
"v7.5.1",
"v7.5.0",
"v7.4.3",
"v7.4.2",
"v7.4.1",
"v7.4.0",
"v7.3.3",
"v7.3.2",
"v7.3.1",
"v7.3.0",
"v7.2.3",
"v7.2.2",
"v7.2.1",
"v7.2.0",
"v7.1.3",
"v7.1.2",
"v7.1.1",
"v7.1.0",
"v7.0.3",
"v7.0.2",
"v7.0.1",
"v7.0.0",
":ml",
"Feature:Anomaly Detection",
"Feature:Detections",
"Feature:Endpoint",
"Feature:Observability Landing - Milestone 1",
"Feature:Osquery",
"Feature:Transforms",
"Synthetics",
"Team: AWL: Platform",
"Team: Actionable Observability",
"Team: CTI",
"Team: SecuritySolution",
"Team:Asset Management",
"Team:Cloud Security Posture",
"Team:Detection Alerts",
"Team:Detection Rules",
"Team:Detections and Resp",
"Team:Docs",
"Team:Elasticsearch UI",
"Team:Endpoint Data Visibility",
"Team:Endpoint Management",
"Team:Endpoint Response",
"Team:EnterpriseSearch",
"Team:Fleet",
"Team:Infra Monitoring UI",
"Team:Ingest Management",
"Team:Observability",
"Team:Onboarding and Lifecycle Mgt",
"Team:Operations",
"Team:QA",
"Team:ResponseOps",
"Team:SIEM",
"Team:Security Solution Platform",
"Team:Security",
"Team:Threat Hunting",
"Team:Threat Hunting:Explore",
"Team:Threat Hunting:Investigations",
"Team:WorkplaceSearch",
"Team:WorkplaceSearch",
"Team:apm",
"Team:logs-metrics-ui",
"Team:uptime",
"bump",
"docs",
"failed-test",
"Feature:Unit Testing",
"Feature:Functional Testing",
"test_xpack_functional"
]
}

Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export const DocumentExplorerCallout = () => {
</EuiButton>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiLink href={docLinks.links.discover.documentExplorer}>
<EuiLink href={docLinks.links.discover.documentExplorer} target="_blank">
<FormattedMessage
id="discover.docExplorerCallout.learnMore"
defaultMessage="Learn more"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export const DocumentExplorerUpdateCallout = () => {
Learn more about the structure of your data with {fieldStatistics}."
values={{
fieldStatistics: (
<EuiLink href={docLinks.links.discover.fieldStatistics} external>
<EuiLink href={docLinks.links.discover.fieldStatistics} target="_blank">
<span css={semiBoldStyle}>
<FormattedMessage
id="discover.docExplorerUpdateCallout.fieldStatistics"
Expand All @@ -82,7 +82,7 @@ export const DocumentExplorerUpdateCallout = () => {
</EuiLink>
),
documentExplorer: (
<EuiLink href={docLinks.links.discover.documentExplorer} external>
<EuiLink href={docLinks.links.discover.documentExplorer} target="_blank">
<span css={semiBoldStyle}>
<FormattedMessage
id="discover.docExplorerUpdateCallout.documentExplorer"
Expand Down
Loading

0 comments on commit 8ad20a3

Please sign in to comment.